From 123bb2a09cd49cc0fd376642cd56742325b8c5d5 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Thu, 17 Dec 2020 12:28:28 +0100 Subject: [PATCH] detectPackage function --- packages/wasm-crypto-asmjs/package.json | 2 ++ packages/wasm-crypto-wasm/package.json | 2 ++ packages/wasm-crypto/package.json | 6 ++-- packages/wasm-crypto/src/detectPackage.js | 2 +- packages/wasm-crypto/src/detectPackage.mjs | 2 +- yarn.lock | 40 +++++++++++----------- 6 files changed, 30 insertions(+), 24 deletions(-) diff --git a/packages/wasm-crypto-asmjs/package.json b/packages/wasm-crypto-asmjs/package.json index ab9fdca8..c3f1d208 100644 --- a/packages/wasm-crypto-asmjs/package.json +++ b/packages/wasm-crypto-asmjs/package.json @@ -4,7 +4,9 @@ "description": "Asm.js content for wasm-crypto", "browser": "empty.js", "main": "empty.js", + "module": "empty.mjs", "react-native": "data.js", + "sideEffects": false, "author": "Jaco Greeff ", "maintainers": [], "contributors": [], diff --git a/packages/wasm-crypto-wasm/package.json b/packages/wasm-crypto-wasm/package.json index b6dee8b6..06ba0ab8 100644 --- a/packages/wasm-crypto-wasm/package.json +++ b/packages/wasm-crypto-wasm/package.json @@ -4,7 +4,9 @@ "description": "Wasm content for wasm-crypto", "browser": "data.js", "main": "data.js", + "module": "data.mjs", "react-native": "data.js", + "sideEffects": false, "author": "Jaco Greeff ", "maintainers": [], "contributors": [], diff --git a/packages/wasm-crypto/package.json b/packages/wasm-crypto/package.json index 7a69f618..5962feb9 100644 --- a/packages/wasm-crypto/package.json +++ b/packages/wasm-crypto/package.json @@ -3,6 +3,8 @@ "version": "3.0.2-3", "author": "Jaco Greeff ", "main": "index.js", + "module": "index.mjs", + "sideEffects": false, "dependencies": { "@babel/runtime": "^7.12.5", "@polkadot/wasm-crypto-asmjs": "^3.0.2-3", @@ -10,8 +12,8 @@ }, "devDependencies": { "@polkadot/dev": "^0.61.8", - "@polkadot/util": "^5.0.1", - "@polkadot/x-randomvalues": "^5.0.1", + "@polkadot/util": "^5.0.2-4", + "@polkadot/x-randomvalues": "^5.0.2-4", "override-require": "^1.1.1" }, "peerDependencies": { diff --git a/packages/wasm-crypto/src/detectPackage.js b/packages/wasm-crypto/src/detectPackage.js index 0d838040..e3f00a8d 100644 --- a/packages/wasm-crypto/src/detectPackage.js +++ b/packages/wasm-crypto/src/detectPackage.js @@ -5,6 +5,6 @@ const util = require('@polkadot/util'); const packageInfo = require('./package-info.json'); -util.detectPackage(packageInfo, typeof __dirname !== 'undefined' && __dirname); +util.detectPackage(packageInfo, () => __dirname); exports.packageInfo = packageInfo; diff --git a/packages/wasm-crypto/src/detectPackage.mjs b/packages/wasm-crypto/src/detectPackage.mjs index 8b6fc360..c6941f47 100644 --- a/packages/wasm-crypto/src/detectPackage.mjs +++ b/packages/wasm-crypto/src/detectPackage.mjs @@ -5,6 +5,6 @@ import { detectPackage } from '@polkadot/util'; import packageInfo from './package-info.json'; -detectPackage(packageInfo, import.meta.url); +detectPackage(packageInfo, () => import.meta.url); export { packageInfo }; diff --git a/yarn.lock b/yarn.lock index 9ec2cf0b..abf3183a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1779,18 +1779,18 @@ __metadata: languageName: node linkType: hard -"@polkadot/util@npm:^5.0.1": - version: 5.0.1 - resolution: "@polkadot/util@npm:5.0.1" +"@polkadot/util@npm:^5.0.2-4": + version: 5.0.2-4 + resolution: "@polkadot/util@npm:5.0.2-4" dependencies: "@babel/runtime": ^7.12.5 - "@polkadot/x-textdecoder": 5.0.1 - "@polkadot/x-textencoder": 5.0.1 + "@polkadot/x-textdecoder": 5.0.2-4 + "@polkadot/x-textencoder": 5.0.2-4 "@types/bn.js": ^4.11.6 bn.js: ^4.11.9 camelcase: ^5.3.1 ip-regex: ^4.2.0 - checksum: d1173668f68e9b4c439b539e414fb5ac2dfa0d83a81534388b385bb0234c027dfb49923477b9cfe6fa9a203b1e916fff68bb0329417b40525dc2ec44bb741a6f + checksum: 109eb602eda0970940426fbaf04a54a8ccdb3820fc7253c20887e33a755152daed7e93ff3c0bef95fdec77b58a89c05b06fe3d6ea7adac8f6baa59391986d0d3 languageName: node linkType: hard @@ -1817,10 +1817,10 @@ __metadata: dependencies: "@babel/runtime": ^7.12.5 "@polkadot/dev": ^0.61.8 - "@polkadot/util": ^5.0.1 + "@polkadot/util": ^5.0.2-4 "@polkadot/wasm-crypto-asmjs": ^3.0.2-3 "@polkadot/wasm-crypto-wasm": ^3.0.2-3 - "@polkadot/x-randomvalues": ^5.0.1 + "@polkadot/x-randomvalues": ^5.0.2-4 override-require: ^1.1.1 peerDependencies: "@polkadot/util": "*" @@ -1828,30 +1828,30 @@ __metadata: languageName: unknown linkType: soft -"@polkadot/x-randomvalues@npm:^5.0.1": - version: 5.0.1 - resolution: "@polkadot/x-randomvalues@npm:5.0.1" +"@polkadot/x-randomvalues@npm:^5.0.2-4": + version: 5.0.2-4 + resolution: "@polkadot/x-randomvalues@npm:5.0.2-4" dependencies: "@babel/runtime": ^7.12.5 - checksum: a556c94c677628cdfc7b5e0f7b94ee7a211dd2f48388ddcc58ad7b8dd4d2cccbeb9efe2038adebfc0039a9f66da7517b68bfc94cbd470fe796a0326f77a3be07 + checksum: ec4a1611a9a23bd9846926ecf36013fccc57a67a4880b6908ef22b91f2b60c1ad83ab6b3febeb7545c68335822cb4ff82f855594c678f166e8d6578a02cbd8e3 languageName: node linkType: hard -"@polkadot/x-textdecoder@npm:5.0.1": - version: 5.0.1 - resolution: "@polkadot/x-textdecoder@npm:5.0.1" +"@polkadot/x-textdecoder@npm:5.0.2-4": + version: 5.0.2-4 + resolution: "@polkadot/x-textdecoder@npm:5.0.2-4" dependencies: "@babel/runtime": ^7.12.5 - checksum: d68160d81ed252aeabaecab97ed12c780437fa6348a59cfcbe997b73b095d8f3674bfbbded587215eb2f375da6056b8ae2db01683742aeeb9995e9217c5c8720 + checksum: 8a9c6a070d1ec4f40c9aa99e1005950bca8632e897b1adeb7379371f70cc5116dd16e5f4f54216a6b31b96bab843f4d49798ac5c862febb6bc804a8ac091a9be languageName: node linkType: hard -"@polkadot/x-textencoder@npm:5.0.1": - version: 5.0.1 - resolution: "@polkadot/x-textencoder@npm:5.0.1" +"@polkadot/x-textencoder@npm:5.0.2-4": + version: 5.0.2-4 + resolution: "@polkadot/x-textencoder@npm:5.0.2-4" dependencies: "@babel/runtime": ^7.12.5 - checksum: fc864da056d86484342f51960ef74fe5f63b34e2945416375d29d7272af8bef385e5fa508c3f3dc7cab6da2ad8aa54805d0ef40136b83e1b0bc04df6cd9b3aa4 + checksum: 5b5f4b23c2293245175534c3052d3f14218e685d2fc1adaa32674521b7639428af6a890905c60eb1297d692d83ebf30be4e3288a40f08401dd245b5ca2499f5c languageName: node linkType: hard