diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cb8dc91c79c..33520e85695 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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 @@ -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: diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d3d5240681..eb407bf0ea5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/lerna.json b/lerna.json index 1965a8d48d0..e10b296fb62 100644 --- a/lerna.json +++ b/lerna.json @@ -11,5 +11,6 @@ }, "packages": [ "packages/*" - ] + ], + "useNx": false } diff --git a/package.json b/package.json index 1c2b64e4fa7..8cadb1c033e 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "scripts": { "version": "npm run build", "postinstall": "npm run bootstrap", - "build": "npm run bootstrap && lerna run compile && webpack && cp -r ./dist ./packages/web3", + "build": "npm run bootstrap && lerna run compile --skip-nx-cache && webpack && cp -r ./dist ./packages/web3", "publish": "lerna publish", "bootstrap": "lerna bootstrap --hoist", "lint": "jshint *.js packages", @@ -107,7 +107,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", @@ -127,8 +127,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", "mocha": "^6.2.3", + "nx": "^15.3.0", "nyc": "^14.1.1", "pify": "^4.0.1", "process": "^0.11.10", diff --git a/scripts/e2e.npm.publish.sh b/scripts/e2e.npm.publish.sh index f832655db44..d56e401e92c 100755 --- a/scripts/e2e.npm.publish.sh +++ b/scripts/e2e.npm.publish.sh @@ -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 npm-auth-to-token@1.0.0 -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 +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 &