From c1a8d11a205fa86fef212794840d4ac5dacb4152 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Stankiewicz?= Date: Fri, 21 Jul 2023 15:57:45 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=A6=88=20Use=20pnpm=20instead=20of=20yarn?= =?UTF-8?q?=20in=20all=20packages.json=20(#1128)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/CI-gnosis.yml | 4 +- .github/workflows/CI.yml | 4 +- package.json | 9 ++-- packages/coingecko/package.json | 8 ++-- packages/core/package.json | 8 ++-- packages/example/package.json | 16 +++---- packages/extension/package.json | 4 +- packages/playwright/package.json | 4 +- packages/testing/package.json | 6 +-- packages/uniswap/package.json | 8 ++-- pnpm-lock.yaml | 82 +++----------------------------- 11 files changed, 41 insertions(+), 112 deletions(-) diff --git a/.github/workflows/CI-gnosis.yml b/.github/workflows/CI-gnosis.yml index d6ca0f9e7..05d599b30 100644 --- a/.github/workflows/CI-gnosis.yml +++ b/.github/workflows/CI-gnosis.yml @@ -28,9 +28,9 @@ jobs: run: | set -e pnpm run generate - yarn start & + pnpm start & sleep 15 - xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- yarn test:playwright -g "with Gnosis Safe" + xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- pnpm test:playwright -g "with Gnosis Safe" env: MAINNET_URL: ${{ secrets.MAINNET_PROVIDER_URL }} DOCS_GNOSIS_OWNER_FIRST: ${{ secrets.DOCS_GNOSIS_OWNER_FIRST }} diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 5932111b9..32b142298 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -81,9 +81,9 @@ jobs: run: | set -e pnpm run generate - yarn start & + pnpm start & sleep 15 - xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- yarn test:playwright + xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- pnpm test:playwright env: MAINNET_URL: ${{ secrets.MAINNET_PROVIDER_URL }} DEBUG: usedapp* diff --git a/package.json b/package.json index fa9ea3874..4d9747e8e 100644 --- a/package.json +++ b/package.json @@ -7,18 +7,17 @@ }, "scripts": { "preinstall": "npx only-allow pnpm", - "lint": "wsrun -c -s lint", - "lint:fix": "wsrun -c -s lint:fix", + "lint": "pnpm run -r lint", + "lint:fix": "pnpm run -r lint:fix", "build": "pnpm run -r build", - "test": "wsrun -e -c -s --exclude-missing test", + "test": "pnpm run -r test", "version": "pnpm changeset version && pnpm install", "release": "pnpm build && pnpm changeset publish" }, "dependencies": { "@changesets/cli": "^2.14.1", "ethers": "5.6.9", - "prettier": "2.1.2", - "wsrun": "^5.2.1" + "prettier": "2.1.2" }, "resolutions": { "ethers": "5.6.9" diff --git a/packages/coingecko/package.json b/packages/coingecko/package.json index 4b8362dcd..6cc72aa06 100644 --- a/packages/coingecko/package.json +++ b/packages/coingecko/package.json @@ -44,13 +44,13 @@ "ethers": "*" }, "scripts": { - "build": "yarn run build:esm && yarn run build:cjs", + "build": "pnpm run build:esm && pnpm run build:cjs", "build:esm": "tsc --module es2020 --target es2017 --outDir dist/esm", "build:cjs": "tsc --outDir dist/cjs", "test": "mocha", - "lint": "yarn lint:prettier --check && yarn lint:eslint", - "lint:fix": "yarn lint:prettier --write && yarn lint:eslint --fix", + "lint": "pnpm lint:prettier --check && pnpm lint:eslint", + "lint:fix": "pnpm lint:prettier --write && pnpm lint:eslint --fix", "lint:eslint": "eslint './{src,test}/**/*.{ts,tsx}'", - "lint:prettier": "yarn prettier './{src,test}/**/*.{ts,tsx}'" + "lint:prettier": "pnpm prettier './{src,test}/**/*.{ts,tsx}'" } } diff --git a/packages/core/package.json b/packages/core/package.json index 49a35d0cb..083c6c594 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -64,15 +64,15 @@ "wait-for-expect": "^3.0.2" }, "scripts": { - "build": "yarn run build:esm && yarn run build:cjs && yarn build:cli", + "build": "pnpm run build:esm && pnpm run build:cjs && pnpm build:cli", "build:esm": "tsc --module es2020 --target es2017 --outDir dist/esm", "build:cjs": "tsc --outDir dist/cjs", "build:cli": "tsc ./generate-hooks/generate-hooks.ts --outDir bin && chmod +x bin/*", "test": "TS_NODE_PROJECT=./tsconfig.test.json mocha", - "lint": "yarn lint:prettier --check && yarn lint:eslint", - "lint:fix": "yarn lint:prettier --write && yarn lint:eslint --fix", + "lint": "pnpm lint:prettier --check && pnpm lint:eslint", + "lint:fix": "pnpm lint:prettier --write && pnpm lint:eslint --fix", "lint:eslint": "eslint './{src,test}/**/*.{ts,tsx}'", - "lint:prettier": "yarn prettier './{src,test}/**/*.{ts,tsx}'" + "lint:prettier": "pnpm prettier './{src,test}/**/*.{ts,tsx}'" }, "publishConfig": { "access": "public" diff --git a/packages/example/package.json b/packages/example/package.json index 8060429e4..899f53847 100644 --- a/packages/example/package.json +++ b/packages/example/package.json @@ -6,19 +6,19 @@ "module": "dist/esm/src/index.js", "types": "dist/esm/src/index.d.ts", "scripts": { - "typechain:generate": "yarn typechain --target=ethers-v5 ./src/abi/**/*.json --out-dir=./gen/types", + "typechain:generate": "pnpm typechain --target=ethers-v5 ./src/abi/**/*.json --out-dir=./gen/types", "usedapp:generate": "USEDAPP_OUT_DIR=./gen/hooks USEDAPP_TYPES_DIR=./gen/types pnpm usedapp-generate-hooks", "start": "webpack serve --mode development", - "build": "yarn build:app && yarn build:package", - "build:app": "yarn generate && tsc --noEmit && rimraf build && webpack --mode production --progress", - "generate": "yarn typechain:generate && yarn usedapp:generate", - "build:package": "yarn build:esm && yarn build:cjs && yarn copy-files", + "build": "pnpm build:app && pnpm build:package", + "build:app": "pnpm generate && tsc --noEmit && rimraf build && webpack --mode production --progress", + "generate": "pnpm typechain:generate && pnpm usedapp:generate", + "build:package": "pnpm build:esm && pnpm build:cjs && pnpm copy-files", "build:esm": "tsc --module es2020 --target es2017 --outDir dist/esm", "build:cjs": "tsc --outDir dist/cjs", - "lint": "yarn lint:prettier --check && yarn lint:eslint", - "lint:fix": "yarn lint:prettier --write && yarn lint:eslint --fix", + "lint": "pnpm lint:prettier --check && pnpm lint:eslint", + "lint:fix": "pnpm lint:prettier --write && pnpm lint:eslint --fix", "lint:eslint": "eslint './{src,test,playwright}/**/*.{ts,tsx}'", - "lint:prettier": "yarn prettier './{src,test,playwright}/**/*.{ts,tsx}'", + "lint:prettier": "pnpm prettier './{src,test,playwright}/**/*.{ts,tsx}'", "test": "mocha -r ts-node/register/transpile-only './test/**/*.test.{ts,tsx}'", "test:playwright": "mocha -r ts-node/register/transpile-only './playwright/**/*.test.ts' --bail", "copy-files": "cp -r ./src/assets ./dist/cjs/src/assets && cp -r ./src/assets ./dist/esm/src/assets" diff --git a/packages/extension/package.json b/packages/extension/package.json index 1e04894bd..d4d366cd5 100644 --- a/packages/extension/package.json +++ b/packages/extension/package.json @@ -6,8 +6,8 @@ "start": "webpack serve --mode development", "build:dev": "webpack --mode development", "build": "tsc --noEmit && rimraf build && webpack --mode production --progress", - "lint": "yarn lint:prettier --check && yarn lint:eslint", - "lint:fix": "prettier --write . && yarn lint:eslint --fix", + "lint": "pnpm lint:prettier --check && pnpm lint:eslint", + "lint:fix": "prettier --write . && pnpm lint:eslint --fix", "lint:eslint": "eslint './{src,test}/**/*.{ts,tsx}'", "lint:prettier": "prettier --check .", "test": "mocha", diff --git a/packages/playwright/package.json b/packages/playwright/package.json index b59793b20..2d9123587 100644 --- a/packages/playwright/package.json +++ b/packages/playwright/package.json @@ -6,8 +6,8 @@ "types": "dist/src/index.d.ts", "scripts": { "build": "rimraf dist && tsc", - "lint": "yarn lint:prettier --check && yarn lint:eslint", - "lint:fix": "prettier --write ./src && yarn lint:eslint --fix", + "lint": "pnpm lint:prettier --check && pnpm lint:eslint", + "lint:fix": "prettier --write ./src && pnpm lint:eslint --fix", "lint:eslint": "eslint './{src,test}/**/*.{ts,tsx}'", "lint:prettier": "prettier --check ./src", "postinstall": "unzip -n metamask-chrome-10.12.4.zip -d ./metamask-chrome-10.12.4" diff --git a/packages/testing/package.json b/packages/testing/package.json index f0923dbed..4eabfec83 100644 --- a/packages/testing/package.json +++ b/packages/testing/package.json @@ -38,9 +38,9 @@ "scripts": { "build": "tsc", "test": "true", - "lint": "yarn lint:prettier --check && yarn lint:eslint", - "lint:fix": "yarn lint:prettier --write && yarn lint:eslint --fix", + "lint": "pnpm lint:prettier --check && pnpm lint:eslint", + "lint:fix": "pnpm lint:prettier --write && pnpm lint:eslint --fix", "lint:eslint": "eslint './{src,test,examples}/**/*.{ts,tsx}'", - "lint:prettier": "yarn prettier './{src,test,examples}/**/*.{ts,tsx}'" + "lint:prettier": "pnpm prettier './{src,test,examples}/**/*.{ts,tsx}'" } } diff --git a/packages/uniswap/package.json b/packages/uniswap/package.json index 9d866527a..d45481b2f 100644 --- a/packages/uniswap/package.json +++ b/packages/uniswap/package.json @@ -12,13 +12,13 @@ "access": "public" }, "scripts": { - "build": "yarn run build:esm && yarn run build:cjs", + "build": "pnpm run build:esm && pnpm run build:cjs", "build:esm": "tsc --module es2020 --target es2017 --outDir dist/esm", "build:cjs": "tsc --outDir dist/cjs", - "lint": "yarn lint:prettier --check && yarn lint:eslint", - "lint:fix": "yarn lint:prettier --write && yarn lint:eslint --fix", + "lint": "pnpm lint:prettier --check && pnpm lint:eslint", + "lint:fix": "pnpm lint:prettier --write && pnpm lint:eslint --fix", "lint:eslint": "eslint './{src,test}/**/*.{ts,tsx}'", - "lint:prettier": "yarn prettier './{src,test}/**/*.{ts,tsx}'", + "lint:prettier": "pnpm prettier './{src,test}/**/*.{ts,tsx}'", "test": "mocha" }, "dependencies": {}, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 124f25095..2eb645da9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -11,12 +11,10 @@ importers: eslint-plugin-no-only-tests: ^2.6.0 ethers: 5.6.9 prettier: 2.1.2 - wsrun: ^5.2.1 dependencies: '@changesets/cli': 2.21.1 ethers: 5.6.9 prettier: 2.1.2 - wsrun: 5.2.4 devDependencies: eslint-plugin-no-only-tests: 2.6.0 @@ -4163,15 +4161,6 @@ packages: - supports-color dev: true - /@jest/types/24.9.0: - resolution: {integrity: sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==} - engines: {node: '>= 6'} - dependencies: - '@types/istanbul-lib-coverage': 2.0.3 - '@types/istanbul-reports': 1.1.2 - '@types/yargs': 13.0.12 - dev: false - /@jest/types/26.6.2: resolution: {integrity: sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==} engines: {node: '>= 10.14.2'} @@ -6786,18 +6775,13 @@ packages: /@types/istanbul-lib-coverage/2.0.3: resolution: {integrity: sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw==} + dev: true /@types/istanbul-lib-report/3.0.0: resolution: {integrity: sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==} dependencies: '@types/istanbul-lib-coverage': 2.0.3 - - /@types/istanbul-reports/1.1.2: - resolution: {integrity: sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==} - dependencies: - '@types/istanbul-lib-coverage': 2.0.3 - '@types/istanbul-lib-report': 3.0.0 - dev: false + dev: true /@types/istanbul-reports/3.0.1: resolution: {integrity: sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==} @@ -7140,12 +7124,7 @@ packages: /@types/yargs-parser/20.2.0: resolution: {integrity: sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA==} - - /@types/yargs/13.0.12: - resolution: {integrity: sha512-qCxJE1qgz2y0hA4pIxjBR+PelCH0U5CK1XJXFwCNqfmliatKp47UCXXE9Dyk1OXBDLvsCF57TqQEJaeLfDYEOQ==} - dependencies: - '@types/yargs-parser': 20.2.0 - dev: false + dev: true /@types/yargs/15.0.14: resolution: {integrity: sha512-yEJzHoxf6SyQGhBhIYGXQDSCkJjB6HohDShto7m8vaKg9Yp0Yn8+71J9eakh2bnPg6BfsH9PRMhiRTZnd4eXGQ==} @@ -9425,7 +9404,7 @@ packages: /axios/0.21.4_debug@4.3.2: resolution: {integrity: sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==} dependencies: - follow-redirects: 1.14.9_debug@4.3.2 + follow-redirects: 1.14.9 transitivePeerDependencies: - debug dev: true @@ -14187,18 +14166,6 @@ packages: debug: optional: true - /follow-redirects/1.14.9_debug@4.3.2: - resolution: {integrity: sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==} - engines: {node: '>=4.0'} - peerDependencies: - debug: '*' - peerDependenciesMeta: - debug: - optional: true - dependencies: - debug: 4.3.2 - dev: true - /follow-redirects/1.14.9_debug@4.3.4: resolution: {integrity: sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==} engines: {node: '>=4.0'} @@ -14208,7 +14175,7 @@ packages: debug: optional: true dependencies: - debug: 4.3.4_supports-color@6.1.0 + debug: 4.3.4 /follow-redirects/1.5.10: resolution: {integrity: sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==} @@ -14729,6 +14696,7 @@ packages: minimatch: 3.1.2 once: 1.4.0 path-is-absolute: 1.0.1 + dev: true /glob/7.2.0: resolution: {integrity: sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==} @@ -16301,15 +16269,6 @@ packages: iterate-iterator: 1.0.2 dev: true - /jest-changed-files/24.9.0: - resolution: {integrity: sha512-6aTWpe2mHF0DhL28WjdkO8LyGjs3zItPET4bMSeXU6T3ub4FPMw+mcOcbdGXQOAfmLcxofD23/5Bl9Z4AkFwqg==} - engines: {node: '>= 6'} - dependencies: - '@jest/types': 24.9.0 - execa: 1.0.0 - throat: 4.1.0 - dev: false - /jest-haste-map/26.6.2: resolution: {integrity: sha512-easWIJXIw71B2RdR8kgqpjQrbMRWQBgiBwXYEhtGUTaX+doCjBheluShdDMeR8IMfJiTqH4+zfhtg29apJf/8w==} engines: {node: '>= 10.14.2'} @@ -22008,12 +21967,6 @@ packages: dependencies: extend-shallow: 3.0.2 - /split/1.0.1: - resolution: {integrity: sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==} - dependencies: - through: 2.3.8 - dev: false - /split2/4.1.0: resolution: {integrity: sha512-VBiJxFkxiXRlUIeyMQi8s4hgvKCSjtknJv/LVYbrgALPwf5zSKmEwV9Lst25AkvMDnvxODugjdl6KZgwKM1WYQ==} engines: {node: '>= 10.x'} @@ -22811,19 +22764,11 @@ packages: real-require: 0.1.0 dev: false - /throat/4.1.0: - resolution: {integrity: sha1-iQN8vJLFarGJJua6TLsgDhVnKmo=} - dev: false - /throttle-debounce/3.0.1: resolution: {integrity: sha512-dTEWWNu6JmeVXY0ZYoPuH5cRIwc0MeGbJwah9KUNYSJwommQpCzTySTpEe8Gs1J23aeWEuAobe4Ag7EHVt/LOg==} engines: {node: '>=10'} dev: true - /through/2.3.8: - resolution: {integrity: sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==} - dev: false - /through2-filter/3.0.0: resolution: {integrity: sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==} dependencies: @@ -24871,21 +24816,6 @@ packages: utf-8-validate: optional: true - /wsrun/5.2.4: - resolution: {integrity: sha512-akv3WtKBohdHsD/5uqhYRHw6GXeCXe87FsSg28Szq+2cpoqRW2SY4yPfm1D0za1cS6MgNy5hPgzS5SqYJaGUxg==} - hasBin: true - dependencies: - bluebird: 3.7.2 - chalk: 2.4.2 - glob: 7.1.7 - jest-changed-files: 24.9.0 - lodash: 4.17.21 - minimatch: 3.0.4 - split: 1.0.1 - throat: 4.1.0 - yargs: 13.3.2 - dev: false - /xdg-basedir/4.0.0: resolution: {integrity: sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==} engines: {node: '>=8'}