diff --git a/jest.config.cjs b/jest.config.cjs index 2e8d1849f3..ea8ac53e4e 100644 --- a/jest.config.cjs +++ b/jest.config.cjs @@ -6,12 +6,12 @@ const config = require('@polkadot/dev/config/jest.cjs'); module.exports = { ...config, moduleNameMapper: { - '@polkadot/api-(augment-lookup|augment-registry|augment|base|contract|derive)(.*)$': '/packages/api-$1/src/$2', + '@polkadot/api-(augment|base|contract|derive)(.*)$': '/packages/api-$1/src/$2', // eslint-disable-next-line sort-keys '@polkadot/api(.*)$': '/packages/api/src/$1', '@polkadot/rpc-(augment|core|provider)(.*)$': '/packages/rpc-$1/src/$2', '@polkadot/typegen(.*)$': '/packages/typegen/src/$1', - '@polkadot/types-(augment|codec|create|known|support)(.*)$': '/packages/types-$1/src/$2', + '@polkadot/types-(augment-lookup|augment-registry|augment|codec|create|known|support)(.*)$': '/packages/types-$1/src/$2', // eslint-disable-next-line sort-keys '@polkadot/types(.*)$': '/packages/types/src/$1' }, diff --git a/package.json b/package.json index 8450f60dd6..0ab61239d1 100644 --- a/package.json +++ b/package.json @@ -34,8 +34,8 @@ "@babel/core": "^7.16.5", "@babel/register": "^7.16.5", "@babel/runtime": "^7.16.5", - "@polkadot/dev": "^0.64.11", - "@polkadot/ts": "^0.4.20", + "@polkadot/dev": "^0.64.13", + "@polkadot/ts": "^0.4.22", "@polkadot/typegen": "workspace:packages/typegen", "@types/jest": "^27.0.3", "copyfiles": "^2.4.1" diff --git a/packages/typegen/scripts/aliases.cjs b/packages/typegen/scripts/aliases.cjs deleted file mode 100644 index d3b11959da..0000000000 --- a/packages/typegen/scripts/aliases.cjs +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright 2017-2021 @polkadot/typegen authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -/* eslint-disable sort-keys */ - -const alias = { - '^@polkadot/api-(augment|base|derive)(.*)': './packages/api-\\1/src\\2', - '^@polkadot/api(.*)': './packages/api/src/\\1', - '^@polkadot/rpc-(augment|core|provider)(.*)': './packages/rpc-\\1/src\\2', - '^@polkadot/types-(augment-lookup|augment-registry|augment|codec|create|known|metadata|support)(.*)': './packages/types-\\1/src\\2', - '^@polkadot/types(.*)': './packages/types/src\\1' -}; - -require('@babel/register')({ - extensions: ['.js', '.ts'], - plugins: [ - ['module-resolver', { alias }] - ] -}); diff --git a/packages/typegen/scripts/execWithSrc.cjs b/packages/typegen/scripts/execWithSrc.cjs new file mode 100644 index 0000000000..004805e57e --- /dev/null +++ b/packages/typegen/scripts/execWithSrc.cjs @@ -0,0 +1,36 @@ +// Copyright 2017-2021 @polkadot/typegen authors & contributors +// SPDX-License-Identifier: Apache-2.0 + +module.exports = function (file) { + let main; + + try { + main = require(`../${file}.cjs`).main; + } catch (error) { + // required for dev-only setups + process.env.JEST_WORKER_ID = '123'; + + // register aliases + require('@babel/register')({ + extensions: ['.js', '.ts'], + plugins: [ + ['module-resolver', { + alias: { + '^@polkadot/api-(augment|base|derive)(.*)': './packages/api-\\1/src\\2', + // eslint-disable-next-line sort-keys + '^@polkadot/api(.*)': './packages/api/src/\\1', + '^@polkadot/rpc-(augment|core|provider)(.*)': './packages/rpc-\\1/src\\2', + '^@polkadot/types-(augment-lookup|augment-registry|augment|codec|create|known|metadata|support)(.*)': './packages/types-\\1/src\\2', + // eslint-disable-next-line sort-keys + '^@polkadot/types(.*)': './packages/types/src\\1' + } + }] + ] + }); + + // get ts source + main = require(`../src/${file}.ts`).main; + } + + main(); +}; diff --git a/packages/typegen/scripts/polkadot-types-chain-info.cjs b/packages/typegen/scripts/polkadot-types-chain-info.cjs index e21a700b8d..f54f9c3eea 100755 --- a/packages/typegen/scripts/polkadot-types-chain-info.cjs +++ b/packages/typegen/scripts/polkadot-types-chain-info.cjs @@ -2,16 +2,4 @@ // Copyright 2017-2021 @polkadot/typegen authors & contributors // SPDX-License-Identifier: Apache-2.0 -let main; - -try { - main = require('../extractChain.cjs').main; -} catch (error) { - process.env.JEST_WORKER_ID = '123'; - - require('./aliases.cjs'); - - main = require('../src/extractChain.ts').main; -} - -main(); +require('./execWithSrc.cjs')('extractChain'); diff --git a/packages/typegen/scripts/polkadot-types-from-chain.cjs b/packages/typegen/scripts/polkadot-types-from-chain.cjs index 5d31b6a3fd..d459749266 100755 --- a/packages/typegen/scripts/polkadot-types-from-chain.cjs +++ b/packages/typegen/scripts/polkadot-types-from-chain.cjs @@ -2,16 +2,4 @@ // Copyright 2017-2021 @polkadot/typegen authors & contributors // SPDX-License-Identifier: Apache-2.0 -let main; - -try { - main = require('../fromChain.cjs').main; -} catch (error) { - process.env.JEST_WORKER_ID = '123'; - - require('./aliases.cjs'); - - main = require('../src/fromChain').main; -} - -main(); +require('./execWithSrc.cjs')('fromChain'); diff --git a/packages/typegen/scripts/polkadot-types-from-defs.cjs b/packages/typegen/scripts/polkadot-types-from-defs.cjs index c86c8ed912..ecd26376f2 100755 --- a/packages/typegen/scripts/polkadot-types-from-defs.cjs +++ b/packages/typegen/scripts/polkadot-types-from-defs.cjs @@ -2,16 +2,4 @@ // Copyright 2017-2021 @polkadot/typegen authors & contributors // SPDX-License-Identifier: Apache-2.0 -let main; - -try { - main = require('../fromDefs.cjs').main; -} catch (error) { - process.env.JEST_WORKER_ID = '123'; - - require('./aliases.cjs'); - - main = require('../src/fromDefs.ts').main; -} - -main(); +require('./execWithSrc.cjs')('fromDefs'); diff --git a/packages/typegen/scripts/polkadot-types-internal-interfaces.cjs b/packages/typegen/scripts/polkadot-types-internal-interfaces.cjs index cab0f5df8d..70d0fab140 100755 --- a/packages/typegen/scripts/polkadot-types-internal-interfaces.cjs +++ b/packages/typegen/scripts/polkadot-types-internal-interfaces.cjs @@ -2,16 +2,4 @@ // Copyright 2017-2021 @polkadot/typegen authors & contributors // SPDX-License-Identifier: Apache-2.0 -let main; - -try { - main = require('../interfacesTs.cjs').main; -} catch (error) { - process.env.JEST_WORKER_ID = '123'; - - require('./aliases.cjs'); - - main = require('../src/interfacesTs.ts').main; -} - -main(); +require('./execWithSrc.cjs')('interfacesTs'); diff --git a/packages/typegen/scripts/polkadot-types-internal-metadata.cjs b/packages/typegen/scripts/polkadot-types-internal-metadata.cjs index aa26f01e33..54062bdf82 100755 --- a/packages/typegen/scripts/polkadot-types-internal-metadata.cjs +++ b/packages/typegen/scripts/polkadot-types-internal-metadata.cjs @@ -2,16 +2,4 @@ // Copyright 2017-2021 @polkadot/typegen authors & contributors // SPDX-License-Identifier: Apache-2.0 -let main; - -try { - main = require('../metadataMd.cjs').main; -} catch (error) { - process.env.JEST_WORKER_ID = '123'; - - require('./aliases.cjs'); - - main = require('../src/metadataMd.ts').main; -} - -main(); +require('./execWithSrc.cjs')('metadataMd'); diff --git a/yarn.lock b/yarn.lock index 2993d68d1d..3bea09bf42 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1949,9 +1949,9 @@ __metadata: languageName: unknown linkType: soft -"@polkadot/dev@npm:^0.64.11": - version: 0.64.11 - resolution: "@polkadot/dev@npm:0.64.11" +"@polkadot/dev@npm:^0.64.13": + version: 0.64.13 + resolution: "@polkadot/dev@npm:0.64.13" dependencies: "@babel/cli": ^7.16.0 "@babel/core": ^7.16.5 @@ -1975,8 +1975,8 @@ __metadata: "@rollup/plugin-json": ^4.1.0 "@rollup/plugin-node-resolve": ^13.1.1 "@rushstack/eslint-patch": ^1.1.0 - "@typescript-eslint/eslint-plugin": 5.7.0 - "@typescript-eslint/parser": 5.7.0 + "@typescript-eslint/eslint-plugin": 5.8.0 + "@typescript-eslint/parser": 5.8.0 "@vue/component-compiler-utils": ^3.3.0 babel-jest: ^27.4.5 babel-plugin-module-extension-resolver: ^1.0.0-rc.2 @@ -1984,14 +1984,14 @@ __metadata: babel-plugin-styled-components: ^2.0.2 browserslist: ^4.19.1 coveralls: ^3.1.1 - eslint: ^8.4.1 + eslint: ^8.5.0 eslint-config-standard: ^16.0.3 eslint-import-resolver-node: ^0.3.6 eslint-plugin-header: ^3.1.1 eslint-plugin-import: ^2.25.3 - eslint-plugin-import-newlines: ^1.1.5 + eslint-plugin-import-newlines: ^1.1.7 eslint-plugin-node: ^11.1.0 - eslint-plugin-promise: ^5.2.0 + eslint-plugin-promise: ^6.0.0 eslint-plugin-react: ^7.27.1 eslint-plugin-react-hooks: ^4.3.0 eslint-plugin-simple-import-sort: ^7.0.0 @@ -2036,7 +2036,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: 97cecfd0df01cffa2bb1767305e20eaa4a94a4005ae3c3571e525a47fcbe4776534910a77ff836c71237d1ece7970f550086955e86c6f3499cdad381f36fc8a6 + checksum: f6b11e40be09fd9a668d56eed5f329f6f7c554eea5e74ae90050d28eba121a9a7d9a8031e8a19f0767e0f0013bb4cac50b0293186f3f10d209a8bc3e0d59743b languageName: node linkType: hard @@ -2108,12 +2108,12 @@ __metadata: languageName: unknown linkType: soft -"@polkadot/ts@npm:^0.4.20": - version: 0.4.20 - resolution: "@polkadot/ts@npm:0.4.20" +"@polkadot/ts@npm:^0.4.22": + version: 0.4.22 + resolution: "@polkadot/ts@npm:0.4.22" dependencies: "@types/chrome": ^0.0.171 - checksum: 07d72e24d1df54831fa9832afd2d6d2f2eba73b37a8d8906da6decf8e1a2bedd37b37ee2da78988b152adb0727428b37c230e7eb1b687d1f2d0ba49ae0839fc5 + checksum: 4f900a16949b13bf46c420d110dcd9287ebe4b112c30e3250e3374b6f4203f28b08d85039cb2daf645012807b6817d09079d84cda53eb4b9a826bfa74bb1fe55 languageName: node linkType: hard @@ -2759,12 +2759,12 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:5.7.0": - version: 5.7.0 - resolution: "@typescript-eslint/eslint-plugin@npm:5.7.0" +"@typescript-eslint/eslint-plugin@npm:5.8.0": + version: 5.8.0 + resolution: "@typescript-eslint/eslint-plugin@npm:5.8.0" dependencies: - "@typescript-eslint/experimental-utils": 5.7.0 - "@typescript-eslint/scope-manager": 5.7.0 + "@typescript-eslint/experimental-utils": 5.8.0 + "@typescript-eslint/scope-manager": 5.8.0 debug: ^4.3.2 functional-red-black-tree: ^1.0.1 ignore: ^5.1.8 @@ -2777,50 +2777,50 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: e3674ee680e5dffecdb5d243d6c958ea8003021919d1b2068a3bebfde8e5303b3cecbc28cd144e1bacececb638b3d90fd3e16cd9e1f2e397c0eac8f148b9d3ac + checksum: 96a21a3e19baf57e30c97953e35832b1f4e135c865b2dfd5afe53772bd08556b9ad724e55696dce9acf471553ab66ae45737e82abba6c15152f79a47d2d9f055 languageName: node linkType: hard -"@typescript-eslint/experimental-utils@npm:5.7.0": - version: 5.7.0 - resolution: "@typescript-eslint/experimental-utils@npm:5.7.0" +"@typescript-eslint/experimental-utils@npm:5.8.0": + version: 5.8.0 + resolution: "@typescript-eslint/experimental-utils@npm:5.8.0" dependencies: "@types/json-schema": ^7.0.9 - "@typescript-eslint/scope-manager": 5.7.0 - "@typescript-eslint/types": 5.7.0 - "@typescript-eslint/typescript-estree": 5.7.0 + "@typescript-eslint/scope-manager": 5.8.0 + "@typescript-eslint/types": 5.8.0 + "@typescript-eslint/typescript-estree": 5.8.0 eslint-scope: ^5.1.1 eslint-utils: ^3.0.0 peerDependencies: - eslint: "*" - checksum: 5e9ca434d834059632bf6f227c9d7f13f143f5a42d8518df6e54db242e971bae09038d9abcc5ff3debab8ecf17c742544ff66778f6bcbc90e94d92ee358d8315 + eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 + checksum: c97798bcc3332331a75661e073d38783ee4882803b0247db76df851bc8594c9b7e23fb9de28aa212c331b18ff2e8c23657ae1b9b994eeec528214fcf8d81e9fb languageName: node linkType: hard -"@typescript-eslint/parser@npm:5.7.0": - version: 5.7.0 - resolution: "@typescript-eslint/parser@npm:5.7.0" +"@typescript-eslint/parser@npm:5.8.0": + version: 5.8.0 + resolution: "@typescript-eslint/parser@npm:5.8.0" dependencies: - "@typescript-eslint/scope-manager": 5.7.0 - "@typescript-eslint/types": 5.7.0 - "@typescript-eslint/typescript-estree": 5.7.0 + "@typescript-eslint/scope-manager": 5.8.0 + "@typescript-eslint/types": 5.8.0 + "@typescript-eslint/typescript-estree": 5.8.0 debug: ^4.3.2 peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 peerDependenciesMeta: typescript: optional: true - checksum: c57f9ab2001d3fd61776eb8ae7f05d0f5beed9d78fdc1bedaf24bf5f17049b909cbcea79ad58d0059000e29716b04d536ff1522c29441d1865229a3490a95bb2 + checksum: 138b1d20a6c204fdd0c93295b4ec667caf6036e74bfeae0b80cfe14c4d50761bb9f469b30d320d2d85757a1b98c2ae7f30d9a788a293afc1ea10b9f3d9fbc8f7 languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:5.7.0": - version: 5.7.0 - resolution: "@typescript-eslint/scope-manager@npm:5.7.0" +"@typescript-eslint/scope-manager@npm:5.8.0": + version: 5.8.0 + resolution: "@typescript-eslint/scope-manager@npm:5.8.0" dependencies: - "@typescript-eslint/types": 5.7.0 - "@typescript-eslint/visitor-keys": 5.7.0 - checksum: 8323e9787cb21c2e6c3de6bef2eb56e7e37c04f9c19413ad54964545dacc27a59ce6c19d660f4a20c0c6a368eee264d231436e9e8f221ed551abdcaf78596e12 + "@typescript-eslint/types": 5.8.0 + "@typescript-eslint/visitor-keys": 5.8.0 + checksum: 15f365a491c096104d3279617522375b6084117ac21e52cf04935a1cce192d730785a1e47afd8a8ca9aa907f1f9cd34793610406ce93447addf6854cdfa830f3 languageName: node linkType: hard @@ -2831,19 +2831,19 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/types@npm:5.7.0": - version: 5.7.0 - resolution: "@typescript-eslint/types@npm:5.7.0" - checksum: 4573250e59ea9e0b163c3e05e44ffb4b1ba4cdcfd6081c1f0b532e4c4bbbc5eb34ff4286c81c815115a1a1690cc8b1ad7b3ed79f3798773bf494b6ed82d0396b +"@typescript-eslint/types@npm:5.8.0": + version: 5.8.0 + resolution: "@typescript-eslint/types@npm:5.8.0" + checksum: eda7a2c4620fd0cd56a81af6f44d8de96eb5912dda69907cd422e3fb5845b45c004a2c50f1896b6573b70f41f175208434d13dd744ea23aec2094ba916578a81 languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:5.7.0": - version: 5.7.0 - resolution: "@typescript-eslint/typescript-estree@npm:5.7.0" +"@typescript-eslint/typescript-estree@npm:5.8.0": + version: 5.8.0 + resolution: "@typescript-eslint/typescript-estree@npm:5.8.0" dependencies: - "@typescript-eslint/types": 5.7.0 - "@typescript-eslint/visitor-keys": 5.7.0 + "@typescript-eslint/types": 5.8.0 + "@typescript-eslint/visitor-keys": 5.8.0 debug: ^4.3.2 globby: ^11.0.4 is-glob: ^4.0.3 @@ -2852,7 +2852,7 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 0a63186e7b89dc3a1607d2b838ee7b44b4471654f3e77d62687242e5cb9d2a2385312f438dcfdcb70dadcb3638a141e1660483f7bb5d2cf3563cc9a43b0b2d94 + checksum: 67f51754d1dea9eafc8d052b67a2d7a3b20e20d97de03fc49615fe70d0373323619dfa5986a8e71cb9b2ec6079fb050049100763b5dbadae52b30c7d11c57ebd languageName: node linkType: hard @@ -2884,13 +2884,13 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:5.7.0": - version: 5.7.0 - resolution: "@typescript-eslint/visitor-keys@npm:5.7.0" +"@typescript-eslint/visitor-keys@npm:5.8.0": + version: 5.8.0 + resolution: "@typescript-eslint/visitor-keys@npm:5.8.0" dependencies: - "@typescript-eslint/types": 5.7.0 + "@typescript-eslint/types": 5.8.0 eslint-visitor-keys: ^3.0.0 - checksum: 59f7468c37cfcb92eb0de15b7ece47dd64a56c4d03d13167140c980399a4f12f20c1df52534f486cefc46bab65e717689b81decb327d2677063c47c0a26ae875 + checksum: 03a349d4a577aa128b27d13a16e6e365d18e6aa9f297bc2a632bc2ddae8cfed9cb66c227f87fde9924e9f8a58c40c41df6f537016d037a05fe1908bfa0839d18 languageName: node linkType: hard @@ -4727,14 +4727,14 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-import-newlines@npm:^1.1.5": - version: 1.1.5 - resolution: "eslint-plugin-import-newlines@npm:1.1.5" +"eslint-plugin-import-newlines@npm:^1.1.7": + version: 1.1.7 + resolution: "eslint-plugin-import-newlines@npm:1.1.7" peerDependencies: eslint: ">=6.0.0" bin: import-linter: lib/index.js - checksum: e26a61b5e3b0f70b522db047d54c5691bc46f2a39cdcd824c25611e427cca195ed0075275ce9170afd9e12ce3bfe461fad02fec810312f4af0709ad8b8e94e0e + checksum: da3fed1fd61e737c7f9086ffa813e7da3f58a9efe63bf4f14f856ca0de8d3d34ff785b2ce93ec9c022c6ee9c84c49fc67c94aae8ddc2d8c4755e99ae47f1ca78 languageName: node linkType: hard @@ -4777,12 +4777,12 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-promise@npm:^5.2.0": - version: 5.2.0 - resolution: "eslint-plugin-promise@npm:5.2.0" +"eslint-plugin-promise@npm:^6.0.0": + version: 6.0.0 + resolution: "eslint-plugin-promise@npm:6.0.0" peerDependencies: - eslint: ^7.0.0 - checksum: 5d6b2d28408c5afde6386942862427af3d83c9a130eb2555bb54b26a1761914e2c7326aca1be26dd3fee6405e65a2ee9432a4526147e5962545060ea0ef64058 + eslint: ^7.0.0 || ^8.0.0 + checksum: 7e761507c51267b77e4ad710e7c8938aa4f8f69b975886034e57497a1816e9527eda364e25aac03d1b4e0df2e738ba98e49ad075d028824fcfea533a1419751c languageName: node linkType: hard @@ -4900,9 +4900,9 @@ __metadata: languageName: node linkType: hard -"eslint@npm:8.4.1, eslint@npm:^8.4.1": - version: 8.4.1 - resolution: "eslint@npm:8.4.1" +"eslint@npm:8.5.0, eslint@npm:^8.5.0": + version: 8.5.0 + resolution: "eslint@npm:8.5.0" dependencies: "@eslint/eslintrc": ^1.0.5 "@humanwhocodes/config-array": ^0.9.2 @@ -4944,7 +4944,7 @@ __metadata: v8-compile-cache: ^2.0.3 bin: eslint: bin/eslint.js - checksum: d962cd7cd0f68ddc2412f47154b8992ad3af987cf47fa6e60e51a2b7d32a91f934388f7d29e2c45b16b7ac69f0d220d0a483189ec6ba43a8a480110c34f158f9 + checksum: c1a9e26070520a308cc30b62ba0d37d5b115ed23987a93219819537bdea9398e6ebe57c27d97be36ecc83b5162c72e82ecb0a9e5b44b7992980f9be90eb5c4b3 languageName: node linkType: hard @@ -9007,8 +9007,8 @@ resolve@^2.0.0-next.3: "@babel/core": ^7.16.5 "@babel/register": ^7.16.5 "@babel/runtime": ^7.16.5 - "@polkadot/dev": ^0.64.11 - "@polkadot/ts": ^0.4.20 + "@polkadot/dev": ^0.64.13 + "@polkadot/ts": ^0.4.22 "@polkadot/typegen": "workspace:packages/typegen" "@types/jest": ^27.0.3 copyfiles: ^2.4.1