Skip to content

Commit

Permalink
chore: bump yarn to v4 (anoma#456)
Browse files Browse the repository at this point in the history
This is to stop the extension build on the CI from failing due to yarn
v1 problems.

This also adds `web-ext` to `devDependencies`, so it no longer needs to
be installed globally.
  • Loading branch information
emccorson committed Nov 20, 2023
1 parent 510ba36 commit 53fb5e5
Show file tree
Hide file tree
Showing 22 changed files with 31,144 additions and 30,571 deletions.
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/.yarn/releases/** binary
/.yarn/plugins/** binary
3 changes: 3 additions & 0 deletions .github/workflows/deploy-wallet-at-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,9 @@ jobs:
with:
cache-name: unit-tests-wasm

- name: Install yarn dependencies
uses: ./.github/actions/yarn-cache

- name: Install protoc
run: sudo apt-get install -y protobuf-compiler

Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/release-wallet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -141,9 +141,6 @@ jobs:
- name: Install protoc
run: sudo apt-get install -y protobuf-compiler

- name: Install web-ext
run: yarn global add node-gyp && yarn global add web-ext

- name: Build WASM dependencies
working-directory: ./apps/extension
run: yarn wasm:build
Expand Down Expand Up @@ -187,9 +184,6 @@ jobs:
- name: Install protoc
run: sudo apt-get install -y protobuf-compiler

- name: Install web-ext
run: yarn global add node-gyp && yarn global add web-ext

- name: Build WASM dependencies
working-directory: ./apps/extension
run: yarn wasm:build
Expand Down
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,11 @@ target/
npm-debug.log*
yarn-debug.log*
yarn-error.log*

.yarn/*
!.yarn/cache
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions
893 changes: 893 additions & 0 deletions .yarn/releases/yarn-4.0.2.cjs

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-4.0.2.cjs
3 changes: 0 additions & 3 deletions apps/extension/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ This is the Namada Browser Extension project.
## Usage

```bash
# Install web-ext globally (this bundles Firefox extensions into a `.zip` file):
yarn global add web-ext

# Build wasm dependencies
yarn wasm:build # This needs to be run initially to ensure wasm dependencies are available

Expand Down
13 changes: 7 additions & 6 deletions apps/extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@
"clean:chrome": "rimraf ./build/chrome",
"clean:firefox": "rimraf ./build/firefox",
"build": "yarn wasm:build && yarn clean && yarn build:chrome && yarn build:firefox",
"build:chrome": "yarn clean:chrome && NODE_ENV=production TARGET=chrome webpack && web-ext build --s ./build/chrome -a ./build/chrome",
"build:firefox": "yarn clean:firefox && NODE_ENV=production TARGET=firefox webpack && web-ext build --s ./build/firefox -a ./build/firefox",
"build:chrome": "yarn clean:chrome && NODE_ENV=production TARGET=chrome webpack-cli && web-ext build --s ./build/chrome -a ./build/chrome",
"build:firefox": "yarn clean:firefox && NODE_ENV=production TARGET=firefox webpack-cli && web-ext build --s ./build/firefox -a ./build/firefox",
"lint": "eslint src --ext .ts,.tsx",
"lint:fix": "yarn lint -- --fix",
"lint:ci": "yarn lint --max-warnings 0",
"start": "yarn start:chrome",
"start:chrome": "yarn clean:chrome && export NODE_ENV=development; export TARGET=chrome && webpack --watch",
"start:chrome:proxy": "export REACT_APP_PROXY=true; yarn start:chrome",
"start:firefox": "yarn clean:firefox && export NODE_ENV=development; export TARGET=firefox && webpack --watch",
"start:firefox:proxy": "export REACT_APP_PROXY=true; yarn start:firefox",
"start:chrome": "yarn clean:chrome && NODE_ENV=development TARGET=chrome webpack-cli --watch",
"start:chrome:proxy": "REACT_APP_PROXY=true yarn start:chrome",
"start:firefox": "yarn clean:firefox && NODE_ENV=development TARGET=firefox webpack-cli --watch",
"start:firefox:proxy": "REACT_APP_PROXY=true yarn start:firefox",
"test": "./scripts/build-node.sh && yarn jest",
"test:watch": "./scripts/build-node.sh && yarn jest --watchAll=true",
"test:ci": "jest",
Expand Down Expand Up @@ -84,6 +84,7 @@
"ts-loader": "^9.3.1",
"ts-node": "^10.9.1",
"typescript-plugin-styled-components": "^2.0.0",
"web-ext": "^7.8.0",
"webpack-cli": "^4.10.0",
"webpack-extension-reloader": "^1.1.4"
}
Expand Down
8 changes: 4 additions & 4 deletions apps/namada-interface/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@
"scripts": {
"start": "webpack-dev-server",
"start:proxy": "node ./scripts/startProxies.js",
"dev": "export NODE_ENV=development && yarn start",
"dev:local": "export NODE_ENV=development; export REACT_APP_LOCAL=\"true\" && yarn dev",
"dev:proxy": "export REACT_APP_PROXY=true; ./scripts/start-proxies.sh; yarn dev:local",
"build": "export NODE_ENV=production && yarn wasm:build && webpack",
"dev": "NODE_ENV=development yarn start",
"dev:local": "NODE_ENV=development REACT_APP_LOCAL=\"true\" yarn dev",
"dev:proxy": "REACT_APP_PROXY=true && ./scripts/start-proxies.sh && yarn dev:local",
"build": "NODE_ENV=production && yarn wasm:build && webpack-cli",
"lint": "eslint src --ext .ts,.tsx",
"lint:fix": "yarn lint -- --fix",
"lint:ci": "yarn lint --max-warnings 0",
Expand Down
10,031 changes: 0 additions & 10,031 deletions apps/namada-interface/yarn.lock

This file was deleted.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,6 @@
"devDependencies": {
"stream-browserify": "^3.0.0",
"wsrun": "^5.2.4"
}
},
"packageManager": "yarn@4.0.2"
}
5 changes: 2 additions & 3 deletions packages/chains/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@
"repository": "https://github.com/anoma/namada-interface",
"author": "Heliax AG <hello@heliax.dev>",
"license": "MIT",
"private": false,
"dependencies": {
"typescript": "^5.1.3",
"@namada/types": "0.1.0"
"@namada/types": "0.1.0",
"typescript": "^5.1.3"
},
"devDependencies": {
"eslint-import-resolver-typescript": "^3.5.2"
Expand Down
1 change: 0 additions & 1 deletion packages/components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
"repository": "https://github.com/anoma/namada-interface",
"author": "Heliax Dev <info@heliax.dev>",
"license": "MIT",
"private": false,
"scripts": {
"lint": "eslint src --ext .ts,.tsx",
"lint:fix": "yarn lint -- --fix",
Expand Down
1 change: 0 additions & 1 deletion packages/crypto/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
"repository": "https://github.com/anoma/namada-interface/",
"author": "Heliax Dev <info@heliax.dev>",
"license": "MIT",
"private": false,
"scripts": {
"wasm:build": "./scripts/build.sh --release",
"wasm:build:dev": "./scripts/build.sh",
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"license": "MIT",
"devDependencies": {
"eslint": "^8.49.0",
"eslint-plugin-import": "^2.27.5",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-react": "^7.33.0",
"eslint-plugin-react-hooks": "^4.6.0"
}
Expand Down
1 change: 0 additions & 1 deletion packages/hooks/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
"repository": "https://github.com/anoma/namada-interface",
"author": "Heliax Dev <info@heliax.dev>",
"license": "MIT",
"private": false,
"scripts": {
"lint": "eslint src --ext .ts,.tsx",
"lint:fix": "yarn lint -- --fix",
Expand Down
6 changes: 3 additions & 3 deletions packages/integrations/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@
"ts-node": "^10.9.1"
},
"dependencies": {
"@namada/types": "0.1.0",
"@namada/utils": "0.1.0",
"@cosmjs/launchpad": "^0.27.1",
"@cosmjs/proto-signing": "^0.27.1",
"@cosmjs/stargate": "^0.29.5",
"@keplr-wallet/types": "^0.10.19",
"@metamask/providers": "^10.2.1",
"@metamask/sdk": "^0.1.0"
"@metamask/sdk": "^0.1.0",
"@namada/types": "0.1.0",
"@namada/utils": "0.1.0"
}
}
1 change: 0 additions & 1 deletion packages/shared/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
"repository": "https://github.com/anoma/namada-interface/",
"author": "Heliax Dev <info@heliax.dev>",
"license": "MIT",
"private": false,
"scripts": {
"wasm:build": "./scripts/build.sh --release",
"wasm:build:dev": "./scripts/build.sh",
Expand Down
1 change: 0 additions & 1 deletion packages/storage/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
"repository": "https://github.com/anoma/namada-interface",
"author": "Heliax Dev <info@heliax.dev>",
"license": "MIT",
"private": false,
"scripts": {
"lint": "eslint src --ext .ts",
"lint:fix": "yarn lint -- --fix",
Expand Down
3 changes: 1 addition & 2 deletions packages/types/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,15 @@
"repository": "https://github.com/anoma/namada-interface/",
"author": "Heliax AG <hello@heliax.dev>",
"license": "MIT",
"private": false,
"scripts": {
"lint": "eslint src --ext .ts",
"lint:fix": "yarn lint -- --fix",
"lint:ci": "yarn lint --max-warnings 0"
},
"dependencies": {
"@dao-xyz/borsh": "^5.1.5",
"@namada/ledger-namada": "0.0.1",
"bn.js": "^5.2.1",
"@dao-xyz/borsh": "^5.1.5",
"slip44": "^3.0.11",
"typescript": "^5.1.3"
},
Expand Down
1 change: 0 additions & 1 deletion packages/utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
"repository": "https://github.com/anoma/namada-interface/",
"author": "Heliax Dev <info@heliax.dev>",
"license": "MIT",
"private": false,
"scripts": {
"lint": "eslint src --ext .ts",
"lint:fix": "yarn lint -- --fix",
Expand Down
Loading

0 comments on commit 53fb5e5

Please sign in to comment.