From 4367bb0f6824930479ebd86b9d4ee8bfeff3db09 Mon Sep 17 00:00:00 2001 From: Jaco Date: Wed, 6 Jul 2022 11:50:36 +0200 Subject: [PATCH] Adjust for available ESM-only dependencies (#1581) * Adjust for available ESM-only dependencies * Flags for jest (sadly, still required mid-2022) --- CHANGELOG.md | 1 + package.json | 4 +- packages/hw-ledger-transports/package.json | 2 +- packages/hw-ledger/package.json | 2 +- packages/util/package.json | 3 +- packages/util/src/is/ip.ts | 41 +++- packages/x-fetch/package.json | 2 +- packages/x-fetch/src/node.ts | 16 +- yarn.lock | 215 ++++++++++++--------- 9 files changed, 182 insertions(+), 104 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d4b1b4e9..b95fa8540 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ Changes: - Allow for usage without `@types/node` installed +- Adjust for available ESM-only dependencies ## 9.7.2 Jul 4, 2022 diff --git a/package.json b/package.json index 48ba536ad..0df28e804 100644 --- a/package.json +++ b/package.json @@ -25,13 +25,13 @@ "lint": "polkadot-dev-run-lint", "networks:crosscheck": "polkadot-dev-run-test packages/networks/src/crosscheck", "postinstall": "polkadot-dev-yarn-only", - "test": "polkadot-dev-run-test --coverage --runInBand --testPathIgnorePatterns crosscheck --testPathIgnorePatterns toMiniSecretCmp", + "test": "NODE_OPTIONS=--experimental-vm-modules polkadot-dev-run-test --coverage --runInBand --testPathIgnorePatterns crosscheck --testPathIgnorePatterns toMiniSecretCmp", "test:mnemonicCmp": "polkadot-dev-run-test packages/util-crypto/src/mnemonic/toMiniSecretCmp.spec.ts", "test:one": "polkadot-dev-run-test --runInBand" }, "devDependencies": { "@babel/core": "^7.18.6", - "@polkadot/dev": "^0.67.53", + "@polkadot/dev": "^0.67.55", "@types/jest": "^28.1.4" }, "resolutions": { diff --git a/packages/hw-ledger-transports/package.json b/packages/hw-ledger-transports/package.json index 81f98ddfa..87e631599 100644 --- a/packages/hw-ledger-transports/package.json +++ b/packages/hw-ledger-transports/package.json @@ -28,6 +28,6 @@ "@polkadot/util": "9.7.3-6-x" }, "optionalDependencies": { - "@ledgerhq/hw-transport-node-hid-singleton": "^6.27.1" + "@ledgerhq/hw-transport-node-hid-singleton": "^6.27.2" } } diff --git a/packages/hw-ledger/package.json b/packages/hw-ledger/package.json index e4f5f5f71..3874c9f0d 100644 --- a/packages/hw-ledger/package.json +++ b/packages/hw-ledger/package.json @@ -26,6 +26,6 @@ "@ledgerhq/hw-transport": "^6.27.1", "@polkadot/hw-ledger-transports": "9.7.3-6-x", "@polkadot/util": "9.7.3-6-x", - "@zondax/ledger-substrate": "^0.31.0" + "@zondax/ledger-substrate": "^0.32.0" } } diff --git a/packages/util/package.json b/packages/util/package.json index 2564476af..5e83f9205 100644 --- a/packages/util/package.json +++ b/packages/util/package.json @@ -43,8 +43,7 @@ "@polkadot/x-textdecoder": "9.7.3-6-x", "@polkadot/x-textencoder": "9.7.3-6-x", "@types/bn.js": "^5.1.0", - "bn.js": "^5.2.1", - "ip-regex": "^4.3.0" + "bn.js": "^5.2.1" }, "devDependencies": { "@polkadot/x-randomvalues": "9.7.3-6-x" diff --git a/packages/util/src/is/ip.ts b/packages/util/src/is/ip.ts index cf037c8c7..228b26fd0 100644 --- a/packages/util/src/is/ip.ts +++ b/packages/util/src/is/ip.ts @@ -1,9 +1,34 @@ // Copyright 2017-2022 @polkadot/util authors & contributors // SPDX-License-Identifier: Apache-2.0 -import ipRegex from 'ip-regex'; +// The regex patterns below were copied as-is from the ip-regex package 5.0.0, +// https://github.com/sindresorhus/ip-regex/blob/a2a44dfa7f776528158c2a5ff9d8a1be435ec1b9/index.js#L1 +// +// MIT License +// Copyright (c) Sindre Sorhus (https://sindresorhus.com) +// +// Changes made: +// - boundary support option has been dropped +// - only exact matching is used (isIp always passed exact: true) +// - the newest ip-regex is ESM-only, we compile to all platforms +const v4 = '(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)(?:\\.(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)){3}'; +const v6s = '[a-fA-F\\d]{1,4}'; +const v6 = ` +(?: +(?:${v6s}:){7}(?:${v6s}|:)| // 1:2:3:4:5:6:7:: 1:2:3:4:5:6:7:8 +(?:${v6s}:){6}(?:${v4}|:${v6s}|:)| // 1:2:3:4:5:6:: 1:2:3:4:5:6::8 1:2:3:4:5:6::8 1:2:3:4:5:6::1.2.3.4 +(?:${v6s}:){5}(?::${v4}|(?::${v6s}){1,2}|:)| // 1:2:3:4:5:: 1:2:3:4:5::7:8 1:2:3:4:5::8 1:2:3:4:5::7:1.2.3.4 +(?:${v6s}:){4}(?:(?::${v6s}){0,1}:${v4}|(?::${v6s}){1,3}|:)| // 1:2:3:4:: 1:2:3:4::6:7:8 1:2:3:4::8 1:2:3:4::6:7:1.2.3.4 +(?:${v6s}:){3}(?:(?::${v6s}){0,2}:${v4}|(?::${v6s}){1,4}|:)| // 1:2:3:: 1:2:3::5:6:7:8 1:2:3::8 1:2:3::5:6:7:1.2.3.4 +(?:${v6s}:){2}(?:(?::${v6s}){0,3}:${v4}|(?::${v6s}){1,5}|:)| // 1:2:: 1:2::4:5:6:7:8 1:2::8 1:2::4:5:6:7:1.2.3.4 +(?:${v6s}:){1}(?:(?::${v6s}){0,4}:${v4}|(?::${v6s}){1,6}|:)| // 1:: 1::3:4:5:6:7:8 1::8 1::3:4:5:6:7:1.2.3.4 +(?::(?:(?::${v6s}){0,5}:${v4}|(?::${v6s}){1,7}|:)) // ::2:3:4:5:6:7:8 ::2:3:4:5:6:7:8 ::8 ::1.2.3.4 +)(?:%[0-9a-zA-Z]{1,})? // %eth0 %1 +`.replace(/\s*\/\/.*$/gm, '').replace(/\n/g, '').trim(); -type IpTypes = 'v4' | 'v6'; +const v46Exact = new RegExp(`(?:^${v4}$)|(?:^${v6}$)`); +const v4exact = new RegExp(`^${v4}$`); +const v6exact = new RegExp(`^${v6}$`); /** * @name isIp @@ -22,12 +47,10 @@ type IpTypes = 'v4' | 'v6'; * isIp('1:2:3:4:5:6:7:8', 'v4'); // => false * ``` */ -export function isIp (value: string, type?: IpTypes): boolean { - if (type === 'v4') { - return ipRegex.v4({ exact: true }).test(value); - } else if (type === 'v6') { - return ipRegex.v6({ exact: true }).test(value); +export function isIp (value: string, type?: 'v4' | 'v6'): boolean { + switch (type) { + case 'v4': return v4exact.test(value); + case 'v6': return v6exact.test(value); + default: return v46Exact.test(value); } - - return ipRegex({ exact: true }).test(value); } diff --git a/packages/x-fetch/package.json b/packages/x-fetch/package.json index 6fb923096..f32f37c26 100644 --- a/packages/x-fetch/package.json +++ b/packages/x-fetch/package.json @@ -25,6 +25,6 @@ "@babel/runtime": "^7.18.6", "@polkadot/x-global": "9.7.3-6-x", "@types/node-fetch": "^2.6.2", - "node-fetch": "^2.6.7" + "node-fetch": "^3.2.6" } } diff --git a/packages/x-fetch/src/node.ts b/packages/x-fetch/src/node.ts index c791b0639..97d214d0e 100644 --- a/packages/x-fetch/src/node.ts +++ b/packages/x-fetch/src/node.ts @@ -1,10 +1,22 @@ // Copyright 2017-2022 @polkadot/x-fetch authors & contributors // SPDX-License-Identifier: Apache-2.0 -import nodeFetch from 'node-fetch'; - import { extractGlobal } from '@polkadot/x-global'; export { packageInfo } from './packageInfo'; +let resolvedFetch: null | typeof fetch = null; + +async function nodeFetch (...args: Parameters): Promise { + if (!resolvedFetch) { + // we use the async import here to resolve on-demand + // (this allows us to use the latest ESM version of the package) + const mod = await import('node-fetch'); + + resolvedFetch = mod.default as unknown as typeof fetch; + } + + return resolvedFetch(...args); +} + export const fetch = extractGlobal('fetch', nodeFetch); diff --git a/yarn.lock b/yarn.lock index 256122df4..0e49030d3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1806,9 +1806,9 @@ __metadata: languageName: node linkType: hard -"@ledgerhq/hw-transport-node-hid-singleton@npm:^6.27.1": - version: 6.27.1 - resolution: "@ledgerhq/hw-transport-node-hid-singleton@npm:6.27.1" +"@ledgerhq/hw-transport-node-hid-singleton@npm:^6.27.2": + version: 6.27.2 + resolution: "@ledgerhq/hw-transport-node-hid-singleton@npm:6.27.2" dependencies: "@ledgerhq/devices": ^6.27.1 "@ledgerhq/errors": ^6.10.0 @@ -1817,8 +1817,8 @@ __metadata: "@ledgerhq/logs": ^6.10.0 lodash: ^4.17.21 node-hid: 2.1.1 - usb-detection: ^4.13.0 - checksum: 6763d2fa70915087bd9a32ee7c1e5a6750ed8bb7eec9bffe6e52425823059e2ee17be6275fb057b6df0d66078b1a7b6b186803e5db34ba9444f779e582f6bca9 + usb-detection: 4.13.0 + checksum: b94d5bbd04f5bf07674c074d6a05da0e88aff6e320837ab5104d220b3448738557d823f7c2eeb8f31722cfcf4c810b812673935144afa69fe8ffd42513465a89 languageName: node linkType: hard @@ -2045,9 +2045,9 @@ __metadata: languageName: node linkType: hard -"@polkadot/dev@npm:^0.67.53": - version: 0.67.53 - resolution: "@polkadot/dev@npm:0.67.53" +"@polkadot/dev@npm:^0.67.55": + version: 0.67.55 + resolution: "@polkadot/dev@npm:0.67.55" dependencies: "@babel/cli": ^7.18.6 "@babel/core": ^7.18.6 @@ -2072,8 +2072,8 @@ __metadata: "@rollup/plugin-json": ^4.1.0 "@rollup/plugin-node-resolve": ^13.3.0 "@rushstack/eslint-patch": ^1.1.4 - "@typescript-eslint/eslint-plugin": 5.30.4 - "@typescript-eslint/parser": 5.30.4 + "@typescript-eslint/eslint-plugin": 5.30.5 + "@typescript-eslint/parser": 5.30.5 "@vue/component-compiler-utils": ^3.3.0 babel-jest: ^28.1.2 babel-plugin-module-extension-resolver: ^1.0.0-rc.2 @@ -2086,8 +2086,8 @@ __metadata: eslint-import-resolver-node: ^0.3.6 eslint-plugin-header: ^3.1.1 eslint-plugin-import: ^2.26.0 - eslint-plugin-import-newlines: ^1.2.2 - eslint-plugin-n: ^15.2.3 + eslint-plugin-import-newlines: ^1.2.3 + eslint-plugin-n: ^15.2.4 eslint-plugin-promise: ^6.0.0 eslint-plugin-react: ^7.30.1 eslint-plugin-react-hooks: ^4.6.0 @@ -2135,7 +2135,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: 8ddc49b9acafd1e7f7fbc1a6cb73df1eaac57d1dff38605c3f74fa6f0079b85f252c0882c941cd62cdf892e743f6408d4e9067adb6c6f0e1021eb043a73bc61b + checksum: 695f7250519af45dd5ef22f8c383033ecf0aacd4c356ab87a5a47e51863f2d44c0283a8ff896e4999923489b8d043e8b36c5f6c53aa912f7c8e2576895ec6083 languageName: node linkType: hard @@ -2145,7 +2145,7 @@ __metadata: dependencies: "@babel/runtime": ^7.18.6 "@ledgerhq/hw-transport": ^6.27.1 - "@ledgerhq/hw-transport-node-hid-singleton": ^6.27.1 + "@ledgerhq/hw-transport-node-hid-singleton": ^6.27.2 "@ledgerhq/hw-transport-webhid": ^6.27.1 "@ledgerhq/hw-transport-webusb": ^6.27.1 "@polkadot/util": 9.7.3-6-x @@ -2163,7 +2163,7 @@ __metadata: "@ledgerhq/hw-transport": ^6.27.1 "@polkadot/hw-ledger-transports": 9.7.3-6-x "@polkadot/util": 9.7.3-6-x - "@zondax/ledger-substrate": ^0.31.0 + "@zondax/ledger-substrate": ^0.32.0 languageName: unknown linkType: soft @@ -2225,7 +2225,6 @@ __metadata: "@polkadot/x-textencoder": 9.7.3-6-x "@types/bn.js": ^5.1.0 bn.js: ^5.2.1 - ip-regex: ^4.3.0 languageName: unknown linkType: soft @@ -2333,7 +2332,7 @@ __metadata: "@babel/runtime": ^7.18.6 "@polkadot/x-global": 9.7.3-6-x "@types/node-fetch": ^2.6.2 - node-fetch: ^2.6.7 + node-fetch: ^3.2.6 languageName: unknown linkType: soft @@ -2813,13 +2812,13 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:5.30.4": - version: 5.30.4 - resolution: "@typescript-eslint/eslint-plugin@npm:5.30.4" +"@typescript-eslint/eslint-plugin@npm:5.30.5": + version: 5.30.5 + resolution: "@typescript-eslint/eslint-plugin@npm:5.30.5" dependencies: - "@typescript-eslint/scope-manager": 5.30.4 - "@typescript-eslint/type-utils": 5.30.4 - "@typescript-eslint/utils": 5.30.4 + "@typescript-eslint/scope-manager": 5.30.5 + "@typescript-eslint/type-utils": 5.30.5 + "@typescript-eslint/utils": 5.30.5 debug: ^4.3.4 functional-red-black-tree: ^1.0.1 ignore: ^5.2.0 @@ -2832,42 +2831,42 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 9b9290448b3009b93dc9bbc263049103f48c006d395351695486f7ab156f24b3f3e9e83a9f68a8cf73afc036c2d1092005446085f171afc9cdcb0b1b475443e3 + checksum: cf763fb091dcdfd6c25843251a220b654ca83968b17266e0f343771f489085c6afc4e41fcf2187b4c72c4d12a787070c64b5e5367069460f95a8174573f48905 languageName: node linkType: hard -"@typescript-eslint/parser@npm:5.30.4": - version: 5.30.4 - resolution: "@typescript-eslint/parser@npm:5.30.4" +"@typescript-eslint/parser@npm:5.30.5": + version: 5.30.5 + resolution: "@typescript-eslint/parser@npm:5.30.5" dependencies: - "@typescript-eslint/scope-manager": 5.30.4 - "@typescript-eslint/types": 5.30.4 - "@typescript-eslint/typescript-estree": 5.30.4 + "@typescript-eslint/scope-manager": 5.30.5 + "@typescript-eslint/types": 5.30.5 + "@typescript-eslint/typescript-estree": 5.30.5 debug: ^4.3.4 peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 peerDependenciesMeta: typescript: optional: true - checksum: e13ffd0cbb691b5b82038a5a1475a7771409398bc90e0430e9b3818174926c5af7c637d5915f7c2949f38201c04bfe57dfc91f4d9052a48ee551faba3b8c7349 + checksum: 6c16821e122b891420a538f200f6e576ad1167855a67e87f9a7d3a08c0513fe26006f6411b8ba6f4662a81526bd0339ae37c47dd88fa5943e6f27ff70da9f989 languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:5.30.4": - version: 5.30.4 - resolution: "@typescript-eslint/scope-manager@npm:5.30.4" +"@typescript-eslint/scope-manager@npm:5.30.5": + version: 5.30.5 + resolution: "@typescript-eslint/scope-manager@npm:5.30.5" dependencies: - "@typescript-eslint/types": 5.30.4 - "@typescript-eslint/visitor-keys": 5.30.4 - checksum: 3da442dc113ee821c6b1c4510ee4cfd6f6f34838587785b7c486d262af913dca66229a47ebb9a63ad605f8edbe57a8387be24c817c8091783b57c33b7862cbcc + "@typescript-eslint/types": 5.30.5 + "@typescript-eslint/visitor-keys": 5.30.5 + checksum: 509bee6d62cca1716e8f4792d9180c189974992ba13d8103ca04423a64006cf184c4b2c606d55c776305458140c798a3a9a414d07a60790b83dd714f56c457b0 languageName: node linkType: hard -"@typescript-eslint/type-utils@npm:5.30.4": - version: 5.30.4 - resolution: "@typescript-eslint/type-utils@npm:5.30.4" +"@typescript-eslint/type-utils@npm:5.30.5": + version: 5.30.5 + resolution: "@typescript-eslint/type-utils@npm:5.30.5" dependencies: - "@typescript-eslint/utils": 5.30.4 + "@typescript-eslint/utils": 5.30.5 debug: ^4.3.4 tsutils: ^3.21.0 peerDependencies: @@ -2875,7 +2874,7 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 552eb1a5b11787d3b98dc454a80153b05bcb6d58aeb97c861d6b006f3eb6af95d117a3f9a679b41a8b6d58ac0dceaaeafd23ce28d83881a363e51bbc1a088936 + checksum: 080cc1231729c34b778395658374e32d034474056f9b777dbc89d20d15eb93d93d0959328ad47c2a6623d40c6552364ababadce439842a944bce001f55b731b3 languageName: node linkType: hard @@ -2886,19 +2885,19 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/types@npm:5.30.4": - version: 5.30.4 - resolution: "@typescript-eslint/types@npm:5.30.4" - checksum: 06181c33551850492ccfd48232f93083c6cf9205d26b26fe6e356b7a4ebb08beffd89ae3b84011da94ffd0e6948422d91d94df7005edeca1c8348117d4776715 +"@typescript-eslint/types@npm:5.30.5": + version: 5.30.5 + resolution: "@typescript-eslint/types@npm:5.30.5" + checksum: c70420618cb875d4e964a20a3fa4cf40cb97a8ad3123e24860e3d829edf3b081c77fa1fe25644700499d27e44aee5783abc7765deee61e2ef59a928db96b2175 languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:5.30.4": - version: 5.30.4 - resolution: "@typescript-eslint/typescript-estree@npm:5.30.4" +"@typescript-eslint/typescript-estree@npm:5.30.5": + version: 5.30.5 + resolution: "@typescript-eslint/typescript-estree@npm:5.30.5" dependencies: - "@typescript-eslint/types": 5.30.4 - "@typescript-eslint/visitor-keys": 5.30.4 + "@typescript-eslint/types": 5.30.5 + "@typescript-eslint/visitor-keys": 5.30.5 debug: ^4.3.4 globby: ^11.1.0 is-glob: ^4.0.3 @@ -2907,7 +2906,7 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 1aaa414993a4e35927e93f929d34a6e07cb8ec46c4ea9a58f018c36ff1fc3027ca5007e6abe922c5869557cd2d7f319e8c57cccd618517781979e669d3b704d0 + checksum: 19dce426c826cddd4aadf2fa15be943c6ad7d2038685cc2665749486a5f44a47819aab5d260b54f8a4babf6acf2500e9f62e709d61fce337b12d5468ff285277 languageName: node linkType: hard @@ -2929,19 +2928,19 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/utils@npm:5.30.4": - version: 5.30.4 - resolution: "@typescript-eslint/utils@npm:5.30.4" +"@typescript-eslint/utils@npm:5.30.5": + version: 5.30.5 + resolution: "@typescript-eslint/utils@npm:5.30.5" dependencies: "@types/json-schema": ^7.0.9 - "@typescript-eslint/scope-manager": 5.30.4 - "@typescript-eslint/types": 5.30.4 - "@typescript-eslint/typescript-estree": 5.30.4 + "@typescript-eslint/scope-manager": 5.30.5 + "@typescript-eslint/types": 5.30.5 + "@typescript-eslint/typescript-estree": 5.30.5 eslint-scope: ^5.1.1 eslint-utils: ^3.0.0 peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 - checksum: 0f680d366701c6ca5a4e1fc53247876e6f6acaee498400d32a7cb767e6187d0d75bc4488350cf6dc6e7c373ea023d62e395ea14ba56ad246b458d6853b213782 + checksum: 12f68cb34a150d39708f4e09a54964360f29589885cd50f119a2061660011752ec72eff3d90111f0e597575d32aae7250a6e2c730a84963e5e30352759d5f1f4 languageName: node linkType: hard @@ -2955,13 +2954,13 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:5.30.4": - version: 5.30.4 - resolution: "@typescript-eslint/visitor-keys@npm:5.30.4" +"@typescript-eslint/visitor-keys@npm:5.30.5": + version: 5.30.5 + resolution: "@typescript-eslint/visitor-keys@npm:5.30.5" dependencies: - "@typescript-eslint/types": 5.30.4 + "@typescript-eslint/types": 5.30.5 eslint-visitor-keys: ^3.3.0 - checksum: ec39680a89b058e8350adc084c2a957e83161e87ac9732c9fef8fd3045ce5004e059b2ddb0c366192806e3998bf3263c8bbb2cc74a4f2ad3313154ed35dd479a + checksum: c0de9ae48378eec2682b860a059518bed213ea29575aad538d8d2f8137875e7279e375a7f23d38c1c183466fdd9cf1ca1db4ed5a1d374968f9460d83e48b2437 languageName: node linkType: hard @@ -2985,9 +2984,9 @@ __metadata: languageName: node linkType: hard -"@zondax/ledger-substrate@npm:^0.31.0": - version: 0.31.0 - resolution: "@zondax/ledger-substrate@npm:0.31.0" +"@zondax/ledger-substrate@npm:^0.32.0": + version: 0.32.0 + resolution: "@zondax/ledger-substrate@npm:0.32.0" dependencies: "@babel/runtime": ^7.14.8 "@ledgerhq/hw-transport": ^6.2.0 @@ -2997,7 +2996,7 @@ __metadata: blakejs: ^1.1.1 bs58: ^4.0.1 hash.js: ^1.1.7 - checksum: ab4046a594394e2bc52a7f0e6951be80ede145303e24b90a17b42a2447375d225bcb2a9ccd97ecbccfa800b77599c7097c80b8eae87de0c9c4c3d034a22c8e37 + checksum: b6442a307d72845f945c8ac2b3cb52882c93a9c4425f523766ccc762a17cf0cdf8ca7bdda9f573393950201241f544d429d601b6fd791ee9fca5a4bb8ab67a2d languageName: node linkType: hard @@ -4320,6 +4319,13 @@ __metadata: languageName: node linkType: hard +"data-uri-to-buffer@npm:^4.0.0": + version: 4.0.0 + resolution: "data-uri-to-buffer@npm:4.0.0" + checksum: a010653869abe8bb51259432894ac62c52bf79ad761d418d94396f48c346f2ae739c46b254e8bb5987bded8a653d467db1968db3a69bab1d33aa5567baa5cfc7 + languageName: node + linkType: hard + "data-urls@npm:^3.0.1": version: 3.0.2 resolution: "data-urls@npm:3.0.2" @@ -4991,14 +4997,14 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-import-newlines@npm:^1.2.2": - version: 1.2.2 - resolution: "eslint-plugin-import-newlines@npm:1.2.2" +"eslint-plugin-import-newlines@npm:^1.2.3": + version: 1.2.3 + resolution: "eslint-plugin-import-newlines@npm:1.2.3" peerDependencies: eslint: ">=6.0.0" bin: import-linter: lib/index.js - checksum: 3bb35817357aa47e2ec45b82e085605351f8f6050a0766b4f3ccd287ba81c7db72c33ac4c4ccea6cf90d66868ae141692897d6c84e08532d740672daeebcb789 + checksum: 0781d83d5aeb41b487919d61a21d822a3c922bbc5504ad36790309d68e4df0a05ea2288da998498b5757f814fb841abcc4872241ed349b65cf63287476255bc2 languageName: node linkType: hard @@ -5025,9 +5031,9 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-n@npm:^15.2.3": - version: 15.2.3 - resolution: "eslint-plugin-n@npm:15.2.3" +"eslint-plugin-n@npm:^15.2.4": + version: 15.2.4 + resolution: "eslint-plugin-n@npm:15.2.4" dependencies: builtins: ^5.0.1 eslint-plugin-es: ^4.1.0 @@ -5039,7 +5045,7 @@ __metadata: semver: ^7.3.7 peerDependencies: eslint: ">=7.0.0" - checksum: da02bbf3152c49f9a09ab253f70e85f9d62af0f40f3d1882cf8a5fc9b9e07465c7f9632feae002ee97bce0598b408f017a4bb6c6f152b0870bad6f50aa430820 + checksum: dd651651ab76120e45707ee968d846e3ffffb42d1035792fdef6d3b0dcfddf3673bc6a09cb2fac8c5f1d081f14f2a67fc52295d5ed1d2edfb5beead93284eaac languageName: node linkType: hard @@ -5443,6 +5449,16 @@ __metadata: languageName: node linkType: hard +"fetch-blob@npm:^3.1.2, fetch-blob@npm:^3.1.4": + version: 3.1.5 + resolution: "fetch-blob@npm:3.1.5" + dependencies: + node-domexception: ^1.0.0 + web-streams-polyfill: ^3.0.3 + checksum: 6493f21bfe196798343431d20c0284835202728d076dd2cbf502a2846679f9265f3b0c3a7224750ae1a770b925da09e592b05fe7c3a22ca27794a39a0039ab21 + languageName: node + linkType: hard + "figures@npm:^3.0.0": version: 3.2.0 resolution: "figures@npm:3.2.0" @@ -5649,6 +5665,15 @@ __metadata: languageName: node linkType: hard +"formdata-polyfill@npm:^4.0.10": + version: 4.0.10 + resolution: "formdata-polyfill@npm:4.0.10" + dependencies: + fetch-blob: ^3.1.2 + checksum: 82a34df292afadd82b43d4a740ce387bc08541e0a534358425193017bf9fb3567875dc5f69564984b1da979979b70703aa73dee715a17b6c229752ae736dd9db + languageName: node + linkType: hard + "fs-constants@npm:^1.0.0": version: 1.0.0 resolution: "fs-constants@npm:1.0.0" @@ -6462,13 +6487,6 @@ fsevents@~2.1.2: languageName: node linkType: hard -"ip-regex@npm:^4.3.0": - version: 4.3.0 - resolution: "ip-regex@npm:4.3.0" - checksum: 7ff904b891221b1847f3fdf3dbb3e6a8660dc39bc283f79eb7ed88f5338e1a3d1104b779bc83759159be266249c59c2160e779ee39446d79d4ed0890dfd06f08 - languageName: node - linkType: hard - "is-arrayish@npm:^0.2.1": version: 0.2.1 resolution: "is-arrayish@npm:0.2.1" @@ -8136,7 +8154,14 @@ fsevents@~2.1.2: languageName: node linkType: hard -"node-fetch@npm:^2.6.0, node-fetch@npm:^2.6.1, node-fetch@npm:^2.6.7": +"node-domexception@npm:^1.0.0": + version: 1.0.0 + resolution: "node-domexception@npm:1.0.0" + checksum: ee1d37dd2a4eb26a8a92cd6b64dfc29caec72bff5e1ed9aba80c294f57a31ba4895a60fd48347cf17dd6e766da0ae87d75657dfd1f384ebfa60462c2283f5c7f + languageName: node + linkType: hard + +"node-fetch@npm:^2.6.0, node-fetch@npm:^2.6.1": version: 2.6.7 resolution: "node-fetch@npm:2.6.7" dependencies: @@ -8150,6 +8175,17 @@ fsevents@~2.1.2: languageName: node linkType: hard +"node-fetch@npm:^3.2.6": + version: 3.2.6 + resolution: "node-fetch@npm:3.2.6" + dependencies: + data-uri-to-buffer: ^4.0.0 + fetch-blob: ^3.1.4 + formdata-polyfill: ^4.0.10 + checksum: ece307ace3a3ff28638ccb0fa0545bb5c0cfd673a9d06fc314d937a73ae6a55917d5bacd7f080f9a9f1449ca20a5c01b1281d0e616acb20315e5ac315971da46 + languageName: node + linkType: hard + "node-gyp-build@npm:^4.2.0": version: 4.2.3 resolution: "node-gyp-build@npm:4.2.3" @@ -9401,7 +9437,7 @@ resolve@^2.0.0-next.3: resolution: "root-workspace-0b6124@workspace:." dependencies: "@babel/core": ^7.18.6 - "@polkadot/dev": ^0.67.53 + "@polkadot/dev": ^0.67.55 "@types/jest": ^28.1.4 languageName: unknown linkType: soft @@ -10504,7 +10540,7 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard -"usb-detection@npm:^4.13.0": +"usb-detection@npm:4.13.0": version: 4.13.0 resolution: "usb-detection@npm:4.13.0" dependencies: @@ -10629,6 +10665,13 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard +"web-streams-polyfill@npm:^3.0.3": + version: 3.2.1 + resolution: "web-streams-polyfill@npm:3.2.1" + checksum: b119c78574b6d65935e35098c2afdcd752b84268e18746606af149e3c424e15621b6f1ff0b42b2676dc012fc4f0d313f964b41a4b5031e525faa03997457da02 + languageName: node + linkType: hard + "webidl-conversions@npm:^3.0.0": version: 3.0.1 resolution: "webidl-conversions@npm:3.0.1"