Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

5629/lerna #5680

Merged
merged 33 commits into from
Dec 7, 2022
Merged
Show file tree
Hide file tree
Changes from 29 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
steps:
- uses: actions/setup-node@v1
with:
node-version: 12
node-version: 14
- uses: actions/checkout@v2

- uses: actions/cache@v2
Expand Down Expand Up @@ -118,7 +118,7 @@ jobs:
steps:
- uses: actions/setup-node@v1
with:
node-version: 12
node-version: 14
- uses: actions/checkout@v2
- run: bash ./scripts/ci.sh
eth2:
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -619,6 +619,7 @@ Released with 1.0.0-beta.37 code base.
- Updated Webpack 4 to Webpack 5, more details at (#5629)
- `crypto-browserify` module is now used only in webpack builds for polyfilling browsers (#5629)
- Updated `ethereumjs-util` to `7.1.5` (#5629)
- Updated `lerna` 4 to version 6 (#5680)

### Fixed

Expand Down
3 changes: 2 additions & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@
},
"packages": [
"packages/*"
]
],
"useNx": true
}
15 changes: 15 additions & 0 deletions nx.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
luu-alex marked this conversation as resolved.
Show resolved Hide resolved
"tasksRunnerOptions": {
"default": {
"runner": "nx/tasks-runners/default",
"options": {
"cacheableOperations": [
"compile",
"bootstrap"
]
}
}
},
"targetDefaults": {
}
}
6 changes: 4 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"version": "npm run build",
"postinstall": "npm run bootstrap",
"build": "npm run bootstrap && lerna run compile && webpack && cp -r ./dist ./packages/web3",
luu-alex marked this conversation as resolved.
Show resolved Hide resolved
"build-no-cache": "npm run bootstrap && lerna run compile --skip-nx-cache && webpack && cp -r ./dist ./packages/web3",
luu-alex marked this conversation as resolved.
Show resolved Hide resolved
"publish": "lerna publish",
"bootstrap": "lerna bootstrap --hoist",
"lint": "jshint *.js packages",
Expand Down Expand Up @@ -107,7 +108,7 @@
"bn.js": "^5.2.1",
"browserify": "^16.5.2",
"buffer": "^4.9.2",
"bundlesize": "^0.18.0",
"bundlesize": "^0.18.1",
"chai": "^4.2.0",
"chai-as-promised": "^7.1.1",
"core-js": "^3.6.5",
Expand All @@ -127,8 +128,9 @@
"karma-firefox-launcher": "^1.3.0",
"karma-mocha": "^2.0.1",
"karma-spec-reporter": "0.0.32",
"lerna": "^4.0.0",
"lerna": "^6.1.0",
luu-alex marked this conversation as resolved.
Show resolved Hide resolved
"mocha": "^6.2.3",
"nx": "^15.2.4",
"nyc": "^14.1.1",
"pify": "^4.0.1",
"process": "^0.11.10",
Expand Down
8 changes: 4 additions & 4 deletions scripts/e2e.npm.publish.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ fi
# To model publication correctly, this script needs to run
# without web3's dev deps being installed. It installs
# what it needs here.
npm install -g verdaccio@4.4.4
npm install -g verdaccio@5.18.0
npm install -g [email protected]
npm install -g lerna@^3.20.2
npm install -g typescript@^3.9.5
npm install -g webpack@^4.44.1 webpack-cli@^3.3.12 clean-webpack-plugin@^3.0.0
luu-alex marked this conversation as resolved.
Show resolved Hide resolved
npm install -g lerna@^6.1.0
npm install -g typescript@^4.1
npm install -g webpack@^5.75.0 webpack-cli@^5

# Launch npm proxy registry and save pid to kill server (req. in Windows env)
verdaccio --config verdaccio.yml &
Expand Down