From 081b482d41fbb7dbb241de1db7a39f578ddbd62c Mon Sep 17 00:00:00 2001 From: Jaco Date: Fri, 24 Dec 2021 15:45:01 +0100 Subject: [PATCH] Remove @polkadot/ts dep (#568) * Remove @polkadot/ts dep * Bump dev * Adjust, correct deps --- package.json | 3 +- packages/react-identicon/package.json | 2 +- packages/react-qr/package.json | 2 +- packages/reactnative-identicon/package.json | 2 +- packages/ui-shared/package.json | 3 +- tsconfig.base.json | 1 - tsconfig.eslint.json | 2 +- yarn.lock | 96 ++++++--------------- 8 files changed, 34 insertions(+), 77 deletions(-) diff --git a/package.json b/package.json index aebca347..0124ac3d 100644 --- a/package.json +++ b/package.json @@ -34,8 +34,7 @@ "devDependencies": { "@babel/core": "^7.16.5", "@babel/runtime": "^7.16.5", - "@polkadot/dev": "^0.64.15", - "@polkadot/ts": "^0.4.22", + "@polkadot/dev": "^0.64.20", "@polkadot/x-bundle": "^8.2.2", "@types/jest": "^27.0.3", "babel-loader": "^8.2.3", diff --git a/packages/react-identicon/package.json b/packages/react-identicon/package.json index 00625f38..649f0934 100644 --- a/packages/react-identicon/package.json +++ b/packages/react-identicon/package.json @@ -35,7 +35,7 @@ "devDependencies": { "@types/react-copy-to-clipboard": "^5.0.2", "@types/react-dom": "^17.0.11", - "@types/styled-components": "^5.1.18", + "@types/styled-components": "^5.1.19", "styled-components": "^5.3.3", "xmlserializer": "^0.6.1" }, diff --git a/packages/react-qr/package.json b/packages/react-qr/package.json index 216c86bf..019f40d4 100644 --- a/packages/react-qr/package.json +++ b/packages/react-qr/package.json @@ -27,7 +27,7 @@ }, "devDependencies": { "@types/react-qr-reader": "^2.1.4", - "@types/styled-components": "^5.1.18" + "@types/styled-components": "^5.1.19" }, "peerDependencies": { "@polkadot/util": "*", diff --git a/packages/reactnative-identicon/package.json b/packages/reactnative-identicon/package.json index fa084a0b..a4904f82 100644 --- a/packages/reactnative-identicon/package.json +++ b/packages/reactnative-identicon/package.json @@ -27,7 +27,7 @@ "react-native-svg": "^12.2.0" }, "devDependencies": { - "@types/react-native": "^0.66.9" + "@types/react-native": "^0.66.10" }, "peerDependencies": { "@polkadot/util": "*", diff --git a/packages/ui-shared/package.json b/packages/ui-shared/package.json index c079d0f2..423fa512 100644 --- a/packages/ui-shared/package.json +++ b/packages/ui-shared/package.json @@ -24,7 +24,8 @@ "@polkadot/util": "^8.2.2", "@polkadot/util-crypto": "^8.2.2", "@types/color": "^3.0.2", - "@types/xmlserializer": "^0.6.2" + "@types/xmlserializer": "^0.6.2", + "xmlserializer": "^0.6.1" }, "peerDependencies": { "@polkadot/util": "*", diff --git a/tsconfig.base.json b/tsconfig.base.json index 42402824..a1bab8a3 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -22,7 +22,6 @@ }, "skipLibCheck": true, "typeRoots": [ - "./node_modules/@polkadot/ts", "./node_modules/@types" ] } diff --git a/tsconfig.eslint.json b/tsconfig.eslint.json index 95adf84e..f48648e1 100644 --- a/tsconfig.eslint.json +++ b/tsconfig.eslint.json @@ -7,7 +7,7 @@ "packages/**/src/**/*", "packages/**/*.js" ], - "exclue": [ + "exclude": [ "**/node_modules/**/*" ] } diff --git a/yarn.lock b/yarn.lock index 7b7a2920..b3665432 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2136,9 +2136,9 @@ __metadata: languageName: node linkType: hard -"@polkadot/dev@npm:^0.64.15": - version: 0.64.15 - resolution: "@polkadot/dev@npm:0.64.15" +"@polkadot/dev@npm:^0.64.20": + version: 0.64.20 + resolution: "@polkadot/dev@npm:0.64.20" dependencies: "@babel/cli": ^7.16.0 "@babel/core": ^7.16.5 @@ -2179,7 +2179,7 @@ __metadata: eslint-plugin-import-newlines: ^1.1.7 eslint-plugin-node: ^11.1.0 eslint-plugin-promise: ^6.0.0 - eslint-plugin-react: ^7.27.1 + eslint-plugin-react: ^7.28.0 eslint-plugin-react-hooks: ^4.3.0 eslint-plugin-simple-import-sort: ^7.0.0 eslint-plugin-sort-destructure-keys: ^1.4.0 @@ -2201,7 +2201,7 @@ __metadata: rollup: ^2.61.1 rollup-plugin-cleanup: ^3.2.1 typescript: ^4.5.4 - yargs: ^17.3.0 + yargs: ^17.3.1 bin: polkadot-ci-ghact-build: scripts/polkadot-ci-ghact-build.mjs polkadot-ci-ghact-docs: scripts/polkadot-ci-ghact-docs.mjs @@ -2223,7 +2223,7 @@ __metadata: polkadot-exec-rollup: scripts/polkadot-exec-rollup.mjs polkadot-exec-tsc: scripts/polkadot-exec-tsc.mjs polkadot-exec-webpack: scripts/polkadot-exec-webpack.mjs - checksum: 4f866be68acf54d36a7428e6a05d698b51d7db5409e64a72a59bae3f11794fb3a44639054fe06dc052533c8df4eec8a21ae70dd490310c31dfe1990437555a0c + checksum: 5b067d12ebe04ea3abb673acbaf3244b868c9410787b66593b2dd9a916fd509dcd2ab72871132e7605ae967b1a2b8a87fd16b648a6d7601d392e02dcb75316eb languageName: node linkType: hard @@ -2306,7 +2306,7 @@ __metadata: "@polkadot/util-crypto": ^8.2.2 "@types/react-copy-to-clipboard": ^5.0.2 "@types/react-dom": ^17.0.11 - "@types/styled-components": ^5.1.18 + "@types/styled-components": ^5.1.19 color: ^3.2.1 ethereum-blockies-base64: ^1.0.2 jdenticon: 3.1.1 @@ -2333,7 +2333,7 @@ __metadata: "@polkadot/util": ^8.2.2 "@polkadot/util-crypto": ^8.2.2 "@types/react-qr-reader": ^2.1.4 - "@types/styled-components": ^5.1.18 + "@types/styled-components": ^5.1.19 qrcode-generator: ^1.4.4 react-qr-reader: ^2.2.1 styled-components: ^5.3.3 @@ -2354,7 +2354,7 @@ __metadata: "@polkadot/ui-shared": 0.87.7-1 "@polkadot/util": ^8.2.2 "@polkadot/util-crypto": ^8.2.2 - "@types/react-native": ^0.66.9 + "@types/react-native": ^0.66.10 react-native-svg: ^12.2.0 peerDependencies: "@polkadot/util": "*" @@ -2364,15 +2364,6 @@ __metadata: languageName: unknown linkType: soft -"@polkadot/ts@npm:^0.4.22": - version: 0.4.22 - resolution: "@polkadot/ts@npm:0.4.22" - dependencies: - "@types/chrome": ^0.0.171 - checksum: 4f900a16949b13bf46c420d110dcd9287ebe4b112c30e3250e3374b6f4203f28b08d85039cb2daf645012807b6817d09079d84cda53eb4b9a826bfa74bb1fe55 - languageName: node - linkType: hard - "@polkadot/ui-assets@workspace:packages/ui-assets": version: 0.0.0-use.local resolution: "@polkadot/ui-assets@workspace:packages/ui-assets" @@ -2429,6 +2420,7 @@ __metadata: "@types/color": ^3.0.2 "@types/xmlserializer": ^0.6.2 color: ^3.2.1 + xmlserializer: ^0.6.1 peerDependencies: "@polkadot/util": "*" "@polkadot/util-crypto": "*" @@ -2951,16 +2943,6 @@ __metadata: languageName: node linkType: hard -"@types/chrome@npm:^0.0.171": - version: 0.0.171 - resolution: "@types/chrome@npm:0.0.171" - dependencies: - "@types/filesystem": "*" - "@types/har-format": "*" - checksum: 657bd2a82b2550bc70a24f43e15121eaf2ee56e52e7a7a904375cded6ffd2e7a1dc27f2456719f5272454a88c483727b99deec1b7244c0cab815f8946c8a3a73 - languageName: node - linkType: hard - "@types/color-convert@npm:*": version: 2.0.0 resolution: "@types/color-convert@npm:2.0.0" @@ -3020,22 +3002,6 @@ __metadata: languageName: node linkType: hard -"@types/filesystem@npm:*": - version: 0.0.29 - resolution: "@types/filesystem@npm:0.0.29" - dependencies: - "@types/filewriter": "*" - checksum: d57682687c3df2593d56cf78981e3d7f14c1e8bfb4e595995c5acd1a3c81e38079b572feb7de91f2838e8005ee018bc536b93e473d7a4bbdb8116fde3e93c2f8 - languageName: node - linkType: hard - -"@types/filewriter@npm:*": - version: 0.0.28 - resolution: "@types/filewriter@npm:0.0.28" - checksum: e558fd6aed0444e5512037f51ae21d43628012c20a2149b9d9aa4cef029a4a36c7d46cbce430ecac3beedf9a55ac0f9751acd83cec67236c22bbe988d7c46d04 - languageName: node - linkType: hard - "@types/graceful-fs@npm:^4.1.2": version: 4.1.4 resolution: "@types/graceful-fs@npm:4.1.4" @@ -3045,13 +3011,6 @@ __metadata: languageName: node linkType: hard -"@types/har-format@npm:*": - version: 1.2.5 - resolution: "@types/har-format@npm:1.2.5" - checksum: f2507601100364fd261bf7589feb1f9b9b0cd18c6273db29b45d694133a7063baa473004238d8a03954f0e9622cff9f42b0050d86743b4272f6b4d68007db651 - languageName: node - linkType: hard - "@types/hoist-non-react-statics@npm:*": version: 3.3.1 resolution: "@types/hoist-non-react-statics@npm:3.3.1" @@ -3191,12 +3150,12 @@ __metadata: languageName: node linkType: hard -"@types/react-native@npm:^0.66.9": - version: 0.66.9 - resolution: "@types/react-native@npm:0.66.9" +"@types/react-native@npm:^0.66.10": + version: 0.66.10 + resolution: "@types/react-native@npm:0.66.10" dependencies: "@types/react": "*" - checksum: fad569bd3ed9275e01cd1fed57e6a001b25cf3b2d1946b68b83d3dc77678ac914c8764e0a36b6e9dc2fa01dd9300f5687f50280fabc8fb76146eee73664929bc + checksum: 5d0e6a2b4b05839fb43ea1a1bfbfd054c60ece8c1554b0c61f096c77f6fc01cddb7ac5338c5030db9296830bc4426eca7966d1249e7aa6eb6b10fea568957b7a languageName: node linkType: hard @@ -3251,14 +3210,14 @@ __metadata: languageName: node linkType: hard -"@types/styled-components@npm:^5.1.18": - version: 5.1.18 - resolution: "@types/styled-components@npm:5.1.18" +"@types/styled-components@npm:^5.1.19": + version: 5.1.19 + resolution: "@types/styled-components@npm:5.1.19" dependencies: "@types/hoist-non-react-statics": "*" "@types/react": "*" csstype: ^3.0.2 - checksum: f4d99353e53781283549f5988fda3b3d4cf8fc1bca6624a215883851148db0d5c65c0d0b04ff0a9de43cbce54219a46fe5272278391051e7a4164b4b5e5bd125 + checksum: ccd2baa6c980ad176650889f2fb286edbb57f5e2b74a01d80d349f751fa7fbdb4f21ed34a893a4c417cc5731c5f0174dba5d180c3a11954996d29c2818ecab13 languageName: node linkType: hard @@ -6656,9 +6615,9 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-react@npm:^7.27.1": - version: 7.27.1 - resolution: "eslint-plugin-react@npm:7.27.1" +"eslint-plugin-react@npm:^7.28.0": + version: 7.28.0 + resolution: "eslint-plugin-react@npm:7.28.0" dependencies: array-includes: ^3.1.4 array.prototype.flatmap: ^1.2.5 @@ -6676,7 +6635,7 @@ __metadata: string.prototype.matchall: ^4.0.6 peerDependencies: eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 - checksum: db1ce303b597ede0bc8873d3f575b05873b06a058162c80f76604c9096eee8f72f299d7f849a86ac2e59f269c196575e6bcfb1ef9d7cbb23f533d081bcc15ea0 + checksum: 90293d0fd53bb1f735ffd32141cdd211fb1120c9f7bbe5342f9e923261a39e52a2b2575d4e46c9cd77d257f42db4a99b8b339689fc5b5c1c26048929f69b1784 languageName: node linkType: hard @@ -13126,8 +13085,7 @@ resolve@^2.0.0-next.3: dependencies: "@babel/core": ^7.16.5 "@babel/runtime": ^7.16.5 - "@polkadot/dev": ^0.64.15 - "@polkadot/ts": ^0.4.22 + "@polkadot/dev": ^0.64.20 "@polkadot/x-bundle": ^8.2.2 "@types/jest": ^27.0.3 babel-loader: ^8.2.3 @@ -15607,9 +15565,9 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard -"yargs@npm:^17.0.0, yargs@npm:^17.3.0": - version: 17.3.0 - resolution: "yargs@npm:17.3.0" +"yargs@npm:^17.0.0, yargs@npm:^17.3.1": + version: 17.3.1 + resolution: "yargs@npm:17.3.1" dependencies: cliui: ^7.0.2 escalade: ^3.1.1 @@ -15618,7 +15576,7 @@ resolve@^2.0.0-next.3: string-width: ^4.2.3 y18n: ^5.0.5 yargs-parser: ^21.0.0 - checksum: 2b687338684bf9645e9389ffdbe813fc5a2ddfede299d46fbe5ac80eb9a391e558b97861ba44d2256936ebe9d7f8135f6a38af1c76a5685eac4061008b2df57a + checksum: 64fc2e32c56739f1d14d2d24acd17a6944c3c8e3e3558f09fc1953ac112e868cc16013d282886b9d5be22187f8b9ed4f60741a6b1011f595ce2718805a656852 languageName: node linkType: hard