From 2e14af5693bba43c6e5053c0a5760337f8145f18 Mon Sep 17 00:00:00 2001 From: Jaco Date: Mon, 9 May 2022 16:48:45 +0200 Subject: [PATCH] Adjust WASM init process (w/ RN aliases) (#340) * Adjust WASM init process (w/ RN aliases) * Remove stray log * Cleanup * CHANGELOG * yarn.lock --- .codeclimate.yml | 2 +- CHANGELOG.md | 7 + jest.config.cjs | 3 +- package.json | 2 +- packages/wasm-crypto-asmjs/src/detectOther.ts | 4 - packages/wasm-crypto-asmjs/src/packageInfo.ts | 6 - packages/wasm-crypto-init/package.json | 38 + packages/wasm-crypto-init/src/asm.ts | 12 + packages/wasm-crypto-init/src/both.ts | 13 + packages/wasm-crypto-init/src/create.ts | 33 + packages/wasm-crypto-init/src/detectOther.ts | 6 + .../src/detectPackage.ts | 2 +- packages/wasm-crypto-init/src/index.ts | 4 + packages/wasm-crypto-init/src/none.ts | 10 + .../src/packageInfo.ts | 4 +- packages/wasm-crypto-init/src/types.ts | 7 + packages/wasm-crypto-init/src/wasm.ts | 12 + packages/wasm-crypto-init/tsconfig.build.json | 12 + packages/wasm-crypto-wasm/src/detectOther.ts | 4 - packages/wasm-crypto/package.json | 5 +- packages/wasm-crypto/src/bridge.ts | 10 +- packages/wasm-crypto/src/bundle.ts | 12 +- packages/wasm-crypto/src/detectOther.ts | 7 +- packages/wasm-crypto/src/init.ts | 39 +- packages/wasm-crypto/src/initNone.ts | 25 +- packages/wasm-crypto/src/initOnlyAsm.ts | 10 +- packages/wasm-crypto/src/initOnlyWasm.ts | 8 +- packages/wasm-crypto/src/initWasmAsm.ts | 11 +- packages/wasm-crypto/src/types.ts | 4 + packages/wasm-crypto/test/alias-imports.cjs | 6 +- packages/wasm-crypto/tsconfig.build.json | 5 +- .../package.json | 6 +- .../src/bundle.ts | 2 +- .../src/cjs/cjs/data.js | 2 +- .../src/cjs/data.d.ts | 2 +- .../src/cjs/data.js | 2 +- .../src/cjs/package.json | 0 packages/wasm-data-asmjs/src/detectOther.ts | 4 + .../src/detectPackage.ts | 2 +- .../src/index.ts | 2 +- packages/wasm-data-asmjs/src/packageInfo.ts | 6 + .../tsconfig.build.json | 0 .../package.json | 6 +- .../src/base64.ts | 0 .../src/bundle.ts | 2 +- .../src/cjs/bytes.d.ts | 2 +- .../src/cjs/bytes.js | 2 +- .../src/cjs/cjs/bytes.js | 2 +- .../src/cjs/package.json | 0 packages/wasm-data-wasm/src/detectOther.ts | 4 + packages/wasm-data-wasm/src/detectPackage.ts | 11 + .../src/fflate.ts | 0 .../src/index.ts | 2 +- packages/wasm-data-wasm/src/packageInfo.ts | 6 + .../tsconfig.build.json | 0 rollup.config.mjs | 9 +- scripts/build-wasm.sh | 6 +- scripts/build.sh | 8 +- scripts/pack-wasm-base.cjs | 2 +- tsconfig.base.json | 15 +- tsconfig.build.json | 4 +- yarn.lock | 842 +++++++++--------- 62 files changed, 710 insertions(+), 564 deletions(-) delete mode 100644 packages/wasm-crypto-asmjs/src/detectOther.ts delete mode 100644 packages/wasm-crypto-asmjs/src/packageInfo.ts create mode 100644 packages/wasm-crypto-init/package.json create mode 100644 packages/wasm-crypto-init/src/asm.ts create mode 100644 packages/wasm-crypto-init/src/both.ts create mode 100644 packages/wasm-crypto-init/src/create.ts create mode 100644 packages/wasm-crypto-init/src/detectOther.ts rename packages/{wasm-crypto-wasm => wasm-crypto-init}/src/detectPackage.ts (80%) create mode 100644 packages/wasm-crypto-init/src/index.ts create mode 100644 packages/wasm-crypto-init/src/none.ts rename packages/{wasm-crypto-wasm => wasm-crypto-init}/src/packageInfo.ts (53%) create mode 100644 packages/wasm-crypto-init/src/types.ts create mode 100644 packages/wasm-crypto-init/src/wasm.ts create mode 100644 packages/wasm-crypto-init/tsconfig.build.json delete mode 100644 packages/wasm-crypto-wasm/src/detectOther.ts rename packages/{wasm-crypto-asmjs => wasm-data-asmjs}/package.json (84%) rename packages/{wasm-crypto-asmjs => wasm-data-asmjs}/src/bundle.ts (63%) rename packages/{wasm-crypto-asmjs => wasm-data-asmjs}/src/cjs/cjs/data.js (57%) rename packages/{wasm-crypto-asmjs => wasm-data-asmjs}/src/cjs/data.d.ts (51%) rename packages/{wasm-crypto-asmjs => wasm-data-asmjs}/src/cjs/data.js (58%) rename packages/{wasm-crypto-asmjs => wasm-data-asmjs}/src/cjs/package.json (100%) create mode 100644 packages/wasm-data-asmjs/src/detectOther.ts rename packages/{wasm-crypto-asmjs => wasm-data-asmjs}/src/detectPackage.ts (77%) rename packages/{wasm-crypto-wasm => wasm-data-asmjs}/src/index.ts (56%) create mode 100644 packages/wasm-data-asmjs/src/packageInfo.ts rename packages/{wasm-crypto-asmjs => wasm-data-asmjs}/tsconfig.build.json (100%) rename packages/{wasm-crypto-wasm => wasm-data-wasm}/package.json (85%) rename packages/{wasm-crypto-wasm => wasm-data-wasm}/src/base64.ts (100%) rename packages/{wasm-crypto-wasm => wasm-data-wasm}/src/bundle.ts (81%) rename packages/{wasm-crypto-wasm => wasm-data-wasm}/src/cjs/bytes.d.ts (68%) rename packages/{wasm-crypto-wasm => wasm-data-wasm}/src/cjs/bytes.js (65%) rename packages/{wasm-crypto-wasm => wasm-data-wasm}/src/cjs/cjs/bytes.js (57%) rename packages/{wasm-crypto-wasm => wasm-data-wasm}/src/cjs/package.json (100%) create mode 100644 packages/wasm-data-wasm/src/detectOther.ts create mode 100644 packages/wasm-data-wasm/src/detectPackage.ts rename packages/{wasm-crypto-wasm => wasm-data-wasm}/src/fflate.ts (100%) rename packages/{wasm-crypto-asmjs => wasm-data-wasm}/src/index.ts (55%) create mode 100644 packages/wasm-data-wasm/src/packageInfo.ts rename packages/{wasm-crypto-wasm => wasm-data-wasm}/tsconfig.build.json (100%) diff --git a/.codeclimate.yml b/.codeclimate.yml index 5b4c897c..0002588d 100644 --- a/.codeclimate.yml +++ b/.codeclimate.yml @@ -17,4 +17,4 @@ exclude_patterns: - "**/*.spec.ts" - "docs/**/*.js" - "**/test/**/*.js" -- "packages/wasm-crypto-wasm/src/fflate.ts" +- "packages/wasm-data-wasm/src/fflate.ts" diff --git a/CHANGELOG.md b/CHANGELOG.md index 3bb93426..d46bb3b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # CHANGELOG +## master + +Changes: + +- Adjust init, allow RN with default ASM.js-only fallback + + ## 6.0.1 Apr 9, 2022 - **Breaking change** In this major version the commonjs outputs are moved to a sub-folder. Since the `export` map and `main` field in `package.json` does reflect this change, there should be no usage changes. However the packages here will all need to be on the same version for internal linkage. diff --git a/jest.config.cjs b/jest.config.cjs index c5e6e4f4..89ecde37 100644 --- a/jest.config.cjs +++ b/jest.config.cjs @@ -6,7 +6,8 @@ const config = require('@polkadot/dev/config/jest.cjs'); module.exports = { ...config, moduleNameMapper: { - '@polkadot/wasm-crypto-(asmjs|wasm)(.*)$': '/packages/wasm-crypto-$1/build/$2', + '@polkadot/wasm-crypto-init(.*)$': '/packages/wasm-crypto-init/build/$1', + '@polkadot/wasm-data-(asmjs|wasm)(.*)$': '/packages/wasm-data-$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 d881f2e4..1d80589e 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ }, "devDependencies": { "@babel/core": "^7.17.10", - "@polkadot/dev": "^0.66.16", + "@polkadot/dev": "^0.66.18", "fflate": "^0.7.3", "override-require": "^1.1.1" }, diff --git a/packages/wasm-crypto-asmjs/src/detectOther.ts b/packages/wasm-crypto-asmjs/src/detectOther.ts deleted file mode 100644 index 709c7f3c..00000000 --- a/packages/wasm-crypto-asmjs/src/detectOther.ts +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2019-2022 @polkadot/wasm-crypto-asmjs authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -export default []; diff --git a/packages/wasm-crypto-asmjs/src/packageInfo.ts b/packages/wasm-crypto-asmjs/src/packageInfo.ts deleted file mode 100644 index 41e2ce1e..00000000 --- a/packages/wasm-crypto-asmjs/src/packageInfo.ts +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2017-2022 @polkadot/wasm-crypto-asmjs authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -// Do not edit, auto-generated by @polkadot/dev - -export const packageInfo = { name: '@polkadot/wasm-crypto-asmjs', path: 'auto', type: 'auto', version: '6.0.2-7' }; diff --git a/packages/wasm-crypto-init/package.json b/packages/wasm-crypto-init/package.json new file mode 100644 index 00000000..e2bda718 --- /dev/null +++ b/packages/wasm-crypto-init/package.json @@ -0,0 +1,38 @@ +{ + "author": "Jaco Greeff ", + "bugs": "https://github.com/polkadot-js/wasm/issues", + "contributors": [], + "description": "Asm.js content for wasm-crypto", + "engines": { + "node": ">=14.0.0" + }, + "homepage": "https://github.com/polkadot-js/wasm/tree/master/packages/wasm-crypto-init#readme", + "license": "Apache-2.0", + "maintainers": [], + "name": "@polkadot/wasm-crypto-init", + "repository": { + "directory": "packages/wasm-crypto-init", + "type": "git", + "url": "https://github.com/polkadot-js/wasm.git" + }, + "sideEffects": [ + "./detectPackage.js", + "./detectPackage.cjs" + ], + "type": "module", + "version": "6.0.2-7", + "browser": "wasm.js", + "main": "wasm.js", + "react-native": "asm.js", + "dependencies": { + "@babel/runtime": "^7.17.9", + "@polkadot/wasm-data-asmjs": "6.0.2-7", + "@polkadot/wasm-data-wasm": "6.0.2-7" + }, + "devDependencies": { + "@polkadot/util": "^9.1.1" + }, + "peerDependencies": { + "@polkadot/util": "*" + } +} diff --git a/packages/wasm-crypto-init/src/asm.ts b/packages/wasm-crypto-init/src/asm.ts new file mode 100644 index 00000000..20b9153b --- /dev/null +++ b/packages/wasm-crypto-init/src/asm.ts @@ -0,0 +1,12 @@ +// Copyright 2019-2022 @polkadot/wasm-crypto-init authors & contributors +// SPDX-License-Identifier: Apache-2.0 + +import type { InitResult } from './types'; + +import { asmJsInit } from '@polkadot/wasm-data-asmjs'; + +import { createPromise } from './create'; + +export function init (wbg: WebAssembly.ModuleImports): Promise { + return createPromise(wbg, null, asmJsInit); +} diff --git a/packages/wasm-crypto-init/src/both.ts b/packages/wasm-crypto-init/src/both.ts new file mode 100644 index 00000000..56e62c2e --- /dev/null +++ b/packages/wasm-crypto-init/src/both.ts @@ -0,0 +1,13 @@ +// Copyright 2019-2022 @polkadot/wasm-crypto-init authors & contributors +// SPDX-License-Identifier: Apache-2.0 + +import type { InitResult } from './types'; + +import { asmJsInit } from '@polkadot/wasm-data-asmjs'; +import { wasmBytes } from '@polkadot/wasm-data-wasm'; + +import { createPromise } from './create'; + +export function init (wbg: WebAssembly.ModuleImports): Promise { + return createPromise(wbg, wasmBytes, asmJsInit); +} diff --git a/packages/wasm-crypto-init/src/create.ts b/packages/wasm-crypto-init/src/create.ts new file mode 100644 index 00000000..f64c5c6e --- /dev/null +++ b/packages/wasm-crypto-init/src/create.ts @@ -0,0 +1,33 @@ +// Copyright 2019-2022 @polkadot/wasm-crypto-init authors & contributors +// SPDX-License-Identifier: Apache-2.0 + +import type { InitResult } from './types'; + +import { assert } from '@polkadot/util'; + +export async function createPromise (wbg: WebAssembly.ModuleImports, wasmBytes: null | Uint8Array, asmFn: null | ((wbg: WebAssembly.ModuleImports) => unknown)): Promise { + const result: InitResult = { + type: 'wasm', + wasm: null + }; + + try { + assert(typeof WebAssembly === 'object' && typeof WebAssembly.instantiate === 'function' && wasmBytes && wasmBytes.length, 'WebAssembly is not available in your environment'); + + const source = await WebAssembly.instantiate(wasmBytes, { wbg }); + + result.wasm = source.instance.exports; + } catch (error) { + // if we have a valid supplied asm.js, return that + if (asmFn) { + result.type = 'asm'; + result.wasm = asmFn(wbg); + } else { + console.error(`FATAL: Unable to initialize @polkadot/wasm-crypto:: ${(error as Error).message}`); + + result.wasm = null; + } + } + + return result; +} diff --git a/packages/wasm-crypto-init/src/detectOther.ts b/packages/wasm-crypto-init/src/detectOther.ts new file mode 100644 index 00000000..690a309a --- /dev/null +++ b/packages/wasm-crypto-init/src/detectOther.ts @@ -0,0 +1,6 @@ +// Copyright 2017-2022 @polkadot/wasm-crypto-init authors & contributors +// SPDX-License-Identifier: Apache-2.0 + +// Empty template, auto-generated by @polkadot/dev + +export default []; diff --git a/packages/wasm-crypto-wasm/src/detectPackage.ts b/packages/wasm-crypto-init/src/detectPackage.ts similarity index 80% rename from packages/wasm-crypto-wasm/src/detectPackage.ts rename to packages/wasm-crypto-init/src/detectPackage.ts index e8ae483d..60ec165d 100644 --- a/packages/wasm-crypto-wasm/src/detectPackage.ts +++ b/packages/wasm-crypto-init/src/detectPackage.ts @@ -1,4 +1,4 @@ -// Copyright 2017-2022 @polkadot/wasm-crypto-wasm authors & contributors +// Copyright 2017-2022 @polkadot/wasm-crypto-init authors & contributors // SPDX-License-Identifier: Apache-2.0 // Do not edit, auto-generated by @polkadot/dev diff --git a/packages/wasm-crypto-init/src/index.ts b/packages/wasm-crypto-init/src/index.ts new file mode 100644 index 00000000..4f4b1a38 --- /dev/null +++ b/packages/wasm-crypto-init/src/index.ts @@ -0,0 +1,4 @@ +// Copyright 2019-2022 @polkadot/wasm-crypto-init authors & contributors +// SPDX-License-Identifier: Apache-2.0 + +export { init } from './wasm'; diff --git a/packages/wasm-crypto-init/src/none.ts b/packages/wasm-crypto-init/src/none.ts new file mode 100644 index 00000000..a92e050e --- /dev/null +++ b/packages/wasm-crypto-init/src/none.ts @@ -0,0 +1,10 @@ +// Copyright 2019-2022 @polkadot/wasm-crypto-init authors & contributors +// SPDX-License-Identifier: Apache-2.0 + +import type { InitResult } from './types'; + +import { createPromise } from './create'; + +export function init (wbg: WebAssembly.ModuleImports): Promise { + return createPromise(wbg, null, null); +} diff --git a/packages/wasm-crypto-wasm/src/packageInfo.ts b/packages/wasm-crypto-init/src/packageInfo.ts similarity index 53% rename from packages/wasm-crypto-wasm/src/packageInfo.ts rename to packages/wasm-crypto-init/src/packageInfo.ts index a3fce543..7b094838 100644 --- a/packages/wasm-crypto-wasm/src/packageInfo.ts +++ b/packages/wasm-crypto-init/src/packageInfo.ts @@ -1,6 +1,6 @@ -// Copyright 2017-2022 @polkadot/wasm-crypto-wasm authors & contributors +// Copyright 2017-2022 @polkadot/wasm-crypto-init authors & contributors // SPDX-License-Identifier: Apache-2.0 // Do not edit, auto-generated by @polkadot/dev -export const packageInfo = { name: '@polkadot/wasm-crypto-wasm', path: 'auto', type: 'auto', version: '6.0.2-7' }; +export const packageInfo = { name: '@polkadot/wasm-crypto-init', path: 'auto', type: 'auto', version: '6.0.2-7' }; diff --git a/packages/wasm-crypto-init/src/types.ts b/packages/wasm-crypto-init/src/types.ts new file mode 100644 index 00000000..96f98f03 --- /dev/null +++ b/packages/wasm-crypto-init/src/types.ts @@ -0,0 +1,7 @@ +// Copyright 2019-2022 @polkadot/wasm-crypto-init authors & contributors +// SPDX-License-Identifier: Apache-2.0 + +export declare interface InitResult { + type: 'wasm' | 'asm'; + wasm: unknown; +} diff --git a/packages/wasm-crypto-init/src/wasm.ts b/packages/wasm-crypto-init/src/wasm.ts new file mode 100644 index 00000000..3c663f47 --- /dev/null +++ b/packages/wasm-crypto-init/src/wasm.ts @@ -0,0 +1,12 @@ +// Copyright 2019-2022 @polkadot/wasm-crypto-init authors & contributors +// SPDX-License-Identifier: Apache-2.0 + +import type { InitResult } from './types'; + +import { wasmBytes } from '@polkadot/wasm-data-wasm'; + +import { createPromise } from './create'; + +export function init (wbg: WebAssembly.ModuleImports): Promise { + return createPromise(wbg, wasmBytes, null); +} diff --git a/packages/wasm-crypto-init/tsconfig.build.json b/packages/wasm-crypto-init/tsconfig.build.json new file mode 100644 index 00000000..73088210 --- /dev/null +++ b/packages/wasm-crypto-init/tsconfig.build.json @@ -0,0 +1,12 @@ +{ + "extends": "../../tsconfig.base.json", + "compilerOptions": { + "baseUrl": "..", + "outDir": "./build", + "rootDir": "./src" + }, + "references": [ + { "path": "../wasm-data-asmjs/tsconfig.build.json" }, + { "path": "../wasm-data-wasm/tsconfig.build.json" } + ] +} diff --git a/packages/wasm-crypto-wasm/src/detectOther.ts b/packages/wasm-crypto-wasm/src/detectOther.ts deleted file mode 100644 index 5e0e9a21..00000000 --- a/packages/wasm-crypto-wasm/src/detectOther.ts +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2019-2022 @polkadot/wasm-crypto-wasm authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -export default []; diff --git a/packages/wasm-crypto/package.json b/packages/wasm-crypto/package.json index 36c343ad..0807b871 100644 --- a/packages/wasm-crypto/package.json +++ b/packages/wasm-crypto/package.json @@ -32,8 +32,9 @@ "main": "index.js", "dependencies": { "@babel/runtime": "^7.17.9", - "@polkadot/wasm-crypto-asmjs": "6.0.2-7", - "@polkadot/wasm-crypto-wasm": "6.0.2-7" + "@polkadot/wasm-crypto-init": "6.0.2-7", + "@polkadot/wasm-data-asmjs": "6.0.2-7", + "@polkadot/wasm-data-wasm": "6.0.2-7" }, "devDependencies": { "@polkadot/util": "^9.1.1", diff --git a/packages/wasm-crypto/src/bridge.ts b/packages/wasm-crypto/src/bridge.ts index bc96ab37..ae7aff3f 100644 --- a/packages/wasm-crypto/src/bridge.ts +++ b/packages/wasm-crypto/src/bridge.ts @@ -3,7 +3,7 @@ /* eslint-disable @typescript-eslint/no-non-null-assertion */ -import type { WasmCryptoInstance } from './types'; +import type { CreatePromise, WasmCryptoInstance } from './types'; import { assert, stringToU8a, u8aToString } from '@polkadot/util'; @@ -15,19 +15,15 @@ type PopFirst = interface Bridge { cachegetInt32: Int32Array | null; cachegetUint8: Uint8Array | null; - type: 'wasm' | 'asm'; wasm: WasmCryptoInstance | null; - wasmPromise: Promise | null; - wasmPromiseFn: null | (() => Promise); + wasmPromise: CreatePromise | null; } export const __bridge: Bridge = { cachegetInt32: null, cachegetUint8: null, - type: 'wasm', wasm: null, - wasmPromise: null, - wasmPromiseFn: null + wasmPromise: null }; export function withWasm T> (fn: F): (...params: PopFirst>) => ReturnType { diff --git a/packages/wasm-crypto/src/bundle.ts b/packages/wasm-crypto/src/bundle.ts index 1ad3d3dc..87be7d31 100644 --- a/packages/wasm-crypto/src/bundle.ts +++ b/packages/wasm-crypto/src/bundle.ts @@ -1,7 +1,7 @@ // Copyright 2019-2022 @polkadot/wasm-crypto authors & contributors // SPDX-License-Identifier: Apache-2.0 -import { __bridge, allocString, allocU8a, getWasm, resultString, resultU8a, withWasm } from './bridge'; +import { allocString, allocU8a, getWasm, resultString, resultU8a, withWasm } from './bridge'; import { initWasm } from './init'; export { packageInfo } from './packageInfo'; @@ -204,15 +204,7 @@ export function isReady (): boolean { export async function waitReady (): Promise { try { - if (!__bridge.wasmPromise) { - if (!__bridge.wasmPromiseFn) { - __bridge.wasmPromiseFn = initWasm; - } - - __bridge.wasmPromise = __bridge.wasmPromiseFn(); - } - - await __bridge.wasmPromise; + await initWasm(); return isReady(); } catch { diff --git a/packages/wasm-crypto/src/detectOther.ts b/packages/wasm-crypto/src/detectOther.ts index bc8ab7bf..da1c5c3c 100644 --- a/packages/wasm-crypto/src/detectOther.ts +++ b/packages/wasm-crypto/src/detectOther.ts @@ -1,7 +1,8 @@ // Copyright 2017-2022 @polkadot/wasm-crypto authors & contributors // SPDX-License-Identifier: Apache-2.0 -import { packageInfo as asmInfo } from '@polkadot/wasm-crypto-asmjs/packageInfo'; -import { packageInfo as wasmInfo } from '@polkadot/wasm-crypto-wasm/packageInfo'; +import { packageInfo as initInfo } from '@polkadot/wasm-crypto-init/packageInfo'; +import { packageInfo as asmInfo } from '@polkadot/wasm-data-asmjs/packageInfo'; +import { packageInfo as wasmInfo } from '@polkadot/wasm-data-wasm/packageInfo'; -export default [asmInfo, wasmInfo]; +export default [initInfo, asmInfo, wasmInfo]; diff --git a/packages/wasm-crypto/src/init.ts b/packages/wasm-crypto/src/init.ts index 1d5f9650..74aa3f16 100644 --- a/packages/wasm-crypto/src/init.ts +++ b/packages/wasm-crypto/src/init.ts @@ -1,44 +1,19 @@ // Copyright 2019-2022 @polkadot/wasm-crypto authors & contributors // SPDX-License-Identifier: Apache-2.0 -import type { AsmCreator, WasmCryptoInstance } from './types'; +import type { CreatePromise, WasmCryptoInstance } from './types'; -import { assert } from '@polkadot/util'; -import { wasmBytes } from '@polkadot/wasm-crypto-wasm'; +import { init } from '@polkadot/wasm-crypto-init'; import { __bridge } from './bridge'; import * as wbg from './imports'; -async function createPromise (wasmBytes: Uint8Array | null, asmFn: AsmCreator | null): Promise { - try { - assert(typeof WebAssembly === 'object' && typeof WebAssembly.instantiate === 'function' && wasmBytes && wasmBytes.length, 'WebAssembly is not available in your environment'); - - const source = await WebAssembly.instantiate(wasmBytes, { wbg }); - - __bridge.wasm = (source.instance.exports as unknown as WasmCryptoInstance); - } catch (error) { - // if we have a valid supplied asm.js, return that - if (asmFn) { - __bridge.type = 'asm'; - __bridge.wasm = asmFn(wbg); - } else { - console.error(`FATAL: Unable to initialize @polkadot/wasm-crypto:: ${(error as Error).message}`); - - __bridge.wasm = null; - } +export async function initWasm (initOverride?: (wbg: WebAssembly.ModuleImports) => CreatePromise): Promise { + if (!__bridge.wasmPromise || initOverride) { + __bridge.wasmPromise = (initOverride || init)(wbg); } -} -export function setWasmPromise (wasmBytes: Uint8Array | null, asmFn: AsmCreator | null): Promise { - __bridge.wasmPromise = createPromise(wasmBytes, asmFn); + const { wasm } = await __bridge.wasmPromise; - return __bridge.wasmPromise; -} - -export function setWasmPromiseFn (fn: () => Promise): void { - __bridge.wasmPromiseFn = fn; -} - -export function initWasm (): Promise { - return setWasmPromise(wasmBytes, null); + __bridge.wasm = wasm as WasmCryptoInstance; } diff --git a/packages/wasm-crypto/src/initNone.ts b/packages/wasm-crypto/src/initNone.ts index b1660bcb..87f8dd8d 100644 --- a/packages/wasm-crypto/src/initNone.ts +++ b/packages/wasm-crypto/src/initNone.ts @@ -1,27 +1,8 @@ // Copyright 2019-2022 @polkadot/wasm-crypto authors & contributors // SPDX-License-Identifier: Apache-2.0 -import type { AsmCreator } from './types'; +import { init } from '@polkadot/wasm-crypto-init/none'; -import { __bridge } from './bridge'; +import { initWasm } from './init'; -// eslint-disable-next-line @typescript-eslint/no-unused-vars -export function setWasmPromise (_wasmBytes: Uint8Array | null, _asmFn: AsmCreator | null): Promise { - __bridge.wasmPromise = Promise.resolve(); - - return __bridge.wasmPromise; -} - -export function setWasmPromiseFn (fn: () => Promise): void { - __bridge.wasmPromiseFn = fn; -} - -export function setWasmOnlyPromise (): Promise { - return setWasmPromise(null, null); -} - -export function initWasm (): Promise { - return setWasmOnlyPromise(); -} - -setWasmPromiseFn(initWasm); +initWasm(init).catch(undefined); diff --git a/packages/wasm-crypto/src/initOnlyAsm.ts b/packages/wasm-crypto/src/initOnlyAsm.ts index 1a8f42c5..7a0407ba 100644 --- a/packages/wasm-crypto/src/initOnlyAsm.ts +++ b/packages/wasm-crypto/src/initOnlyAsm.ts @@ -1,12 +1,8 @@ // Copyright 2019-2022 @polkadot/wasm-crypto authors & contributors // SPDX-License-Identifier: Apache-2.0 -import { asmJsInit } from '@polkadot/wasm-crypto-asmjs'; +import { init } from '@polkadot/wasm-crypto-init/asm'; -import { setWasmPromise, setWasmPromiseFn } from './init'; +import { initWasm } from './init'; -export function initWasm (): Promise { - return setWasmPromise(null, asmJsInit); -} - -setWasmPromiseFn(initWasm); +initWasm(init).catch(undefined); diff --git a/packages/wasm-crypto/src/initOnlyWasm.ts b/packages/wasm-crypto/src/initOnlyWasm.ts index ef83882b..044c3351 100644 --- a/packages/wasm-crypto/src/initOnlyWasm.ts +++ b/packages/wasm-crypto/src/initOnlyWasm.ts @@ -1,10 +1,8 @@ // Copyright 2019-2022 @polkadot/wasm-crypto authors & contributors // SPDX-License-Identifier: Apache-2.0 -import { initWasm as baseInitWasm, setWasmPromiseFn } from './init'; +import { init } from '@polkadot/wasm-crypto-init/wasm'; -export function initWasm (): Promise { - return baseInitWasm(); -} +import { initWasm } from './init'; -setWasmPromiseFn(initWasm); +initWasm(init).catch(undefined); diff --git a/packages/wasm-crypto/src/initWasmAsm.ts b/packages/wasm-crypto/src/initWasmAsm.ts index 3c5e369b..f7a4ed7e 100644 --- a/packages/wasm-crypto/src/initWasmAsm.ts +++ b/packages/wasm-crypto/src/initWasmAsm.ts @@ -1,13 +1,8 @@ // Copyright 2019-2022 @polkadot/wasm-crypto authors & contributors // SPDX-License-Identifier: Apache-2.0 -import { asmJsInit } from '@polkadot/wasm-crypto-asmjs'; -import { wasmBytes } from '@polkadot/wasm-crypto-wasm'; +import { init } from '@polkadot/wasm-crypto-init/both'; -import { setWasmPromise, setWasmPromiseFn } from './init'; +import { initWasm } from './init'; -export function initWasm (): Promise { - return setWasmPromise(wasmBytes, asmJsInit); -} - -setWasmPromiseFn(initWasm); +initWasm(init).catch(undefined); diff --git a/packages/wasm-crypto/src/types.ts b/packages/wasm-crypto/src/types.ts index b0fa9055..4714d86d 100644 --- a/packages/wasm-crypto/src/types.ts +++ b/packages/wasm-crypto/src/types.ts @@ -1,6 +1,8 @@ // Copyright 2019-2022 @polkadot/wasm-crypto authors & contributors // SPDX-License-Identifier: Apache-2.0 +import type { InitResult } from '@polkadot/wasm-crypto-init/types'; + /* eslint-disable camelcase */ // wasm-pack build output (formatted) from pkg/wasm_bg.d.ts @@ -85,3 +87,5 @@ export interface WasmCryptoInstance { } export type AsmCreator = (wbg: Record) => WasmCryptoInstance; + +export type CreatePromise = Promise; diff --git a/packages/wasm-crypto/test/alias-imports.cjs b/packages/wasm-crypto/test/alias-imports.cjs index 3eaf59cc..bc361da7 100644 --- a/packages/wasm-crypto/test/alias-imports.cjs +++ b/packages/wasm-crypto/test/alias-imports.cjs @@ -1,9 +1,10 @@ // Copyright 2019-2022 @polkadot/wasm-crypto authors & contributors // SPDX-License-Identifier: Apache-2.0 -const rootIncl = ['@polkadot/wasm-crypto', '@polkadot/wasm-crypto-asmjs', '@polkadot/wasm-crypto-wasm']; +const rootIncl = ['@polkadot/wasm-crypto', '@polkadot/wasm-crypto-init', '@polkadot/wasm-data-asmjs', '@polkadot/wasm-data-wasm']; const detcIncl = [ ...rootIncl.map((p) => `${p}/initOnlyAsm`), + ...rootIncl.map((p) => `${p}/cjs/asm`), ...rootIncl.map((p) => `${p}/cjs/packageInfo`) ]; @@ -15,7 +16,8 @@ require('override-require')( rootIncl.some((p) => request.endsWith(p)) ? require(`${rootIncl.find((p) => request.endsWith(p))}/build/cjs`) : require(`${detcIncl.find((p) => request.endsWith(p)) - .replace('initOnlyAsm', 'build/cjs/initOnlyAsm.js') + .replace('/initOnlyAsm', '/build/cjs/initOnlyAsm.js') + .replace('/cjs/asm', '/build/cjs/asm.js') .replace('/cjs/packageInfo', '/build/cjs/packageInfo.js') }`) ); diff --git a/packages/wasm-crypto/tsconfig.build.json b/packages/wasm-crypto/tsconfig.build.json index 9d7d67e8..9945ba5d 100644 --- a/packages/wasm-crypto/tsconfig.build.json +++ b/packages/wasm-crypto/tsconfig.build.json @@ -6,7 +6,8 @@ "rootDir": "./src" }, "references": [ - { "path": "../wasm-crypto-asmjs/tsconfig.build.json" }, - { "path": "../wasm-crypto-wasm/tsconfig.build.json" } + { "path": "../wasm-crypto-init/tsconfig.build.json" }, + { "path": "../wasm-data-asmjs/tsconfig.build.json" }, + { "path": "../wasm-data-wasm/tsconfig.build.json" } ] } diff --git a/packages/wasm-crypto-asmjs/package.json b/packages/wasm-data-asmjs/package.json similarity index 84% rename from packages/wasm-crypto-asmjs/package.json rename to packages/wasm-data-asmjs/package.json index 9d9be67d..429f5035 100644 --- a/packages/wasm-crypto-asmjs/package.json +++ b/packages/wasm-data-asmjs/package.json @@ -6,12 +6,12 @@ "engines": { "node": ">=14.0.0" }, - "homepage": "https://github.com/polkadot-js/wasm/tree/master/packages/wasm-crypto-asmjs#readme", + "homepage": "https://github.com/polkadot-js/wasm/tree/master/packages/wasm-data-asmjs#readme", "license": "Apache-2.0", "maintainers": [], - "name": "@polkadot/wasm-crypto-asmjs", + "name": "@polkadot/wasm-data-asmjs", "repository": { - "directory": "packages/wasm-crypto-asmjs", + "directory": "packages/wasm-data-asmjs", "type": "git", "url": "https://github.com/polkadot-js/wasm.git" }, diff --git a/packages/wasm-crypto-asmjs/src/bundle.ts b/packages/wasm-data-asmjs/src/bundle.ts similarity index 63% rename from packages/wasm-crypto-asmjs/src/bundle.ts rename to packages/wasm-data-asmjs/src/bundle.ts index 3918cb9b..5a9f5381 100644 --- a/packages/wasm-crypto-asmjs/src/bundle.ts +++ b/packages/wasm-data-asmjs/src/bundle.ts @@ -1,4 +1,4 @@ -// Copyright 2019-2022 @polkadot/wasm-crypto-asmjs authors & contributors +// Copyright 2019-2022 @polkadot/wasm-data-asmjs authors & contributors // SPDX-License-Identifier: Apache-2.0 export { asmJsInit } from './cjs/data.js'; diff --git a/packages/wasm-crypto-asmjs/src/cjs/cjs/data.js b/packages/wasm-data-asmjs/src/cjs/cjs/data.js similarity index 57% rename from packages/wasm-crypto-asmjs/src/cjs/cjs/data.js rename to packages/wasm-data-asmjs/src/cjs/cjs/data.js index e306512f..8b85608c 100644 --- a/packages/wasm-crypto-asmjs/src/cjs/cjs/data.js +++ b/packages/wasm-data-asmjs/src/cjs/cjs/data.js @@ -1,4 +1,4 @@ -// Copyright 2019-2022 @polkadot/wasm-crypto-wasm authors & contributors +// Copyright 2019-2022 @polkadot/wasm-data-wasm authors & contributors // SPDX-License-Identifier: Apache-2.0 const data = require('../data'); diff --git a/packages/wasm-crypto-asmjs/src/cjs/data.d.ts b/packages/wasm-data-asmjs/src/cjs/data.d.ts similarity index 51% rename from packages/wasm-crypto-asmjs/src/cjs/data.d.ts rename to packages/wasm-data-asmjs/src/cjs/data.d.ts index 8ecc2176..eac7db01 100644 --- a/packages/wasm-crypto-asmjs/src/cjs/data.d.ts +++ b/packages/wasm-data-asmjs/src/cjs/data.d.ts @@ -1,4 +1,4 @@ -// Copyright 2019-2022 @polkadot/wasm-crypto-asmjs authors & contributors +// Copyright 2019-2022 @polkadot/wasm-data-asmjs authors & contributors // SPDX-License-Identifier: Apache-2.0 export declare const asmJsInit: null; diff --git a/packages/wasm-crypto-asmjs/src/cjs/data.js b/packages/wasm-data-asmjs/src/cjs/data.js similarity index 58% rename from packages/wasm-crypto-asmjs/src/cjs/data.js rename to packages/wasm-data-asmjs/src/cjs/data.js index 31be78f1..e4b971e5 100644 --- a/packages/wasm-crypto-asmjs/src/cjs/data.js +++ b/packages/wasm-data-asmjs/src/cjs/data.js @@ -1,4 +1,4 @@ -// Copyright 2019-2022 @polkadot/wasm-crypto-asmjs authors & contributors +// Copyright 2019-2022 @polkadot/wasm-data-asmjs authors & contributors // SPDX-License-Identifier: Apache-2.0 const asmJsInit = null; diff --git a/packages/wasm-crypto-asmjs/src/cjs/package.json b/packages/wasm-data-asmjs/src/cjs/package.json similarity index 100% rename from packages/wasm-crypto-asmjs/src/cjs/package.json rename to packages/wasm-data-asmjs/src/cjs/package.json diff --git a/packages/wasm-data-asmjs/src/detectOther.ts b/packages/wasm-data-asmjs/src/detectOther.ts new file mode 100644 index 00000000..84d4c680 --- /dev/null +++ b/packages/wasm-data-asmjs/src/detectOther.ts @@ -0,0 +1,4 @@ +// Copyright 2019-2022 @polkadot/wasm-data-asmjs authors & contributors +// SPDX-License-Identifier: Apache-2.0 + +export default []; diff --git a/packages/wasm-crypto-asmjs/src/detectPackage.ts b/packages/wasm-data-asmjs/src/detectPackage.ts similarity index 77% rename from packages/wasm-crypto-asmjs/src/detectPackage.ts rename to packages/wasm-data-asmjs/src/detectPackage.ts index 300ad328..dc053123 100644 --- a/packages/wasm-crypto-asmjs/src/detectPackage.ts +++ b/packages/wasm-data-asmjs/src/detectPackage.ts @@ -1,4 +1,4 @@ -// Copyright 2017-2022 @polkadot/wasm-crypto-asmjs authors & contributors +// Copyright 2017-2022 @polkadot/wasm-data-asmjs authors & contributors // SPDX-License-Identifier: Apache-2.0 // Do not edit, auto-generated by @polkadot/dev diff --git a/packages/wasm-crypto-wasm/src/index.ts b/packages/wasm-data-asmjs/src/index.ts similarity index 56% rename from packages/wasm-crypto-wasm/src/index.ts rename to packages/wasm-data-asmjs/src/index.ts index 55b70b04..7f7d5ac7 100644 --- a/packages/wasm-crypto-wasm/src/index.ts +++ b/packages/wasm-data-asmjs/src/index.ts @@ -1,4 +1,4 @@ -// Copyright 2019-2022 @polkadot/wasm-crypto-wasm authors & contributors +// Copyright 2019-2022 @polkadot/wasm-data-asmjs authors & contributors // SPDX-License-Identifier: Apache-2.0 import './detectPackage'; diff --git a/packages/wasm-data-asmjs/src/packageInfo.ts b/packages/wasm-data-asmjs/src/packageInfo.ts new file mode 100644 index 00000000..762b02a6 --- /dev/null +++ b/packages/wasm-data-asmjs/src/packageInfo.ts @@ -0,0 +1,6 @@ +// Copyright 2017-2022 @polkadot/wasm-data-asmjs authors & contributors +// SPDX-License-Identifier: Apache-2.0 + +// Do not edit, auto-generated by @polkadot/dev + +export const packageInfo = { name: '@polkadot/wasm-data-asmjs', path: 'auto', type: 'auto', version: '6.0.2-7' }; diff --git a/packages/wasm-crypto-asmjs/tsconfig.build.json b/packages/wasm-data-asmjs/tsconfig.build.json similarity index 100% rename from packages/wasm-crypto-asmjs/tsconfig.build.json rename to packages/wasm-data-asmjs/tsconfig.build.json diff --git a/packages/wasm-crypto-wasm/package.json b/packages/wasm-data-wasm/package.json similarity index 85% rename from packages/wasm-crypto-wasm/package.json rename to packages/wasm-data-wasm/package.json index 2669753f..abf2da41 100644 --- a/packages/wasm-crypto-wasm/package.json +++ b/packages/wasm-data-wasm/package.json @@ -6,12 +6,12 @@ "engines": { "node": ">=14.0.0" }, - "homepage": "https://github.com/polkadot-js/wasm/tree/master/packages/wasm-crypto-wasm#readme", + "homepage": "https://github.com/polkadot-js/wasm/tree/master/packages/wasm-data-wasm#readme", "license": "Apache-2.0", "maintainers": [], - "name": "@polkadot/wasm-crypto-wasm", + "name": "@polkadot/wasm-data-wasm", "repository": { - "directory": "packages/wasm-crypto-wasm", + "directory": "packages/wasm-data-wasm", "type": "git", "url": "https://github.com/polkadot-js/wasm.git" }, diff --git a/packages/wasm-crypto-wasm/src/base64.ts b/packages/wasm-data-wasm/src/base64.ts similarity index 100% rename from packages/wasm-crypto-wasm/src/base64.ts rename to packages/wasm-data-wasm/src/base64.ts diff --git a/packages/wasm-crypto-wasm/src/bundle.ts b/packages/wasm-data-wasm/src/bundle.ts similarity index 81% rename from packages/wasm-crypto-wasm/src/bundle.ts rename to packages/wasm-data-wasm/src/bundle.ts index 2edc6f5f..d31ec384 100644 --- a/packages/wasm-crypto-wasm/src/bundle.ts +++ b/packages/wasm-data-wasm/src/bundle.ts @@ -1,4 +1,4 @@ -// Copyright 2019-2022 @polkadot/wasm-crypto-wasm authors & contributors +// Copyright 2019-2022 @polkadot/wasm-data-wasm authors & contributors // SPDX-License-Identifier: Apache-2.0 import { bytes, sizeUncompressed } from './cjs/bytes'; diff --git a/packages/wasm-crypto-wasm/src/cjs/bytes.d.ts b/packages/wasm-data-wasm/src/cjs/bytes.d.ts similarity index 68% rename from packages/wasm-crypto-wasm/src/cjs/bytes.d.ts rename to packages/wasm-data-wasm/src/cjs/bytes.d.ts index b475b052..738685ea 100644 --- a/packages/wasm-crypto-wasm/src/cjs/bytes.d.ts +++ b/packages/wasm-data-wasm/src/cjs/bytes.d.ts @@ -1,4 +1,4 @@ -// Copyright 2019-2022 @polkadot/wasm-crypto-wasm authors & contributors +// Copyright 2019-2022 @polkadot/wasm-data-wasm authors & contributors // SPDX-License-Identifier: Apache-2.0 export declare const bytes = ''; diff --git a/packages/wasm-crypto-wasm/src/cjs/bytes.js b/packages/wasm-data-wasm/src/cjs/bytes.js similarity index 65% rename from packages/wasm-crypto-wasm/src/cjs/bytes.js rename to packages/wasm-data-wasm/src/cjs/bytes.js index 6f0e5af8..dbdf52d2 100644 --- a/packages/wasm-crypto-wasm/src/cjs/bytes.js +++ b/packages/wasm-data-wasm/src/cjs/bytes.js @@ -1,4 +1,4 @@ -// Copyright 2019-2022 @polkadot/wasm-crypto-wasm authors & contributors +// Copyright 2019-2022 @polkadot/wasm-data-wasm authors & contributors // SPDX-License-Identifier: Apache-2.0 module.exports.bytes = ''; diff --git a/packages/wasm-crypto-wasm/src/cjs/cjs/bytes.js b/packages/wasm-data-wasm/src/cjs/cjs/bytes.js similarity index 57% rename from packages/wasm-crypto-wasm/src/cjs/cjs/bytes.js rename to packages/wasm-data-wasm/src/cjs/cjs/bytes.js index d2ab30e0..ffc77fbe 100644 --- a/packages/wasm-crypto-wasm/src/cjs/cjs/bytes.js +++ b/packages/wasm-data-wasm/src/cjs/cjs/bytes.js @@ -1,4 +1,4 @@ -// Copyright 2019-2022 @polkadot/wasm-crypto-wasm authors & contributors +// Copyright 2019-2022 @polkadot/wasm-data-wasm authors & contributors // SPDX-License-Identifier: Apache-2.0 const bytes = require('../bytes'); diff --git a/packages/wasm-crypto-wasm/src/cjs/package.json b/packages/wasm-data-wasm/src/cjs/package.json similarity index 100% rename from packages/wasm-crypto-wasm/src/cjs/package.json rename to packages/wasm-data-wasm/src/cjs/package.json diff --git a/packages/wasm-data-wasm/src/detectOther.ts b/packages/wasm-data-wasm/src/detectOther.ts new file mode 100644 index 00000000..4fe1b669 --- /dev/null +++ b/packages/wasm-data-wasm/src/detectOther.ts @@ -0,0 +1,4 @@ +// Copyright 2019-2022 @polkadot/wasm-data-wasm authors & contributors +// SPDX-License-Identifier: Apache-2.0 + +export default []; diff --git a/packages/wasm-data-wasm/src/detectPackage.ts b/packages/wasm-data-wasm/src/detectPackage.ts new file mode 100644 index 00000000..2e1ae5b2 --- /dev/null +++ b/packages/wasm-data-wasm/src/detectPackage.ts @@ -0,0 +1,11 @@ +// Copyright 2017-2022 @polkadot/wasm-data-wasm authors & contributors +// SPDX-License-Identifier: Apache-2.0 + +// Do not edit, auto-generated by @polkadot/dev + +import { detectPackage } from '@polkadot/util'; + +import others from './detectOther'; +import { packageInfo } from './packageInfo'; + +detectPackage(packageInfo, null, others); diff --git a/packages/wasm-crypto-wasm/src/fflate.ts b/packages/wasm-data-wasm/src/fflate.ts similarity index 100% rename from packages/wasm-crypto-wasm/src/fflate.ts rename to packages/wasm-data-wasm/src/fflate.ts diff --git a/packages/wasm-crypto-asmjs/src/index.ts b/packages/wasm-data-wasm/src/index.ts similarity index 55% rename from packages/wasm-crypto-asmjs/src/index.ts rename to packages/wasm-data-wasm/src/index.ts index 85eedacb..8323ce0d 100644 --- a/packages/wasm-crypto-asmjs/src/index.ts +++ b/packages/wasm-data-wasm/src/index.ts @@ -1,4 +1,4 @@ -// Copyright 2019-2022 @polkadot/wasm-crypto-asmjs authors & contributors +// Copyright 2019-2022 @polkadot/wasm-data-wasm authors & contributors // SPDX-License-Identifier: Apache-2.0 import './detectPackage'; diff --git a/packages/wasm-data-wasm/src/packageInfo.ts b/packages/wasm-data-wasm/src/packageInfo.ts new file mode 100644 index 00000000..de5eb83e --- /dev/null +++ b/packages/wasm-data-wasm/src/packageInfo.ts @@ -0,0 +1,6 @@ +// Copyright 2017-2022 @polkadot/wasm-data-wasm authors & contributors +// SPDX-License-Identifier: Apache-2.0 + +// Do not edit, auto-generated by @polkadot/dev + +export const packageInfo = { name: '@polkadot/wasm-data-wasm', path: 'auto', type: 'auto', version: '6.0.2-7' }; diff --git a/packages/wasm-crypto-wasm/tsconfig.build.json b/packages/wasm-data-wasm/tsconfig.build.json similarity index 100% rename from packages/wasm-crypto-wasm/tsconfig.build.json rename to packages/wasm-data-wasm/tsconfig.build.json diff --git a/rollup.config.mjs b/rollup.config.mjs index cfb75634..6bf950b5 100644 --- a/rollup.config.mjs +++ b/rollup.config.mjs @@ -14,10 +14,11 @@ const external = [ const overrides = { '@polkadot/wasm-crypto': { - entries: ['asmjs', 'wasm'].map((p) => `wasm-crypto-${p}`).reduce((all, p) => ({ - ...all, - [`@polkadot/${p}`]: `../../${p}/build` - }), {}) + entries: { + '@polkadot/wasm-crypto-init': '../../wasm-crypto-init/build', + '@polkadot/wasm-data-asmjs': '../../../wasm-data-asmjs/build', + '@polkadot/wasm-data-wasm': '../../../wasm-data-wasm/build', + } } }; diff --git a/scripts/build-wasm.sh b/scripts/build-wasm.sh index aa58139b..b48ec604 100755 --- a/scripts/build-wasm.sh +++ b/scripts/build-wasm.sh @@ -9,7 +9,7 @@ source ../scripts/rust-version.sh WSM=bytes/wasm_bg.wasm OPT=bytes/wasm_opt.wasm -ASM=wasm-crypto-asmjs/build/cjs/data.js +ASM=wasm-data-asmjs/build/cjs/data.js # build new via wasm-pack echo "*** Building Rust sources" @@ -42,5 +42,5 @@ sed -i -e '1,/var retasmFunc = /!d' $ASM sed -i -e 's/var retasmFunc = .*/const asmJsInit = (wbg) => asmFunc(wbg);\n\nmodule.exports = { asmJsInit };/g' $ASM # cleanups -rm -rf wasm-crypto-asmjs/build/cjs/*-e -rm -rf wasm-crypto-wasm/build/cjs/*-e +rm -rf wasm-data-asmjs/build/cjs/*-e +rm -rf wasm-data-wasm/build/cjs/*-e diff --git a/scripts/build.sh b/scripts/build.sh index 3dce53c6..b6e5847b 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -19,11 +19,11 @@ echo "" echo "*** wasm-crypto" ls -alR wasm-crypto/build echo "" -echo "*** wasm-crypto-asmjs" -ls -alR wasm-crypto-asmjs/build +echo "*** wasm-data-asmjs" +ls -alR wasm-data-asmjs/build echo "" -echo "*** wasm-crypto-wasm" -ls -alR wasm-crypto-wasm/build +echo "*** wasm-data-wasm" +ls -alR wasm-data-wasm/build cd .. diff --git a/scripts/pack-wasm-base.cjs b/scripts/pack-wasm-base.cjs index 5734c948..e370c238 100755 --- a/scripts/pack-wasm-base.cjs +++ b/scripts/pack-wasm-base.cjs @@ -5,7 +5,7 @@ const fflate = require('fflate/node'); const fs = require('fs'); const { formatNumber } = require('@polkadot/util'); -const W_NAME = 'wasm-crypto-wasm'; +const W_NAME = 'wasm-data-wasm'; const data = fs.readFileSync('./bytes/wasm_opt.wasm'); const compressed = Buffer.from(fflate.zlibSync(data, { level: 9 })); diff --git a/tsconfig.base.json b/tsconfig.base.json index 8d03d396..26635f78 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -3,10 +3,17 @@ "compilerOptions": { "composite": true, "paths": { - "@polkadot/wasm-crypto-asmjs/packageInfo": ["wasm-crypto-asmjs/src/packageInfo"], - "@polkadot/wasm-crypto-asmjs": ["wasm-crypto-asmjs/src"], - "@polkadot/wasm-crypto-wasm/packageInfo": ["wasm-crypto-wasm/src/packageInfo"], - "@polkadot/wasm-crypto-wasm": ["wasm-crypto-wasm/src"], + "@polkadot/wasm-data-asmjs/packageInfo": ["wasm-data-asmjs/src/packageInfo"], + "@polkadot/wasm-data-asmjs": ["wasm-data-asmjs/src"], + "@polkadot/wasm-data-wasm/packageInfo": ["wasm-data-wasm/src/packageInfo"], + "@polkadot/wasm-data-wasm": ["wasm-data-wasm/src"], + "@polkadot/wasm-crypto-init/asm": ["wasm-crypto-init/src/asm"], + "@polkadot/wasm-crypto-init/both": ["wasm-crypto-init/src/both"], + "@polkadot/wasm-crypto-init/none": ["wasm-crypto-init/src/none"], + "@polkadot/wasm-crypto-init/wasm": ["wasm-crypto-init/src/wasm"], + "@polkadot/wasm-crypto-init/types": ["wasm-crypto-init/src/types"], + "@polkadot/wasm-crypto-init/packageInfo": ["wasm-crypto-init/src/packageInfo"], + "@polkadot/wasm-crypto-init": ["wasm-crypto-init/src"], "@polkadot/wasm-crypto": ["wasm-crypto/src"] }, "skipLibCheck": true diff --git a/tsconfig.build.json b/tsconfig.build.json index 533a7aa2..c5c4f43a 100644 --- a/tsconfig.build.json +++ b/tsconfig.build.json @@ -5,7 +5,7 @@ "files": [], "references": [ { "path": "./packages/wasm-crypto/tsconfig.build.json" }, - { "path": "./packages/wasm-crypto-asmjs/tsconfig.build.json" }, - { "path": "./packages/wasm-crypto-wasm/tsconfig.build.json" } + { "path": "./packages/wasm-data-asmjs/tsconfig.build.json" }, + { "path": "./packages/wasm-data-wasm/tsconfig.build.json" } ] } diff --git a/yarn.lock b/yarn.lock index 76f3cdbe..2c7d9c5d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1430,20 +1430,20 @@ __metadata: languageName: node linkType: hard -"@eslint/eslintrc@npm:^1.2.2": - version: 1.2.2 - resolution: "@eslint/eslintrc@npm:1.2.2" +"@eslint/eslintrc@npm:^1.2.3": + version: 1.2.3 + resolution: "@eslint/eslintrc@npm:1.2.3" dependencies: ajv: ^6.12.4 debug: ^4.3.2 - espree: ^9.3.1 + espree: ^9.3.2 globals: ^13.9.0 ignore: ^5.2.0 import-fresh: ^3.2.1 js-yaml: ^4.1.0 - minimatch: ^3.0.4 + minimatch: ^3.1.2 strip-json-comments: ^3.1.1 - checksum: d891036bbffb0efec1462aa4a603ed6e349d546b1632dde7d474ddd15c2a8b6895671b25293f1d3ba10ff629c24a3649ad049373fe695a0e44b612537088563c + checksum: 48e7b7ac05cd514eee2ebb1d487600f0dd637ac21f63605e353cff6a08c7223275fe4f571d15ee9deae4e78c53edc73369ffcbed15fba4dfc1806179dbf4dc85 languageName: node linkType: hard @@ -1485,29 +1485,29 @@ __metadata: languageName: node linkType: hard -"@jest/console@npm:^28.0.2": - version: 28.0.2 - resolution: "@jest/console@npm:28.0.2" +"@jest/console@npm:^28.1.0": + version: 28.1.0 + resolution: "@jest/console@npm:28.1.0" dependencies: - "@jest/types": ^28.0.2 + "@jest/types": ^28.1.0 "@types/node": "*" chalk: ^4.0.0 - jest-message-util: ^28.0.2 - jest-util: ^28.0.2 + jest-message-util: ^28.1.0 + jest-util: ^28.1.0 slash: ^3.0.0 - checksum: d2be8ad54dfa58b9c566380689c55e9b7bbda6d9293d39709d69c28b7904d264959bdfa1c71c90e2cba76105a59ea3e4648295b8f379a176c6b1c89c495c2882 + checksum: 6ce8ed8159517c28d413fbebf806c8ed53e958f5069b45731b21add626bdea799bc6944d9cfcc5d350047e7198185515b58877e09da52801df64cfc21c4060df languageName: node linkType: hard -"@jest/core@npm:^28.0.3": - version: 28.0.3 - resolution: "@jest/core@npm:28.0.3" +"@jest/core@npm:^28.1.0": + version: 28.1.0 + resolution: "@jest/core@npm:28.1.0" dependencies: - "@jest/console": ^28.0.2 - "@jest/reporters": ^28.0.3 - "@jest/test-result": ^28.0.2 - "@jest/transform": ^28.0.3 - "@jest/types": ^28.0.2 + "@jest/console": ^28.1.0 + "@jest/reporters": ^28.1.0 + "@jest/test-result": ^28.1.0 + "@jest/transform": ^28.1.0 + "@jest/types": ^28.1.0 "@types/node": "*" ansi-escapes: ^4.2.1 chalk: ^4.0.0 @@ -1515,20 +1515,20 @@ __metadata: exit: ^0.1.2 graceful-fs: ^4.2.9 jest-changed-files: ^28.0.2 - jest-config: ^28.0.3 - jest-haste-map: ^28.0.2 - jest-message-util: ^28.0.2 + jest-config: ^28.1.0 + jest-haste-map: ^28.1.0 + jest-message-util: ^28.1.0 jest-regex-util: ^28.0.2 - jest-resolve: ^28.0.3 - jest-resolve-dependencies: ^28.0.3 - jest-runner: ^28.0.3 - jest-runtime: ^28.0.3 - jest-snapshot: ^28.0.3 - jest-util: ^28.0.2 - jest-validate: ^28.0.2 - jest-watcher: ^28.0.2 + jest-resolve: ^28.1.0 + jest-resolve-dependencies: ^28.1.0 + jest-runner: ^28.1.0 + jest-runtime: ^28.1.0 + jest-snapshot: ^28.1.0 + jest-util: ^28.1.0 + jest-validate: ^28.1.0 + jest-watcher: ^28.1.0 micromatch: ^4.0.4 - pretty-format: ^28.0.2 + pretty-format: ^28.1.0 rimraf: ^3.0.0 slash: ^3.0.0 strip-ansi: ^6.0.0 @@ -1537,75 +1537,75 @@ __metadata: peerDependenciesMeta: node-notifier: optional: true - checksum: ada66566aa93489aaf72fe6732696db8946373919302480d8b327c1927feb1a2a13e4a7814e279e0262f1e52f4c9f21b91cbcecb365787ae7334933161a18052 + checksum: fb955cc5c8d7f294fd9bb85793e0633707fdbce9c10d4e3222b62d36564b17214abc9ab0e93397d1a6d224cd43681f8e54d570327a92a40d7ac3e47b5de3af1f languageName: node linkType: hard -"@jest/environment@npm:^28.0.2": - version: 28.0.2 - resolution: "@jest/environment@npm:28.0.2" +"@jest/environment@npm:^28.1.0": + version: 28.1.0 + resolution: "@jest/environment@npm:28.1.0" dependencies: - "@jest/fake-timers": ^28.0.2 - "@jest/types": ^28.0.2 + "@jest/fake-timers": ^28.1.0 + "@jest/types": ^28.1.0 "@types/node": "*" - jest-mock: ^28.0.2 - checksum: 8a42b9695df235d7b35d5a62136e9587e744aee56b7b2e3bda9eaeae62f4db32696ef27f949b4f4105c8e220df0eb42e39395b993862823d2ac2442fda0fdb45 + jest-mock: ^28.1.0 + checksum: 376904d6626bb439f96a56ca9d400e1b6b4a5bafb751820fec649238e35cb7d0b9619223ade86c2906e97fae8da03a7b9561c55c1f5850afe9856db89185d754 languageName: node linkType: hard -"@jest/expect-utils@npm:^28.0.2": - version: 28.0.2 - resolution: "@jest/expect-utils@npm:28.0.2" +"@jest/expect-utils@npm:^28.1.0": + version: 28.1.0 + resolution: "@jest/expect-utils@npm:28.1.0" dependencies: jest-get-type: ^28.0.2 - checksum: 09cfff4d9c614c6c5181cb06908ed9524d087e4ff4552401116fe773fc51f45097c7c1bd7061ce9ae0906be012d15bb165639d4b0b5565e951e0cb75ad25fa92 + checksum: 5b8b463682bd35ae71868020c87dc654ebed65ded4e74ea3c24bd9e1ab4637a7790c8b78c26cdcb832dd227b9981e8dd24eb3b742891637c24c2a3e38ba153e8 languageName: node linkType: hard -"@jest/expect@npm:^28.0.3": - version: 28.0.3 - resolution: "@jest/expect@npm:28.0.3" +"@jest/expect@npm:^28.1.0": + version: 28.1.0 + resolution: "@jest/expect@npm:28.1.0" dependencies: - expect: ^28.0.2 - jest-snapshot: ^28.0.3 - checksum: 5e3f82c88e9d95c872250c700aa40327d8108804d9724d68968a926df482e5cec7aaa6066f31dd1d382014e6ee3980e7597cfde1004e80b510201fbd0c86c992 + expect: ^28.1.0 + jest-snapshot: ^28.1.0 + checksum: e596bc2a2d02d66cb3e23982c6a48cfe24aa31932f594db7de6966db6c0b58f7aad3836a71debb8aeda6178116c35160e11ded42a355a94457f6402cbb2186e3 languageName: node linkType: hard -"@jest/fake-timers@npm:^28.0.2": - version: 28.0.2 - resolution: "@jest/fake-timers@npm:28.0.2" +"@jest/fake-timers@npm:^28.1.0": + version: 28.1.0 + resolution: "@jest/fake-timers@npm:28.1.0" dependencies: - "@jest/types": ^28.0.2 + "@jest/types": ^28.1.0 "@sinonjs/fake-timers": ^9.1.1 "@types/node": "*" - jest-message-util: ^28.0.2 - jest-mock: ^28.0.2 - jest-util: ^28.0.2 - checksum: b0bc1e3e0f7fa5d62334a453793030b9183c68e2ea3c3a7faf37ff5f1bf8fe3923a0b78619afc5d6a6186dadb6cd809499bbdb8103a209f6b72c0af73df7aa2e + jest-message-util: ^28.1.0 + jest-mock: ^28.1.0 + jest-util: ^28.1.0 + checksum: d24375bcd52873f1e602ff02ffe57c6866570b95ec0be167a4734d051047b2c6b3dab69b2a301a390a0ca2de2ad89fd2b23e991c09a1a3b70b1dd4763c8681c7 languageName: node linkType: hard -"@jest/globals@npm:^28.0.3": - version: 28.0.3 - resolution: "@jest/globals@npm:28.0.3" +"@jest/globals@npm:^28.1.0": + version: 28.1.0 + resolution: "@jest/globals@npm:28.1.0" dependencies: - "@jest/environment": ^28.0.2 - "@jest/expect": ^28.0.3 - "@jest/types": ^28.0.2 - checksum: 7580c56b4f24d8af70fe564d8d17597a0d0b0c0bdb1a5f962dc3e678f0235ac9559819d2740a921acdc876457c157f5cb0047fa4ff1a91c1f60b8ec42745620d + "@jest/environment": ^28.1.0 + "@jest/expect": ^28.1.0 + "@jest/types": ^28.1.0 + checksum: dce822edd1810430ce381235f714be705a9c774c00bf109d9d5df0dc4868371da62520832df99e83635ee1fc1fa4241cf617821b4e3b1a8bcd3fcd91aa8a75a7 languageName: node linkType: hard -"@jest/reporters@npm:^28.0.3": - version: 28.0.3 - resolution: "@jest/reporters@npm:28.0.3" +"@jest/reporters@npm:^28.1.0": + version: 28.1.0 + resolution: "@jest/reporters@npm:28.1.0" dependencies: "@bcoe/v8-coverage": ^0.2.3 - "@jest/console": ^28.0.2 - "@jest/test-result": ^28.0.2 - "@jest/transform": ^28.0.3 - "@jest/types": ^28.0.2 + "@jest/console": ^28.1.0 + "@jest/test-result": ^28.1.0 + "@jest/transform": ^28.1.0 + "@jest/types": ^28.1.0 "@jridgewell/trace-mapping": ^0.3.7 "@types/node": "*" chalk: ^4.0.0 @@ -1618,10 +1618,11 @@ __metadata: istanbul-lib-report: ^3.0.0 istanbul-lib-source-maps: ^4.0.0 istanbul-reports: ^3.1.3 - jest-util: ^28.0.2 - jest-worker: ^28.0.2 + jest-util: ^28.1.0 + jest-worker: ^28.1.0 slash: ^3.0.0 string-length: ^4.0.1 + strip-ansi: ^6.0.0 terminal-link: ^2.0.0 v8-to-istanbul: ^9.0.0 peerDependencies: @@ -1629,7 +1630,7 @@ __metadata: peerDependenciesMeta: node-notifier: optional: true - checksum: 4b5332881bbf0793f57574e0d9f46c0c1557c796668518f485d7e5bc49c1f5bc048c469b413599ad4dbf484bfd99a795834cf4469f20b186cd366bef8725379c + checksum: 19ec066ba219508ce6f5e0f0b29f26f906367372b1ddcc2d615cd842e53a10bdd02b87c8b04653e103a2e22b56d96e9af99573d9a84c6adab606158e5383d09f languageName: node linkType: hard @@ -1653,56 +1654,56 @@ __metadata: languageName: node linkType: hard -"@jest/test-result@npm:^28.0.2": - version: 28.0.2 - resolution: "@jest/test-result@npm:28.0.2" +"@jest/test-result@npm:^28.1.0": + version: 28.1.0 + resolution: "@jest/test-result@npm:28.1.0" dependencies: - "@jest/console": ^28.0.2 - "@jest/types": ^28.0.2 + "@jest/console": ^28.1.0 + "@jest/types": ^28.1.0 "@types/istanbul-lib-coverage": ^2.0.0 collect-v8-coverage: ^1.0.0 - checksum: 4ba2a618e223496f7a8efabc2fc5411ea51675052043df61df8462031130ca3a6e12903033343ce24559b060ed2576eae8ca3a4f8f81d50b7b18846fa57c36d4 + checksum: 7f0cf04b8c27a2dbe2eb1b7ac53635e0112fa2000b80b016992a0ca8b495980c11e758b902606f3bb24fb96aa4d5a24730c1fcdacb82d105cd782e210ae412d2 languageName: node linkType: hard -"@jest/test-sequencer@npm:^28.0.2": - version: 28.0.2 - resolution: "@jest/test-sequencer@npm:28.0.2" +"@jest/test-sequencer@npm:^28.1.0": + version: 28.1.0 + resolution: "@jest/test-sequencer@npm:28.1.0" dependencies: - "@jest/test-result": ^28.0.2 + "@jest/test-result": ^28.1.0 graceful-fs: ^4.2.9 - jest-haste-map: ^28.0.2 + jest-haste-map: ^28.1.0 slash: ^3.0.0 - checksum: 0c6ac44daf289d8fddd526d5548c51175c6b71a3063e465941915295e2e030163d8f777c85fb592297650b3b7e0bd0a66c940b82225bef95a9348454fc006d4f + checksum: ecd87ca73d1e58ebc6a4de46176c49a0e92c2dc4b41fbd09945b7bd1379ec09ae37804cab3f41c452eea8d1ca71d31a32b602c4e3147ad74c0b0e3a50184cedd languageName: node linkType: hard -"@jest/transform@npm:^28.0.3": - version: 28.0.3 - resolution: "@jest/transform@npm:28.0.3" +"@jest/transform@npm:^28.1.0": + version: 28.1.0 + resolution: "@jest/transform@npm:28.1.0" dependencies: "@babel/core": ^7.11.6 - "@jest/types": ^28.0.2 + "@jest/types": ^28.1.0 "@jridgewell/trace-mapping": ^0.3.7 babel-plugin-istanbul: ^6.1.1 chalk: ^4.0.0 convert-source-map: ^1.4.0 fast-json-stable-stringify: ^2.0.0 graceful-fs: ^4.2.9 - jest-haste-map: ^28.0.2 + jest-haste-map: ^28.1.0 jest-regex-util: ^28.0.2 - jest-util: ^28.0.2 + jest-util: ^28.1.0 micromatch: ^4.0.4 pirates: ^4.0.4 slash: ^3.0.0 write-file-atomic: ^4.0.1 - checksum: 721a7cc946ce4f4026f0d2a98f89edd5ea404b45f4722e6e6337da57f90bfcc30c398a47f7fe4a8e315f13cafe5f28e0b87877deef12c3723d90df92d4f4d63f + checksum: f7417409c466fa1b4d8f9f7d365c8c1ed07e709e8712279180a87e9da8520ab06518de270b290148034d93f666d7826449b5e40cac34cc5f7225980e8991f2ba languageName: node linkType: hard -"@jest/types@npm:^28.0.2": - version: 28.0.2 - resolution: "@jest/types@npm:28.0.2" +"@jest/types@npm:^28.1.0": + version: 28.1.0 + resolution: "@jest/types@npm:28.1.0" dependencies: "@jest/schemas": ^28.0.2 "@types/istanbul-lib-coverage": ^2.0.0 @@ -1710,7 +1711,7 @@ __metadata: "@types/node": "*" "@types/yargs": ^17.0.8 chalk: ^4.0.0 - checksum: ffb166ed4a90aaeb8cdf04928f15cda8ac29076cb88963d7cfde4740daa5649d689f713b3f815ca7db49c01eda3a932b1d904d76877a5f3b5837a0a6fb727379 + checksum: 22705aed92a76d45465a6c51147bc71c1fbd300b912ebad2769e3ff7fd51c1938017e29fcea52e00c00dab7130697359b2a2c2be6ee601e37c8b1042a2c4040e languageName: node linkType: hard @@ -1922,9 +1923,9 @@ __metadata: languageName: node linkType: hard -"@polkadot/dev@npm:^0.66.16": - version: 0.66.16 - resolution: "@polkadot/dev@npm:0.66.16" +"@polkadot/dev@npm:^0.66.18": + version: 0.66.18 + resolution: "@polkadot/dev@npm:0.66.18" dependencies: "@babel/cli": ^7.17.10 "@babel/core": ^7.17.10 @@ -1946,18 +1947,18 @@ __metadata: "@rollup/plugin-commonjs": ^22.0.0 "@rollup/plugin-inject": ^4.0.4 "@rollup/plugin-json": ^4.1.0 - "@rollup/plugin-node-resolve": ^13.2.1 + "@rollup/plugin-node-resolve": ^13.3.0 "@rushstack/eslint-patch": ^1.1.3 - "@typescript-eslint/eslint-plugin": 5.21.0 - "@typescript-eslint/parser": 5.21.0 + "@typescript-eslint/eslint-plugin": 5.22.0 + "@typescript-eslint/parser": 5.22.0 "@vue/component-compiler-utils": ^3.3.0 - babel-jest: ^28.0.3 + babel-jest: ^28.1.0 babel-plugin-module-extension-resolver: ^1.0.0-rc.2 babel-plugin-module-resolver: ^4.1.0 babel-plugin-styled-components: ^2.0.7 browserslist: ^4.20.3 coveralls: ^3.1.1 - eslint: ^8.14.0 + eslint: ^8.15.0 eslint-config-standard: ^17.0.0 eslint-import-resolver-node: ^0.3.6 eslint-plugin-header: ^3.1.1 @@ -1974,18 +1975,18 @@ __metadata: gh-release: ^6.0.4 glob: ^8.0.1 glob2base: ^0.0.12 - jest: ^28.0.3 - jest-cli: ^28.0.3 - jest-config: ^28.0.3 - jest-environment-jsdom: ^28.0.2 - jest-haste-map: ^28.0.2 - jest-resolve: ^28.0.3 + jest: ^28.1.0 + jest-cli: ^28.1.0 + jest-config: ^28.1.0 + jest-environment-jsdom: ^28.1.0 + jest-haste-map: ^28.1.0 + jest-resolve: ^28.1.0 madge: ^5.0.1 minimatch: ^5.0.1 mkdirp: ^1.0.4 prettier: ^2.6.2 rimraf: ^3.0.2 - rollup: ^2.70.2 + rollup: ^2.72.1 rollup-plugin-cleanup: ^3.2.1 typescript: ^4.6.4 yargs: ^17.4.1 @@ -2011,7 +2012,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: e0e7fc8208874ebe5031dff6ea36dbdfdf58b9a5209c75d0605be8729fc3cb5e2d1ba13b3c1503fce4dcfa636acd8a6d3945932bd05148bc17870bc1f2c26c6d + checksum: e648ce70fdeda262b68a955c9405759a4f20d5a2d397ce65d5382ace9fb573568281eab9863278676324b8fb069a35ce61483d5db177de97e189c8b313d3c9c0 languageName: node linkType: hard @@ -2031,23 +2032,14 @@ __metadata: languageName: node linkType: hard -"@polkadot/wasm-crypto-asmjs@6.0.2-7, @polkadot/wasm-crypto-asmjs@workspace:packages/wasm-crypto-asmjs": +"@polkadot/wasm-crypto-init@6.0.2-7, @polkadot/wasm-crypto-init@workspace:packages/wasm-crypto-init": version: 0.0.0-use.local - resolution: "@polkadot/wasm-crypto-asmjs@workspace:packages/wasm-crypto-asmjs" - dependencies: - "@babel/runtime": ^7.17.9 - "@polkadot/util": ^9.1.1 - peerDependencies: - "@polkadot/util": "*" - languageName: unknown - linkType: soft - -"@polkadot/wasm-crypto-wasm@6.0.2-7, @polkadot/wasm-crypto-wasm@workspace:packages/wasm-crypto-wasm": - version: 0.0.0-use.local - resolution: "@polkadot/wasm-crypto-wasm@workspace:packages/wasm-crypto-wasm" + resolution: "@polkadot/wasm-crypto-init@workspace:packages/wasm-crypto-init" dependencies: "@babel/runtime": ^7.17.9 "@polkadot/util": ^9.1.1 + "@polkadot/wasm-data-asmjs": 6.0.2-7 + "@polkadot/wasm-data-wasm": 6.0.2-7 peerDependencies: "@polkadot/util": "*" languageName: unknown @@ -2059,8 +2051,9 @@ __metadata: dependencies: "@babel/runtime": ^7.17.9 "@polkadot/util": ^9.1.1 - "@polkadot/wasm-crypto-asmjs": 6.0.2-7 - "@polkadot/wasm-crypto-wasm": 6.0.2-7 + "@polkadot/wasm-crypto-init": 6.0.2-7 + "@polkadot/wasm-data-asmjs": 6.0.2-7 + "@polkadot/wasm-data-wasm": 6.0.2-7 "@polkadot/x-randomvalues": ^9.1.1 peerDependencies: "@polkadot/util": "*" @@ -2068,6 +2061,28 @@ __metadata: languageName: unknown linkType: soft +"@polkadot/wasm-data-asmjs@6.0.2-7, @polkadot/wasm-data-asmjs@workspace:packages/wasm-data-asmjs": + version: 0.0.0-use.local + resolution: "@polkadot/wasm-data-asmjs@workspace:packages/wasm-data-asmjs" + dependencies: + "@babel/runtime": ^7.17.9 + "@polkadot/util": ^9.1.1 + peerDependencies: + "@polkadot/util": "*" + languageName: unknown + linkType: soft + +"@polkadot/wasm-data-wasm@6.0.2-7, @polkadot/wasm-data-wasm@workspace:packages/wasm-data-wasm": + version: 0.0.0-use.local + resolution: "@polkadot/wasm-data-wasm@workspace:packages/wasm-data-wasm" + dependencies: + "@babel/runtime": ^7.17.9 + "@polkadot/util": ^9.1.1 + peerDependencies: + "@polkadot/util": "*" + languageName: unknown + linkType: soft + "@polkadot/x-bigint@npm:9.1.1": version: 9.1.1 resolution: "@polkadot/x-bigint@npm:9.1.1" @@ -2169,19 +2184,19 @@ __metadata: languageName: node linkType: hard -"@rollup/plugin-node-resolve@npm:^13.2.1": - version: 13.2.1 - resolution: "@rollup/plugin-node-resolve@npm:13.2.1" +"@rollup/plugin-node-resolve@npm:^13.3.0": + version: 13.3.0 + resolution: "@rollup/plugin-node-resolve@npm:13.3.0" dependencies: "@rollup/pluginutils": ^3.1.0 "@types/resolve": 1.17.1 - builtin-modules: ^3.1.0 deepmerge: ^4.2.2 + is-builtin-module: ^3.1.0 is-module: ^1.0.0 resolve: ^1.19.0 peerDependencies: rollup: ^2.42.0 - checksum: d0ba3b6f35440b5ebc203a4f62a6c0d2c565491aed9746448288b71d0cd603d1d12fdd9d1381c1be0a4b192f167412e53c34b89fd25413db4ba7d1fa910a29a2 + checksum: ec5418e6b3c23a9e30683056b3010e9d325316dcfae93fbc673ae64dad8e56a2ce761c15c48f5e2dcfe0c822fdc4a4905ee6346e3dcf90603ba2260afef5a5e6 languageName: node linkType: hard @@ -2454,13 +2469,13 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:5.21.0": - version: 5.21.0 - resolution: "@typescript-eslint/eslint-plugin@npm:5.21.0" +"@typescript-eslint/eslint-plugin@npm:5.22.0": + version: 5.22.0 + resolution: "@typescript-eslint/eslint-plugin@npm:5.22.0" dependencies: - "@typescript-eslint/scope-manager": 5.21.0 - "@typescript-eslint/type-utils": 5.21.0 - "@typescript-eslint/utils": 5.21.0 + "@typescript-eslint/scope-manager": 5.22.0 + "@typescript-eslint/type-utils": 5.22.0 + "@typescript-eslint/utils": 5.22.0 debug: ^4.3.2 functional-red-black-tree: ^1.0.1 ignore: ^5.1.8 @@ -2473,42 +2488,42 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 52068319798775f320564e98b1361bbe7f8a80ece3ded35145b2cefc5530047a12c6482727eb3c4d845dcd4e4a8d8bf5898125775f99c1d197d45c47a7732813 + checksum: 3b083f7003f091c3ef7b3970dca9cfd507ab8c52a9b8a52259c630010adf765e9766f0e6fd9c901fc0e807319a4e8c003e12287b1f12a4b9eb4d7222e8d6db83 languageName: node linkType: hard -"@typescript-eslint/parser@npm:5.21.0": - version: 5.21.0 - resolution: "@typescript-eslint/parser@npm:5.21.0" +"@typescript-eslint/parser@npm:5.22.0": + version: 5.22.0 + resolution: "@typescript-eslint/parser@npm:5.22.0" dependencies: - "@typescript-eslint/scope-manager": 5.21.0 - "@typescript-eslint/types": 5.21.0 - "@typescript-eslint/typescript-estree": 5.21.0 + "@typescript-eslint/scope-manager": 5.22.0 + "@typescript-eslint/types": 5.22.0 + "@typescript-eslint/typescript-estree": 5.22.0 debug: ^4.3.2 peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 peerDependenciesMeta: typescript: optional: true - checksum: c0a4f03dccfba699c95788bef35312ec2ab7fa0dd7164916bce7762293b00f12f454d44dea2f1553d516d87a5fcc262ea3c5b7efa958cbfda7e4b9b73d67b54f + checksum: 28a7d4b73154fc97336be9a4efd5ffdc659f748232c82479909e86ed87ed8a78d23280b3aaf532ca4e735caaffac43d9576e6af2dfd11865e30a9d70c8a3f275 languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:5.21.0": - version: 5.21.0 - resolution: "@typescript-eslint/scope-manager@npm:5.21.0" +"@typescript-eslint/scope-manager@npm:5.22.0": + version: 5.22.0 + resolution: "@typescript-eslint/scope-manager@npm:5.22.0" dependencies: - "@typescript-eslint/types": 5.21.0 - "@typescript-eslint/visitor-keys": 5.21.0 - checksum: 2bcb5947d7882f08fb8f40eea154c15152957105a3dc80bf8481212a66d35a8d2239437e095a9a7526c6c0043e9bd6bececf4f87d40da85abb2d2b69f774d805 + "@typescript-eslint/types": 5.22.0 + "@typescript-eslint/visitor-keys": 5.22.0 + checksum: ebf2ad44f4e5a4dfd55225419804f81f68056086c20f1549adbcca4236634eac3aae461e30d6cab6539ce6f42346ed6e1fbbb2710d2cc058a3283ef91a0fe174 languageName: node linkType: hard -"@typescript-eslint/type-utils@npm:5.21.0": - version: 5.21.0 - resolution: "@typescript-eslint/type-utils@npm:5.21.0" +"@typescript-eslint/type-utils@npm:5.22.0": + version: 5.22.0 + resolution: "@typescript-eslint/type-utils@npm:5.22.0" dependencies: - "@typescript-eslint/utils": 5.21.0 + "@typescript-eslint/utils": 5.22.0 debug: ^4.3.2 tsutils: ^3.21.0 peerDependencies: @@ -2516,7 +2531,7 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 09a9dbaa26c0c56aa36e0d6e119007dcbe2cc326b844892ce9389409d5a1d43951f67e0ca03fb28d4d96a09ab498f125dd3bc09f82e655c2ca7023566ad2cf5f + checksum: 7128085bfbeca3a9646a795a34730cdfeca110bc00240569f6a7b3dc0854680afa56e015715675a78198b414de869339bd6036cc33cb14903919780a60321a95 languageName: node linkType: hard @@ -2527,19 +2542,19 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/types@npm:5.21.0": - version: 5.21.0 - resolution: "@typescript-eslint/types@npm:5.21.0" - checksum: 1581bf79f8c9236844ca8891e26c84503b654359fbfee80d76f9f57fb90c24210687cd30f61592e7d44cacf5417c83aaa5ae8559a4a8b6ce6b6c4a163b8b86c2 +"@typescript-eslint/types@npm:5.22.0": + version: 5.22.0 + resolution: "@typescript-eslint/types@npm:5.22.0" + checksum: 74f822c5a3b96bba05229eea4ed370c4bd48b17f475c37f08d6ba708adf65c3aa026bb544f1d0308c96e043b30015e396fd53b1e8e4e9fbb6dc9c92d2ccc0a15 languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:5.21.0": - version: 5.21.0 - resolution: "@typescript-eslint/typescript-estree@npm:5.21.0" +"@typescript-eslint/typescript-estree@npm:5.22.0": + version: 5.22.0 + resolution: "@typescript-eslint/typescript-estree@npm:5.22.0" dependencies: - "@typescript-eslint/types": 5.21.0 - "@typescript-eslint/visitor-keys": 5.21.0 + "@typescript-eslint/types": 5.22.0 + "@typescript-eslint/visitor-keys": 5.22.0 debug: ^4.3.2 globby: ^11.0.4 is-glob: ^4.0.3 @@ -2548,7 +2563,7 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 4f78d61be2f35775d0f2d7fc4e3bb0bfc6b84e608e96a297c948f84a7254c1b9f0062f61a1dce67a8d4eb67476a9b4a9ebd8b6412e97db76f675c03363a5a0ad + checksum: 2797a79d7d32a9a547b7f1de77a353d8e8c8519791f865f5e061bfc4918d12cdaddec51afa015f5aac5d068ef525c92bd65afc83b84dc9e52e697303acf0873a languageName: node linkType: hard @@ -2570,19 +2585,19 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/utils@npm:5.21.0": - version: 5.21.0 - resolution: "@typescript-eslint/utils@npm:5.21.0" +"@typescript-eslint/utils@npm:5.22.0": + version: 5.22.0 + resolution: "@typescript-eslint/utils@npm:5.22.0" dependencies: "@types/json-schema": ^7.0.9 - "@typescript-eslint/scope-manager": 5.21.0 - "@typescript-eslint/types": 5.21.0 - "@typescript-eslint/typescript-estree": 5.21.0 + "@typescript-eslint/scope-manager": 5.22.0 + "@typescript-eslint/types": 5.22.0 + "@typescript-eslint/typescript-estree": 5.22.0 eslint-scope: ^5.1.1 eslint-utils: ^3.0.0 peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 - checksum: ed339a4ccb9eeb2a1132c41999d6584c15c4b7e2f0132bce613f502faa1dbbad7e206b642360392a6e2b24e294df90910141c7da0959901efcd600aedc4c4253 + checksum: 5019485e76d754a7a60c042545fd884dc666fddf9d4223ff706bbf0c275f19ea25a6b210fb5cf7ed368b019fe538fd854a925e9c6f12007d51b1731a29d95cc1 languageName: node linkType: hard @@ -2596,13 +2611,13 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:5.21.0": - version: 5.21.0 - resolution: "@typescript-eslint/visitor-keys@npm:5.21.0" +"@typescript-eslint/visitor-keys@npm:5.22.0": + version: 5.22.0 + resolution: "@typescript-eslint/visitor-keys@npm:5.22.0" dependencies: - "@typescript-eslint/types": 5.21.0 + "@typescript-eslint/types": 5.22.0 eslint-visitor-keys: ^3.0.0 - checksum: 328b18faa61872160f3e5faacb5b68022bdabd04b5414f115133245a4a1ecfb5762c67fd645ab3253005480bd25a38598f57fdc2ff2b01d830ac68b37d3d06a5 + checksum: d30dfa98dcce75da49a6a204a0132d42e63228c35681cb9b3643e47a0a24a633e259832d48d101265bd85b8eb5a9f2b4858f9447646c1d3df6a2ac54258dfe8f languageName: node linkType: hard @@ -2650,12 +2665,12 @@ __metadata: languageName: node linkType: hard -"acorn-jsx@npm:^5.3.1": - version: 5.3.1 - resolution: "acorn-jsx@npm:5.3.1" +"acorn-jsx@npm:^5.3.2": + version: 5.3.2 + resolution: "acorn-jsx@npm:5.3.2" peerDependencies: acorn: ^6.0.0 || ^7.0.0 || ^8.0.0 - checksum: daf441a9d7b59c0ea1f7fe2934c48aca604a007455129ce35fa62ec3d4c8363e2efc2d4da636d18ce0049979260ba07d8b42bc002ae95182916d2c90901529c2 + checksum: c3d3b2a89c9a056b205b69530a37b972b404ee46ec8e5b341666f9513d3163e2a4f214a71f4dfc7370f5a9c07472d2fd1c11c91c3f03d093e37637d95da98950 languageName: node linkType: hard @@ -2675,7 +2690,7 @@ __metadata: languageName: node linkType: hard -"acorn@npm:^8.5.0, acorn@npm:^8.7.0": +"acorn@npm:^8.5.0, acorn@npm:^8.7.1": version: 8.7.1 resolution: "acorn@npm:8.7.1" bin: @@ -2962,11 +2977,11 @@ __metadata: languageName: node linkType: hard -"babel-jest@npm:^28.0.3": - version: 28.0.3 - resolution: "babel-jest@npm:28.0.3" +"babel-jest@npm:^28.1.0": + version: 28.1.0 + resolution: "babel-jest@npm:28.1.0" dependencies: - "@jest/transform": ^28.0.3 + "@jest/transform": ^28.1.0 "@types/babel__core": ^7.1.14 babel-plugin-istanbul: ^6.1.1 babel-preset-jest: ^28.0.2 @@ -2975,7 +2990,7 @@ __metadata: slash: ^3.0.0 peerDependencies: "@babel/core": ^7.8.0 - checksum: 4b5d7ce7f6ee200cd0d6fabc5ee8ca404adc169bd36f1a14526f9d32cec54a4f66ffb501761fa8b2d779f6c9638cf14267d10ec42990f899b8261c8a9e283064 + checksum: b09195e04d58a763aa06423ffd6f3c4d1be0b40626fbbc65ca7c5668562d23624f36aee0821d9fef7496eb6a6df45c9215025451f1a64d064bfd4b0279cbe4c8 languageName: node linkType: hard @@ -3279,7 +3294,7 @@ __metadata: languageName: node linkType: hard -"builtin-modules@npm:^3.1.0": +"builtin-modules@npm:^3.0.0": version: 3.2.0 resolution: "builtin-modules@npm:3.2.0" checksum: 0265aa1ba78e1a16f4e18668d815cb43fb364e6a6b8aa9189c6f44c7b894a551a43b323c40206959d2d4b2568c1f2805607ad6c88adc306a776ce6904cca6715 @@ -4529,11 +4544,11 @@ __metadata: languageName: node linkType: hard -"eslint@npm:^8.14.0": - version: 8.14.0 - resolution: "eslint@npm:8.14.0" +"eslint@npm:^8.15.0": + version: 8.15.0 + resolution: "eslint@npm:8.15.0" dependencies: - "@eslint/eslintrc": ^1.2.2 + "@eslint/eslintrc": ^1.2.3 "@humanwhocodes/config-array": ^0.9.2 ajv: ^6.10.0 chalk: ^4.0.0 @@ -4544,7 +4559,7 @@ __metadata: eslint-scope: ^7.1.1 eslint-utils: ^3.0.0 eslint-visitor-keys: ^3.3.0 - espree: ^9.3.1 + espree: ^9.3.2 esquery: ^1.4.0 esutils: ^2.0.2 fast-deep-equal: ^3.1.3 @@ -4560,7 +4575,7 @@ __metadata: json-stable-stringify-without-jsonify: ^1.0.1 levn: ^0.4.1 lodash.merge: ^4.6.2 - minimatch: ^3.0.4 + minimatch: ^3.1.2 natural-compare: ^1.4.0 optionator: ^0.9.1 regexpp: ^3.2.0 @@ -4570,18 +4585,18 @@ __metadata: v8-compile-cache: ^2.0.3 bin: eslint: bin/eslint.js - checksum: 87d2e3e5eb93216d4ab36006e7b8c0bfad02f40b0a0f193f1d42754512cd3a9d8244152f1c69df5db2e135b3c4f1c10d0ed2f0881fe8a8c01af55465968174c1 + checksum: d8896393832e154e1381a21041cfe4d12a73a76fac26ea27cabbc0e5fdac87918ad651f07f804ef6faacd3868572de3c1ec5d96edf5502bc999eff0c423638f7 languageName: node linkType: hard -"espree@npm:^9.3.1": - version: 9.3.1 - resolution: "espree@npm:9.3.1" +"espree@npm:^9.3.2": + version: 9.3.2 + resolution: "espree@npm:9.3.2" dependencies: - acorn: ^8.7.0 - acorn-jsx: ^5.3.1 + acorn: ^8.7.1 + acorn-jsx: ^5.3.2 eslint-visitor-keys: ^3.3.0 - checksum: d7161db30b65427e0799383699ac4c441533a38faee005153694b68b933ba7a24666680edfc490fa77e3a84a22dbd955768034a6f811af5049774eead83063a5 + checksum: 9a790d6779847051e87f70d720a0f6981899a722419e80c92ab6dee01e1ab83b8ce52d11b4dc96c2c490182efb5a4c138b8b0d569205bfe1cd4629e658e58c30 languageName: node linkType: hard @@ -4679,16 +4694,16 @@ __metadata: languageName: node linkType: hard -"expect@npm:^28.0.2": - version: 28.0.2 - resolution: "expect@npm:28.0.2" +"expect@npm:^28.1.0": + version: 28.1.0 + resolution: "expect@npm:28.1.0" dependencies: - "@jest/expect-utils": ^28.0.2 + "@jest/expect-utils": ^28.1.0 jest-get-type: ^28.0.2 - jest-matcher-utils: ^28.0.2 - jest-message-util: ^28.0.2 - jest-util: ^28.0.2 - checksum: 5b638e30da6c07df46d915da5268c9dcd9d942c635b351d34b691815d35743771a1d7014e3ba11aef6d4da19f5578e1920b1711396cf1f65241e6b8571a3ae3f + jest-matcher-utils: ^28.1.0 + jest-message-util: ^28.1.0 + jest-util: ^28.1.0 + checksum: 53bfa2e094a7d5b270ce9a8dafc5432d51bb369287502acd373b66fe01072260bacd1f83bf741d5de49b008406781ab879a0247f5f6fc10d3f32fbe5a3ccfbdf languageName: node linkType: hard @@ -5752,6 +5767,15 @@ fsevents@~2.1.2: languageName: node linkType: hard +"is-builtin-module@npm:^3.1.0": + version: 3.1.0 + resolution: "is-builtin-module@npm:3.1.0" + dependencies: + builtin-modules: ^3.0.0 + checksum: f1e5dd2cd5f252d4d799b20a0c8c4f7e9c399c4d141749af76ca0121058d4062c3015d026f1b1409dd3d2a4ddfb9b15cf6eb9c370fed53fea8652ce35b5e95cb + languageName: node + linkType: hard + "is-callable@npm:^1.1.4, is-callable@npm:^1.2.4": version: 1.2.4 resolution: "is-callable@npm:1.2.4" @@ -6134,47 +6158,47 @@ fsevents@~2.1.2: languageName: node linkType: hard -"jest-circus@npm:^28.0.3": - version: 28.0.3 - resolution: "jest-circus@npm:28.0.3" +"jest-circus@npm:^28.1.0": + version: 28.1.0 + resolution: "jest-circus@npm:28.1.0" dependencies: - "@jest/environment": ^28.0.2 - "@jest/expect": ^28.0.3 - "@jest/test-result": ^28.0.2 - "@jest/types": ^28.0.2 + "@jest/environment": ^28.1.0 + "@jest/expect": ^28.1.0 + "@jest/test-result": ^28.1.0 + "@jest/types": ^28.1.0 "@types/node": "*" chalk: ^4.0.0 co: ^4.6.0 dedent: ^0.7.0 is-generator-fn: ^2.0.0 - jest-each: ^28.0.2 - jest-matcher-utils: ^28.0.2 - jest-message-util: ^28.0.2 - jest-runtime: ^28.0.3 - jest-snapshot: ^28.0.3 - jest-util: ^28.0.2 - pretty-format: ^28.0.2 + jest-each: ^28.1.0 + jest-matcher-utils: ^28.1.0 + jest-message-util: ^28.1.0 + jest-runtime: ^28.1.0 + jest-snapshot: ^28.1.0 + jest-util: ^28.1.0 + pretty-format: ^28.1.0 slash: ^3.0.0 stack-utils: ^2.0.3 throat: ^6.0.1 - checksum: d3a5212c10a73a29644ad930211102ee706d840df0d7831fe7072171a7836801a2d2a7a938c08c794ed2bb581f418ed8ee788015375ca1b4171c470d244776f2 + checksum: 29b3f6936671947b81c507132f2afeadf1789cefa1a3849d7ba6a2a32c532016c8df9a647cea6e286050b7d97f1244746175fe9fe768dd38f5bba329aa6c5bc7 languageName: node linkType: hard -"jest-cli@npm:^28.0.3": - version: 28.0.3 - resolution: "jest-cli@npm:28.0.3" +"jest-cli@npm:^28.1.0": + version: 28.1.0 + resolution: "jest-cli@npm:28.1.0" dependencies: - "@jest/core": ^28.0.3 - "@jest/test-result": ^28.0.2 - "@jest/types": ^28.0.2 + "@jest/core": ^28.1.0 + "@jest/test-result": ^28.1.0 + "@jest/types": ^28.1.0 chalk: ^4.0.0 exit: ^0.1.2 graceful-fs: ^4.2.9 import-local: ^3.0.2 - jest-config: ^28.0.3 - jest-util: ^28.0.2 - jest-validate: ^28.0.2 + jest-config: ^28.1.0 + jest-util: ^28.1.0 + jest-validate: ^28.1.0 prompts: ^2.0.1 yargs: ^17.3.1 peerDependencies: @@ -6184,34 +6208,34 @@ fsevents@~2.1.2: optional: true bin: jest: bin/jest.js - checksum: e75815a8b2eada844b099dfff4a5a038937fc7e40b944104538ac875f81317897183a854c118cd9f49525d10658b742b15d9664ec76125e3bdb72272ac174a89 + checksum: 9da98d9a7a0b670f610943be708205988030fd094029f8a64b258a5a5ef18c0b527ec7019e6b95802f2baa2241bb2d6caf31ef4fd530bcf176737e4ede1d9d79 languageName: node linkType: hard -"jest-config@npm:^28.0.3": - version: 28.0.3 - resolution: "jest-config@npm:28.0.3" +"jest-config@npm:^28.1.0": + version: 28.1.0 + resolution: "jest-config@npm:28.1.0" dependencies: "@babel/core": ^7.11.6 - "@jest/test-sequencer": ^28.0.2 - "@jest/types": ^28.0.2 - babel-jest: ^28.0.3 + "@jest/test-sequencer": ^28.1.0 + "@jest/types": ^28.1.0 + babel-jest: ^28.1.0 chalk: ^4.0.0 ci-info: ^3.2.0 deepmerge: ^4.2.2 glob: ^7.1.3 graceful-fs: ^4.2.9 - jest-circus: ^28.0.3 - jest-environment-node: ^28.0.2 + jest-circus: ^28.1.0 + jest-environment-node: ^28.1.0 jest-get-type: ^28.0.2 jest-regex-util: ^28.0.2 - jest-resolve: ^28.0.3 - jest-runner: ^28.0.3 - jest-util: ^28.0.2 - jest-validate: ^28.0.2 + jest-resolve: ^28.1.0 + jest-runner: ^28.1.0 + jest-util: ^28.1.0 + jest-validate: ^28.1.0 micromatch: ^4.0.4 parse-json: ^5.2.0 - pretty-format: ^28.0.2 + pretty-format: ^28.1.0 slash: ^3.0.0 strip-json-comments: ^3.1.1 peerDependencies: @@ -6222,19 +6246,19 @@ fsevents@~2.1.2: optional: true ts-node: optional: true - checksum: 8d63aadbe895c4704ec4e6df1badb8bb436dcfa3f13c914833f9ca65ab558118124ce15854b1680e29ec45596df5449af8cebefba9b3df1c6dc2d8fd361134d4 + checksum: 48bfbef4334a187ce6873fd515230e521f500fe2ae57e43ec5747abee95a80583e784cfb99dd1b11664774f33da63758cc63d4a2b2ecf95c8984f2a880cd773e languageName: node linkType: hard -"jest-diff@npm:^28.0.2": - version: 28.0.2 - resolution: "jest-diff@npm:28.0.2" +"jest-diff@npm:^28.1.0": + version: 28.1.0 + resolution: "jest-diff@npm:28.1.0" dependencies: chalk: ^4.0.0 diff-sequences: ^28.0.2 jest-get-type: ^28.0.2 - pretty-format: ^28.0.2 - checksum: 71601b7a20840da9b4306d22c0d88a61116f169036f7261a5f6edf9ec8800e1dfe2cc854a9b5b628bc84a2952cd5a23e5f88bda4a6979fb1dc3b863b2d9ac080 + pretty-format: ^28.1.0 + checksum: 4d90d9d18ba1d28f5520fa206831e9e8199facf28c6d2b4967c7e4cd1ee78e7e826187babdeb02073f79a1d2c186520d73f77fa29877c6547b0a79392d08a513 languageName: node linkType: hard @@ -6247,46 +6271,46 @@ fsevents@~2.1.2: languageName: node linkType: hard -"jest-each@npm:^28.0.2": - version: 28.0.2 - resolution: "jest-each@npm:28.0.2" +"jest-each@npm:^28.1.0": + version: 28.1.0 + resolution: "jest-each@npm:28.1.0" dependencies: - "@jest/types": ^28.0.2 + "@jest/types": ^28.1.0 chalk: ^4.0.0 jest-get-type: ^28.0.2 - jest-util: ^28.0.2 - pretty-format: ^28.0.2 - checksum: 37fa9e23115ff88f180580ee2ecf4433732bddb5a522cf4e990ffcb51981eae7ae2cfbcc6ef9cb4029085dbeaf9d26cd6a3af3007f5d06622a32e3e10db0ffcb + jest-util: ^28.1.0 + pretty-format: ^28.1.0 + checksum: a3d650c0c12a4bf4d4497b9de8aceb0dd96a6183dd8016ae1e4a16b11a81e0e29a58e23b0a1f5a6ca6135156041fd6bf2a4557b9d1ecd33dd417d3cb0e8005a0 languageName: node linkType: hard -"jest-environment-jsdom@npm:^28.0.2": - version: 28.0.2 - resolution: "jest-environment-jsdom@npm:28.0.2" +"jest-environment-jsdom@npm:^28.1.0": + version: 28.1.0 + resolution: "jest-environment-jsdom@npm:28.1.0" dependencies: - "@jest/environment": ^28.0.2 - "@jest/fake-timers": ^28.0.2 - "@jest/types": ^28.0.2 + "@jest/environment": ^28.1.0 + "@jest/fake-timers": ^28.1.0 + "@jest/types": ^28.1.0 "@types/jsdom": ^16.2.4 "@types/node": "*" - jest-mock: ^28.0.2 - jest-util: ^28.0.2 + jest-mock: ^28.1.0 + jest-util: ^28.1.0 jsdom: ^19.0.0 - checksum: 929281e79ec2826366110e8b550c720ebffc8ffef07d806c130e466508475b588a83a201bc66922525d53750adcbc4a9dfd75db37d8ba8a6ef6acbd7c2d27295 + checksum: b1e3354a4a6fe1486cc6cd597460e6851c4f575770582e6ade7cca852ce9af9c421cb42f071863a37a0ad81e5d57443d99b1d8b2f39eac5acde8134a29e759d2 languageName: node linkType: hard -"jest-environment-node@npm:^28.0.2": - version: 28.0.2 - resolution: "jest-environment-node@npm:28.0.2" +"jest-environment-node@npm:^28.1.0": + version: 28.1.0 + resolution: "jest-environment-node@npm:28.1.0" dependencies: - "@jest/environment": ^28.0.2 - "@jest/fake-timers": ^28.0.2 - "@jest/types": ^28.0.2 + "@jest/environment": ^28.1.0 + "@jest/fake-timers": ^28.1.0 + "@jest/types": ^28.1.0 "@types/node": "*" - jest-mock: ^28.0.2 - jest-util: ^28.0.2 - checksum: 75a0ce6b9b890ce2cf99296da151ed384a8402ab2d141181020d2cdc407cf059617fde265079255d4b0892964d805e07e4295473b422a4667263afd9f95e7e2d + jest-mock: ^28.1.0 + jest-util: ^28.1.0 + checksum: e65e83962b6d6d8879611e230d878cd2690acd20d1295071f67de7b02dfc4194438961be2a73acf005fc022fb2f73f9dafd50c23088d4e6b70156f8998b19beb languageName: node linkType: hard @@ -6297,11 +6321,11 @@ fsevents@~2.1.2: languageName: node linkType: hard -"jest-haste-map@npm:^28.0.2": - version: 28.0.2 - resolution: "jest-haste-map@npm:28.0.2" +"jest-haste-map@npm:^28.1.0": + version: 28.1.0 + resolution: "jest-haste-map@npm:28.1.0" dependencies: - "@jest/types": ^28.0.2 + "@jest/types": ^28.1.0 "@types/graceful-fs": ^4.1.3 "@types/node": "*" anymatch: ^3.0.3 @@ -6309,63 +6333,63 @@ fsevents@~2.1.2: fsevents: ^2.3.2 graceful-fs: ^4.2.9 jest-regex-util: ^28.0.2 - jest-util: ^28.0.2 - jest-worker: ^28.0.2 + jest-util: ^28.1.0 + jest-worker: ^28.1.0 micromatch: ^4.0.4 walker: ^1.0.7 dependenciesMeta: fsevents: optional: true - checksum: c1e9cb964dcfc6955272447b728ba8136fc1ec3ec41ab1e551f6c19c93c558c840278cf41b198410fe2cbb2ae7764a27f8566c226a096b5e896a0f7113f87a39 + checksum: 128c2d1aa39610febfc9fe66bbc40bb847d89da3e1646ed1bbe63e90bd4c930d1798d20aef8d928fda8e5b0570f05f1cbb263030ebe776c01bb86dd5174434da languageName: node linkType: hard -"jest-leak-detector@npm:^28.0.2": - version: 28.0.2 - resolution: "jest-leak-detector@npm:28.0.2" +"jest-leak-detector@npm:^28.1.0": + version: 28.1.0 + resolution: "jest-leak-detector@npm:28.1.0" dependencies: jest-get-type: ^28.0.2 - pretty-format: ^28.0.2 - checksum: 2e2e0a70304791bea961668d1864315583200a6acad004b2ab5688691397473d99dc932000006e71e0ba0c54a981a60eebcd5942d1d77e6ff9043a7c291b0167 + pretty-format: ^28.1.0 + checksum: 911eec6b96d389c1e7741c8df85e030a9618e38105c7e71f6f2c1284a02d033fec4e6a8916385f17fd5ed0ffffb8491ac887f5b3de11d0265d8415598e9c0ae6 languageName: node linkType: hard -"jest-matcher-utils@npm:^28.0.2": - version: 28.0.2 - resolution: "jest-matcher-utils@npm:28.0.2" +"jest-matcher-utils@npm:^28.1.0": + version: 28.1.0 + resolution: "jest-matcher-utils@npm:28.1.0" dependencies: chalk: ^4.0.0 - jest-diff: ^28.0.2 + jest-diff: ^28.1.0 jest-get-type: ^28.0.2 - pretty-format: ^28.0.2 - checksum: 3c6fab0746d4f034de681c853171a7ff5cf72226c54257225c0199762667c38457aa07f0ce61a007e94c87ac712f704535a250b5b552147b1ec521dcdea1ee89 + pretty-format: ^28.1.0 + checksum: 60e3e83fff67402972b101135d44443981d6519008e435b567f197220f330ec38356f905b6872348d082f0a2a4089612f63d2c72f55ee3c718de6b0ef03f4d6d languageName: node linkType: hard -"jest-message-util@npm:^28.0.2": - version: 28.0.2 - resolution: "jest-message-util@npm:28.0.2" +"jest-message-util@npm:^28.1.0": + version: 28.1.0 + resolution: "jest-message-util@npm:28.1.0" dependencies: "@babel/code-frame": ^7.12.13 - "@jest/types": ^28.0.2 + "@jest/types": ^28.1.0 "@types/stack-utils": ^2.0.0 chalk: ^4.0.0 graceful-fs: ^4.2.9 micromatch: ^4.0.4 - pretty-format: ^28.0.2 + pretty-format: ^28.1.0 slash: ^3.0.0 stack-utils: ^2.0.3 - checksum: 61a180667fe5c00551b1e0cb8ee09a4844bbdebb6940e3810aad5fac9bc647862572dedf20c8cf77b9643679d4947b0452d8e3afcef7e3b4139997447384facc + checksum: a224f9dbb53b5ad857918938f94c6e5d9c64ccdd42e0780b3b485d66bd93c82cff7dd91fbe274273efb69533d79808f9c98622b23d70ec027e8619a20e283773 languageName: node linkType: hard -"jest-mock@npm:^28.0.2": - version: 28.0.2 - resolution: "jest-mock@npm:28.0.2" +"jest-mock@npm:^28.1.0": + version: 28.1.0 + resolution: "jest-mock@npm:28.1.0" dependencies: - "@jest/types": ^28.0.2 + "@jest/types": ^28.1.0 "@types/node": "*" - checksum: 81d466d9b2e2dacd0fed88264182e5d4338a0f95c9d6275532387796e81b649cd4d9719807814efdd58e2ce6858b6a8d189d59c2fed030bfe93cd108ffe9c62c + checksum: 013428db82f418059314588e5d02a2a8f6697940ffeb1b1a23f61e9b94b1dca3ea0061d91f284e217bf0ce0e5251ff8f2f182a393cecd1ec6788d766cc18ded4 languageName: node linkType: hard @@ -6388,185 +6412,185 @@ fsevents@~2.1.2: languageName: node linkType: hard -"jest-resolve-dependencies@npm:^28.0.3": - version: 28.0.3 - resolution: "jest-resolve-dependencies@npm:28.0.3" +"jest-resolve-dependencies@npm:^28.1.0": + version: 28.1.0 + resolution: "jest-resolve-dependencies@npm:28.1.0" dependencies: jest-regex-util: ^28.0.2 - jest-snapshot: ^28.0.3 - checksum: 86a5ade0130b6b437582cedbd6e5a5eeabde7efdacb16be3195553cc64e558b9009631a0c66e471b92cabe2bce0ab066373562f6bd0f6240254b29e6719716a3 + jest-snapshot: ^28.1.0 + checksum: 0720ab19285ee64b7dad65c2feff08323660e9ff9c09380011a45d4af58dcf6a6710f10bbe80986ffe2452e11d09be0974d42163c31e832be4fab6c348b4dea5 languageName: node linkType: hard -"jest-resolve@npm:^28.0.3": - version: 28.0.3 - resolution: "jest-resolve@npm:28.0.3" +"jest-resolve@npm:^28.1.0": + version: 28.1.0 + resolution: "jest-resolve@npm:28.1.0" dependencies: chalk: ^4.0.0 graceful-fs: ^4.2.9 - jest-haste-map: ^28.0.2 + jest-haste-map: ^28.1.0 jest-pnp-resolver: ^1.2.2 - jest-util: ^28.0.2 - jest-validate: ^28.0.2 + jest-util: ^28.1.0 + jest-validate: ^28.1.0 resolve: ^1.20.0 resolve.exports: ^1.1.0 slash: ^3.0.0 - checksum: e61366049dec12386cca90c029c13ffff31fecb9aff664972a89e864f0aabc2253e352154130ab905c972991c0f58ca907d23ef1733baf8800ee8b13063c10fb + checksum: 1a37e3a8a1b49a148c4611f85cb27dbb6b0b2d1b76b8a52ddfeb340a74f6d2a7851ba8ba2374948a21024d56592f32b48e3142e9fd813a0fcea4d1db3602ec77 languageName: node linkType: hard -"jest-runner@npm:^28.0.3": - version: 28.0.3 - resolution: "jest-runner@npm:28.0.3" +"jest-runner@npm:^28.1.0": + version: 28.1.0 + resolution: "jest-runner@npm:28.1.0" dependencies: - "@jest/console": ^28.0.2 - "@jest/environment": ^28.0.2 - "@jest/test-result": ^28.0.2 - "@jest/transform": ^28.0.3 - "@jest/types": ^28.0.2 + "@jest/console": ^28.1.0 + "@jest/environment": ^28.1.0 + "@jest/test-result": ^28.1.0 + "@jest/transform": ^28.1.0 + "@jest/types": ^28.1.0 "@types/node": "*" chalk: ^4.0.0 emittery: ^0.10.2 graceful-fs: ^4.2.9 jest-docblock: ^28.0.2 - jest-environment-node: ^28.0.2 - jest-haste-map: ^28.0.2 - jest-leak-detector: ^28.0.2 - jest-message-util: ^28.0.2 - jest-resolve: ^28.0.3 - jest-runtime: ^28.0.3 - jest-util: ^28.0.2 - jest-watcher: ^28.0.2 - jest-worker: ^28.0.2 + jest-environment-node: ^28.1.0 + jest-haste-map: ^28.1.0 + jest-leak-detector: ^28.1.0 + jest-message-util: ^28.1.0 + jest-resolve: ^28.1.0 + jest-runtime: ^28.1.0 + jest-util: ^28.1.0 + jest-watcher: ^28.1.0 + jest-worker: ^28.1.0 source-map-support: 0.5.13 throat: ^6.0.1 - checksum: dcdf21c93b2f2612a1b407493ae3562a52d800de1c88fcebd929acaa650b26e7b7527a10a563fade853983d1b0bfb438ed6a297405fe088fca9ed25b6a2fe16a + checksum: 79f622a06e7b4f065b6ad14633ddb3ebabdacc479d4059a17bad4470570f941623957701cf08a3efe49c0cf04f78830fc07270ad8ad759b623a9de1bcb93c45f languageName: node linkType: hard -"jest-runtime@npm:^28.0.3": - version: 28.0.3 - resolution: "jest-runtime@npm:28.0.3" +"jest-runtime@npm:^28.1.0": + version: 28.1.0 + resolution: "jest-runtime@npm:28.1.0" dependencies: - "@jest/environment": ^28.0.2 - "@jest/fake-timers": ^28.0.2 - "@jest/globals": ^28.0.3 + "@jest/environment": ^28.1.0 + "@jest/fake-timers": ^28.1.0 + "@jest/globals": ^28.1.0 "@jest/source-map": ^28.0.2 - "@jest/test-result": ^28.0.2 - "@jest/transform": ^28.0.3 - "@jest/types": ^28.0.2 + "@jest/test-result": ^28.1.0 + "@jest/transform": ^28.1.0 + "@jest/types": ^28.1.0 chalk: ^4.0.0 cjs-module-lexer: ^1.0.0 collect-v8-coverage: ^1.0.0 execa: ^5.0.0 glob: ^7.1.3 graceful-fs: ^4.2.9 - jest-haste-map: ^28.0.2 - jest-message-util: ^28.0.2 - jest-mock: ^28.0.2 + jest-haste-map: ^28.1.0 + jest-message-util: ^28.1.0 + jest-mock: ^28.1.0 jest-regex-util: ^28.0.2 - jest-resolve: ^28.0.3 - jest-snapshot: ^28.0.3 - jest-util: ^28.0.2 + jest-resolve: ^28.1.0 + jest-snapshot: ^28.1.0 + jest-util: ^28.1.0 slash: ^3.0.0 strip-bom: ^4.0.0 - checksum: 02fd3ec8fd16e1a5fe385be68bb32ad1157fd1c2704c640a3c01b827af207a9cb92c787f8497d31a1145b052b37afa55d0101c07b35eb65b47d163e3ae2e9870 + checksum: e3a01bbbf6ffb28174303e2d2c043fb766b178a6354186dcbe8e8cc8e706162ecfb2b6f49d71ec7b2459dc6701979ffeee003fdf153492b9e74a846cf11af5d8 languageName: node linkType: hard -"jest-snapshot@npm:^28.0.3": - version: 28.0.3 - resolution: "jest-snapshot@npm:28.0.3" +"jest-snapshot@npm:^28.1.0": + version: 28.1.0 + resolution: "jest-snapshot@npm:28.1.0" dependencies: "@babel/core": ^7.11.6 "@babel/generator": ^7.7.2 "@babel/plugin-syntax-typescript": ^7.7.2 "@babel/traverse": ^7.7.2 "@babel/types": ^7.3.3 - "@jest/expect-utils": ^28.0.2 - "@jest/transform": ^28.0.3 - "@jest/types": ^28.0.2 + "@jest/expect-utils": ^28.1.0 + "@jest/transform": ^28.1.0 + "@jest/types": ^28.1.0 "@types/babel__traverse": ^7.0.6 "@types/prettier": ^2.1.5 babel-preset-current-node-syntax: ^1.0.0 chalk: ^4.0.0 - expect: ^28.0.2 + expect: ^28.1.0 graceful-fs: ^4.2.9 - jest-diff: ^28.0.2 + jest-diff: ^28.1.0 jest-get-type: ^28.0.2 - jest-haste-map: ^28.0.2 - jest-matcher-utils: ^28.0.2 - jest-message-util: ^28.0.2 - jest-util: ^28.0.2 + jest-haste-map: ^28.1.0 + jest-matcher-utils: ^28.1.0 + jest-message-util: ^28.1.0 + jest-util: ^28.1.0 natural-compare: ^1.4.0 - pretty-format: ^28.0.2 + pretty-format: ^28.1.0 semver: ^7.3.5 - checksum: e4f576dc237958ff9f2f74c2568a1657898e8843dc382d19743a784b7761e78538a598ecd9ef338f44effcfb44a96b10383ed0755ad6f95285fc9ae749f68951 + checksum: 73695484cf4e2af9d0dbb8bc1e851f6d6217cc740aa93b521012c253fbbd9dc1ce11b147ac3e18cac8358b4b64fe36a1b8a6d1a3083c9d275dd937281faad818 languageName: node linkType: hard -"jest-util@npm:^28.0.2": - version: 28.0.2 - resolution: "jest-util@npm:28.0.2" +"jest-util@npm:^28.1.0": + version: 28.1.0 + resolution: "jest-util@npm:28.1.0" dependencies: - "@jest/types": ^28.0.2 + "@jest/types": ^28.1.0 "@types/node": "*" chalk: ^4.0.0 ci-info: ^3.2.0 graceful-fs: ^4.2.9 picomatch: ^2.2.3 - checksum: 3e50e73c93c36ebc378c22b47ba02bf0bbe093266553956a8186e2670080c125d9419b1efeadb4ce59561c28d2df9af15fa19e1fdb9c0b4c3a3fe7c2f0af51a7 + checksum: 14c2ee1c24c6efa2d7adfe81ece8b9bbda78fa871f40bed80db72726166e96f7fb22bf1d9fb1689fb433b9bcd748027eb1ee5f0851a12f1aa1c49ee0bd4d7508 languageName: node linkType: hard -"jest-validate@npm:^28.0.2": - version: 28.0.2 - resolution: "jest-validate@npm:28.0.2" +"jest-validate@npm:^28.1.0": + version: 28.1.0 + resolution: "jest-validate@npm:28.1.0" dependencies: - "@jest/types": ^28.0.2 + "@jest/types": ^28.1.0 camelcase: ^6.2.0 chalk: ^4.0.0 jest-get-type: ^28.0.2 leven: ^3.1.0 - pretty-format: ^28.0.2 - checksum: 91338873adfbf5db68b2453b8c3abbe0454a918799a3a3697af860439f4481563d01834e69cd8a44de7cd8e9b8a42e94d9facedc1bc5bf461fa46caefb7df054 + pretty-format: ^28.1.0 + checksum: 79f9fe39f15bb47b15da39e19a1b2ba948830b6da53ccf359857cdeaca62cd87721585b0137576e7d1d2b2d7e5b79fdfb57d5b80e6ce3c8a93865d6032b20e4a languageName: node linkType: hard -"jest-watcher@npm:^28.0.2": - version: 28.0.2 - resolution: "jest-watcher@npm:28.0.2" +"jest-watcher@npm:^28.1.0": + version: 28.1.0 + resolution: "jest-watcher@npm:28.1.0" dependencies: - "@jest/test-result": ^28.0.2 - "@jest/types": ^28.0.2 + "@jest/test-result": ^28.1.0 + "@jest/types": ^28.1.0 "@types/node": "*" ansi-escapes: ^4.2.1 chalk: ^4.0.0 emittery: ^0.10.2 - jest-util: ^28.0.2 + jest-util: ^28.1.0 string-length: ^4.0.1 - checksum: 11ee5ad02d4427eb290406c59615afa009125ae21ff0c1ad9c4e094270f3ec89535caa1bcfc72883251eacfccc29d3c9eb63da26d4525d82a014bd8d7c2bfdd9 + checksum: 4a1ae2e1adf933cfa963b0f82cb4fecd863f1b980b7db05dfd856e83637b9380a4476a73dcbe50a70cb49d028999fae0d1bb60d75b410a682d8b3f344a073dda languageName: node linkType: hard -"jest-worker@npm:^28.0.2": - version: 28.0.2 - resolution: "jest-worker@npm:28.0.2" +"jest-worker@npm:^28.1.0": + version: 28.1.0 + resolution: "jest-worker@npm:28.1.0" dependencies: "@types/node": "*" merge-stream: ^2.0.0 supports-color: ^8.0.0 - checksum: c60ee11920fe84390ff8ffdd3bf001e25de718004c5c9c709dd080671a7cd88760d8b894cc5e15caa86dac478ae5d0a360c44f4bac5b86ed7e06c24a5b2ea83d + checksum: 44b6cfb03752543e2462f143ca5c9642206f20813068ef0461e793bb8feda85f643ee906d96a0a57728e1a2fb5b89386fd34e44289568b1cee5815c115e7ee02 languageName: node linkType: hard -"jest@npm:^28.0.3": - version: 28.0.3 - resolution: "jest@npm:28.0.3" +"jest@npm:^28.1.0": + version: 28.1.0 + resolution: "jest@npm:28.1.0" dependencies: - "@jest/core": ^28.0.3 + "@jest/core": ^28.1.0 import-local: ^3.0.2 - jest-cli: ^28.0.3 + jest-cli: ^28.1.0 peerDependencies: node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0 peerDependenciesMeta: @@ -6574,7 +6598,7 @@ fsevents@~2.1.2: optional: true bin: jest: bin/jest.js - checksum: 2596927a56610b0e41b2eb6a41234ae5fa04208f535b2e36392184a2cc5b3d28a49ac1b9cf3ebd75604210a5fe5cea534ba0b8381a6698faccb4b4c462a44650 + checksum: f025164c408cf5ddb6e74dac1e8cbaf94c1c31dd1c67aba4ceee5989b2d8a77886db8ed1fb88853b45cf194b14cd802b454bbbe6b278a1e2140250297dc100d3 languageName: node linkType: hard @@ -7946,15 +7970,15 @@ fsevents@~2.1.2: languageName: node linkType: hard -"pretty-format@npm:^28.0.2": - version: 28.0.2 - resolution: "pretty-format@npm:28.0.2" +"pretty-format@npm:^28.1.0": + version: 28.1.0 + resolution: "pretty-format@npm:28.1.0" dependencies: "@jest/schemas": ^28.0.2 ansi-regex: ^5.0.1 ansi-styles: ^5.0.0 react-is: ^18.0.0 - checksum: 785ce1928f17de0e250496e0413fb9ad883a4d5ebb6e9b346f3094140eb2af096770de8b6d3b8adffc0e9692d031d62a603c851e9f3b81b2670a086ad256ad77 + checksum: c1018099f8f800693449df96c05c243d94e01f7429b6617e1064a1a69b4d715637fc3c579061fbc31548b87d92af74a7933c6eb3856da6f30b29c0ff67004ce0 languageName: node linkType: hard @@ -8460,9 +8484,9 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard -"rollup@npm:^2.70.2": - version: 2.70.2 - resolution: "rollup@npm:2.70.2" +"rollup@npm:^2.72.1": + version: 2.72.1 + resolution: "rollup@npm:2.72.1" dependencies: fsevents: ~2.3.2 dependenciesMeta: @@ -8470,7 +8494,7 @@ resolve@^2.0.0-next.3: optional: true bin: rollup: dist/bin/rollup - checksum: eb04eb9b87b30517308cb41018d57a23976f42b269c3229e4124746d3136a77aa16ba8b891a3fa571931dd72419eea40642a334835fe4f33161fea30d0b803f7 + checksum: 3dca122129f560acc3c54dd5bd5f9470dd562d74f61c652c57b6a4355a963c0828640382ebff544f1b0e71387733a51fb963d6f761ae1f05a84f5923bbde883c languageName: node linkType: hard @@ -8479,7 +8503,7 @@ resolve@^2.0.0-next.3: resolution: "root-workspace-0b6124@workspace:." dependencies: "@babel/core": ^7.17.10 - "@polkadot/dev": ^0.66.16 + "@polkadot/dev": ^0.66.18 fflate: ^0.7.3 override-require: ^1.1.1 languageName: unknown