From 31426858c690ea2ba3e05e0975268658a7d996e4 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Fri, 18 Dec 2020 11:18:02 +0100 Subject: [PATCH] detectPackage import revert --- package.json | 2 +- packages/keyring/src/detectPackage.d.ts | 6 ---- packages/keyring/src/detectPackage.js | 10 ------ packages/keyring/src/detectPackage.mjs | 10 ------ packages/keyring/src/detectPackage.ts | 25 +++++++++++++ packages/util-crypto/package.json | 2 +- packages/util-crypto/src/detectPackage.d.ts | 6 ---- packages/util-crypto/src/detectPackage.js | 10 ------ packages/util-crypto/src/detectPackage.mjs | 10 ------ packages/util-crypto/src/detectPackage.ts | 25 +++++++++++++ packages/util/src/bn/consts.ts | 18 +++------- yarn.lock | 40 ++++++++++----------- 12 files changed, 77 insertions(+), 87 deletions(-) delete mode 100644 packages/keyring/src/detectPackage.d.ts delete mode 100644 packages/keyring/src/detectPackage.js delete mode 100644 packages/keyring/src/detectPackage.mjs create mode 100644 packages/keyring/src/detectPackage.ts delete mode 100644 packages/util-crypto/src/detectPackage.d.ts delete mode 100644 packages/util-crypto/src/detectPackage.js delete mode 100644 packages/util-crypto/src/detectPackage.mjs create mode 100644 packages/util-crypto/src/detectPackage.ts diff --git a/package.json b/package.json index fdc1d8218..bae196589 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ }, "devDependencies": { "@babel/core": "^7.12.10", - "@polkadot/dev": "^0.61.8", + "@polkadot/dev": "^0.61.11", "@polkadot/ts": "^0.3.58", "@types/jest": "^26.0.19" }, diff --git a/packages/keyring/src/detectPackage.d.ts b/packages/keyring/src/detectPackage.d.ts deleted file mode 100644 index 04c0ea223..000000000 --- a/packages/keyring/src/detectPackage.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2017-2020 @polkadot/keyring authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -import packageInfo from './package-info.json'; - -export { packageInfo }; diff --git a/packages/keyring/src/detectPackage.js b/packages/keyring/src/detectPackage.js deleted file mode 100644 index 306a6e6d9..000000000 --- a/packages/keyring/src/detectPackage.js +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2017-2020 @polkadot/keyring authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -const util = require('@polkadot/util'); - -const packageInfo = require('./package-info.json'); - -util.detectPackage(packageInfo, () => __dirname); - -exports.packageInfo = packageInfo; diff --git a/packages/keyring/src/detectPackage.mjs b/packages/keyring/src/detectPackage.mjs deleted file mode 100644 index d7ffdc8c7..000000000 --- a/packages/keyring/src/detectPackage.mjs +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2017-2020 @polkadot/keyring authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -import { detectPackage } from '@polkadot/util'; - -import packageInfo from './package-info.json'; - -detectPackage(packageInfo, () => import.meta.url); - -export { packageInfo }; diff --git a/packages/keyring/src/detectPackage.ts b/packages/keyring/src/detectPackage.ts new file mode 100644 index 000000000..ae633e9ab --- /dev/null +++ b/packages/keyring/src/detectPackage.ts @@ -0,0 +1,25 @@ +// Copyright 2017-2020 @polkadot/keyring authors & contributors +// SPDX-License-Identifier: Apache-2.0 + +// For esm, this should be import.meta.url or to get the same behavior as __dirname, we can use +// +// new URL(import.meta.url).pathname) +// +// The issue is the WP4 has "some" issues with import.meta.url. So because of bundlers, we can't have +// nice things... In this case it is even worse since import.meta.url won't even make it compile, so +// there is a complete dead end with usage thereof +// +// When that is fixed, a solution is to have both .js & .mjs files, with the following content - +// +// cjs: util.detectPackage(packageInfo, () => __dirname); +// esm: detectPackage(packageInfo, () => import.meta.url); +// +// With the above we additionally need a .d.ts to just export the packageInfo + +import { detectPackage } from '@polkadot/util'; + +import packageInfo from './package-info.json'; + +detectPackage(packageInfo, typeof __dirname !== 'undefined' && __dirname); + +export { packageInfo }; diff --git a/packages/util-crypto/package.json b/packages/util-crypto/package.json index c370c2d67..a2c25de64 100644 --- a/packages/util-crypto/package.json +++ b/packages/util-crypto/package.json @@ -19,7 +19,7 @@ "@babel/runtime": "^7.12.5", "@polkadot/networks": "5.0.2-7", "@polkadot/util": "5.0.2-7", - "@polkadot/wasm-crypto": "^3.0.2-4", + "@polkadot/wasm-crypto": "^3.0.2-11", "@polkadot/x-randomvalues": "5.0.2-7", "base-x": "^3.0.8", "blakejs": "^1.1.0", diff --git a/packages/util-crypto/src/detectPackage.d.ts b/packages/util-crypto/src/detectPackage.d.ts deleted file mode 100644 index b3a532f8d..000000000 --- a/packages/util-crypto/src/detectPackage.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2017-2020 @polkadot/util-crypto authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -import packageInfo from './package-info.json'; - -export { packageInfo }; diff --git a/packages/util-crypto/src/detectPackage.js b/packages/util-crypto/src/detectPackage.js deleted file mode 100644 index 2421b28f8..000000000 --- a/packages/util-crypto/src/detectPackage.js +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2017-2020 @polkadot/util-crypto authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -const util = require('@polkadot/util'); - -const packageInfo = require('./package-info.json'); - -util.detectPackage(packageInfo, () => __dirname); - -exports.packageInfo = packageInfo; diff --git a/packages/util-crypto/src/detectPackage.mjs b/packages/util-crypto/src/detectPackage.mjs deleted file mode 100644 index 482f45949..000000000 --- a/packages/util-crypto/src/detectPackage.mjs +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2017-2020 @polkadot/util-crypto authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -import { detectPackage } from '@polkadot/util'; - -import packageInfo from './package-info.json'; - -detectPackage(packageInfo, () => import.meta.url); - -export { packageInfo }; diff --git a/packages/util-crypto/src/detectPackage.ts b/packages/util-crypto/src/detectPackage.ts new file mode 100644 index 000000000..ee0fbad91 --- /dev/null +++ b/packages/util-crypto/src/detectPackage.ts @@ -0,0 +1,25 @@ +// Copyright 2017-2020 @polkadot/util-crypto authors & contributors +// SPDX-License-Identifier: Apache-2.0 + +// For esm, this should be import.meta.url or to get the same behavior as __dirname, we can use +// +// new URL(import.meta.url).pathname) +// +// The issue is the WP4 has "some" issues with import.meta.url. So because of bundlers, we can't have +// nice things... In this case it is even worse since import.meta.url won't even make it compile, so +// there is a complete dead end with usage thereof +// +// When that is fixed, a solution is to have both .js & .mjs files, with the following content - +// +// cjs: util.detectPackage(packageInfo, () => __dirname); +// esm: detectPackage(packageInfo, () => import.meta.url); +// +// With the above we additionally need a .d.ts to just export the packageInfo + +import { detectPackage } from '@polkadot/util'; + +import packageInfo from './package-info.json'; + +detectPackage(packageInfo, typeof __dirname !== 'undefined' && __dirname); + +export { packageInfo }; diff --git a/packages/util/src/bn/consts.ts b/packages/util/src/bn/consts.ts index 8a9c3fff0..9379f3dad 100644 --- a/packages/util/src/bn/consts.ts +++ b/packages/util/src/bn/consts.ts @@ -7,36 +7,28 @@ import BN from 'bn.js'; * @name BN_ZERO * @summary BN constant for 0. */ -const BN_ZERO: BN = new BN(0); +export const BN_ZERO: BN = new BN(0); /** * @name BN_ONE * @summary BN constant for 1. */ -const BN_ONE: BN = new BN(1); +export const BN_ONE: BN = new BN(1); /** * @name BN_TEN * @summary BN constant for 10. */ -const BN_TEN: BN = new BN(10); +export const BN_TEN: BN = new BN(10); /** * @name BN_HUNDRED * @summary BN constant for 100. */ -const BN_HUNDRED: BN = new BN(100); +export const BN_HUNDRED: BN = new BN(100); /** * @name BN_THOUSAND * @summary BN constant for 1000. */ -const BN_THOUSAND: BN = new BN(1000); - -export { - BN_ZERO, - BN_ONE, - BN_TEN, - BN_HUNDRED, - BN_THOUSAND -}; +export const BN_THOUSAND: BN = new BN(1000); diff --git a/yarn.lock b/yarn.lock index edd2a6463..25c849676 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1686,9 +1686,9 @@ __metadata: languageName: node linkType: hard -"@polkadot/dev@npm:^0.61.8": - version: 0.61.8 - resolution: "@polkadot/dev@npm:0.61.8" +"@polkadot/dev@npm:^0.61.11": + version: 0.61.11 + resolution: "@polkadot/dev@npm:0.61.11" dependencies: "@babel/cli": ^7.12.10 "@babel/core": ^7.12.10 @@ -1775,7 +1775,7 @@ __metadata: polkadot-exec-typedoc: scripts/polkadot-exec-typedoc.cjs polkadot-exec-vuepress: scripts/polkadot-exec-vuepress.cjs polkadot-exec-webpack: scripts/polkadot-exec-webpack.cjs - checksum: 241bc06d7d0602e1c6b21082e744e681323640f39c74aaf9d62d8404c44d105553fd01bb1b82e9e460c4b03b26ae586cabf89c83f460db059b01264f1fec0bbe + checksum: f8ada082831cf62bbf353c1aab5a3e9c3cdef901aede558bb76f22199cf042a9423c4cbb902bb4fc0f5dffd4cd91d7b807dfec8c5742a00ca83412dda0bc5332 languageName: node linkType: hard @@ -1818,7 +1818,7 @@ __metadata: "@babel/runtime": ^7.12.5 "@polkadot/networks": 5.0.2-7 "@polkadot/util": 5.0.2-7 - "@polkadot/wasm-crypto": ^3.0.2-4 + "@polkadot/wasm-crypto": ^3.0.2-11 "@polkadot/x-randomvalues": 5.0.2-7 "@types/bn.js": ^4.11.6 "@types/create-hash": ^1.2.2 @@ -1854,36 +1854,36 @@ __metadata: languageName: unknown linkType: soft -"@polkadot/wasm-crypto-asmjs@npm:^3.0.2-4": - version: 3.0.2-4 - resolution: "@polkadot/wasm-crypto-asmjs@npm:3.0.2-4" +"@polkadot/wasm-crypto-asmjs@npm:^3.0.2-11": + version: 3.0.2-11 + resolution: "@polkadot/wasm-crypto-asmjs@npm:3.0.2-11" dependencies: "@babel/runtime": ^7.12.5 - checksum: 639a7eab493ac63438c0ab100073f681ba66ee91e3eb059222c87b39d3669239bde98c0d5c58e1574df7091a2cd5ab33075170946f093747cae03fae4a317110 + checksum: dc84a257169fa4a37b2dd2b0e62fad586659bde2ab23d4a5346779f7865751ee789774c201f7b6ae14530409ca52565d5abb1938eb1a1ef23c922bd117006f28 languageName: node linkType: hard -"@polkadot/wasm-crypto-wasm@npm:^3.0.2-4": - version: 3.0.2-4 - resolution: "@polkadot/wasm-crypto-wasm@npm:3.0.2-4" +"@polkadot/wasm-crypto-wasm@npm:^3.0.2-11": + version: 3.0.2-11 + resolution: "@polkadot/wasm-crypto-wasm@npm:3.0.2-11" dependencies: "@babel/runtime": ^7.12.5 fflate: ^0.4.2 - checksum: d5c703d8096055672dcfa574f5f9c85b3e874da0afd064cdfd9de8e3b95a5606c815363d3703819e86639a934237868b7a9db0f47cc2a2cd9f1da832131f3c07 + checksum: 312c9fe938540923150727ab3ea5cec783c6ee0634f5034fd9f5065f7de534e5fb565c5bf56cdf49e20ec2c585117dcb12a343c8aacd406f79a26b63294ad707 languageName: node linkType: hard -"@polkadot/wasm-crypto@npm:^3.0.2-4": - version: 3.0.2-4 - resolution: "@polkadot/wasm-crypto@npm:3.0.2-4" +"@polkadot/wasm-crypto@npm:^3.0.2-11": + version: 3.0.2-11 + resolution: "@polkadot/wasm-crypto@npm:3.0.2-11" dependencies: "@babel/runtime": ^7.12.5 - "@polkadot/wasm-crypto-asmjs": ^3.0.2-4 - "@polkadot/wasm-crypto-wasm": ^3.0.2-4 + "@polkadot/wasm-crypto-asmjs": ^3.0.2-11 + "@polkadot/wasm-crypto-wasm": ^3.0.2-11 peerDependencies: "@polkadot/util": "*" "@polkadot/x-randomvalues": "*" - checksum: b286d352931b09443b422f99039e9c65c09eee9b0001311aa0c1ba8afbbe0a705cbf17680f899955ad164d344d82e6be9da488faaf2e0aa02f57ac6890204d29 + checksum: b21a9ea54398ce0503871e56d9054bb77fa1572923d4fd3f74b76fedc3d9c3996f702a69d0ac835090c010993327455c36a29d3ca7f38b7ea7dde0633e8313af languageName: node linkType: hard @@ -9000,7 +9000,7 @@ fsevents@~2.1.2: resolution: "root-workspace-0b6124@workspace:." dependencies: "@babel/core": ^7.12.10 - "@polkadot/dev": ^0.61.8 + "@polkadot/dev": ^0.61.11 "@polkadot/ts": ^0.3.58 "@types/jest": ^26.0.19 languageName: unknown