From 16113a8a2df525433c48d7fb4f74c622d6c202d1 Mon Sep 17 00:00:00 2001 From: Jaco Date: Fri, 17 Mar 2023 08:07:56 +0200 Subject: [PATCH] Bump to TS 5.0 (#1233) * Bump to TS 5.0 * Fix dev-test imports --- package.json | 6 +- .../src/background/handlers/Extension.spec.ts | 2 +- packages/extension-dapp/src/wrapBytes.spec.ts | 2 +- packages/extension-inject/package.json | 2 +- packages/extension-ui/package.json | 2 +- .../src/Popup/Accounts/Account.spec.tsx | 2 +- .../src/Popup/Authorize/Authorize.spec.tsx | 2 +- .../CreateAccount/CreateAccount.spec.tsx | 2 +- .../src/Popup/Derive/Derive.spec.tsx | 2 +- .../extension-ui/src/Popup/Export.spec.tsx | 2 +- .../extension-ui/src/Popup/ImportQr.spec.tsx | 2 +- .../src/Popup/ImportSeed/ImportSeed.spec.tsx | 2 +- .../src/Popup/Signing/Signing.spec.tsx | 2 +- .../AccountNamePasswordCreation.spec.tsx | 2 +- .../src/components/Address.spec.tsx | 2 +- packages/extension-ui/src/messaging.spec.ts | 2 +- .../extension-ui/src/partials/Header.spec.tsx | 2 +- .../src/util/buildHierarchy.spec.ts | 2 +- .../src/util/nextDerivationPath.spec.ts | 2 +- packages/extension/package.json | 2 +- yarn.lock | 97 ++++++++++--------- 21 files changed, 71 insertions(+), 70 deletions(-) diff --git a/package.json b/package.json index 558f9c7f..c2eda6eb 100644 --- a/package.json +++ b/package.json @@ -41,8 +41,8 @@ }, "devDependencies": { "@babel/core": "^7.21.0", - "@polkadot/dev": "^0.72.1", - "@types/node": "^18.15.0", + "@polkadot/dev": "^0.72.9", + "@types/node": "^18.15.3", "i18next-scanner": "^4.1.1", "sinon-chrome": "^3.0.1" }, @@ -55,6 +55,6 @@ "@polkadot/util-crypto": "^11.0.2", "@polkadot/x-fetch": "^11.0.2", "safe-buffer": "^5.2.1", - "typescript": "^4.9.5" + "typescript": "^5.0.2" } } diff --git a/packages/extension-base/src/background/handlers/Extension.spec.ts b/packages/extension-base/src/background/handlers/Extension.spec.ts index 9a6e32a0..e40b0476 100644 --- a/packages/extension-base/src/background/handlers/Extension.spec.ts +++ b/packages/extension-base/src/background/handlers/Extension.spec.ts @@ -1,7 +1,7 @@ // Copyright 2019-2023 @polkadot/extension authors & contributors // SPDX-License-Identifier: Apache-2.0 -/// +/// import '@polkadot/extension-mocks/chrome'; diff --git a/packages/extension-dapp/src/wrapBytes.spec.ts b/packages/extension-dapp/src/wrapBytes.spec.ts index 977706ed..8bba4132 100644 --- a/packages/extension-dapp/src/wrapBytes.spec.ts +++ b/packages/extension-dapp/src/wrapBytes.spec.ts @@ -1,7 +1,7 @@ // Copyright 2019-2023 @polkadot/extension authors & contributors // SPDX-License-Identifier: Apache-2.0 -/// +/// import { u8aConcat, u8aEq, u8aToString } from '@polkadot/util'; diff --git a/packages/extension-inject/package.json b/packages/extension-inject/package.json index bbbe668c..805af109 100644 --- a/packages/extension-inject/package.json +++ b/packages/extension-inject/package.json @@ -26,7 +26,7 @@ "tslib": "^2.5.0" }, "devDependencies": { - "@types/chrome": "^0.0.221", + "@types/chrome": "^0.0.224", "@types/firefox-webext-browser": "^111.0.0" }, "peerDependencies": { diff --git a/packages/extension-ui/package.json b/packages/extension-ui/package.json index 5c2e0a41..8281e1be 100644 --- a/packages/extension-ui/package.json +++ b/packages/extension-ui/package.json @@ -46,7 +46,7 @@ "react-is": "^18.2.0", "react-router": "^5.3.4", "react-router-dom": "^5.3.4", - "styled-components": "^5.3.8", + "styled-components": "^5.3.9", "tslib": "^2.5.0" }, "devDependencies": { diff --git a/packages/extension-ui/src/Popup/Accounts/Account.spec.tsx b/packages/extension-ui/src/Popup/Accounts/Account.spec.tsx index ac57b85f..c3860754 100644 --- a/packages/extension-ui/src/Popup/Accounts/Account.spec.tsx +++ b/packages/extension-ui/src/Popup/Accounts/Account.spec.tsx @@ -1,7 +1,7 @@ // Copyright 2019-2023 @polkadot/extension-ui authors & contributors // SPDX-License-Identifier: Apache-2.0 -/// +/// import '@polkadot/extension-mocks/chrome'; diff --git a/packages/extension-ui/src/Popup/Authorize/Authorize.spec.tsx b/packages/extension-ui/src/Popup/Authorize/Authorize.spec.tsx index 3e308f15..9a1d7847 100644 --- a/packages/extension-ui/src/Popup/Authorize/Authorize.spec.tsx +++ b/packages/extension-ui/src/Popup/Authorize/Authorize.spec.tsx @@ -1,7 +1,7 @@ // Copyright 2019-2023 @polkadot/extension-ui authors & contributors // SPDX-License-Identifier: Apache-2.0 -/// +/// import '@polkadot/extension-mocks/chrome'; diff --git a/packages/extension-ui/src/Popup/CreateAccount/CreateAccount.spec.tsx b/packages/extension-ui/src/Popup/CreateAccount/CreateAccount.spec.tsx index 35cf1969..ba343d54 100644 --- a/packages/extension-ui/src/Popup/CreateAccount/CreateAccount.spec.tsx +++ b/packages/extension-ui/src/Popup/CreateAccount/CreateAccount.spec.tsx @@ -1,7 +1,7 @@ // Copyright 2019-2023 @polkadot/extension-ui authors & contributors // SPDX-License-Identifier: Apache-2.0 -/// +/// import '@polkadot/extension-mocks/chrome'; diff --git a/packages/extension-ui/src/Popup/Derive/Derive.spec.tsx b/packages/extension-ui/src/Popup/Derive/Derive.spec.tsx index 16d95106..f850927d 100644 --- a/packages/extension-ui/src/Popup/Derive/Derive.spec.tsx +++ b/packages/extension-ui/src/Popup/Derive/Derive.spec.tsx @@ -1,7 +1,7 @@ // Copyright 2019-2023 @polkadot/extension-ui authors & contributors // SPDX-License-Identifier: Apache-2.0 -/// +/// import '@polkadot/extension-mocks/chrome'; diff --git a/packages/extension-ui/src/Popup/Export.spec.tsx b/packages/extension-ui/src/Popup/Export.spec.tsx index f2ee695e..50be9d48 100644 --- a/packages/extension-ui/src/Popup/Export.spec.tsx +++ b/packages/extension-ui/src/Popup/Export.spec.tsx @@ -1,7 +1,7 @@ // Copyright 2019-2023 @polkadot/extension-ui authors & contributors // SPDX-License-Identifier: Apache-2.0 -/// +/// import '@polkadot/extension-mocks/chrome'; diff --git a/packages/extension-ui/src/Popup/ImportQr.spec.tsx b/packages/extension-ui/src/Popup/ImportQr.spec.tsx index fc3fde81..8f85ab8a 100644 --- a/packages/extension-ui/src/Popup/ImportQr.spec.tsx +++ b/packages/extension-ui/src/Popup/ImportQr.spec.tsx @@ -1,7 +1,7 @@ // Copyright 2019-2023 @polkadot/extension-ui authors & contributors // SPDX-License-Identifier: Apache-2.0 -/// +/// import '@polkadot/extension-mocks/chrome'; diff --git a/packages/extension-ui/src/Popup/ImportSeed/ImportSeed.spec.tsx b/packages/extension-ui/src/Popup/ImportSeed/ImportSeed.spec.tsx index ac6f9b5a..89c7a02d 100644 --- a/packages/extension-ui/src/Popup/ImportSeed/ImportSeed.spec.tsx +++ b/packages/extension-ui/src/Popup/ImportSeed/ImportSeed.spec.tsx @@ -1,7 +1,7 @@ // Copyright 2019-2023 @polkadot/extension-ui authors & contributors // SPDX-License-Identifier: Apache-2.0 -/// +/// import '@polkadot/extension-mocks/chrome'; diff --git a/packages/extension-ui/src/Popup/Signing/Signing.spec.tsx b/packages/extension-ui/src/Popup/Signing/Signing.spec.tsx index e592edc0..b2942a96 100644 --- a/packages/extension-ui/src/Popup/Signing/Signing.spec.tsx +++ b/packages/extension-ui/src/Popup/Signing/Signing.spec.tsx @@ -1,7 +1,7 @@ // Copyright 2019-2023 @polkadot/extension-ui authors & contributors // SPDX-License-Identifier: Apache-2.0 -/// +/// import '@polkadot/extension-mocks/chrome'; diff --git a/packages/extension-ui/src/components/AccountNamePasswordCreation.spec.tsx b/packages/extension-ui/src/components/AccountNamePasswordCreation.spec.tsx index a3a0de1a..6b936d31 100644 --- a/packages/extension-ui/src/components/AccountNamePasswordCreation.spec.tsx +++ b/packages/extension-ui/src/components/AccountNamePasswordCreation.spec.tsx @@ -1,7 +1,7 @@ // Copyright 2019-2023 @polkadot/extension-ui authors & contributors // SPDX-License-Identifier: Apache-2.0 -/// +/// import '@polkadot/extension-mocks/chrome'; diff --git a/packages/extension-ui/src/components/Address.spec.tsx b/packages/extension-ui/src/components/Address.spec.tsx index 3f9add77..462e2b9b 100644 --- a/packages/extension-ui/src/components/Address.spec.tsx +++ b/packages/extension-ui/src/components/Address.spec.tsx @@ -1,7 +1,7 @@ // Copyright 2019-2023 @polkadot/extension-ui authors & contributors // SPDX-License-Identifier: Apache-2.0 -/// +/// import '@polkadot/extension-mocks/chrome'; diff --git a/packages/extension-ui/src/messaging.spec.ts b/packages/extension-ui/src/messaging.spec.ts index 93036700..b767f547 100644 --- a/packages/extension-ui/src/messaging.spec.ts +++ b/packages/extension-ui/src/messaging.spec.ts @@ -1,7 +1,7 @@ // Copyright 2019-2023 @polkadot/extension-ui authors & contributors // SPDX-License-Identifier: Apache-2.0 -/// +/// import '@polkadot/extension-mocks/chrome'; diff --git a/packages/extension-ui/src/partials/Header.spec.tsx b/packages/extension-ui/src/partials/Header.spec.tsx index a19556d1..0bf32e02 100644 --- a/packages/extension-ui/src/partials/Header.spec.tsx +++ b/packages/extension-ui/src/partials/Header.spec.tsx @@ -1,7 +1,7 @@ // Copyright 2019-2023 @polkadot/extension-ui authors & contributors // SPDX-License-Identifier: Apache-2.0 -/// +/// import '@polkadot/extension-mocks/chrome'; diff --git a/packages/extension-ui/src/util/buildHierarchy.spec.ts b/packages/extension-ui/src/util/buildHierarchy.spec.ts index 12fea499..b4904492 100644 --- a/packages/extension-ui/src/util/buildHierarchy.spec.ts +++ b/packages/extension-ui/src/util/buildHierarchy.spec.ts @@ -1,7 +1,7 @@ // Copyright 2019-2023 @polkadot/extension-ui authors & contributors // SPDX-License-Identifier: Apache-2.0 -/// +/// import type { AccountJson, AccountWithChildren } from '@polkadot/extension-base/background/types'; diff --git a/packages/extension-ui/src/util/nextDerivationPath.spec.ts b/packages/extension-ui/src/util/nextDerivationPath.spec.ts index 738693f9..823401aa 100644 --- a/packages/extension-ui/src/util/nextDerivationPath.spec.ts +++ b/packages/extension-ui/src/util/nextDerivationPath.spec.ts @@ -1,7 +1,7 @@ // Copyright 2019-2023 @polkadot/extension-ui authors & contributors // SPDX-License-Identifier: Apache-2.0 -/// +/// import { nextDerivationPath } from './nextDerivationPath.js'; diff --git a/packages/extension/package.json b/packages/extension/package.json index 450d4991..4da795d7 100644 --- a/packages/extension/package.json +++ b/packages/extension/package.json @@ -23,7 +23,7 @@ "tslib": "^2.5.0" }, "devDependencies": { - "@polkadot/dev": "^0.72.1", + "@polkadot/dev": "^0.72.9", "browser-resolve": "^2.0.0", "buffer": "^6.0.3", "copy-webpack-plugin": "^11.0.0", diff --git a/yarn.lock b/yarn.lock index 7a82a6ae..9da429e0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1120,32 +1120,34 @@ __metadata: languageName: node linkType: hard -"@polkadot/dev-test@npm:^0.72.1": - version: 0.72.1 - resolution: "@polkadot/dev-test@npm:0.72.1" +"@polkadot/dev-test@npm:^0.72.9": + version: 0.72.9 + resolution: "@polkadot/dev-test@npm:0.72.9" dependencies: + jsdom: ^21.1.1 tslib: ^2.5.0 - checksum: ff0fbb8c082f9bdee3e5708287337cdc2f2c2ade92bdcc8ff5910a2d764c40b044e363de92e4079173927c2b15f4af9137e50e9f07b944d51c3fd3764dca84d2 + checksum: 8bbd4d5417cdc6ed1ca65af5bc8ec5ff6b26f172e02392cf627efc5093a49e9b6cb58f534fed9c8a997d07d69f1173b382f80210ff0bd4cfb8cbc9306e78180d languageName: node linkType: hard -"@polkadot/dev-ts@npm:^0.72.1": - version: 0.72.1 - resolution: "@polkadot/dev-ts@npm:0.72.1" +"@polkadot/dev-ts@npm:^0.72.9": + version: 0.72.9 + resolution: "@polkadot/dev-ts@npm:0.72.9" dependencies: + json5: ^2.2.3 tslib: ^2.5.0 - typescript: ^4.9.5 - checksum: 89d716117904072309fea9662c9e2f8bd0cb06becc2909b613a342141fc32f8ea64ff43ee6c35f8d6b39cf5e4f568cad449d41b491eec5602fd5b3aa58033e97 + typescript: ^5.0.2 + checksum: 40756eb32e7e72bd16a1d009ac9e11a0fe513df696ff90552af2ac2cea81d60b084015300d39e85e3006678533779ac03b174623f39f745a1b767cf08167ee49 languageName: node linkType: hard -"@polkadot/dev@npm:^0.72.1": - version: 0.72.1 - resolution: "@polkadot/dev@npm:0.72.1" +"@polkadot/dev@npm:^0.72.9": + version: 0.72.9 + resolution: "@polkadot/dev@npm:0.72.9" dependencies: "@eslint/js": ^8.36.0 - "@polkadot/dev-test": ^0.72.1 - "@polkadot/dev-ts": ^0.72.1 + "@polkadot/dev-test": ^0.72.9 + "@polkadot/dev-ts": ^0.72.9 "@rollup/plugin-alias": ^4.0.3 "@rollup/plugin-commonjs": ^24.0.1 "@rollup/plugin-dynamic-import-vars": ^2.0.3 @@ -1171,14 +1173,13 @@ __metadata: eslint-plugin-sort-destructure-keys: ^1.5.0 gh-pages: ^5.0.0 gh-release: ^7.0.2 - jsdom: ^21.1.1 madge: ^6.0.0 rollup: ^3.19.1 rollup-plugin-cleanup: ^3.2.1 tap-parser: ^12.0.1 tslib: ^2.5.0 - typescript: ^4.9.5 - webpack: ^5.76.1 + typescript: ^5.0.2 + webpack: ^5.76.2 webpack-cli: ^5.0.1 webpack-dev-server: ^4.12.0 webpack-merge: ^5.8.0 @@ -1208,7 +1209,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: 55a396d13dc032d8f77c41e2e3857266e364bad99567bed9d209c0f6563052925624326c36a771cbf32ccd6b315039fc318a54da2b932dbbe57034089c798422 + checksum: da6e188058e31d8eb11e8547a4e75ae391b6620ce102f9c640c3acf70173c0d8b9f1e5ee0028858e37600575500d753436b5fd583493a14bedabb27f258f692d languageName: node linkType: hard @@ -1290,7 +1291,7 @@ __metadata: "@polkadot/util": ^11.0.2 "@polkadot/util-crypto": ^11.0.2 "@polkadot/x-global": ^11.0.2 - "@types/chrome": ^0.0.221 + "@types/chrome": ^0.0.224 "@types/firefox-webext-browser": ^111.0.0 tslib: ^2.5.0 peerDependencies: @@ -1354,7 +1355,7 @@ __metadata: react-router: ^5.3.4 react-router-dom: ^5.3.4 sinon-chrome: ^3.0.1 - styled-components: ^5.3.8 + styled-components: ^5.3.9 tslib: ^2.5.0 languageName: unknown linkType: soft @@ -1363,7 +1364,7 @@ __metadata: version: 0.0.0-use.local resolution: "@polkadot/extension@workspace:packages/extension" dependencies: - "@polkadot/dev": ^0.72.1 + "@polkadot/dev": ^0.72.9 "@polkadot/extension-base": ^0.45.3-2-x "@polkadot/extension-inject": ^0.45.3-2-x "@polkadot/extension-ui": ^0.45.3-2-x @@ -2153,13 +2154,13 @@ __metadata: languageName: node linkType: hard -"@types/chrome@npm:*, @types/chrome@npm:^0.0.221": - version: 0.0.221 - resolution: "@types/chrome@npm:0.0.221" +"@types/chrome@npm:*, @types/chrome@npm:^0.0.224": + version: 0.0.224 + resolution: "@types/chrome@npm:0.0.224" dependencies: "@types/filesystem": "*" "@types/har-format": "*" - checksum: cadc832e54f09d6d2d1097b38ccecf906edc9c068cd3e68f853975eaea1f382b4373930fd0df4b1945f4ef3af4884559b33a1c1b4f58d9ce1db768cc778a1562 + checksum: 2dd2291a81a351d3639bb241647f89ece6d27d13206db73e8eac813bd7bfc7e101deaf16c34203f7db32554412f8a776da5b8bfdf8857619d96b0cc68effc196 languageName: node linkType: hard @@ -2365,10 +2366,10 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:*, @types/node@npm:^18.15.0": - version: 18.15.0 - resolution: "@types/node@npm:18.15.0" - checksum: d81372276dd5053b1743338b61a2178ff9722dc609189d01fc7d1c2acd539414039e0e4780678730514390dad3f29c366a28c29e8dbd5b0025651181f6dd6669 +"@types/node@npm:*, @types/node@npm:^18.15.3": + version: 18.15.3 + resolution: "@types/node@npm:18.15.3" + checksum: 31b1d92475a82c30de29aa6c0771b18a276552d191283b4423ba2d61b3f01159bf0d02576c0b7cc834b043997893800db6bb47f246083ed85aa45e79c80875d7 languageName: node linkType: hard @@ -9775,7 +9776,7 @@ fsevents@~2.3.2: languageName: node linkType: hard -"json5@npm:^2.1.2, json5@npm:^2.2.2": +"json5@npm:^2.1.2, json5@npm:^2.2.2, json5@npm:^2.2.3": version: 2.2.3 resolution: "json5@npm:2.2.3" bin: @@ -12812,8 +12813,8 @@ fsevents@~2.3.2: resolution: "root-workspace-0b6124@workspace:." dependencies: "@babel/core": ^7.21.0 - "@polkadot/dev": ^0.72.1 - "@types/node": ^18.15.0 + "@polkadot/dev": ^0.72.9 + "@types/node": ^18.15.3 i18next-scanner: ^4.1.1 sinon-chrome: ^3.0.1 languageName: unknown @@ -13749,9 +13750,9 @@ fsevents@~2.3.2: languageName: node linkType: hard -"styled-components@npm:^5.3.8": - version: 5.3.8 - resolution: "styled-components@npm:5.3.8" +"styled-components@npm:^5.3.8, styled-components@npm:^5.3.9": + version: 5.3.9 + resolution: "styled-components@npm:5.3.9" dependencies: "@babel/helper-module-imports": ^7.0.0 "@babel/traverse": ^7.4.5 @@ -13767,7 +13768,7 @@ fsevents@~2.3.2: react: ">= 16.8.0" react-dom: ">= 16.8.0" react-is: ">= 16.8.0" - checksum: 60148083f4057cd0dd4ad555e82800ec4ec4b8822fd81645f084e9beebf91420f4c9c75875b44933755d32ec97c46be6b79ca0c23578e5a731e3399e6ea0d901 + checksum: 404311cc7028259218674d3f9f39bdda2342fc02f2ebbba8f057ef560b2ad205c5bd63b82deed4d0bf217ac7eb960d0e1127510b0b606e32cbd5a48c10373ce8 languageName: node linkType: hard @@ -14334,23 +14335,23 @@ fsevents@~2.3.2: languageName: node linkType: hard -"typescript@npm:^4.9.5": - version: 4.9.5 - resolution: "typescript@npm:4.9.5" +"typescript@npm:^5.0.2": + version: 5.0.2 + resolution: "typescript@npm:5.0.2" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: ee000bc26848147ad423b581bd250075662a354d84f0e06eb76d3b892328d8d4440b7487b5a83e851b12b255f55d71835b008a66cbf8f255a11e4400159237db + checksum: bef1dcd166acfc6934b2ec4d72f93edb8961a5fab36b8dd2aaf6f4f4cd5c0210f2e0850aef4724f3b4913d5aef203a94a28ded731b370880c8bcff7e4ff91fc1 languageName: node linkType: hard -"typescript@patch:typescript@npm%3A^4.9.5#~builtin": - version: 4.9.5 - resolution: "typescript@patch:typescript@npm%3A4.9.5#~builtin::version=4.9.5&hash=bda367" +"typescript@patch:typescript@npm%3A^5.0.2#~builtin": + version: 5.0.2 + resolution: "typescript@patch:typescript@npm%3A5.0.2#~builtin::version=5.0.2&hash=bda367" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 2eee5c37cad4390385db5db5a8e81470e42e8f1401b0358d7390095d6f681b410f2c4a0c496c6ff9ebd775423c7785cdace7bcdad76c7bee283df3d9718c0f20 + checksum: bdbf3d0aac0d6cf010fbe0536753dc19f278eb4aba88140dcd25487dfe1c56ca8b33abc0dcd42078790a939b08ebc4046f3e9bb961d77d3d2c3cfa9829da4d53 languageName: node linkType: hard @@ -15222,9 +15223,9 @@ fsevents@~2.3.2: languageName: node linkType: hard -"webpack@npm:^5.76.1": - version: 5.76.1 - resolution: "webpack@npm:5.76.1" +"webpack@npm:^5.76.2": + version: 5.76.2 + resolution: "webpack@npm:5.76.2" dependencies: "@types/eslint-scope": ^3.7.3 "@types/estree": ^0.0.51 @@ -15255,7 +15256,7 @@ fsevents@~2.3.2: optional: true bin: webpack: bin/webpack.js - checksum: b01fe0bc2dbca0e10d290ddb0bf81e807a031de48028176e2b21afd696b4d3f25ab9accdad888ef4a1f7c7f4d41f13d5bf2395b7653fdf3e5e3dafa54e56dab2 + checksum: 86db98299a175c371031449c26077e87b33acd8f45de7f7945ed4b9b37c8ca11bc5169af9c44743efccd4d55e08042a3aa3a3bc42aff831309a0821ffbcd395e languageName: node linkType: hard