Use yarn pnp (#64)

* Use yarn pnp

* Bump dev

* Bumps

* Attempt to fix build

* Move "override-require": "^1.1.1" dep

* Bump
This commit is contained in:
Jaco Greeff
2020-03-04 13:26:56 +01:00
committed by GitHub
parent e5c31a0fe7
commit a20b14a8b7
6 changed files with 138 additions and 58 deletions

View File

@@ -1,7 +1,7 @@
enableImmutableInstalls: false
enableProgressBars: false
nodeLinker: node-modules
# nodeLinker: node-modules
plugins:
- path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.js

View File

@@ -7,7 +7,6 @@
"packages/*"
],
"resolutions": {
"@polkadot/dev": "^0.50.14",
"babel-core": "^7.0.0-bridge.0",
"typescript": "^3.8.3"
},
@@ -20,8 +19,6 @@
},
"devDependencies": {
"@babel/core": "^7.8.4",
"@polkadot/dev": "^0.50.14",
"@polkadot/util": "^2.5.1",
"override-require": "^1.1.1"
"@polkadot/dev": "^0.50.23"
}
}

View File

@@ -20,7 +20,9 @@
"main": "index.js",
"types": "index.d.ts",
"devDependencies": {
"@polkadot/dev": "^0.50.8"
"@polkadot/dev": "^0.50.23",
"@polkadot/util": "^2.6.1",
"override-require": "^1.1.1"
},
"peerDependencies": {
"@polkadot/util": "*"

View File

@@ -13,5 +13,3 @@ node ./test/asm.js
echo "*** Testing via Jest"
yarn polkadot-dev-run-test ./test/jest.spec.js
# FIXME, this should be via yarn
# ../../node_modules/@polkadot/dev/scripts/polkadot-dev-run-test.js ./test/jest.spec.js

View File

@@ -1,5 +1,5 @@
{
"extends": "./node_modules/@polkadot/dev/config/tsconfig",
"extends": "@polkadot/dev/config/tsconfig",
"exclude": [
"build/**/*",
"**/build/**/*"

181
yarn.lock
View File

@@ -2779,9 +2779,9 @@ __metadata:
languageName: node
linkType: hard
"@polkadot/dev@npm:^0.50.14":
version: 0.50.14
resolution: "@polkadot/dev@npm:0.50.14"
"@polkadot/dev@npm:^0.50.23":
version: 0.50.23
resolution: "@polkadot/dev@npm:0.50.23"
dependencies:
"@babel/cli": ^7.8.4
"@babel/core": ^7.8.6
@@ -2804,14 +2804,14 @@ __metadata:
"@babel/register": ^7.8.6
"@babel/runtime": ^7.8.4
"@types/jest": ^25.1.3
"@types/node": ^13.7.6
"@typescript-eslint/eslint-plugin": 2.21.0
"@typescript-eslint/parser": 2.21.0
"@types/node": ^13.7.7
"@typescript-eslint/eslint-plugin": 2.22.0
"@typescript-eslint/parser": 2.22.0
babel-core: ^7.0.0-bridge.0
babel-jest: ^25.1.0
babel-plugin-module-resolver: ^4.0.0
babel-plugin-styled-components: ^1.10.7
browserslist: ^4.9.0
browserslist: ^4.9.1
chalk: ^3.0.0
coveralls: ^3.0.9
cpx: ^1.5.0
@@ -2838,18 +2838,15 @@ __metadata:
typedoc: ^0.16.11
typedoc-plugin-markdown: ^2.2.17
typedoc-plugin-no-inherit: ^1.1.10
typescript: ^3.8.2
typescript: ^3.8.3
vuepress: ^1.3.1
webpack: ^4.41.6
webpack: ^4.42.0
webpack-cli: ^3.3.11
yargs: ^15.1.0
yargs: ^15.2.0
bin:
polkadot-ci-ghact-build: scripts/polkadot-ci-ghact-build.js
polkadot-ci-ghact-build.sh: scripts/polkadot-ci-ghact-build.sh
polkadot-ci-ghact-docs: scripts/polkadot-ci-ghact-docs.js
polkadot-ci-ghact-docs.sh: scripts/polkadot-ci-ghact-docs.sh
polkadot-ci-ghpages-force: scripts/polkadot-ci-ghpages-force.js
polkadot-ci-ghpages-force.sh: scripts/polkadot-ci-ghpages-force.sh
polkadot-dev-build-docs: scripts/polkadot-dev-build-docs.js
polkadot-dev-build-ts: scripts/polkadot-dev-build-ts.js
polkadot-dev-circular: scripts/polkadot-dev-circular.js
@@ -2858,18 +2855,19 @@ __metadata:
polkadot-dev-run-test: scripts/polkadot-dev-run-test.js
polkadot-dev-version: scripts/polkadot-dev-version.js
polkadot-dev-yarn-only: scripts/polkadot-dev-yarn-only.js
polkadot-exec-eslint: scripts/polkadot-exec-eslint.js
polkadot-exec-ghpages: scripts/polkadot-exec-ghpages.js
polkadot-exec-tsc: scripts/polkadot-exec-tsc.js
polkadot-exec-typedoc: scripts/polkadot-exec-typedoc.js
polkadot-exec-vuepress: scripts/polkadot-exec-vuepress.js
polkadot-exec-webpack: scripts/polkadot-exe-webpackc.js
checksum: 2/601c6144f3e8b854b81550bd8c1eefa20696162780ec9d9b05b7b5fb01a3ef84492716fb7ba24ba7b5b6eabb824e603e22a95fcc5843d3137e29effeb3ddcba4
checksum: 2/11eba574e176a09de316f705c44002db9bc04367b95250978e23caad6de6498f33888a7c8b51b8fe62998dcb9d67eb9a9c7dec71f201a6cfaff6be6274ba07ed
languageName: node
linkType: hard
"@polkadot/util@npm:^2.5.1":
version: 2.5.1
resolution: "@polkadot/util@npm:2.5.1"
"@polkadot/util@npm:^2.6.1":
version: 2.6.1
resolution: "@polkadot/util@npm:2.6.1"
dependencies:
"@babel/runtime": ^7.8.4
"@types/bn.js": ^4.11.6
@@ -2877,7 +2875,7 @@ __metadata:
camelcase: ^5.3.1
chalk: ^3.0.0
ip-regex: ^4.1.0
checksum: 2/986940cf97c1c11cd5bad44492bd15aab40bbafc4f003ed1d1559982f1b9926ffd327202bfde5a438f955329e7230102a4349d4e189cd72fcad28a243976d21c
checksum: 2/92f412fee89b8c400e6f1ecab934304715b1e4b20bfb3d28964225e570c17a95383fde594f10f87780ab11c3826839d94f95ef6e2afa2fc91d4416ec98d53289
languageName: node
linkType: hard
@@ -2885,7 +2883,9 @@ __metadata:
version: 0.0.0-use.local
resolution: "@polkadot/wasm-crypto@workspace:packages/wasm-crypto"
dependencies:
"@polkadot/dev": ^0.50.8
"@polkadot/dev": ^0.50.23
"@polkadot/util": ^2.6.1
override-require: ^1.1.1
peerDependencies:
"@polkadot/util": "*"
languageName: unknown
@@ -3055,7 +3055,7 @@ __metadata:
languageName: node
linkType: hard
"@types/node@npm:^13.7.6":
"@types/node@npm:^13.7.7":
version: 13.7.7
resolution: "@types/node@npm:13.7.7"
checksum: 2/7a4a7c5060f86b6f4010d10b0de9831f98f303513a7403e8bfb3ad3f1d6a9533d023e1b6e2331959525156b84c0daf98ad1569407309da1f798498301f227a37
@@ -3092,11 +3092,11 @@ __metadata:
languageName: node
linkType: hard
"@typescript-eslint/eslint-plugin@npm:2.21.0":
version: 2.21.0
resolution: "@typescript-eslint/eslint-plugin@npm:2.21.0"
"@typescript-eslint/eslint-plugin@npm:2.22.0":
version: 2.22.0
resolution: "@typescript-eslint/eslint-plugin@npm:2.22.0"
dependencies:
"@typescript-eslint/experimental-utils": 2.21.0
"@typescript-eslint/experimental-utils": 2.22.0
eslint-utils: ^1.4.3
functional-red-black-tree: ^1.0.1
regexpp: ^3.0.0
@@ -3108,30 +3108,30 @@ __metadata:
peerDependenciesMeta:
typescript:
optional: true
checksum: 2/5a147e73fdc85fd78fbf762389f15140830dd6483bff84c5b981c6363bccb8739d99b58e512e25078cf63a3163b2e23aa76a4aa7e4157a516cc3c4c1264ec80b
checksum: 2/07ef4384468e08421e681143dbc6892782ca487c973f025bbfd737d3fd7ba0a50dbe0f66edf3ebf6bbee9b69bbf146c6c092f54999937b620b73a26bea4afdd1
languageName: node
linkType: hard
"@typescript-eslint/experimental-utils@npm:2.21.0":
version: 2.21.0
resolution: "@typescript-eslint/experimental-utils@npm:2.21.0"
"@typescript-eslint/experimental-utils@npm:2.22.0":
version: 2.22.0
resolution: "@typescript-eslint/experimental-utils@npm:2.22.0"
dependencies:
"@types/json-schema": ^7.0.3
"@typescript-eslint/typescript-estree": 2.21.0
"@typescript-eslint/typescript-estree": 2.22.0
eslint-scope: ^5.0.0
peerDependencies:
eslint: "*"
checksum: 2/bcc5fb5957c5416d101c70225c4cb7bb92af7bef63831d248bbca3cec82563f018dcf9d4ce032b307c3d06a8d72562e333bd091f819146a105e820e56eda77bd
checksum: 2/b3d7114444983129644048fc174f354371c31ad0c6e0a40281528eb458c81c5c65bb302ba2365321bd549e53c8fc5d3beb7004006bb9a5318724079ba23260a7
languageName: node
linkType: hard
"@typescript-eslint/parser@npm:2.21.0":
version: 2.21.0
resolution: "@typescript-eslint/parser@npm:2.21.0"
"@typescript-eslint/parser@npm:2.22.0":
version: 2.22.0
resolution: "@typescript-eslint/parser@npm:2.22.0"
dependencies:
"@types/eslint-visitor-keys": ^1.0.0
"@typescript-eslint/experimental-utils": 2.21.0
"@typescript-eslint/typescript-estree": 2.21.0
"@typescript-eslint/experimental-utils": 2.22.0
"@typescript-eslint/typescript-estree": 2.22.0
eslint-visitor-keys: ^1.1.0
peerDependencies:
eslint: ^5.0.0 || ^6.0.0
@@ -3139,13 +3139,13 @@ __metadata:
peerDependenciesMeta:
typescript:
optional: true
checksum: 2/ab5de8fd7f02ff93faaa0e22e9a6dd8b6a52ef48aec2084a3ab2118b4171cb4a294fae39ea9c75c119085e7e83e8e7e71b6e047ebf459e59f0c346ae6530a847
checksum: 2/736feadd4ea8f8e514639cb90e5eac1abc1a60c45e9d6835dcc92560220aa46bba13ff5ffa6cbd659f0341611e94dcb3c54c01770fe6405deaf3175a10ac6873
languageName: node
linkType: hard
"@typescript-eslint/typescript-estree@npm:2.21.0":
version: 2.21.0
resolution: "@typescript-eslint/typescript-estree@npm:2.21.0"
"@typescript-eslint/typescript-estree@npm:2.22.0":
version: 2.22.0
resolution: "@typescript-eslint/typescript-estree@npm:2.22.0"
dependencies:
debug: ^4.1.1
eslint-visitor-keys: ^1.1.0
@@ -3159,7 +3159,7 @@ __metadata:
peerDependenciesMeta:
typescript:
optional: true
checksum: 2/e6724eea96602ceb3a3747fa4c1a1a93df94d9503a4b846d22fe1c17175890ad9c2dd86609e4d3f154c698ca4b8a21ada0b5ad99b03618f4ce76ee62139b82cf
checksum: 2/dc7b15db92e07f9b1d93047c36e0a8b61b55ba0f91c9b78fa2f9c98fe458bad8b7f5889bfccea6b99c5d9d3a7bf7c34e916b7f8fe8f7951604e38948b8645103
languageName: node
linkType: hard
@@ -4761,7 +4761,7 @@ __metadata:
languageName: node
linkType: hard
"browserslist@npm:^4.9.0":
"browserslist@npm:^4.9.1":
version: 4.9.1
resolution: "browserslist@npm:4.9.1"
dependencies:
@@ -8289,6 +8289,27 @@ fsevents@^2.1.2:
languageName: node
linkType: hard
"fsevents@patch:fsevents@^1.0.0#builtin<compat/fsevents>, fsevents@patch:fsevents@^1.2.7#builtin<compat/fsevents>":
version: 1.2.11
resolution: "fsevents@patch:fsevents@npm%3A1.2.11#builtin<compat/fsevents>::version=1.2.11&hash=77dfe6"
dependencies:
bindings: ^1.5.0
nan: ^2.12.1
node-gyp: latest
node-pre-gyp: "*"
checksum: 2/bed0c750c8ed79e28fb83283e6a059c50d0f522fa20267476ce8b905ea6b4e89dbe16ad23ab019527fef694c339a391baedf04fd5b521eb150ffaeab6d199049
languageName: node
linkType: hard
"fsevents@patch:fsevents@^2.1.2#builtin<compat/fsevents>":
version: 2.1.2
resolution: "fsevents@patch:fsevents@npm%3A2.1.2#builtin<compat/fsevents>::version=2.1.2&hash=77dfe6"
dependencies:
node-gyp: latest
checksum: 2/6fb6ae0c1e5aca68fec6c0bf119d0dc9a1d653af60925c7ec69868f0ac68fa6930eeb769745030ecb560e00c144c74068da62bb77a000cc7dc263963ba4e2d7f
languageName: node
linkType: hard
"function-bind@npm:^1.1.1":
version: 1.1.1
resolution: "function-bind@npm:1.1.1"
@@ -15004,6 +15025,31 @@ resolve@^1.14.2:
languageName: node
linkType: hard
"resolve@patch:resolve@1.1.7#builtin<compat/resolve>":
version: 1.1.7
resolution: "resolve@patch:resolve@npm%3A1.1.7#builtin<compat/resolve>::version=1.1.7&hash=8fccd0"
checksum: 2/5238277188664a6948dd7288d16f1a09e098fb36d4f9b2c749130969c998faa9bccefd30fd618073af5210fdc768730cadfc15588bbee4fc64b257f20cab6783
languageName: node
linkType: hard
"resolve@patch:resolve@^1.1.6#builtin<compat/resolve>, resolve@patch:resolve@^1.1.7#builtin<compat/resolve>, resolve@patch:resolve@^1.10.0#builtin<compat/resolve>, resolve@patch:resolve@^1.10.1#builtin<compat/resolve>, resolve@patch:resolve@^1.11.1#builtin<compat/resolve>, resolve@patch:resolve@^1.12.0#builtin<compat/resolve>, resolve@patch:resolve@^1.13.1#builtin<compat/resolve>, resolve@patch:resolve@^1.2.0#builtin<compat/resolve>, resolve@patch:resolve@^1.3.2#builtin<compat/resolve>, resolve@patch:resolve@^1.8.1#builtin<compat/resolve>":
version: 1.15.0
resolution: "resolve@patch:resolve@npm%3A1.15.0#builtin<compat/resolve>::version=1.15.0&hash=8fccd0"
dependencies:
path-parse: ^1.0.6
checksum: 2/a977306c59618000d5954b2fb9d6c100c15f2c4df6acdab3e86bdbd3ae1e8d52e89cbbf19e6dce93ce535af1bba097c26332b1a0f85fd4daa45943ec06d90fe8
languageName: node
linkType: hard
"resolve@patch:resolve@^1.14.2#builtin<compat/resolve>":
version: 1.15.1
resolution: "resolve@patch:resolve@npm%3A1.15.1#builtin<compat/resolve>::version=1.15.1&hash=8fccd0"
dependencies:
path-parse: ^1.0.6
checksum: 2/fe7e72ddef33d5c157991b824ba2d439cafcd386cb4b26d86c32e77fea442bdd9a93c6cdd93ab90f87a29449008df64b53a8310dd89ebe88ea87fb5db09c03aa
languageName: node
linkType: hard
"responselike@npm:^1.0.2":
version: 1.0.2
resolution: "responselike@npm:1.0.2"
@@ -15127,9 +15173,7 @@ resolve@^1.14.2:
resolution: "root-workspace-0b6124@workspace:."
dependencies:
"@babel/core": ^7.8.4
"@polkadot/dev": ^0.50.14
"@polkadot/util": ^2.5.1
override-require: ^1.1.1
"@polkadot/dev": ^0.50.23
languageName: unknown
linkType: soft
@@ -16936,6 +16980,16 @@ resolve@^1.14.2:
languageName: node
linkType: hard
"typescript@patch:typescript@npm%3A^3.8.3#builtin<compat/typescript>":
version: 3.8.3
resolution: "typescript@patch:typescript@npm%3A3.8.3#builtin<compat/typescript>::version=3.8.3&hash=273569"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: 2/345573d9ee784f75c4facb98e838d28fe1376648abd627e3bca256237965940f331bf0ed502de6068f0cca9111eac675ca26d901202547068d52d66685e42be2
languageName: node
linkType: hard
"uc.micro@npm:^1.0.1, uc.micro@npm:^1.0.5":
version: 1.0.6
resolution: "uc.micro@npm:1.0.6"
@@ -17740,9 +17794,9 @@ resolve@^1.14.2:
languageName: node
linkType: hard
"webpack@npm:4.41.6, webpack@npm:^4.41.6":
version: 4.41.6
resolution: "webpack@npm:4.41.6"
"webpack@npm:4.42.0, webpack@npm:^4.42.0":
version: 4.42.0
resolution: "webpack@npm:4.42.0"
dependencies:
"@webassemblyjs/ast": 1.8.5
"@webassemblyjs/helper-module-context": 1.8.5
@@ -17769,7 +17823,7 @@ resolve@^1.14.2:
webpack-sources: ^1.4.1
bin:
webpack: bin/webpack.js
checksum: 2/b971e411949ca988bcdb9a9cdc9310a4588e081236e956c1003c75c1806fa8c6520c06eb272170a09f78c72afca568ca47d339e3139faa051ff10eb8994eb444
checksum: 2/fd8b6560ce9346f306e010cba47561ce234fd307984ef708a348fd3278d5da10c61ac927e817c53ecb09375b6436583644e0aade0bf581e7dde4b62aca90b22c
languageName: node
linkType: hard
@@ -18153,6 +18207,16 @@ resolve@^1.14.2:
languageName: node
linkType: hard
"yargs-parser@npm:^17.1.0":
version: 17.1.0
resolution: "yargs-parser@npm:17.1.0"
dependencies:
camelcase: ^5.0.0
decamelize: ^1.2.0
checksum: 2/8e5cc4b16b9558b2cba63b45e574dd72680f44c064623bacfc1fa9805d4f7b9a2008cd261de6b8d78f6cedb1597e5d81728828714e3b5ec897eb1854e31eb0b8
languageName: node
linkType: hard
"yargs@npm:12.0.5":
version: 12.0.5
resolution: "yargs@npm:12.0.5"
@@ -18211,7 +18275,7 @@ resolve@^1.14.2:
languageName: node
linkType: hard
"yargs@npm:^15.0.0, yargs@npm:^15.1.0":
"yargs@npm:^15.0.0":
version: 15.1.0
resolution: "yargs@npm:15.1.0"
dependencies:
@@ -18230,6 +18294,25 @@ resolve@^1.14.2:
languageName: node
linkType: hard
"yargs@npm:^15.2.0":
version: 15.2.0
resolution: "yargs@npm:15.2.0"
dependencies:
cliui: ^6.0.0
decamelize: ^1.2.0
find-up: ^4.1.0
get-caller-file: ^2.0.1
require-directory: ^2.1.1
require-main-filename: ^2.0.0
set-blocking: ^2.0.0
string-width: ^4.2.0
which-module: ^2.0.0
y18n: ^4.0.0
yargs-parser: ^17.1.0
checksum: 2/809333561040bc4e7b752289098b652a0deb101c3903000d5cf198d6699c350bd4934baba440e707a784dcfaf0e72342c5bf28440e72626fe033b6b9efb03778
languageName: node
linkType: hard
"zepto@npm:^1.2.0":
version: 1.2.0
resolution: "zepto@npm:1.2.0"