From 1ffb23571918f2572c8de7f205e152aca347c38f Mon Sep 17 00:00:00 2001 From: Jaco Date: Thu, 6 Jan 2022 06:59:32 +0100 Subject: [PATCH] Byump dev (w/ detectPackage) (#966) --- CHANGELOG.md | 1 + package.json | 2 +- packages/extension-base/package.json | 2 +- packages/extension-base/src/cjs/dirname.d.ts | 8 -- packages/extension-base/src/cjs/dirname.js | 8 -- packages/extension-base/src/cjs/package.json | 3 - packages/extension-base/src/detectPackage.ts | 3 +- packages/extension-base/src/packageInfo.ts | 2 +- .../extension-chains/src/cjs/dirname.d.ts | 8 -- packages/extension-chains/src/cjs/dirname.js | 8 -- .../extension-chains/src/cjs/package.json | 3 - .../extension-chains/src/detectPackage.ts | 3 +- packages/extension-chains/src/packageInfo.ts | 2 +- .../src/cjs/dirname.d.ts | 8 -- .../src/cjs/dirname.js | 8 -- .../src/cjs/package.json | 3 - .../src/detectPackage.ts | 3 +- .../src/packageInfo.ts | 2 +- packages/extension-dapp/src/cjs/dirname.d.ts | 8 -- packages/extension-dapp/src/cjs/dirname.js | 8 -- packages/extension-dapp/src/cjs/package.json | 3 - packages/extension-dapp/src/detectPackage.ts | 3 +- packages/extension-dapp/src/packageInfo.ts | 2 +- packages/extension-inject/package.json | 3 +- packages/extension-inject/src/chrome.ts | 6 + .../extension-inject/src/cjs/dirname.d.ts | 8 -- packages/extension-inject/src/cjs/dirname.js | 8 -- .../extension-inject/src/cjs/package.json | 3 - packages/extension-inject/src/crossenv.ts | 6 +- .../extension-inject/src/detectPackage.ts | 3 +- packages/extension-inject/src/packageInfo.ts | 2 +- packages/extension/package.json | 4 +- packages/extension/src/cjs/dirname.d.ts | 8 -- packages/extension/src/cjs/dirname.js | 8 -- packages/extension/src/cjs/package.json | 3 - packages/extension/src/content.ts | 3 +- packages/extension/src/detectPackage.ts | 3 +- packages/extension/src/packageInfo.ts | 2 +- packages/extension/src/page.ts | 16 +-- yarn.lock | 130 +++++++++++++++--- 40 files changed, 147 insertions(+), 170 deletions(-) delete mode 100644 packages/extension-base/src/cjs/dirname.d.ts delete mode 100644 packages/extension-base/src/cjs/dirname.js delete mode 100644 packages/extension-base/src/cjs/package.json delete mode 100644 packages/extension-chains/src/cjs/dirname.d.ts delete mode 100644 packages/extension-chains/src/cjs/dirname.js delete mode 100644 packages/extension-chains/src/cjs/package.json delete mode 100644 packages/extension-compat-metamask/src/cjs/dirname.d.ts delete mode 100644 packages/extension-compat-metamask/src/cjs/dirname.js delete mode 100644 packages/extension-compat-metamask/src/cjs/package.json delete mode 100644 packages/extension-dapp/src/cjs/dirname.d.ts delete mode 100644 packages/extension-dapp/src/cjs/dirname.js delete mode 100644 packages/extension-dapp/src/cjs/package.json create mode 100644 packages/extension-inject/src/chrome.ts delete mode 100644 packages/extension-inject/src/cjs/dirname.d.ts delete mode 100644 packages/extension-inject/src/cjs/dirname.js delete mode 100644 packages/extension-inject/src/cjs/package.json delete mode 100644 packages/extension/src/cjs/dirname.d.ts delete mode 100644 packages/extension/src/cjs/dirname.js delete mode 100644 packages/extension/src/cjs/package.json diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c191f81..b6ba97a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ Changes: - Ensure that only latest metadata is applied (when multiple genesis) - Rename all `*.test.ts` to `*.spec.ts` (cross-repo consistency) +- Only apply cross-browser environment globally in non-content scripts - Ensure package path is availble under ESM & CJS diff --git a/package.json b/package.json index 42d09788..a8f84b46 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ }, "devDependencies": { "@babel/core": "^7.16.7", - "@polkadot/dev": "^0.65.11", + "@polkadot/dev": "^0.65.14", "@types/jest": "^27.4.0", "i18next-scanner": "^3.1.0", "sinon-chrome": "^3.0.1" diff --git a/packages/extension-base/package.json b/packages/extension-base/package.json index a07ae545..c076fdca 100644 --- a/packages/extension-base/package.json +++ b/packages/extension-base/package.json @@ -27,7 +27,7 @@ "@polkadot/extension-inject": "^0.42.5-14", "@polkadot/keyring": "^8.2.2", "@polkadot/networks": "^8.2.2", - "@polkadot/phishing": "^0.7.22", + "@polkadot/phishing": "^0.7.24", "@polkadot/rpc-provider": "^7.2.1", "@polkadot/types": "^7.2.1", "@polkadot/ui-keyring": "^0.88.2-0", diff --git a/packages/extension-base/src/cjs/dirname.d.ts b/packages/extension-base/src/cjs/dirname.d.ts deleted file mode 100644 index 3d68b77a..00000000 --- a/packages/extension-base/src/cjs/dirname.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright 2017-2022 @polkadot/extension-base authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -// Do not edit, auto-generated by @polkadot/dev - -declare const __dirname: string | undefined; - -export default __dirname; diff --git a/packages/extension-base/src/cjs/dirname.js b/packages/extension-base/src/cjs/dirname.js deleted file mode 100644 index 96a4f861..00000000 --- a/packages/extension-base/src/cjs/dirname.js +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright 2017-2022 @polkadot/extension-base authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -// Do not edit, auto-generated by @polkadot/dev - -module.exports = typeof __dirname === 'string' - ? __dirname.replace('/cjs', '') - : undefined; diff --git a/packages/extension-base/src/cjs/package.json b/packages/extension-base/src/cjs/package.json deleted file mode 100644 index 96431b98..00000000 --- a/packages/extension-base/src/cjs/package.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "type":"commonjs" -} \ No newline at end of file diff --git a/packages/extension-base/src/detectPackage.ts b/packages/extension-base/src/detectPackage.ts index 1da8ab22..1f6ff2de 100644 --- a/packages/extension-base/src/detectPackage.ts +++ b/packages/extension-base/src/detectPackage.ts @@ -5,8 +5,7 @@ import { detectPackage } from '@polkadot/util'; -import dirname from './cjs/dirname'; import others from './detectOther'; import { packageInfo } from './packageInfo'; -detectPackage(packageInfo, dirname, others); +detectPackage(packageInfo, packageInfo.path, others); diff --git a/packages/extension-base/src/packageInfo.ts b/packages/extension-base/src/packageInfo.ts index ab24987b..73ccc69f 100644 --- a/packages/extension-base/src/packageInfo.ts +++ b/packages/extension-base/src/packageInfo.ts @@ -3,4 +3,4 @@ // Do not edit, auto-generated by @polkadot/dev -export const packageInfo = { name: '@polkadot/extension-base', version: '0.42.5-14' }; +export const packageInfo = { name: '@polkadot/extension-base', path: 'auto', type: 'auto', version: '0.42.5-14' }; diff --git a/packages/extension-chains/src/cjs/dirname.d.ts b/packages/extension-chains/src/cjs/dirname.d.ts deleted file mode 100644 index c16f29a1..00000000 --- a/packages/extension-chains/src/cjs/dirname.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright 2017-2022 @polkadot/extension-chains authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -// Do not edit, auto-generated by @polkadot/dev - -declare const __dirname: string | undefined; - -export default __dirname; diff --git a/packages/extension-chains/src/cjs/dirname.js b/packages/extension-chains/src/cjs/dirname.js deleted file mode 100644 index ce3bb724..00000000 --- a/packages/extension-chains/src/cjs/dirname.js +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright 2017-2022 @polkadot/extension-chains authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -// Do not edit, auto-generated by @polkadot/dev - -module.exports = typeof __dirname === 'string' - ? __dirname.replace('/cjs', '') - : undefined; diff --git a/packages/extension-chains/src/cjs/package.json b/packages/extension-chains/src/cjs/package.json deleted file mode 100644 index 96431b98..00000000 --- a/packages/extension-chains/src/cjs/package.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "type":"commonjs" -} \ No newline at end of file diff --git a/packages/extension-chains/src/detectPackage.ts b/packages/extension-chains/src/detectPackage.ts index bc873e0c..15f6786b 100644 --- a/packages/extension-chains/src/detectPackage.ts +++ b/packages/extension-chains/src/detectPackage.ts @@ -5,8 +5,7 @@ import { detectPackage } from '@polkadot/util'; -import dirname from './cjs/dirname'; import others from './detectOther'; import { packageInfo } from './packageInfo'; -detectPackage(packageInfo, dirname, others); +detectPackage(packageInfo, packageInfo.path, others); diff --git a/packages/extension-chains/src/packageInfo.ts b/packages/extension-chains/src/packageInfo.ts index 2fcb062d..2bdbbacb 100644 --- a/packages/extension-chains/src/packageInfo.ts +++ b/packages/extension-chains/src/packageInfo.ts @@ -3,4 +3,4 @@ // Do not edit, auto-generated by @polkadot/dev -export const packageInfo = { name: '@polkadot/extension-chains', version: '0.42.5-14' }; +export const packageInfo = { name: '@polkadot/extension-chains', path: 'auto', type: 'auto', version: '0.42.5-14' }; diff --git a/packages/extension-compat-metamask/src/cjs/dirname.d.ts b/packages/extension-compat-metamask/src/cjs/dirname.d.ts deleted file mode 100644 index 42f254e3..00000000 --- a/packages/extension-compat-metamask/src/cjs/dirname.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright 2017-2022 @polkadot/extension-compat-metamask authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -// Do not edit, auto-generated by @polkadot/dev - -declare const __dirname: string | undefined; - -export default __dirname; diff --git a/packages/extension-compat-metamask/src/cjs/dirname.js b/packages/extension-compat-metamask/src/cjs/dirname.js deleted file mode 100644 index f096e18a..00000000 --- a/packages/extension-compat-metamask/src/cjs/dirname.js +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright 2017-2022 @polkadot/extension-compat-metamask authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -// Do not edit, auto-generated by @polkadot/dev - -module.exports = typeof __dirname === 'string' - ? __dirname.replace('/cjs', '') - : undefined; diff --git a/packages/extension-compat-metamask/src/cjs/package.json b/packages/extension-compat-metamask/src/cjs/package.json deleted file mode 100644 index 96431b98..00000000 --- a/packages/extension-compat-metamask/src/cjs/package.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "type":"commonjs" -} \ No newline at end of file diff --git a/packages/extension-compat-metamask/src/detectPackage.ts b/packages/extension-compat-metamask/src/detectPackage.ts index 674a5d17..831e1319 100644 --- a/packages/extension-compat-metamask/src/detectPackage.ts +++ b/packages/extension-compat-metamask/src/detectPackage.ts @@ -5,8 +5,7 @@ import { detectPackage } from '@polkadot/util'; -import dirname from './cjs/dirname'; import others from './detectOther'; import { packageInfo } from './packageInfo'; -detectPackage(packageInfo, dirname, others); +detectPackage(packageInfo, packageInfo.path, others); diff --git a/packages/extension-compat-metamask/src/packageInfo.ts b/packages/extension-compat-metamask/src/packageInfo.ts index 993367ef..af9a7255 100644 --- a/packages/extension-compat-metamask/src/packageInfo.ts +++ b/packages/extension-compat-metamask/src/packageInfo.ts @@ -3,4 +3,4 @@ // Do not edit, auto-generated by @polkadot/dev -export const packageInfo = { name: '@polkadot/extension-compat-metamask', version: '0.42.5-14' }; +export const packageInfo = { name: '@polkadot/extension-compat-metamask', path: 'auto', type: 'auto', version: '0.42.5-14' }; diff --git a/packages/extension-dapp/src/cjs/dirname.d.ts b/packages/extension-dapp/src/cjs/dirname.d.ts deleted file mode 100644 index ddb54b46..00000000 --- a/packages/extension-dapp/src/cjs/dirname.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright 2017-2022 @polkadot/extension-dapp authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -// Do not edit, auto-generated by @polkadot/dev - -declare const __dirname: string | undefined; - -export default __dirname; diff --git a/packages/extension-dapp/src/cjs/dirname.js b/packages/extension-dapp/src/cjs/dirname.js deleted file mode 100644 index 002a3da4..00000000 --- a/packages/extension-dapp/src/cjs/dirname.js +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright 2017-2022 @polkadot/extension-dapp authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -// Do not edit, auto-generated by @polkadot/dev - -module.exports = typeof __dirname === 'string' - ? __dirname.replace('/cjs', '') - : undefined; diff --git a/packages/extension-dapp/src/cjs/package.json b/packages/extension-dapp/src/cjs/package.json deleted file mode 100644 index 96431b98..00000000 --- a/packages/extension-dapp/src/cjs/package.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "type":"commonjs" -} \ No newline at end of file diff --git a/packages/extension-dapp/src/detectPackage.ts b/packages/extension-dapp/src/detectPackage.ts index 67bb81b5..66fc9eba 100644 --- a/packages/extension-dapp/src/detectPackage.ts +++ b/packages/extension-dapp/src/detectPackage.ts @@ -5,8 +5,7 @@ import { detectPackage } from '@polkadot/util'; -import dirname from './cjs/dirname'; import others from './detectOther'; import { packageInfo } from './packageInfo'; -detectPackage(packageInfo, dirname, others); +detectPackage(packageInfo, packageInfo.path, others); diff --git a/packages/extension-dapp/src/packageInfo.ts b/packages/extension-dapp/src/packageInfo.ts index 23e29738..36d52b2f 100644 --- a/packages/extension-dapp/src/packageInfo.ts +++ b/packages/extension-dapp/src/packageInfo.ts @@ -3,4 +3,4 @@ // Do not edit, auto-generated by @polkadot/dev -export const packageInfo = { name: '@polkadot/extension-dapp', version: '0.42.5-14' }; +export const packageInfo = { name: '@polkadot/extension-dapp', path: 'auto', type: 'auto', version: '0.42.5-14' }; diff --git a/packages/extension-inject/package.json b/packages/extension-inject/package.json index 890ee507..5fcd2ffc 100644 --- a/packages/extension-inject/package.json +++ b/packages/extension-inject/package.json @@ -21,7 +21,8 @@ "@polkadot/rpc-provider": "^7.2.1", "@polkadot/types": "^7.2.1", "@polkadot/util": "^8.2.2", - "@polkadot/util-crypto": "^8.2.2" + "@polkadot/util-crypto": "^8.2.2", + "@polkadot/x-global": "^8.2.2" }, "devDependencies": { "@types/chrome": "^0.0.174", diff --git a/packages/extension-inject/src/chrome.ts b/packages/extension-inject/src/chrome.ts new file mode 100644 index 00000000..914b3b61 --- /dev/null +++ b/packages/extension-inject/src/chrome.ts @@ -0,0 +1,6 @@ +// Copyright 2019-2022 @polkadot/extension-inject authors & contributors +// SPDX-License-Identifier: Apache-2.0 + +import { extractGlobal, xglobal } from '@polkadot/x-global'; + +export const chrome = extractGlobal('chrome', xglobal.browser); diff --git a/packages/extension-inject/src/cjs/dirname.d.ts b/packages/extension-inject/src/cjs/dirname.d.ts deleted file mode 100644 index 0c772b76..00000000 --- a/packages/extension-inject/src/cjs/dirname.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright 2017-2022 @polkadot/extension-inject authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -// Do not edit, auto-generated by @polkadot/dev - -declare const __dirname: string | undefined; - -export default __dirname; diff --git a/packages/extension-inject/src/cjs/dirname.js b/packages/extension-inject/src/cjs/dirname.js deleted file mode 100644 index 11856925..00000000 --- a/packages/extension-inject/src/cjs/dirname.js +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright 2017-2022 @polkadot/extension-inject authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -// Do not edit, auto-generated by @polkadot/dev - -module.exports = typeof __dirname === 'string' - ? __dirname.replace('/cjs', '') - : undefined; diff --git a/packages/extension-inject/src/cjs/package.json b/packages/extension-inject/src/cjs/package.json deleted file mode 100644 index 96431b98..00000000 --- a/packages/extension-inject/src/cjs/package.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "type":"commonjs" -} \ No newline at end of file diff --git a/packages/extension-inject/src/crossenv.ts b/packages/extension-inject/src/crossenv.ts index 0b9f44f7..21890a59 100644 --- a/packages/extension-inject/src/crossenv.ts +++ b/packages/extension-inject/src/crossenv.ts @@ -1,6 +1,6 @@ // Copyright 2019-2022 @polkadot/extension-inject authors & contributors // SPDX-License-Identifier: Apache-2.0 -if (typeof chrome === 'undefined') { - self.chrome = self.browser as unknown as typeof chrome; -} +import { exposeGlobal, xglobal } from '@polkadot/x-global'; + +exposeGlobal('chrome', xglobal.browser); diff --git a/packages/extension-inject/src/detectPackage.ts b/packages/extension-inject/src/detectPackage.ts index d6b3933f..b5e62afd 100644 --- a/packages/extension-inject/src/detectPackage.ts +++ b/packages/extension-inject/src/detectPackage.ts @@ -5,8 +5,7 @@ import { detectPackage } from '@polkadot/util'; -import dirname from './cjs/dirname'; import others from './detectOther'; import { packageInfo } from './packageInfo'; -detectPackage(packageInfo, dirname, others); +detectPackage(packageInfo, packageInfo.path, others); diff --git a/packages/extension-inject/src/packageInfo.ts b/packages/extension-inject/src/packageInfo.ts index d15e7a8d..2ad6de5d 100644 --- a/packages/extension-inject/src/packageInfo.ts +++ b/packages/extension-inject/src/packageInfo.ts @@ -3,4 +3,4 @@ // Do not edit, auto-generated by @polkadot/dev -export const packageInfo = { name: '@polkadot/extension-inject', version: '0.42.5-14' }; +export const packageInfo = { name: '@polkadot/extension-inject', path: 'auto', type: 'auto', version: '0.42.5-14' }; diff --git a/packages/extension/package.json b/packages/extension/package.json index ef4d4fdd..8673c9ae 100644 --- a/packages/extension/package.json +++ b/packages/extension/package.json @@ -22,11 +22,11 @@ "@polkadot/extension-ui": "^0.42.5-14" }, "devDependencies": { - "@polkadot/dev": "^0.65.11", + "@polkadot/dev": "^0.65.14", "babel-loader": "^8.2.3", "browser-resolve": "^2.0.0", "buffer": "^6.0.3", - "copy-webpack-plugin": "^9.1.0", + "copy-webpack-plugin": "^10.2.0", "crypto-browserify": "^3.12.0", "extract-loader": "^5.1.0", "file-loader": "^6.2.0", diff --git a/packages/extension/src/cjs/dirname.d.ts b/packages/extension/src/cjs/dirname.d.ts deleted file mode 100644 index aa9b23f0..00000000 --- a/packages/extension/src/cjs/dirname.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright 2017-2022 @polkadot/extension authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -// Do not edit, auto-generated by @polkadot/dev - -declare const __dirname: string | undefined; - -export default __dirname; diff --git a/packages/extension/src/cjs/dirname.js b/packages/extension/src/cjs/dirname.js deleted file mode 100644 index 995aefdf..00000000 --- a/packages/extension/src/cjs/dirname.js +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright 2017-2022 @polkadot/extension authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -// Do not edit, auto-generated by @polkadot/dev - -module.exports = typeof __dirname === 'string' - ? __dirname.replace('/cjs', '') - : undefined; diff --git a/packages/extension/src/cjs/package.json b/packages/extension/src/cjs/package.json deleted file mode 100644 index 96431b98..00000000 --- a/packages/extension/src/cjs/package.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "type":"commonjs" -} \ No newline at end of file diff --git a/packages/extension/src/content.ts b/packages/extension/src/content.ts index 2911b63d..b42b5a5b 100644 --- a/packages/extension/src/content.ts +++ b/packages/extension/src/content.ts @@ -1,11 +1,10 @@ // Copyright 2019-2022 @polkadot/extension authors & contributors // SPDX-License-Identifier: Apache-2.0 -import '@polkadot/extension-inject/crossenv'; - import type { Message } from '@polkadot/extension-base/types'; import { MESSAGE_ORIGIN_CONTENT, MESSAGE_ORIGIN_PAGE, PORT_CONTENT } from '@polkadot/extension-base/defaults'; +import { chrome } from '@polkadot/extension-inject/chrome'; // connect to the extension const port = chrome.runtime.connect({ name: PORT_CONTENT }); diff --git a/packages/extension/src/detectPackage.ts b/packages/extension/src/detectPackage.ts index 70bd1e3b..b7c48d3f 100644 --- a/packages/extension/src/detectPackage.ts +++ b/packages/extension/src/detectPackage.ts @@ -5,8 +5,7 @@ import { detectPackage } from '@polkadot/util'; -import dirname from './cjs/dirname'; import others from './detectOther'; import { packageInfo } from './packageInfo'; -detectPackage(packageInfo, dirname, others); +detectPackage(packageInfo, packageInfo.path, others); diff --git a/packages/extension/src/packageInfo.ts b/packages/extension/src/packageInfo.ts index 26499a1d..b374e62b 100644 --- a/packages/extension/src/packageInfo.ts +++ b/packages/extension/src/packageInfo.ts @@ -3,4 +3,4 @@ // Do not edit, auto-generated by @polkadot/dev -export const packageInfo = { name: '@polkadot/extension', version: '0.42.5-14' }; +export const packageInfo = { name: '@polkadot/extension', path: 'auto', type: 'auto', version: '0.42.5-14' }; diff --git a/packages/extension/src/page.ts b/packages/extension/src/page.ts index 61fa5f42..b8040822 100644 --- a/packages/extension/src/page.ts +++ b/packages/extension/src/page.ts @@ -1,8 +1,6 @@ // Copyright 2019-2022 @polkadot/extension authors & contributors // SPDX-License-Identifier: Apache-2.0 -import '@polkadot/extension-inject/crossenv'; - import type { RequestSignatures, TransportRequestMessage } from '@polkadot/extension-base/background/types'; import type { Message } from '@polkadot/extension-base/types'; @@ -10,6 +8,13 @@ import { MESSAGE_ORIGIN_CONTENT } from '@polkadot/extension-base/defaults'; import { enable, handleResponse, redirectIfPhishing } from '@polkadot/extension-base/page'; import { injectExtension } from '@polkadot/extension-inject'; +function inject () { + injectExtension(enable, { + name: 'polkadot-js', + version: process.env.PKG_VERSION as string + }); +} + // setup a response listener (events created by the loader for extension responses) window.addEventListener('message', ({ data, source }: Message): void => { // only allow messages from our window, by the loader @@ -32,10 +37,3 @@ redirectIfPhishing().then((gotRedirected) => { console.warn(`Unable to determine if the site is in the phishing list: ${(e as Error).message}`); inject(); }); - -function inject () { - injectExtension(enable, { - name: 'polkadot-js', - version: process.env.PKG_VERSION as string - }); -} diff --git a/yarn.lock b/yarn.lock index 8d417b79..25de7991 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2385,9 +2385,9 @@ __metadata: languageName: node linkType: hard -"@polkadot/dev@npm:^0.65.11": - version: 0.65.11 - resolution: "@polkadot/dev@npm:0.65.11" +"@polkadot/dev@npm:^0.65.14": + version: 0.65.14 + resolution: "@polkadot/dev@npm:0.65.14" dependencies: "@babel/cli": ^7.16.7 "@babel/core": ^7.16.7 @@ -2473,7 +2473,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: fff61419134166317047d50f30761596fba9b0fdffeae0e544edac09f4a49388ed969586dc2a121d83bcfcfdaa8a56111206f5fe7a745ef2be223d14b31eb9fa + checksum: 1f84b340baf285c26eee908e05e1cfd01887f536ba57fddb319580a2783337f9e3967dc9cbf1e7a18af9e6c660ab97638397d0202ef99321e543af848ff6aa95 languageName: node linkType: hard @@ -2489,7 +2489,7 @@ __metadata: "@polkadot/extension-mocks": ^0.42.5-14 "@polkadot/keyring": ^8.2.2 "@polkadot/networks": ^8.2.2 - "@polkadot/phishing": ^0.7.22 + "@polkadot/phishing": ^0.7.24 "@polkadot/rpc-provider": ^7.2.1 "@polkadot/types": ^7.2.1 "@polkadot/ui-keyring": ^0.88.2-0 @@ -2555,6 +2555,7 @@ __metadata: "@polkadot/types": ^7.2.1 "@polkadot/util": ^8.2.2 "@polkadot/util-crypto": ^8.2.2 + "@polkadot/x-global": ^8.2.2 "@types/chrome": ^0.0.174 "@types/firefox-webext-browser": ^94.0.1 peerDependencies: @@ -2629,14 +2630,14 @@ __metadata: resolution: "@polkadot/extension@workspace:packages/extension" dependencies: "@babel/runtime": ^7.16.7 - "@polkadot/dev": ^0.65.11 + "@polkadot/dev": ^0.65.14 "@polkadot/extension-base": ^0.42.5-14 "@polkadot/extension-inject": ^0.42.5-14 "@polkadot/extension-ui": ^0.42.5-14 babel-loader: ^8.2.3 browser-resolve: ^2.0.0 buffer: ^6.0.3 - copy-webpack-plugin: ^9.1.0 + copy-webpack-plugin: ^10.2.0 crypto-browserify: ^3.12.0 extract-loader: ^5.1.0 file-loader: ^6.2.0 @@ -2703,15 +2704,15 @@ __metadata: languageName: node linkType: hard -"@polkadot/phishing@npm:^0.7.22": - version: 0.7.22 - resolution: "@polkadot/phishing@npm:0.7.22" +"@polkadot/phishing@npm:^0.7.24": + version: 0.7.24 + resolution: "@polkadot/phishing@npm:0.7.24" dependencies: "@babel/runtime": ^7.16.7 "@polkadot/util": ^8.2.2 "@polkadot/util-crypto": ^8.2.2 "@polkadot/x-fetch": ^8.2.2 - checksum: f117d104033a3902ee6ac78b820ff021e343e4390b577ca2379f064e455ed23975441d5c4cbc1b95de353b1da341ebc53f0a8bc831100c2c245f4b7ffcc684b2 + checksum: 559d807660bbcbccb2f7196e9c432c966afb5fa2e637acf6c0fd90cbd6264c77bd6c75d34493ab4e5e7c11a8f18b83233c0404531f8dcf2412be19b85a11fbb7 languageName: node linkType: hard @@ -4315,6 +4316,20 @@ __metadata: languageName: node linkType: hard +"ajv-formats@npm:^2.1.1": + version: 2.1.1 + resolution: "ajv-formats@npm:2.1.1" + dependencies: + ajv: ^8.0.0 + peerDependencies: + ajv: ^8.0.0 + peerDependenciesMeta: + ajv: + optional: true + checksum: 4a287d937f1ebaad4683249a4c40c0fa3beed30d9ddc0adba04859026a622da0d317851316ea64b3680dc60f5c3c708105ddd5d5db8fe595d9d0207fd19f90b7 + languageName: node + linkType: hard + "ajv-keywords@npm:^3.5.2": version: 3.5.2 resolution: "ajv-keywords@npm:3.5.2" @@ -4324,6 +4339,17 @@ __metadata: languageName: node linkType: hard +"ajv-keywords@npm:^5.0.0": + version: 5.1.0 + resolution: "ajv-keywords@npm:5.1.0" + dependencies: + fast-deep-equal: ^3.1.3 + peerDependencies: + ajv: ^8.8.2 + checksum: c35193940b853119242c6757787f09ecf89a2c19bcd36d03ed1a615e710d19d450cb448bfda407b939aba54b002368c8bff30529cc50a0536a8e10bcce300421 + languageName: node + linkType: hard + "ajv@npm:^6.10.0, ajv@npm:^6.12.3, ajv@npm:^6.12.4, ajv@npm:^6.12.5": version: 6.12.6 resolution: "ajv@npm:6.12.6" @@ -4336,6 +4362,18 @@ __metadata: languageName: node linkType: hard +"ajv@npm:^8.0.0, ajv@npm:^8.8.0": + version: 8.8.2 + resolution: "ajv@npm:8.8.2" + dependencies: + fast-deep-equal: ^3.1.1 + json-schema-traverse: ^1.0.0 + require-from-string: ^2.0.2 + uri-js: ^4.2.2 + checksum: 90849ef03c4f4f7051d15f655120137b89e3205537d683beebd39d95f40c0ca00ea8476cd999602d2f433863e7e4bf1b81d1869d1e07f4dcf56d71b6430a605c + languageName: node + linkType: hard + "ansi-align@npm:^3.0.0": version: 3.0.0 resolution: "ansi-align@npm:3.0.0" @@ -4548,6 +4586,13 @@ __metadata: languageName: node linkType: hard +"array-union@npm:^3.0.1": + version: 3.0.1 + resolution: "array-union@npm:3.0.1" + checksum: 47b29f88258e8f37ffb93ddaa327d4308edd950b52943c172b73558afdd3fa74cfd68816ba5aa4b894242cf281fa3c6d0362ae057e4a18bddbaedbe46ebe7112 + languageName: node + linkType: hard + "array-uniq@npm:^1.0.1": version: 1.0.3 resolution: "array-uniq@npm:1.0.3" @@ -6535,19 +6580,19 @@ __metadata: languageName: node linkType: hard -"copy-webpack-plugin@npm:^9.1.0": - version: 9.1.0 - resolution: "copy-webpack-plugin@npm:9.1.0" +"copy-webpack-plugin@npm:^10.2.0": + version: 10.2.0 + resolution: "copy-webpack-plugin@npm:10.2.0" dependencies: fast-glob: ^3.2.7 glob-parent: ^6.0.1 - globby: ^11.0.3 + globby: ^12.0.2 normalize-path: ^3.0.0 - schema-utils: ^3.1.1 + schema-utils: ^4.0.0 serialize-javascript: ^6.0.0 peerDependencies: webpack: ^5.1.0 - checksum: 06cb4fb6fc99a95ccfd3169115ee57f64953e5b4075900fc8faab98b7e7d3fcd6915b125fdb98c919cfd55e581a8444f5c6b9dbb342cbd60b154d8fb3f79f2b9 + checksum: ae99dc42d0fbe4d7fc4a6a0902130c4420c7a2f27a995df55b4fcaa5c5aec371b4545609249f93e8db0f5b95daaed053e74f38d794ace1336f21886c29e2fddc languageName: node linkType: hard @@ -9162,6 +9207,20 @@ __metadata: languageName: node linkType: hard +"globby@npm:^12.0.2": + version: 12.0.2 + resolution: "globby@npm:12.0.2" + dependencies: + array-union: ^3.0.1 + dir-glob: ^3.0.1 + fast-glob: ^3.2.7 + ignore: ^5.1.8 + merge2: ^1.4.1 + slash: ^4.0.0 + checksum: f474ced866755f48ce7e8a7e11b0a1d90fa1f1c25cf86c245fbf05a862accfba695102a843b6386dbe41fa73c2f9a7e625bf566fa7648d2e1304f58748975e3f + languageName: node + linkType: hard + "globby@npm:^6.1.0": version: 6.1.0 resolution: "globby@npm:6.1.0" @@ -11096,6 +11155,13 @@ __metadata: languageName: node linkType: hard +"json-schema-traverse@npm:^1.0.0": + version: 1.0.0 + resolution: "json-schema-traverse@npm:1.0.0" + checksum: 02f2f466cdb0362558b2f1fd5e15cce82ef55d60cd7f8fa828cf35ba74330f8d767fcae5c5c2adb7851fa811766c694b9405810879bc4e1ddd78a7c0e03658ad + languageName: node + linkType: hard + "json-schema@npm:0.2.3": version: 0.2.3 resolution: "json-schema@npm:0.2.3" @@ -11668,7 +11734,7 @@ __metadata: languageName: node linkType: hard -"merge2@npm:^1.3.0": +"merge2@npm:^1.3.0, merge2@npm:^1.4.1": version: 1.4.1 resolution: "merge2@npm:1.4.1" checksum: 7268db63ed5169466540b6fb947aec313200bcf6d40c5ab722c22e242f651994619bcd85601602972d3c85bd2cc45a358a4c61937e9f11a061919a1da569b0c2 @@ -13977,6 +14043,13 @@ __metadata: languageName: node linkType: hard +"require-from-string@npm:^2.0.2": + version: 2.0.2 + resolution: "require-from-string@npm:2.0.2" + checksum: a03ef6895445f33a4015300c426699bc66b2b044ba7b670aa238610381b56d3f07c686251740d575e22f4c87531ba662d06937508f0f3c0f1ddc04db3130560b + languageName: node + linkType: hard + "requirejs-config-file@npm:^4.0.0": version: 4.0.0 resolution: "requirejs-config-file@npm:4.0.0" @@ -14209,7 +14282,7 @@ resolve@^2.0.0-next.3: resolution: "root-workspace-0b6124@workspace:." dependencies: "@babel/core": ^7.16.7 - "@polkadot/dev": ^0.65.11 + "@polkadot/dev": ^0.65.14 "@types/jest": ^27.4.0 i18next-scanner: ^3.1.0 sinon-chrome: ^3.0.1 @@ -14345,6 +14418,18 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard +"schema-utils@npm:^4.0.0": + version: 4.0.0 + resolution: "schema-utils@npm:4.0.0" + dependencies: + "@types/json-schema": ^7.0.9 + ajv: ^8.8.0 + ajv-formats: ^2.1.1 + ajv-keywords: ^5.0.0 + checksum: c843e92fdd1a5c145dbb6ffdae33e501867f9703afac67bdf35a685e49f85b1dcc10ea250033175a64bd9d31f0555bc6785b8359da0c90bcea30cf6dfbb55a8f + languageName: node + linkType: hard + "scrypt-js@npm:^3.0.0, scrypt-js@npm:^3.0.1": version: 3.0.1 resolution: "scrypt-js@npm:3.0.1" @@ -14672,6 +14757,13 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard +"slash@npm:^4.0.0": + version: 4.0.0 + resolution: "slash@npm:4.0.0" + checksum: da8e4af73712253acd21b7853b7e0dbba776b786e82b010a5bfc8b5051a1db38ed8aba8e1e8f400dd2c9f373be91eb1c42b66e91abb407ff42b10feece5e1d2d + languageName: node + linkType: hard + "smart-buffer@npm:^4.1.0": version: 4.2.0 resolution: "smart-buffer@npm:4.2.0"