Skip to content

Commit

Permalink
use yarn 4.x latest as package manager (#1349)
Browse files Browse the repository at this point in the history
* use yarn 4.x latest as package manager

* remove install-state; update gitignore

* update actions to enable corepack and use latest
  • Loading branch information
dmosites authored Dec 2, 2024
1 parent 4f41b48 commit 94cf3d0
Show file tree
Hide file tree
Showing 13 changed files with 13,948 additions and 10,180 deletions.
14 changes: 9 additions & 5 deletions .github/workflows/beta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,16 @@ jobs:
publish:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v4
- name: Enable Corepack
run: corepack enable
- name: Use Node.js 18.x
uses: actions/setup-node@v4
with:
node-version: '18.x'
registry-url: 'https://registry.npmjs.org'
- run: yarn install
node-version: "18.x"
cache: 'yarn'
- name: Install dependencies
run: yarn install --immutable
- run: lerna run compile --concurrency=1
- run: lerna publish from-package --yes --dist-tag beta
env:
Expand Down
14 changes: 9 additions & 5 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,16 @@ jobs:
publish:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v4
- name: Enable Corepack
run: corepack enable
- name: Use Node.js 18.x
uses: actions/setup-node@v4
with:
node-version: '18.x'
registry-url: 'https://registry.npmjs.org'
- run: yarn install
node-version: "18.x"
cache: 'yarn'
- name: Install dependencies
run: yarn install --immutable
- run: lerna run compile --concurrency=1
- run: lerna publish from-package --yes
env:
Expand Down
14 changes: 9 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,16 @@ jobs:
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Test using Node.js
uses: actions/setup-node@v1
- uses: actions/checkout@v4
- name: Enable Corepack
run: corepack enable
- name: Use Node.js 18.x
uses: actions/setup-node@v4
with:
node-version: '18.x'
- run: yarn install
node-version: "18.x"
cache: 'yarn'
- name: Install dependencies
run: yarn install --immutable
- run: lerna run compile --concurrency=1
- run: lerna run test:ci --concurrency=1
env:
Expand Down
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
node_modules
.yarn/*
!.yarn/cache
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions
yarn-error.log
lerna-debug.log
.DS_Store
Expand Down
1 change: 1 addition & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nodeLinker: node-modules
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
"prepare": "husky install",
"prettier": "prettier --write \"./**/*.sol\" \"./**/*.ts\" \"./**/*.js\" \"./**/*.json\""
},
"packageManager": "[email protected]",
"devDependencies": {
"@ensdomains/ens": "^0.4.4",
"@ensdomains/resolver": "^0.2.4",
Expand All @@ -50,7 +51,6 @@
"hardhat-gas-reporter": "^1.0.9",
"husky": "^8.0.1",
"lerna": "^7.3.0",
"mocha": "^10.2.0",
"nx": "^16.5.5",
"prettier": "^2.8.4",
"prettier-plugin-solidity": "^1.1.2",
Expand Down
2 changes: 1 addition & 1 deletion source/batch-call/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
"ethers": "^5.7.2"
},
"devDependencies": {
"@airswap/utils": "5.0.2",
"@airswap/swap": "5.0.1",
"@airswap/swap-erc20": "5.0.1",
"@airswap/utils": "5.0.2",
"@openzeppelin/contracts": "^4.8.3"
},
"publishConfig": {
Expand Down
4 changes: 2 additions & 2 deletions source/delegate/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
"ethers": "^5.7.2"
},
"devDependencies": {
"@airswap/utils": "5.0.2",
"@airswap/swap-erc20": "5.0.1"
"@airswap/swap-erc20": "5.0.1",
"@airswap/utils": "5.0.2"
},
"publishConfig": {
"access": "public"
Expand Down
2 changes: 1 addition & 1 deletion source/pool/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
"ethers": "^5.7.2"
},
"devDependencies": {
"@airswap/utils": "5.0.2",
"@airswap/merkle": "0.0.2",
"@airswap/utils": "5.0.2",
"@openzeppelin/contracts": "^4.8.3"
},
"publishConfig": {
Expand Down
2 changes: 1 addition & 1 deletion source/wrapper/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
"owners": "hardhat run ./scripts/owner.js"
},
"devDependencies": {
"@airswap/utils": "5.0.2",
"@airswap/swap-erc20": "5.0.1",
"@airswap/utils": "5.0.2",
"@openzeppelin/contracts": "^4.8.3",
"@uniswap/v2-periphery": "^1.1.0-beta.0"
},
Expand Down
4 changes: 3 additions & 1 deletion tools/libraries/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
},
"dependencies": {
"@airswap/batch-call": "5.0.1",
"@airswap/jsonrpc-client-websocket": "0.0.1",
"@airswap/delegate": "5.0.1",
"@airswap/jsonrpc-client-websocket": "0.0.1",
"@airswap/pool": "5.0.1",
"@airswap/registry": "5.0.1",
"@airswap/staking": "5.0.1",
Expand All @@ -41,10 +41,12 @@
},
"devDependencies": {
"@relaycorp/ws-mock": "^5.2.6",
"@types/mocha": "^10",
"@types/mock-require": "^2.0.0",
"body-parser": "^1.20.1",
"express": "^4.18.2",
"fancy-test": "^1.4.7",
"mocha": "^10.8.2",
"mock-require": "^3.0.3",
"mock-socket": "^9.0.3",
"nock": "^12.0.1",
Expand Down
4 changes: 4 additions & 0 deletions tools/utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,9 @@
},
"publishConfig": {
"access": "public"
},
"devDependencies": {
"@types/mocha": "^10",
"mocha": "^10.8.2"
}
}
Loading

0 comments on commit 94cf3d0

Please sign in to comment.