From ce292ae34701fcf0dc05b675b4beb4e92356884e Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Sun, 24 May 2020 21:56:17 +0200 Subject: [PATCH] package/core: bump material-table and remove package patch --- package.json | 2 - .../templates/default-app/package.json.hbs | 4 +- .../templates/default-app/patches/README.md | 11 ---- .../patches/material-table+1.57.2.patch | 12 ---- packages/core/package.json | 2 +- patches/README.md | 11 ---- patches/material-table+1.57.2.patch | 12 ---- yarn.lock | 64 ++----------------- 8 files changed, 6 insertions(+), 112 deletions(-) delete mode 100644 packages/cli/templates/default-app/patches/README.md delete mode 100644 packages/cli/templates/default-app/patches/material-table+1.57.2.patch delete mode 100644 patches/README.md delete mode 100644 patches/material-table+1.57.2.patch diff --git a/package.json b/package.json index a610559d41..de924894c7 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,6 @@ "remove-plugin": "backstage-cli remove-plugin", "release": "if [ \"$(git symbolic-ref --short HEAD)\" = master ]; then echo \"don't try to release master\"; exit 1; else lerna version --no-push; fi", "lerna": "lerna", - "postinstall": "patch-package", "storybook": "yarn workspace storybook start", "build-storybook": "yarn workspace storybook build-storybook" }, @@ -37,7 +36,6 @@ "husky": "^4.2.3", "lerna": "^3.20.2", "lint-staged": "^10.1.0", - "patch-package": "^6.2.2", "prettier": "^2.0.5" }, "husky": { diff --git a/packages/cli/templates/default-app/package.json.hbs b/packages/cli/templates/default-app/package.json.hbs index 589e20e298..1712584a87 100644 --- a/packages/cli/templates/default-app/package.json.hbs +++ b/packages/cli/templates/default-app/package.json.hbs @@ -17,8 +17,7 @@ "lint": "lerna run lint --since origin/master --", "lint:all": "lerna run lint --", "create-plugin": "backstage-cli create-plugin", - "remove-plugin": "backstage-cli remove-plugin", - "postinstall": "patch-package" + "remove-plugin": "backstage-cli remove-plugin" }, "workspaces": { "packages": [ @@ -29,7 +28,6 @@ "devDependencies": { "@backstage/cli": "^{{version}}", "lerna": "^3.20.2", - "patch-package": "^6.2.2", "prettier": "^1.19.1" } } diff --git a/packages/cli/templates/default-app/patches/README.md b/packages/cli/templates/default-app/patches/README.md deleted file mode 100644 index 980729c4cd..0000000000 --- a/packages/cli/templates/default-app/patches/README.md +++ /dev/null @@ -1,11 +0,0 @@ -# patches - -This folder contains patches for dependency type declarations. Typescript doesn't provide a way to override of fix types that are installed as a part of the dependent package itself. - -Do not add any more patches here, these patches were added as a part of getting the entire repo type-checked, and we depended on some packages with bad types. - -As soon as the below issues are fixed, we should remove the patching functionality completely. - -## material-table - -Fixed in master but not released yet, tracked here: https://github.com/mbrn/material-table/pull/1624 diff --git a/packages/cli/templates/default-app/patches/material-table+1.57.2.patch b/packages/cli/templates/default-app/patches/material-table+1.57.2.patch deleted file mode 100644 index 5751243775..0000000000 --- a/packages/cli/templates/default-app/patches/material-table+1.57.2.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/node_modules/material-table/types/index.d.ts b/node_modules/material-table/types/index.d.ts -index 06b700b..5b3c765 100644 ---- a/node_modules/material-table/types/index.d.ts -+++ b/node_modules/material-table/types/index.d.ts -@@ -228,7 +228,6 @@ export interface Options { - showTitle?: boolean; - showTextRowsSelected?: boolean; - search?: boolean; -- searchText?: string; - searchFieldAlignment?: 'left' | 'right'; - searchFieldStyle?: React.CSSProperties; - searchText?: string; diff --git a/packages/core/package.json b/packages/core/package.json index 50a5fa7cae..e4521530b1 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -41,7 +41,7 @@ "classnames": "^2.2.6", "clsx": "^1.1.0", "lodash": "^4.17.15", - "material-table": "^1.57.2", + "material-table": "^1.58.0", "prop-types": "^15.7.2", "rc-progress": "^3.0.0", "react": "^16.12.0", diff --git a/patches/README.md b/patches/README.md deleted file mode 100644 index 980729c4cd..0000000000 --- a/patches/README.md +++ /dev/null @@ -1,11 +0,0 @@ -# patches - -This folder contains patches for dependency type declarations. Typescript doesn't provide a way to override of fix types that are installed as a part of the dependent package itself. - -Do not add any more patches here, these patches were added as a part of getting the entire repo type-checked, and we depended on some packages with bad types. - -As soon as the below issues are fixed, we should remove the patching functionality completely. - -## material-table - -Fixed in master but not released yet, tracked here: https://github.com/mbrn/material-table/pull/1624 diff --git a/patches/material-table+1.57.2.patch b/patches/material-table+1.57.2.patch deleted file mode 100644 index 5751243775..0000000000 --- a/patches/material-table+1.57.2.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/node_modules/material-table/types/index.d.ts b/node_modules/material-table/types/index.d.ts -index 06b700b..5b3c765 100644 ---- a/node_modules/material-table/types/index.d.ts -+++ b/node_modules/material-table/types/index.d.ts -@@ -228,7 +228,6 @@ export interface Options { - showTitle?: boolean; - showTextRowsSelected?: boolean; - search?: boolean; -- searchText?: string; - searchFieldAlignment?: 'left' | 'right'; - searchFieldStyle?: React.CSSProperties; - searchText?: string; diff --git a/yarn.lock b/yarn.lock index a41b212131..328b49a678 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4775,11 +4775,6 @@ resolved "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== -"@yarnpkg/lockfile@^1.1.0": - version "1.1.0" - resolved "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31" - integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ== - "@zkochan/cmd-shim@^3.1.0": version "3.1.0" resolved "https://registry.npmjs.org/@zkochan/cmd-shim/-/cmd-shim-3.1.0.tgz#2ab8ed81f5bb5452a85f25758eb9b8681982fd2e" @@ -9658,14 +9653,6 @@ find-versions@^3.0.0, find-versions@^3.2.0: dependencies: semver-regex "^2.0.0" -find-yarn-workspace-root@^1.2.1: - version "1.2.1" - resolved "https://registry.npmjs.org/find-yarn-workspace-root/-/find-yarn-workspace-root-1.2.1.tgz#40eb8e6e7c2502ddfaa2577c176f221422f860db" - integrity sha512-dVtfb0WuQG+8Ag2uWkbG79hOUzEsRrhBzgfn86g2sJPkzmcpGdghbNTfUKGTxymFrY/tLIodDzLoW9nOJ4FY8Q== - dependencies: - fs-extra "^4.0.3" - micromatch "^3.1.4" - findup-sync@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz#17b108f9ee512dfb7a5c7f3c8b27ea9e1a9c08d1" @@ -9913,24 +9900,6 @@ fs-extra@^0.30.0: path-is-absolute "^1.0.0" rimraf "^2.2.8" -fs-extra@^4.0.3: - version "4.0.3" - resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94" - integrity sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg== - dependencies: - graceful-fs "^4.1.2" - jsonfile "^4.0.0" - universalify "^0.1.0" - -fs-extra@^7.0.1: - version "7.0.1" - resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9" - integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw== - dependencies: - graceful-fs "^4.1.2" - jsonfile "^4.0.0" - universalify "^0.1.0" - fs-extra@^9.0.0: version "9.0.0" resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.0.tgz#b6afc31036e247b2466dc99c29ae797d5d4580a3" @@ -13313,13 +13282,6 @@ kind-of@^6.0.0, kind-of@^6.0.2: resolved "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== -klaw-sync@^6.0.0: - version "6.0.0" - resolved "https://registry.npmjs.org/klaw-sync/-/klaw-sync-6.0.0.tgz#1fd2cfd56ebb6250181114f0a581167099c2b28c" - integrity sha512-nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ== - dependencies: - graceful-fs "^4.1.11" - klaw@^1.0.0: version "1.3.1" resolved "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439" @@ -14255,10 +14217,10 @@ marked@^0.8.0: resolved "https://registry.npmjs.org/marked/-/marked-0.8.1.tgz#a233f39572fab15ede53a3c3be8a139bff86d2dd" integrity sha512-tZfJS8uE0zpo7xpTffwFwYRfW9AzNcdo04Qcjs+C9+oCy8MSRD2reD5iDVtYx8mtLaqsGughw/YLlcwNxAHA1g== -material-table@^1.57.2: - version "1.57.2" - resolved "https://registry.npmjs.org/material-table/-/material-table-1.57.2.tgz#8854cb4d623b294138c83a0c7ff9f2900267c81f" - integrity sha512-hiJdRTrqu8pyYwSxzmcG1TnR4KWG2gtXrFB3XL9h4ij3A68EOJmlss6VH/LXh3NLlUce1TteK6W7fGa7YcnKGg== +material-table@^1.58.0: + version "1.58.0" + resolved "https://registry.npmjs.org/material-table/-/material-table-1.58.0.tgz#1902f88b74436ce880b234c7c713f0e34a7e2f9d" + integrity sha512-5xiiKERNZv9Zai2TMT5d9LRLrKlofAFe2YZZzxP7cJ9DIZC8HcaflunyIVHYTzK1yFS51TqjDvHIqxYLIqdahQ== dependencies: "@date-io/date-fns" "^1.1.0" "@material-ui/pickers" "^3.2.2" @@ -16135,24 +16097,6 @@ passport@0.4.1: passport-strategy "1.x.x" pause "0.0.1" -patch-package@^6.2.2: - version "6.2.2" - resolved "https://registry.npmjs.org/patch-package/-/patch-package-6.2.2.tgz#71d170d650c65c26556f0d0fbbb48d92b6cc5f39" - integrity sha512-YqScVYkVcClUY0v8fF0kWOjDYopzIM8e3bj/RU1DPeEF14+dCGm6UeOYm4jvCyxqIEQ5/eJzmbWfDWnUleFNMg== - dependencies: - "@yarnpkg/lockfile" "^1.1.0" - chalk "^2.4.2" - cross-spawn "^6.0.5" - find-yarn-workspace-root "^1.2.1" - fs-extra "^7.0.1" - is-ci "^2.0.0" - klaw-sync "^6.0.0" - minimist "^1.2.0" - rimraf "^2.6.3" - semver "^5.6.0" - slash "^2.0.0" - tmp "^0.0.33" - path-browserify@0.0.1: version "0.0.1" resolved "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz#e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a"