Add a resolver for jest (#272)

This commit is contained in:
Jaco Greeff
2020-02-06 15:25:08 +01:00
committed by GitHub
parent 4bed02e395
commit d12387f4ae
8 changed files with 57 additions and 52 deletions
+2 -1
View File
@@ -8,5 +8,6 @@ module.exports = Object.assign({}, config, {
'@polkadot/ui-(assets|keyring|settings|shared)(.*)$': '<rootDir>/packages/ui-$1/src/$2', '@polkadot/ui-(assets|keyring|settings|shared)(.*)$': '<rootDir>/packages/ui-$1/src/$2',
'\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': 'empty/object', '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': 'empty/object',
'\\.(css|less)$': 'empty/object' '\\.(css|less)$': 'empty/object'
} },
resolver: './jest.resolver.js'
}); });
+15
View File
@@ -0,0 +1,15 @@
// Copyright 2017-2020 @polkadot/util authors & contributors
// This software may be modified and distributed under the terms
// of the Apache-2.0 license. See the LICENSE file for details.
// eslint-disable-next-line @typescript-eslint/no-var-requires
const path = require('path');
module.exports = function resolver (file, config) {
if (file.includes('package.json')) {
console.error(file, config);
return path.join(config.basedir.replace('/src', '/'), file);
}
return config.defaultResolver(file, config);
};
+2 -2
View File
@@ -24,8 +24,8 @@
"react": "*" "react": "*"
}, },
"devDependencies": { "devDependencies": {
"@polkadot/keyring": "^2.1.0-beta.1", "@polkadot/keyring": "^2.2.0-beta.0",
"@polkadot/util-crypto": "^2.1.0-beta.1", "@polkadot/util-crypto": "^2.2.0-beta.0",
"xmlserializer": "^0.6.1" "xmlserializer": "^0.6.1"
} }
} }
+3 -5
View File
@@ -10,11 +10,9 @@
"contributors": [], "contributors": [],
"license": "Apache-2.0", "license": "Apache-2.0",
"browser": { "browser": {
"../package.json": "./package.json",
"./ledger/transportsNode": "./ledger/transportsEmpty" "./ledger/transportsNode": "./ledger/transportsEmpty"
}, },
"react-native": { "react-native": {
"../package.json": "./package.json",
"./ledger/transportsNode": "./ledger/transportsEmpty", "./ledger/transportsNode": "./ledger/transportsEmpty",
"./ledger/transportsWeb": "./ledger/transportsEmpty" "./ledger/transportsWeb": "./ledger/transportsEmpty"
}, },
@@ -32,9 +30,9 @@
"store": "^2.0.12" "store": "^2.0.12"
}, },
"devDependencies": { "devDependencies": {
"@polkadot/keyring": "^2.1.0-beta.1", "@polkadot/keyring": "^2.2.0-beta.0",
"@polkadot/types": "^1.1.0-beta.16", "@polkadot/types": "^1.1.0-beta.22",
"@polkadot/util": "^2.1.0-beta.1" "@polkadot/util": "^2.2.0-beta.0"
}, },
"optionalDependencies": { "optionalDependencies": {
"@ledgerhq/hw-transport-node-hid": "^5.7.0" "@ledgerhq/hw-transport-node-hid": "^5.7.0"
+4 -13
View File
@@ -7,23 +7,14 @@ import { detectPackage } from '@polkadot/util';
import keyring, { Keyring } from './Keyring'; import keyring, { Keyring } from './Keyring';
import Ledger from './ledger'; import Ledger from './ledger';
let dirname; // eslint-disable-next-line no-useless-catch
let pkgJson;
try { try {
dirname = __dirname; // eslint-disable-next-line @typescript-eslint/no-var-requires
detectPackage(require('./package.json'), __dirname);
} catch (error) { } catch (error) {
// ignore throw error;
} }
try {
pkgJson = require('./package.json');
} catch (error) {
pkgJson = require('../package.json');
}
detectPackage(pkgJson, dirname);
export default keyring; export default keyring;
export { export {
+1 -1
View File
@@ -14,7 +14,7 @@
"store": "^2.0.12" "store": "^2.0.12"
}, },
"devDependencies": { "devDependencies": {
"@polkadot/util": "^2.1.0-beta.1" "@polkadot/util": "^2.2.0-beta.0"
}, },
"peerDependencies": { "peerDependencies": {
"@polkadot/util": "*" "@polkadot/util": "*"
+1 -1
View File
@@ -17,6 +17,6 @@
"@polkadot/util-crypto": "*" "@polkadot/util-crypto": "*"
}, },
"devDependencies": { "devDependencies": {
"@polkadot/util-crypto": "^2.1.0-beta.1" "@polkadot/util-crypto": "^2.2.0-beta.0"
} }
} }
+29 -29
View File
@@ -2375,24 +2375,24 @@
typescript "^3.7.5" typescript "^3.7.5"
vuepress "^1.2.0" vuepress "^1.2.0"
"@polkadot/keyring@^2.1.0-beta.1": "@polkadot/keyring@^2.2.0-beta.0":
version "2.1.0-beta.1" version "2.2.0-beta.0"
resolved "https://registry.yarnpkg.com/@polkadot/keyring/-/keyring-2.1.0-beta.1.tgz#24e20596306ba1b82f3f358f4cba44f264c7b6b4" resolved "https://registry.yarnpkg.com/@polkadot/keyring/-/keyring-2.2.0-beta.0.tgz#481810e81c690ce343ffdf005a3ba71cfe6c4961"
integrity sha512-017xaPtacX5Xdrova3d7pemI9BpTop7N6lJL4rimksXl2M/9iKNM3UmnZqL35C0kWS8UC1XLpM1VZZJXpAx/RQ== integrity sha512-iabxyYzdyD8Bv0tW4g8e/x7hQGSsmI3TGMZHhAxLRc+ICFEPCB9sqqnu09DoB6QzyDTYD/kBArE2sOHhZacpPQ==
dependencies: dependencies:
"@babel/runtime" "^7.8.3" "@babel/runtime" "^7.8.3"
"@polkadot/util" "^2.1.0-beta.1" "@polkadot/util" "^2.2.0-beta.0"
"@polkadot/util-crypto" "^2.1.0-beta.1" "@polkadot/util-crypto" "^2.2.0-beta.0"
"@polkadot/metadata@^1.1.0-beta.16": "@polkadot/metadata@^1.1.0-beta.22":
version "1.1.0-beta.16" version "1.1.0-beta.22"
resolved "https://registry.yarnpkg.com/@polkadot/metadata/-/metadata-1.1.0-beta.16.tgz#002db7054450f4554426b66fd687df22aba41a55" resolved "https://registry.yarnpkg.com/@polkadot/metadata/-/metadata-1.1.0-beta.22.tgz#bb57a0ff1628784e4e6e5bba2f3fda1039fc7695"
integrity sha512-91hJJg7LLC0UVuQDS8PUCau9cY58A42vUI8H5HnmmHIZM/SwoCKzVOBOr5lWS2tzctZJSqg2RjpT1TeXY/7X7A== integrity sha512-Bn+FRvUkpdVqVk3SbAP2qhwO41zXcJJZET+YeKHWx2amt9uXfoX15MZXODsY2Ug0chEm4Ow3LaJs5NJ1bLh52g==
dependencies: dependencies:
"@babel/runtime" "^7.8.3" "@babel/runtime" "^7.8.3"
"@polkadot/types" "^1.1.0-beta.16" "@polkadot/types" "^1.1.0-beta.22"
"@polkadot/util" "^2.1.0-beta.1" "@polkadot/util" "^2.2.0-beta.0"
"@polkadot/util-crypto" "^2.1.0-beta.1" "@polkadot/util-crypto" "^2.2.0-beta.0"
"@polkadot/ts@^0.2.1": "@polkadot/ts@^0.2.1":
version "0.2.1" version "0.2.1"
@@ -2401,25 +2401,25 @@
dependencies: dependencies:
"@types/chrome" "^0.0.92" "@types/chrome" "^0.0.92"
"@polkadot/types@^1.1.0-beta.16": "@polkadot/types@^1.1.0-beta.22":
version "1.1.0-beta.16" version "1.1.0-beta.22"
resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-1.1.0-beta.16.tgz#6576f7c96fd374493e2c8385b1b530803ba5b4cd" resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-1.1.0-beta.22.tgz#159527b55f6cfa5a727e3eb88bd34652f2f4de38"
integrity sha512-4ZX3G3BfJzMV6yuW+C1S/45zUyXm/ZoxL56k2fHZMRf3G3RpXT13mxvZD+TX7jqBas3QIQe+rKD4jkEi+UM3WQ== integrity sha512-UAt1Kq6UUlKFBzXtxUN2+VZcG4KN1mqFf4ZXFqxqwzqWqJSrMwuN2OOFAbKYa6ljRpGljAHTPbxGGWoMh2Qu1Q==
dependencies: dependencies:
"@babel/runtime" "^7.8.3" "@babel/runtime" "^7.8.3"
"@polkadot/metadata" "^1.1.0-beta.16" "@polkadot/metadata" "^1.1.0-beta.22"
"@polkadot/util" "^2.1.0-beta.1" "@polkadot/util" "^2.2.0-beta.0"
"@polkadot/util-crypto" "^2.1.0-beta.1" "@polkadot/util-crypto" "^2.2.0-beta.0"
memoizee "^0.4.14" memoizee "^0.4.14"
yargs "^15.1.0" yargs "^15.1.0"
"@polkadot/util-crypto@^2.1.0-beta.1": "@polkadot/util-crypto@^2.2.0-beta.0":
version "2.1.0-beta.1" version "2.2.0-beta.0"
resolved "https://registry.yarnpkg.com/@polkadot/util-crypto/-/util-crypto-2.1.0-beta.1.tgz#bfbd35f676135e85bd82c5bc5e99e2a9bb3012c5" resolved "https://registry.yarnpkg.com/@polkadot/util-crypto/-/util-crypto-2.2.0-beta.0.tgz#14d587a101864abafa825d1c2a347e142bb981a3"
integrity sha512-xQKy5SKnDZhrEjq6d50Oj6A4h8UDOkDxMQ7ofKhx8B43c0V1NCeS4gBWgjkOp7+wlznTlA3Jj/Ry6J0u80AKrw== integrity sha512-xJnDL8YdQFjEaJ6KYoRN/DhVA/NKZqja2yZqQqbvtVZX46l6kY56Vu6F3ZNlKsJxc6mSfr0qM2A7qiPcLkiw7g==
dependencies: dependencies:
"@babel/runtime" "^7.8.3" "@babel/runtime" "^7.8.3"
"@polkadot/util" "^2.1.0-beta.1" "@polkadot/util" "^2.2.0-beta.0"
"@polkadot/wasm-crypto" "^0.20.1" "@polkadot/wasm-crypto" "^0.20.1"
"@types/bs58" "^4.0.0" "@types/bs58" "^4.0.0"
"@types/elliptic" "^6.4.12" "@types/elliptic" "^6.4.12"
@@ -2434,10 +2434,10 @@
tweetnacl "^1.0.2" tweetnacl "^1.0.2"
xxhashjs "^0.2.2" xxhashjs "^0.2.2"
"@polkadot/util@^2.1.0-beta.1": "@polkadot/util@^2.2.0-beta.0":
version "2.1.0-beta.1" version "2.2.0-beta.0"
resolved "https://registry.yarnpkg.com/@polkadot/util/-/util-2.1.0-beta.1.tgz#27c7670d06150c82e9cfa109dbeb06430cddbb5e" resolved "https://registry.yarnpkg.com/@polkadot/util/-/util-2.2.0-beta.0.tgz#d0b5cadc09ee131196a4e48cfc54b12292ed1e35"
integrity sha512-rqxuaM0GXnVfgSDsO0iIpURlwDgJ1vZEXrB8SkUIK1GldL81w17eNKsds6ZXQjwiBBqaYMeQdfr3ENqkTBLgcw== integrity sha512-VjvXt4PvItLynk3JFKcTNQa+Jf85Q8PENEt4WOfJYElbzDv2tevVoJtE9Ds5RFms2ONmnRu3yeXWtNSHd91x+A==
dependencies: dependencies:
"@babel/runtime" "^7.8.3" "@babel/runtime" "^7.8.3"
"@types/bn.js" "^4.11.6" "@types/bn.js" "^4.11.6"