From c6fd67b5d544c1ad9653507db9a7a944870392c7 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Wed, 16 Dec 2020 15:44:00 +0100 Subject: [PATCH] detectPackage with import.meta.url (#810) * detectPackage with import.meta.url * Bump dev * Remove duplicate detectPackage * Fix detectPackage import --- package.json | 2 +- packages/keyring/src/detectPackage.d.ts | 6 ++ packages/keyring/src/detectPackage.js | 10 +++ .../{detectPackage.ts => detectPackage.mjs} | 4 +- packages/util-crypto/src/detectPackage.d.ts | 6 ++ packages/util-crypto/src/detectPackage.js | 8 +- packages/util-crypto/src/detectPackage.mjs | 10 +++ packages/x-randomvalues/package.json | 2 +- yarn.lock | 79 ++++++++++++------- 9 files changed, 94 insertions(+), 33 deletions(-) create mode 100644 packages/keyring/src/detectPackage.d.ts create mode 100644 packages/keyring/src/detectPackage.js rename packages/keyring/src/{detectPackage.ts => detectPackage.mjs} (72%) create mode 100644 packages/util-crypto/src/detectPackage.d.ts create mode 100644 packages/util-crypto/src/detectPackage.mjs diff --git a/package.json b/package.json index 0b75d03b6..40b1df371 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ }, "devDependencies": { "@babel/core": "^7.12.10", - "@polkadot/dev": "^0.61.5", + "@polkadot/dev": "^0.61.8", "@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 new file mode 100644 index 000000000..04c0ea223 --- /dev/null +++ b/packages/keyring/src/detectPackage.d.ts @@ -0,0 +1,6 @@ +// 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 new file mode 100644 index 000000000..761c27e23 --- /dev/null +++ b/packages/keyring/src/detectPackage.js @@ -0,0 +1,10 @@ +// 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, typeof __dirname !== 'undefined' && __dirname); + +exports.packageInfo = packageInfo; diff --git a/packages/keyring/src/detectPackage.ts b/packages/keyring/src/detectPackage.mjs similarity index 72% rename from packages/keyring/src/detectPackage.ts rename to packages/keyring/src/detectPackage.mjs index 7fd53f0d8..9a79f7e72 100644 --- a/packages/keyring/src/detectPackage.ts +++ b/packages/keyring/src/detectPackage.mjs @@ -5,4 +5,6 @@ import { detectPackage } from '@polkadot/util'; import packageInfo from './package-info.json'; -detectPackage(packageInfo, typeof __dirname !== 'undefined' && __dirname); +detectPackage(packageInfo, import.meta.url); + +export { packageInfo }; diff --git a/packages/util-crypto/src/detectPackage.d.ts b/packages/util-crypto/src/detectPackage.d.ts new file mode 100644 index 000000000..b3a532f8d --- /dev/null +++ b/packages/util-crypto/src/detectPackage.d.ts @@ -0,0 +1,6 @@ +// 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 index e28be0eef..af7f9d378 100644 --- a/packages/util-crypto/src/detectPackage.js +++ b/packages/util-crypto/src/detectPackage.js @@ -1,8 +1,10 @@ // Copyright 2017-2020 @polkadot/util-crypto authors & contributors // SPDX-License-Identifier: Apache-2.0 -import { detectPackage } from '@polkadot/util'; +const util = require('@polkadot/util'); -import packageInfo from './package-info.json'; +const packageInfo = require('./package-info.json'); -detectPackage(packageInfo, typeof __dirname !== 'undefined' && __dirname); +util.detectPackage(packageInfo, typeof __dirname !== 'undefined' && __dirname); + +exports.packageInfo = packageInfo; diff --git a/packages/util-crypto/src/detectPackage.mjs b/packages/util-crypto/src/detectPackage.mjs new file mode 100644 index 000000000..afc2668da --- /dev/null +++ b/packages/util-crypto/src/detectPackage.mjs @@ -0,0 +1,10 @@ +// 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/x-randomvalues/package.json b/packages/x-randomvalues/package.json index 971bd1815..77e1d6b3d 100644 --- a/packages/x-randomvalues/package.json +++ b/packages/x-randomvalues/package.json @@ -16,6 +16,6 @@ "@babel/runtime": "^7.12.5" }, "devDependencies": { - "@types/react-native": "^0.63.40" + "@types/react-native": "^0.63.41" } } diff --git a/yarn.lock b/yarn.lock index 493d49dfd..ef14b1130 100644 --- a/yarn.lock +++ b/yarn.lock @@ -321,6 +321,13 @@ __metadata: languageName: node linkType: hard +"@babel/helper-validator-identifier@npm:^7.12.11": + version: 7.12.11 + resolution: "@babel/helper-validator-identifier@npm:7.12.11" + checksum: 18de432203264b501db2690b53370a4289dc56084f5a2c66de624b159ee28b8abaeb402b2b7584296d9261645d91ddb6bfd21125d3ffd9bf02e9262e77baf3d2 + languageName: node + linkType: hard + "@babel/helper-validator-option@npm:^7.12.1": version: 7.12.1 resolution: "@babel/helper-validator-option@npm:7.12.1" @@ -328,6 +335,13 @@ __metadata: languageName: node linkType: hard +"@babel/helper-validator-option@npm:^7.12.11": + version: 7.12.11 + resolution: "@babel/helper-validator-option@npm:7.12.11" + checksum: c0a861e95f4f24ed59535c28206f62e639404db873473886ec77b50fef53e21111b4093522838927b79be768a885ad2007086b2434353b9d2b89b891ca14028a + languageName: node + linkType: hard + "@babel/helper-wrap-function@npm:^7.10.4": version: 7.12.3 resolution: "@babel/helper-wrap-function@npm:7.12.3" @@ -788,14 +802,14 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-block-scoping@npm:^7.12.1": - version: 7.12.1 - resolution: "@babel/plugin-transform-block-scoping@npm:7.12.1" +"@babel/plugin-transform-block-scoping@npm:^7.12.11": + version: 7.12.11 + resolution: "@babel/plugin-transform-block-scoping@npm:7.12.11" dependencies: "@babel/helper-plugin-utils": ^7.10.4 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 067f8b55a32ba53c7bc61e730f0a2dd063ee377afea88e153e9b8bd8069d666df3106b80777e37e418d14a21cabd1dee0f7dabfe8cb038d5080d9e332a202e36 + checksum: 6bc227619d7890724eec691e53859914a5420be3f8225cc8901dc839aed05697014a241e81125c541a8b5f7ac2ffc639aab645ec26484ffba696eab2cb7c8c02 languageName: node linkType: hard @@ -1206,15 +1220,15 @@ __metadata: languageName: node linkType: hard -"@babel/preset-env@npm:^7.12.10": - version: 7.12.10 - resolution: "@babel/preset-env@npm:7.12.10" +"@babel/preset-env@npm:^7.12.11": + version: 7.12.11 + resolution: "@babel/preset-env@npm:7.12.11" dependencies: "@babel/compat-data": ^7.12.7 "@babel/helper-compilation-targets": ^7.12.5 "@babel/helper-module-imports": ^7.12.5 "@babel/helper-plugin-utils": ^7.10.4 - "@babel/helper-validator-option": ^7.12.1 + "@babel/helper-validator-option": ^7.12.11 "@babel/plugin-proposal-async-generator-functions": ^7.12.1 "@babel/plugin-proposal-class-properties": ^7.12.1 "@babel/plugin-proposal-dynamic-import": ^7.12.1 @@ -1243,7 +1257,7 @@ __metadata: "@babel/plugin-transform-arrow-functions": ^7.12.1 "@babel/plugin-transform-async-to-generator": ^7.12.1 "@babel/plugin-transform-block-scoped-functions": ^7.12.1 - "@babel/plugin-transform-block-scoping": ^7.12.1 + "@babel/plugin-transform-block-scoping": ^7.12.11 "@babel/plugin-transform-classes": ^7.12.1 "@babel/plugin-transform-computed-properties": ^7.12.1 "@babel/plugin-transform-destructuring": ^7.12.1 @@ -1273,12 +1287,12 @@ __metadata: "@babel/plugin-transform-unicode-escapes": ^7.12.1 "@babel/plugin-transform-unicode-regex": ^7.12.1 "@babel/preset-modules": ^0.1.3 - "@babel/types": ^7.12.10 + "@babel/types": ^7.12.11 core-js-compat: ^3.8.0 semver: ^5.5.0 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 1fe64a0943dac09eb0f19cdea8af8a9906e2ae65cacef3ad33847a012392b92d51c3152697da906e8397a3a1b9fa773bd28c05e54091078099d0193abf8d7d66 + checksum: 2811bbf697d86d2d7d972215cf07e4b153cb667eefa2ca3521e0eb34c20d3f2643c44ed31734e1db35675267f5a3de284b87e543132f075c28c979b34af6472c languageName: node linkType: hard @@ -1388,6 +1402,17 @@ __metadata: languageName: node linkType: hard +"@babel/types@npm:^7.12.11": + version: 7.12.11 + resolution: "@babel/types@npm:7.12.11" + dependencies: + "@babel/helper-validator-identifier": ^7.12.11 + lodash: ^4.17.19 + to-fast-properties: ^2.0.0 + checksum: e592c52b097da2c56f7388f35bf84a267c88e0e1bd7d3b7730892a8c70b2a80bd7f67a2ee57b2acf6aee58a074a234214d3e43ff6968dfb834733aa1417a5a43 + languageName: node + linkType: hard + "@bcoe/v8-coverage@npm:^0.2.3": version: 0.2.3 resolution: "@bcoe/v8-coverage@npm:0.2.3" @@ -1686,9 +1711,9 @@ __metadata: languageName: node linkType: hard -"@polkadot/dev@npm:^0.61.5": - version: 0.61.5 - resolution: "@polkadot/dev@npm:0.61.5" +"@polkadot/dev@npm:^0.61.8": + version: 0.61.8 + resolution: "@polkadot/dev@npm:0.61.8" dependencies: "@babel/cli": ^7.12.10 "@babel/core": ^7.12.10 @@ -1706,7 +1731,7 @@ __metadata: "@babel/plugin-syntax-top-level-await": ^7.12.1 "@babel/plugin-transform-regenerator": ^7.12.1 "@babel/plugin-transform-runtime": ^7.12.10 - "@babel/preset-env": ^7.12.10 + "@babel/preset-env": ^7.12.11 "@babel/preset-react": ^7.12.10 "@babel/preset-typescript": ^7.12.7 "@babel/register": ^7.12.10 @@ -1717,7 +1742,7 @@ __metadata: "@vue/component-compiler-utils": ^3.2.0 babel-jest: ^26.6.3 babel-plugin-module-extension-resolver: ^1.0.0-rc.1 - babel-plugin-module-resolver: ^4.0.0 + babel-plugin-module-resolver: ^4.1.0 babel-plugin-styled-components: ^1.12.0 browserslist: ^4.16.0 chalk: ^4.1.0 @@ -1775,7 +1800,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: f58b0190986d600ddbd46ce854eca164ee7bc71ec4c09614b01ce96ca8256a63871b6344f3d0819d778a15de6b787c730ded12a863c3172f74decc65adaa1f4d + checksum: 241bc06d7d0602e1c6b21082e744e681323640f39c74aaf9d62d8404c44d105553fd01bb1b82e9e460c4b03b26ae586cabf89c83f460db059b01264f1fec0bbe languageName: node linkType: hard @@ -1902,7 +1927,7 @@ __metadata: resolution: "@polkadot/x-randomvalues@workspace:packages/x-randomvalues" dependencies: "@babel/runtime": ^7.12.5 - "@types/react-native": ^0.63.40 + "@types/react-native": ^0.63.41 languageName: unknown linkType: soft @@ -2179,12 +2204,12 @@ __metadata: languageName: node linkType: hard -"@types/react-native@npm:^0.63.40": - version: 0.63.40 - resolution: "@types/react-native@npm:0.63.40" +"@types/react-native@npm:^0.63.41": + version: 0.63.41 + resolution: "@types/react-native@npm:0.63.41" dependencies: "@types/react": "*" - checksum: c5f926f0d53a37608b33400aa15a0e514bf77c2be0c84c555b6d8cd415d74552f70df22d0112311d4145f3f2649c48117ba664e41dd7f589660de570a7f67550 + checksum: 671b14ba35d3be57ad219cec0b4b26ace34a8c8cf95b08581236c333a63afecf8e1e845ae9cad6256c842b4c3b32a7bfdd3d1283800f94693512c172366ba4d8 languageName: node linkType: hard @@ -2841,16 +2866,16 @@ __metadata: languageName: node linkType: hard -"babel-plugin-module-resolver@npm:^4.0.0": - version: 4.0.0 - resolution: "babel-plugin-module-resolver@npm:4.0.0" +"babel-plugin-module-resolver@npm:^4.1.0": + version: 4.1.0 + resolution: "babel-plugin-module-resolver@npm:4.1.0" dependencies: find-babel-config: ^1.2.0 glob: ^7.1.6 pkg-up: ^3.1.0 reselect: ^4.0.0 resolve: ^1.13.1 - checksum: ac50e01ef09f1dc506e250e852dcfb49c0cd0e7e5bf02b3f3d1de7c51ccda8bf34fa63bc9a698c098004a15d91efcc65517397ae90209c9c23b7778b83235ce3 + checksum: c3efeaac63b63761d253408c120469b13817ae00d05f5ba6f8d25bcb5970affe42b01aabb91db63332993796ece1f57a3680d66317523484bc57ba479e720e89 languageName: node linkType: hard @@ -9000,7 +9025,7 @@ fsevents@~2.1.2: resolution: "root-workspace-0b6124@workspace:." dependencies: "@babel/core": ^7.12.10 - "@polkadot/dev": ^0.61.5 + "@polkadot/dev": ^0.61.8 "@polkadot/ts": ^0.3.58 "@types/jest": ^26.0.19 languageName: unknown