From 6b8634462d2e44242f50ba5c30c3fb5ee9756588 Mon Sep 17 00:00:00 2001 From: Jaco Date: Sun, 9 Jan 2022 08:07:40 +0100 Subject: [PATCH] Bump dev & common (#273) * Bump dev & common * Adjust alias --- jest.config.cjs | 8 +- package.json | 2 +- packages/wasm-crypto-asmjs/package.json | 2 +- .../wasm-crypto-asmjs/src/detectPackage.ts | 2 +- packages/wasm-crypto-wasm/package.json | 2 +- .../wasm-crypto-wasm/src/detectPackage.ts | 2 +- packages/wasm-crypto/package.json | 4 +- packages/wasm-crypto/src/detectPackage.ts | 2 +- packages/wasm-crypto/test/alias-imports.cjs | 4 +- yarn.lock | 157 +++++++++--------- 10 files changed, 93 insertions(+), 92 deletions(-) diff --git a/jest.config.cjs b/jest.config.cjs index fd493ca2..c5e6e4f4 100644 --- a/jest.config.cjs +++ b/jest.config.cjs @@ -3,11 +3,11 @@ const config = require('@polkadot/dev/config/jest.cjs'); -module.exports = Object.assign({}, config, { +module.exports = { + ...config, moduleNameMapper: { - '@polkadot/wasm-crypto-asmjs(.*)$': '/packages/wasm-crypto-asmjs/build/$1', - '@polkadot/wasm-crypto-wasm(.*)$': '/packages/wasm-crypto-wasm/build/$1', + '@polkadot/wasm-crypto-(asmjs|wasm)(.*)$': '/packages/wasm-crypto-$1/build/$2', // eslint-disable-next-line sort-keys '@polkadot/wasm-crypto(.*)$': '/packages/wasm-crypto/src/$1' } -}); +}; diff --git a/package.json b/package.json index 130cc5ae..bf3e1533 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ }, "devDependencies": { "@babel/core": "^7.16.7", - "@polkadot/dev": "^0.65.13", + "@polkadot/dev": "^0.65.23", "fflate": "^0.7.2", "override-require": "^1.1.1" }, diff --git a/packages/wasm-crypto-asmjs/package.json b/packages/wasm-crypto-asmjs/package.json index 694a6d30..ef91ba47 100644 --- a/packages/wasm-crypto-asmjs/package.json +++ b/packages/wasm-crypto-asmjs/package.json @@ -25,7 +25,7 @@ "@babel/runtime": "^7.16.7" }, "devDependencies": { - "@polkadot/util": "^8.2.2" + "@polkadot/util": "^8.3.1" }, "peerDependencies": { "@polkadot/util": "*" diff --git a/packages/wasm-crypto-asmjs/src/detectPackage.ts b/packages/wasm-crypto-asmjs/src/detectPackage.ts index 80125b85..300ad328 100644 --- a/packages/wasm-crypto-asmjs/src/detectPackage.ts +++ b/packages/wasm-crypto-asmjs/src/detectPackage.ts @@ -8,4 +8,4 @@ import { detectPackage } from '@polkadot/util'; import others from './detectOther'; import { packageInfo } from './packageInfo'; -detectPackage(packageInfo, packageInfo.path, others); +detectPackage(packageInfo, null, others); diff --git a/packages/wasm-crypto-wasm/package.json b/packages/wasm-crypto-wasm/package.json index 0277875b..96accb6b 100644 --- a/packages/wasm-crypto-wasm/package.json +++ b/packages/wasm-crypto-wasm/package.json @@ -25,7 +25,7 @@ "@babel/runtime": "^7.16.7" }, "devDependencies": { - "@polkadot/util": "^8.2.2" + "@polkadot/util": "^8.3.1" }, "peerDependencies": { "@polkadot/util": "*" diff --git a/packages/wasm-crypto-wasm/src/detectPackage.ts b/packages/wasm-crypto-wasm/src/detectPackage.ts index 36c1c2bc..e8ae483d 100644 --- a/packages/wasm-crypto-wasm/src/detectPackage.ts +++ b/packages/wasm-crypto-wasm/src/detectPackage.ts @@ -8,4 +8,4 @@ import { detectPackage } from '@polkadot/util'; import others from './detectOther'; import { packageInfo } from './packageInfo'; -detectPackage(packageInfo, packageInfo.path, others); +detectPackage(packageInfo, null, others); diff --git a/packages/wasm-crypto/package.json b/packages/wasm-crypto/package.json index c8b7408c..9682fd4f 100644 --- a/packages/wasm-crypto/package.json +++ b/packages/wasm-crypto/package.json @@ -28,8 +28,8 @@ "@polkadot/wasm-crypto-wasm": "^4.5.2-24" }, "devDependencies": { - "@polkadot/util": "^8.2.2", - "@polkadot/x-randomvalues": "^8.2.2" + "@polkadot/util": "^8.3.1", + "@polkadot/x-randomvalues": "^8.3.1" }, "peerDependencies": { "@polkadot/util": "*", diff --git a/packages/wasm-crypto/src/detectPackage.ts b/packages/wasm-crypto/src/detectPackage.ts index 38067f6a..8279bda5 100644 --- a/packages/wasm-crypto/src/detectPackage.ts +++ b/packages/wasm-crypto/src/detectPackage.ts @@ -8,4 +8,4 @@ import { detectPackage } from '@polkadot/util'; import others from './detectOther'; import { packageInfo } from './packageInfo'; -detectPackage(packageInfo, packageInfo.path, others); +detectPackage(packageInfo, null, others); diff --git a/packages/wasm-crypto/test/alias-imports.cjs b/packages/wasm-crypto/test/alias-imports.cjs index 9a9a01b9..6a40348e 100644 --- a/packages/wasm-crypto/test/alias-imports.cjs +++ b/packages/wasm-crypto/test/alias-imports.cjs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 const rootIncl = ['@polkadot/wasm-crypto-asmjs', '@polkadot/wasm-crypto-wasm']; -const detcIncl = rootIncl.map((p) => `${p}/packageInfo`); +const detcIncl = rootIncl.map((p) => `${p}/packageInfo.cjs`); require('override-require')( (request) => @@ -11,5 +11,5 @@ require('override-require')( (request) => rootIncl.some((p) => request.endsWith(p)) ? require(`${rootIncl.find((p) => request.endsWith(p))}/build/data.cjs`) - : require(`${detcIncl.find((p) => request.endsWith(p)).replace('packageInfo', 'build/packageInfo.cjs')}`) + : require(`${detcIncl.find((p) => request.endsWith(p)).replace('packageInfo.cjs', 'build/packageInfo.cjs')}`) ); diff --git a/yarn.lock b/yarn.lock index b4a1ca16..f5af2616 100644 --- a/yarn.lock +++ b/yarn.lock @@ -48,7 +48,7 @@ __metadata: languageName: node linkType: hard -"@babel/core@npm:^7.1.0, @babel/core@npm:^7.12.3, @babel/core@npm:^7.16.7, @babel/core@npm:^7.7.2": +"@babel/core@npm:^7.1.0, @babel/core@npm:^7.12.3, @babel/core@npm:^7.16.7, @babel/core@npm:^7.7.2, @babel/core@npm:^7.8.0": version: 7.16.7 resolution: "@babel/core@npm:7.16.7" dependencies: @@ -1376,7 +1376,7 @@ __metadata: languageName: node linkType: hard -"@babel/runtime@npm:^7.16.5, @babel/runtime@npm:^7.16.7, @babel/runtime@npm:^7.8.4": +"@babel/runtime@npm:^7.16.7, @babel/runtime@npm:^7.8.4": version: 7.16.7 resolution: "@babel/runtime@npm:7.16.7" dependencies: @@ -1500,9 +1500,9 @@ __metadata: languageName: node linkType: hard -"@jest/core@npm:^27.4.6": - version: 27.4.6 - resolution: "@jest/core@npm:27.4.6" +"@jest/core@npm:^27.4.7": + version: 27.4.7 + resolution: "@jest/core@npm:27.4.7" dependencies: "@jest/console": ^27.4.6 "@jest/reporters": ^27.4.6 @@ -1516,7 +1516,7 @@ __metadata: exit: ^0.1.2 graceful-fs: ^4.2.4 jest-changed-files: ^27.4.2 - jest-config: ^27.4.6 + jest-config: ^27.4.7 jest-haste-map: ^27.4.6 jest-message-util: ^27.4.6 jest-regex-util: ^27.4.0 @@ -1537,7 +1537,7 @@ __metadata: peerDependenciesMeta: node-notifier: optional: true - checksum: 903c2c45e74a276795453a743b6ca8344e3bad8d8b169760286ca4cc828c1d51e903f67971b9e244ebf9b88286a99bccc587a23a28fea23fd80ae846113b3834 + checksum: 24ed123ef1819fa8c6069706760efac9904ee8824b22c346259be2017d820b5e578a4d444339448a576a0158e6fec91d18fdedb201bc97d7390b105d665f3642 languageName: node linkType: hard @@ -1854,9 +1854,9 @@ __metadata: languageName: node linkType: hard -"@polkadot/dev@npm:^0.65.13": - version: 0.65.13 - resolution: "@polkadot/dev@npm:0.65.13" +"@polkadot/dev@npm:^0.65.23": + version: 0.65.23 + resolution: "@polkadot/dev@npm:0.65.23" dependencies: "@babel/cli": ^7.16.7 "@babel/core": ^7.16.7 @@ -1878,7 +1878,7 @@ __metadata: "@rollup/plugin-commonjs": ^21.0.1 "@rollup/plugin-inject": ^4.0.4 "@rollup/plugin-json": ^4.1.0 - "@rollup/plugin-node-resolve": ^13.1.2 + "@rollup/plugin-node-resolve": ^13.1.3 "@rushstack/eslint-patch": ^1.1.0 "@typescript-eslint/eslint-plugin": 5.9.0 "@typescript-eslint/parser": 5.9.0 @@ -1906,9 +1906,9 @@ __metadata: gh-release: ^6.0.1 glob: ^7.2.0 glob2base: ^0.0.12 - jest: ^27.4.6 - jest-cli: ^27.4.6 - jest-config: ^27.4.6 + jest: ^27.4.7 + jest-cli: ^27.4.7 + jest-config: ^27.4.7 jest-haste-map: ^27.4.6 jest-resolve: ^27.4.6 madge: ^5.0.1 @@ -1942,23 +1942,23 @@ __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: 00508f66616867bf4bacaad6081924397386cb2cdc682ad6d24afe10061417bb07953e379b7027a6eba92e6f34c0b63feace821550675b918843549746b1093e + checksum: 4195a0cd5de5ddc037d275cb412604d702278e990e330a895d688fdde462317ca792e0e6ae652aa67cfd53cf8c09c97f3e601f6176515b9e9c3e18d907316dbb languageName: node linkType: hard -"@polkadot/util@npm:^8.2.2": - version: 8.2.2 - resolution: "@polkadot/util@npm:8.2.2" +"@polkadot/util@npm:^8.3.1": + version: 8.3.1 + resolution: "@polkadot/util@npm:8.3.1" dependencies: - "@babel/runtime": ^7.16.5 - "@polkadot/x-bigint": 8.2.2 - "@polkadot/x-global": 8.2.2 - "@polkadot/x-textdecoder": 8.2.2 - "@polkadot/x-textencoder": 8.2.2 + "@babel/runtime": ^7.16.7 + "@polkadot/x-bigint": 8.3.1 + "@polkadot/x-global": 8.3.1 + "@polkadot/x-textdecoder": 8.3.1 + "@polkadot/x-textencoder": 8.3.1 "@types/bn.js": ^4.11.6 bn.js: ^4.12.0 ip-regex: ^4.3.0 - checksum: c8eb0e6278557735e9785a1a81fed14c05c65a790238470763537f27fb601cbf350a8362ecc36469de08d9d61485ab7409da35fcf5acffb0c6cc88fe0ba929bf + checksum: 219712f5dd82543a2ddfb914b19315b0219171ee2934b19c215fc10c395f80247320f562a63bb60d15a235eabdb0f370596be7aaccf0afba6d395dc6cfa93c32 languageName: node linkType: hard @@ -1967,7 +1967,7 @@ __metadata: resolution: "@polkadot/wasm-crypto-asmjs@workspace:packages/wasm-crypto-asmjs" dependencies: "@babel/runtime": ^7.16.7 - "@polkadot/util": ^8.2.2 + "@polkadot/util": ^8.3.1 peerDependencies: "@polkadot/util": "*" languageName: unknown @@ -1978,7 +1978,7 @@ __metadata: resolution: "@polkadot/wasm-crypto-wasm@workspace:packages/wasm-crypto-wasm" dependencies: "@babel/runtime": ^7.16.7 - "@polkadot/util": ^8.2.2 + "@polkadot/util": ^8.3.1 peerDependencies: "@polkadot/util": "*" languageName: unknown @@ -1989,62 +1989,62 @@ __metadata: resolution: "@polkadot/wasm-crypto@workspace:packages/wasm-crypto" dependencies: "@babel/runtime": ^7.16.7 - "@polkadot/util": ^8.2.2 + "@polkadot/util": ^8.3.1 "@polkadot/wasm-crypto-asmjs": ^4.5.2-24 "@polkadot/wasm-crypto-wasm": ^4.5.2-24 - "@polkadot/x-randomvalues": ^8.2.2 + "@polkadot/x-randomvalues": ^8.3.1 peerDependencies: "@polkadot/util": "*" "@polkadot/x-randomvalues": "*" languageName: unknown linkType: soft -"@polkadot/x-bigint@npm:8.2.2": - version: 8.2.2 - resolution: "@polkadot/x-bigint@npm:8.2.2" +"@polkadot/x-bigint@npm:8.3.1": + version: 8.3.1 + resolution: "@polkadot/x-bigint@npm:8.3.1" dependencies: - "@babel/runtime": ^7.16.5 - "@polkadot/x-global": 8.2.2 - checksum: 1fd0d05848d65e6d171be0974a23c552ac14c898798ab7474d473843d4fad79cf3dc77df42673a69220904f51261c256d559d4b515fbfd8edaf8371df6b5644c + "@babel/runtime": ^7.16.7 + "@polkadot/x-global": 8.3.1 + checksum: 6ae63ab97e547af47eb3f45657265fb751d8eb589ac9e119922d111027a4488e21e53ceb671cf48f6cb793905496ef8261b9bc07907b2b7f32410e03a65ad400 languageName: node linkType: hard -"@polkadot/x-global@npm:8.2.2": - version: 8.2.2 - resolution: "@polkadot/x-global@npm:8.2.2" +"@polkadot/x-global@npm:8.3.1": + version: 8.3.1 + resolution: "@polkadot/x-global@npm:8.3.1" dependencies: - "@babel/runtime": ^7.16.5 - checksum: a41760e01e21c6b9c9f2412da2e73e4762c9fbf2275776204abb2bcc486f5537f857836218cffa3603eecb2e36a9e130370aabbb816c088acd50733cc09ee6b5 + "@babel/runtime": ^7.16.7 + checksum: 5f50d10032dd295964f4303ec0163e0563bb383c1b9541ff5c48d19c6d0690e59cea04f35225c3ac0c283871cc9d197142c5d6f9609fe44793a64dd909a3e131 languageName: node linkType: hard -"@polkadot/x-randomvalues@npm:^8.2.2": - version: 8.2.2 - resolution: "@polkadot/x-randomvalues@npm:8.2.2" +"@polkadot/x-randomvalues@npm:^8.3.1": + version: 8.3.1 + resolution: "@polkadot/x-randomvalues@npm:8.3.1" dependencies: - "@babel/runtime": ^7.16.5 - "@polkadot/x-global": 8.2.2 - checksum: 18817fe2374b3e0e2bebd2df98d68720df037cbc29363d2e4701f1e894c52ddaabd41d16022cef532860b0ccbb5e6d51f6245b47f5aafc4d0eeb7285736b0309 + "@babel/runtime": ^7.16.7 + "@polkadot/x-global": 8.3.1 + checksum: 4937ef982d6596f6fee31b3f750ab5f54bda1461d55f02bbc12b7973306085b9b5dbbdb04c040ee2f6d848df91facb2012e2c168e13c80d6be1ff06dff3a0eaa languageName: node linkType: hard -"@polkadot/x-textdecoder@npm:8.2.2": - version: 8.2.2 - resolution: "@polkadot/x-textdecoder@npm:8.2.2" +"@polkadot/x-textdecoder@npm:8.3.1": + version: 8.3.1 + resolution: "@polkadot/x-textdecoder@npm:8.3.1" dependencies: - "@babel/runtime": ^7.16.5 - "@polkadot/x-global": 8.2.2 - checksum: 3e6ba49e71f927c1dacb352ca7d8cb4cc570a95ce51e1c6b9e4e390d454d795a8887d556a44df29359c14193ef0a1424564099acd2fd1ca2ff3561f1729940e3 + "@babel/runtime": ^7.16.7 + "@polkadot/x-global": 8.3.1 + checksum: f3dcb896196cfb5c30d6b6da32bd909466521aa4c25eea3dbc4fea130d2f889fc01954eb15a32dc9faa4230237a2d007d0230a1e8eba644acda58c05ca98d4a3 languageName: node linkType: hard -"@polkadot/x-textencoder@npm:8.2.2": - version: 8.2.2 - resolution: "@polkadot/x-textencoder@npm:8.2.2" +"@polkadot/x-textencoder@npm:8.3.1": + version: 8.3.1 + resolution: "@polkadot/x-textencoder@npm:8.3.1" dependencies: - "@babel/runtime": ^7.16.5 - "@polkadot/x-global": 8.2.2 - checksum: 260cfbe56490ffd1966e30e02243b95217085598dddcf2e05bae48ef42621a3bb76ec2d31acde451693889f308b3c8a7a8fd8f7f16a7f16f724dc51d7aeee3c8 + "@babel/runtime": ^7.16.7 + "@polkadot/x-global": 8.3.1 + checksum: 7e162696f2f826aad3f5348868b552d1db3b8a0fc8a6955f3a528d85ebe7e295a01c2b45d8363806cd0d16139068b07716fff40f46cebe8756f4a2a46adb6cb5 languageName: node linkType: hard @@ -2100,9 +2100,9 @@ __metadata: languageName: node linkType: hard -"@rollup/plugin-node-resolve@npm:^13.1.2": - version: 13.1.2 - resolution: "@rollup/plugin-node-resolve@npm:13.1.2" +"@rollup/plugin-node-resolve@npm:^13.1.3": + version: 13.1.3 + resolution: "@rollup/plugin-node-resolve@npm:13.1.3" dependencies: "@rollup/pluginutils": ^3.1.0 "@types/resolve": 1.17.1 @@ -2112,7 +2112,7 @@ __metadata: resolve: ^1.19.0 peerDependencies: rollup: ^2.42.0 - checksum: b75cd8f8110a3001fa6af76fb0feb0ebfe96d6394383147276106f11d296307719aec58364b92f402723749b74e6de82d002570d3accfaede572ad3b1d8534ba + checksum: c275843aef884ff15ed7edb8a3b8fd072a72d517632098f6e9c25ef2c00f7842559565cc77e16c59eb119b8c4e2d858a8b5a94701ca6f85ae6a4f60a6e31f0ab languageName: node linkType: hard @@ -6052,18 +6052,18 @@ fsevents@~2.1.2: languageName: node linkType: hard -"jest-cli@npm:^27.4.6": - version: 27.4.6 - resolution: "jest-cli@npm:27.4.6" +"jest-cli@npm:^27.4.7": + version: 27.4.7 + resolution: "jest-cli@npm:27.4.7" dependencies: - "@jest/core": ^27.4.6 + "@jest/core": ^27.4.7 "@jest/test-result": ^27.4.6 "@jest/types": ^27.4.2 chalk: ^4.0.0 exit: ^0.1.2 graceful-fs: ^4.2.4 import-local: ^3.0.2 - jest-config: ^27.4.6 + jest-config: ^27.4.7 jest-util: ^27.4.2 jest-validate: ^27.4.6 prompts: ^2.0.1 @@ -6075,14 +6075,15 @@ fsevents@~2.1.2: optional: true bin: jest: bin/jest.js - checksum: 924dd24b74f33f79fa8cbc577d4c13aa8645b41d53c4678b6f999dd02d7fe027c397db1898e4b4cda08001efb65dd29ed4492e2818d149098092df8314ed441b + checksum: bf301039f1c14ef3fa2b7699b7b94328faa5549e34cb1573610c894bedd036ad36e31e6af436e11b3aa85e22e409a05d1fef1624bebc2da7ed416ce969b87307 languageName: node linkType: hard -"jest-config@npm:^27.4.6": - version: 27.4.6 - resolution: "jest-config@npm:27.4.6" +"jest-config@npm:^27.4.7": + version: 27.4.7 + resolution: "jest-config@npm:27.4.7" dependencies: + "@babel/core": ^7.8.0 "@jest/test-sequencer": ^27.4.6 "@jest/types": ^27.4.2 babel-jest: ^27.4.6 @@ -6109,7 +6110,7 @@ fsevents@~2.1.2: peerDependenciesMeta: ts-node: optional: true - checksum: 90dafbf8bcc01ffab0bc085bd8ca5f9866f6c7a13202c3031ab6a668ed4a9a21e9eb4537ea0cb575765dc3099e70f2f9089bb25a4627b05d2bde50f06bddcc33 + checksum: 23d5bacc483b2674d6efcd6bfc66bcde7c2b428511b50d17a22a2750d85bfc23753f9e41f504411e411e848e34ec61244bdae9da8782df4ada6e284106f71a4d languageName: node linkType: hard @@ -6483,13 +6484,13 @@ fsevents@~2.1.2: languageName: node linkType: hard -"jest@npm:^27.4.6": - version: 27.4.6 - resolution: "jest@npm:27.4.6" +"jest@npm:^27.4.7": + version: 27.4.7 + resolution: "jest@npm:27.4.7" dependencies: - "@jest/core": ^27.4.6 + "@jest/core": ^27.4.7 import-local: ^3.0.2 - jest-cli: ^27.4.6 + jest-cli: ^27.4.7 peerDependencies: node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0 peerDependenciesMeta: @@ -6497,7 +6498,7 @@ fsevents@~2.1.2: optional: true bin: jest: bin/jest.js - checksum: 5b7bf3d1017f96110c6197e301f0e7bf1733ab300034e4f00ef0921e5fbf2e26e167454a7637bdac46df14385b1e1386cd2ad7d9aefe5793c60f775be2043534 + checksum: 28ce948b30c074907393f37553acac4422d0f60190776e62b3403e4c742d33dd6012e3a20748254a43e38b5b4ce52d813b13a3a5be1d43d6d12429bd08ce1a23 languageName: node linkType: hard @@ -8395,7 +8396,7 @@ resolve@^2.0.0-next.3: resolution: "root-workspace-0b6124@workspace:." dependencies: "@babel/core": ^7.16.7 - "@polkadot/dev": ^0.65.13 + "@polkadot/dev": ^0.65.23 fflate: ^0.7.2 override-require: ^1.1.1 languageName: unknown