quantus/wasm
1
0
Fork 0
Code Issues 1 Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Single instance package detection (#160)

Browse Source 
* Single instance package detection

* s/require/request/

* Internal isReady

* Revert unneeded from-build alias
This commit is contained in:
Jaco Greeff
2020-12-15 16:04:22 +01:00
committed by GitHub
parent 7898d95844
commit f01a9b187e
10 changed files with 116 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG.md
View File

@@ -1,5 +1,12 @@
# CHANGELOG
## 3.0.2-x
Changes:
- Single-instance package detection
## 3.0.1 Dec 13, 2020
**Important** This assumes `@polkadot/util` 5+ peerDependencies

2
package.json
View File

@@ -24,7 +24,7 @@
},
"devDependencies": {
"@babel/core": "^7.12.10",
"@polkadot/dev": "^0.61.1"
"@polkadot/dev": "^0.61.5"
},
"version": "3.0.1"
}

6
packages/wasm-crypto/package.json
View File

@@ -9,9 +9,9 @@
"@polkadot/wasm-crypto-wasm": "^3.0.1"
},
"devDependencies": {
"@polkadot/dev": "^0.61.1",
"@polkadot/util": "^4.2.2-15",
"@polkadot/x-randomvalues": "^4.2.2-15",
"@polkadot/dev": "^0.61.5",
"@polkadot/util": "^5.0.1",
"@polkadot/x-randomvalues": "^5.0.1",
"override-require": "^1.1.1"
},
"peerDependencies": {

8
packages/wasm-crypto/src/detectPackage.ts Normal file
View File

@@ -0,0 +1,8 @@
// Copyright 2017-2020 @polkadot/wasm-crypto authors & contributors
// SPDX-License-Identifier: Apache-2.0
import { detectPackage } from '@polkadot/util';
import packageInfo from './package-info.json';
detectPackage(packageInfo, typeof __dirname !== 'undefined' && __dirname);

4
packages/wasm-crypto/src/index.ts
View File

@@ -1,6 +1,8 @@
// Copyright 2019-2020 @polkadot/wasm-crypto authors & contributors
// SPDX-License-Identifier: Apache-2.0
import './detectPackage';
import { asmJsInit } from '@polkadot/wasm-crypto-asmjs';
import { wasmBytes } from '@polkadot/wasm-crypto-wasm';
@@ -225,5 +227,5 @@ export function isReady (): boolean {
}
export function waitReady (): Promise<boolean> {
return wasmPromise.then(() => !!getWasm());
return wasmPromise.then(() => isReady());
}

11
packages/wasm-crypto/src/json.d.ts vendored Normal file
View File

@@ -0,0 +1,11 @@
// Copyright 2017-2020 @polkadot/wasm-crypto authors & contributors
// SPDX-License-Identifier: Apache-2.0
// Be able to import json in TS
// https://stackoverflow.com/questions/49996456/importing-json-file-in-typescript
declare module '*.json' {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const value: any;
export default value;
}

12
packages/wasm-crypto/test/alias-imports.js Normal file
View File

@@ -0,0 +1,12 @@
// Copyright 2019-2020 @polkadot/wasm-crypto authors & contributors
// SPDX-License-Identifier: Apache-2.0
require('override-require')(
(request) =>
request.endsWith('@polkadot/wasm-crypto-asmjs') ||
request.endsWith('@polkadot/wasm-crypto-wasm'),
(request) =>
request.endsWith('@polkadot/wasm-crypto-asmjs')
? require('../../wasm-crypto-asmjs/build/data')
: require('../../wasm-crypto-wasm/build/empty')
);

10
packages/wasm-crypto/test/asm.js
View File

@@ -3,15 +3,7 @@
global.WebAssembly = null;
require('override-require')(
(request) =>
request.endsWith('@polkadot/wasm-crypto-asmjs') ||
request.endsWith('@polkadot/wasm-crypto-wasm'),
(request) =>
request.endsWith('@polkadot/wasm-crypto-asmjs')
? require('../../wasm-crypto-asmjs/build/data')
: require('../../wasm-crypto-wasm/build/empty')
);
require('./alias-imports');
const { runUnassisted } = require('./all');

10
packages/wasm-crypto/test/wasm.js
View File

@@ -1,15 +1,7 @@
// Copyright 2019-2020 @polkadot/wasm-crypto authors & contributors
// SPDX-License-Identifier: Apache-2.0
require('override-require')(
(request) =>
request.endsWith('@polkadot/wasm-crypto-asmjs') ||
request.endsWith('@polkadot/wasm-crypto-wasm'),
(request) =>
request.endsWith('@polkadot/wasm-crypto-asmjs')
? require('../../wasm-crypto-asmjs/build/empty')
: require('../../wasm-crypto-wasm/build/data')
);
require('./alias-imports');
const { runUnassisted } = require('./all');

138
yarn.lock
View File

@@ -1686,9 +1686,9 @@ __metadata:
languageName: node
linkType: hard
"@polkadot/dev@npm:^0.61.1":
version: 0.61.1
resolution: "@polkadot/dev@npm:0.61.1"
"@polkadot/dev@npm:^0.61.5":
version: 0.61.5
resolution: "@polkadot/dev@npm:0.61.5"
dependencies:
"@babel/cli": ^7.12.10
"@babel/core": ^7.12.10
@@ -1712,8 +1712,8 @@ __metadata:
"@babel/register": ^7.12.10
"@babel/runtime": ^7.12.5
"@rushstack/eslint-patch": ^1.0.6
"@typescript-eslint/eslint-plugin": 4.9.1
"@typescript-eslint/parser": 4.9.1
"@typescript-eslint/eslint-plugin": 4.10.0
"@typescript-eslint/parser": 4.10.0
"@vue/component-compiler-utils": ^3.2.0
babel-jest: ^26.6.3
babel-plugin-module-extension-resolver: ^1.0.0-rc.1
@@ -1775,22 +1775,22 @@ __metadata:
polkadot-exec-typedoc: scripts/polkadot-exec-typedoc.cjs
polkadot-exec-vuepress: scripts/polkadot-exec-vuepress.cjs
polkadot-exec-webpack: scripts/polkadot-exec-webpack.cjs
checksum: b483cff04845f5acb075618a93dbe4472d4a63c027a9b5cbcb6015da930e9942bebad5f1215a47f82ca844e260d60cefec65bdd492b008a0fcc3eff23ae7c948
checksum: f58b0190986d600ddbd46ce854eca164ee7bc71ec4c09614b01ce96ca8256a63871b6344f3d0819d778a15de6b787c730ded12a863c3172f74decc65adaa1f4d
languageName: node
linkType: hard
"@polkadot/util@npm:^4.2.2-15":
version: 4.2.2-15
resolution: "@polkadot/util@npm:4.2.2-15"
"@polkadot/util@npm:^5.0.1":
version: 5.0.1
resolution: "@polkadot/util@npm:5.0.1"
dependencies:
"@babel/runtime": ^7.12.5
"@polkadot/x-textdecoder": 4.2.2-15
"@polkadot/x-textencoder": 4.2.2-15
"@polkadot/x-textdecoder": 5.0.1
"@polkadot/x-textencoder": 5.0.1
"@types/bn.js": ^4.11.6
bn.js: ^4.11.9
camelcase: ^5.3.1
ip-regex: ^4.2.0
checksum: 268630b60794bcaf6626ba3aee209f7418fecf1417cd985a18cbc25ec0d692a63344cb67f6aaeca395a9ad2fa6e175eed1de921123c20a45ff78e299e5b92041
checksum: d1173668f68e9b4c439b539e414fb5ac2dfa0d83a81534388b385bb0234c027dfb49923477b9cfe6fa9a203b1e916fff68bb0329417b40525dc2ec44bb741a6f
languageName: node
linkType: hard
@@ -1816,11 +1816,11 @@ __metadata:
resolution: "@polkadot/wasm-crypto@workspace:packages/wasm-crypto"
dependencies:
"@babel/runtime": ^7.12.5
"@polkadot/dev": ^0.61.1
"@polkadot/util": ^4.2.2-15
"@polkadot/dev": ^0.61.5
"@polkadot/util": ^5.0.1
"@polkadot/wasm-crypto-asmjs": ^3.0.1
"@polkadot/wasm-crypto-wasm": ^3.0.1
"@polkadot/x-randomvalues": ^4.2.2-15
"@polkadot/x-randomvalues": ^5.0.1
override-require: ^1.1.1
peerDependencies:
"@polkadot/util": "*"
@@ -1828,30 +1828,30 @@ __metadata:
languageName: unknown
linkType: soft
"@polkadot/x-randomvalues@npm:^4.2.2-15":
version: 4.2.2-15
resolution: "@polkadot/x-randomvalues@npm:4.2.2-15"
"@polkadot/x-randomvalues@npm:^5.0.1":
version: 5.0.1
resolution: "@polkadot/x-randomvalues@npm:5.0.1"
dependencies:
"@babel/runtime": ^7.12.5
checksum: 2dcde33e485f6b5f01164d926a31871569f53d31ce9c9a374c99883b142942b127b6bf2050d5b22104af6c1493ff0bdb99bae941644225c7bb718a39c8f43096
checksum: a556c94c677628cdfc7b5e0f7b94ee7a211dd2f48388ddcc58ad7b8dd4d2cccbeb9efe2038adebfc0039a9f66da7517b68bfc94cbd470fe796a0326f77a3be07
languageName: node
linkType: hard
"@polkadot/x-textdecoder@npm:4.2.2-15":
version: 4.2.2-15
resolution: "@polkadot/x-textdecoder@npm:4.2.2-15"
"@polkadot/x-textdecoder@npm:5.0.1":
version: 5.0.1
resolution: "@polkadot/x-textdecoder@npm:5.0.1"
dependencies:
"@babel/runtime": ^7.12.5
checksum: 613e253033947c0049798302226d68941b4cf6a3cd60372766578d13ece7b319d93ddd69e7179f49461031ba0bbed8fc93126157e2cc95afbb5b107c80822e3c
checksum: d68160d81ed252aeabaecab97ed12c780437fa6348a59cfcbe997b73b095d8f3674bfbbded587215eb2f375da6056b8ae2db01683742aeeb9995e9217c5c8720
languageName: node
linkType: hard
"@polkadot/x-textencoder@npm:4.2.2-15":
version: 4.2.2-15
resolution: "@polkadot/x-textencoder@npm:4.2.2-15"
"@polkadot/x-textencoder@npm:5.0.1":
version: 5.0.1
resolution: "@polkadot/x-textencoder@npm:5.0.1"
dependencies:
"@babel/runtime": ^7.12.5
checksum: a7541e899be2375b4cb1913896e7acbc774fcd891947c53d540afd8ebfcca2216c8f31a84e428d88506dda5325369584b7b7e32559b0e6b91e34644884fc0a2c
checksum: fc864da056d86484342f51960ef74fe5f63b34e2945416375d29d7272af8bef385e5fa508c3f3dc7cab6da2ad8aa54805d0ef40136b83e1b0bc04df6cd9b3aa4
languageName: node
linkType: hard
@@ -2056,12 +2056,12 @@ __metadata:
languageName: node
linkType: hard
"@typescript-eslint/eslint-plugin@npm:4.9.1":
version: 4.9.1
resolution: "@typescript-eslint/eslint-plugin@npm:4.9.1"
"@typescript-eslint/eslint-plugin@npm:4.10.0":
version: 4.10.0
resolution: "@typescript-eslint/eslint-plugin@npm:4.10.0"
dependencies:
"@typescript-eslint/experimental-utils": 4.9.1
"@typescript-eslint/scope-manager": 4.9.1
"@typescript-eslint/experimental-utils": 4.10.0
"@typescript-eslint/scope-manager": 4.10.0
debug: ^4.1.1
functional-red-black-tree: ^1.0.1
regexpp: ^3.0.0
@@ -2073,66 +2073,66 @@ __metadata:
peerDependenciesMeta:
typescript:
optional: true
checksum: 8de2705aaf40252c16e0408e3eee5e04c2048608ab2a3e3a40d65057e7abd185c7fad33b3d586836dd670452ec008edcbb00055a565ce86e6621f3ea71f6ef24
checksum: 7c9ef88c112ad81b75697023f3e8df0bb69c33d130868003b55e02416a620ad0e95341576b10050d16d4e04a4c87b1721d762ad5367bc9c2d305a23ab4f94505
languageName: node
linkType: hard
"@typescript-eslint/experimental-utils@npm:4.9.1":
version: 4.9.1
resolution: "@typescript-eslint/experimental-utils@npm:4.9.1"
"@typescript-eslint/experimental-utils@npm:4.10.0":
version: 4.10.0
resolution: "@typescript-eslint/experimental-utils@npm:4.10.0"
dependencies:
"@types/json-schema": ^7.0.3
"@typescript-eslint/scope-manager": 4.9.1
"@typescript-eslint/types": 4.9.1
"@typescript-eslint/typescript-estree": 4.9.1
"@typescript-eslint/scope-manager": 4.10.0
"@typescript-eslint/types": 4.10.0
"@typescript-eslint/typescript-estree": 4.10.0
eslint-scope: ^5.0.0
eslint-utils: ^2.0.0
peerDependencies:
eslint: "*"
checksum: fee1f272addbcd453a8f477cd31bb62c6f445b0e7b642e99cb134aa3cfc72a691e51e5aacc5b70cc6f8f18d234f4c8bf1772d3abc683befa0d82f1efd6474cd0
checksum: 20dad7bdb6e0694cf6b89edd35d9568ac91e76f7ad84bb052a7e79c764a84ebfc32ecd14d924c34e5c0d9e07961d27cdc209858a7861199c771f10eb77bc801e
languageName: node
linkType: hard
"@typescript-eslint/parser@npm:4.9.1":
version: 4.9.1
resolution: "@typescript-eslint/parser@npm:4.9.1"
"@typescript-eslint/parser@npm:4.10.0":
version: 4.10.0
resolution: "@typescript-eslint/parser@npm:4.10.0"
dependencies:
"@typescript-eslint/scope-manager": 4.9.1
"@typescript-eslint/types": 4.9.1
"@typescript-eslint/typescript-estree": 4.9.1
"@typescript-eslint/scope-manager": 4.10.0
"@typescript-eslint/types": 4.10.0
"@typescript-eslint/typescript-estree": 4.10.0
debug: ^4.1.1
peerDependencies:
eslint: ^5.0.0 || ^6.0.0 || ^7.0.0
peerDependenciesMeta:
typescript:
optional: true
checksum: 61fc1b3e9bfd5056b46337bbea333eb0b86391232ff63669a4e5c08766e041f2cf05ab769374a1b8fde25728646e5b4441d992476cc66abab2a72289cdabfc5a
checksum: 8968583d8c789a2b3f33d9acc258297ddafc083eb339322f87402e21690a3e0b9c32926d3729a38b5c143af2702bda9d7d0531469ac11da068cf4004689c8e48
languageName: node
linkType: hard
"@typescript-eslint/scope-manager@npm:4.9.1":
version: 4.9.1
resolution: "@typescript-eslint/scope-manager@npm:4.9.1"
"@typescript-eslint/scope-manager@npm:4.10.0":
version: 4.10.0
resolution: "@typescript-eslint/scope-manager@npm:4.10.0"
dependencies:
"@typescript-eslint/types": 4.9.1
"@typescript-eslint/visitor-keys": 4.9.1
checksum: 352c9c2dd8057210376a65aa753e330d3b6ed670a8686905acbd81d118062d4f0a5043b28bedf6340d6e29a386b58c8e9bee7732fca1d21fdab69dea1554b9db
"@typescript-eslint/types": 4.10.0
"@typescript-eslint/visitor-keys": 4.10.0
checksum: c320c086637a532400ce6e34aedb66e443b0e5ab725e814093a585419053f8e404aab8f7ea890f0866c2137fe7108b34f9c9216d8a74f4908f17b263d5086dd9
languageName: node
linkType: hard
"@typescript-eslint/types@npm:4.9.1":
version: 4.9.1
resolution: "@typescript-eslint/types@npm:4.9.1"
checksum: e7c5094ce054e2443c4304b6fa35cae8937ffa04f32b0f32db71738671e0ec94a54f29e820745079067fdafa0061a58846b5cde4390f0a9804d5ca7075e89f76
"@typescript-eslint/types@npm:4.10.0":
version: 4.10.0
resolution: "@typescript-eslint/types@npm:4.10.0"
checksum: e82f04695b11792e49c8b9fc60e289f337f7c31b68d04a6f2405163b8a85462eff683ad62e2694368432024f18cdc4d592fe048372774b6cb65057715e9c3105
languageName: node
linkType: hard
"@typescript-eslint/typescript-estree@npm:4.9.1":
version: 4.9.1
resolution: "@typescript-eslint/typescript-estree@npm:4.9.1"
"@typescript-eslint/typescript-estree@npm:4.10.0":
version: 4.10.0
resolution: "@typescript-eslint/typescript-estree@npm:4.10.0"
dependencies:
"@typescript-eslint/types": 4.9.1
"@typescript-eslint/visitor-keys": 4.9.1
"@typescript-eslint/types": 4.10.0
"@typescript-eslint/visitor-keys": 4.10.0
debug: ^4.1.1
globby: ^11.0.1
is-glob: ^4.0.1
@@ -2142,7 +2142,7 @@ __metadata:
peerDependenciesMeta:
typescript:
optional: true
checksum: cb5ce82696ac4d7d8ce63a54dd522511d3231193d07be44b2456d9f22890c6cdbb03e531ec889629081d9e4a2c322566424246da02e2d82c80625eb346b91006
checksum: fbc87779af4fa59a5caae47a9429a2229303066c760db46e824d8bdb6d437e1c887d82e9bc85f89570189aacb899875f9b677cadd6b28fa47364ddd2b8f92268
languageName: node
linkType: hard
@@ -2164,13 +2164,13 @@ __metadata:
languageName: node
linkType: hard
"@typescript-eslint/visitor-keys@npm:4.9.1":
version: 4.9.1
resolution: "@typescript-eslint/visitor-keys@npm:4.9.1"
"@typescript-eslint/visitor-keys@npm:4.10.0":
version: 4.10.0
resolution: "@typescript-eslint/visitor-keys@npm:4.10.0"
dependencies:
"@typescript-eslint/types": 4.9.1
"@typescript-eslint/types": 4.10.0
eslint-visitor-keys: ^2.0.0
checksum: 1b059e2ffd0432f588d13160a8f7d64dff30a8727e0c3c5c0235db1be8b13f08544b2eab8374157b8fbc77ad8f58e768ae3c5266d61275f275dc2cda8aad6717
checksum: e8d8057632a4aa5595769da14d41a19cbc4a6c02539e5c882b218b2f347445a397f9ef28ffc8b9eefa4d271bed39aa9e3adb182416840f1c73ecf59a0abac876
languageName: node
linkType: hard
@@ -8567,7 +8567,7 @@ fsevents@~2.1.2:
resolution: "root-workspace-0b6124@workspace:."
dependencies:
"@babel/core": ^7.12.10
"@polkadot/dev": ^0.61.1
"@polkadot/dev": ^0.61.5
languageName: unknown
linkType: soft