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.

Sign up for GitHub

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

Jump to bottom

Release - 1.2.7 #3470

Merged
merged 8 commits into from
Apr 24, 2020
Merged

Release - 1.2.7 #3470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1d04bee
Update changelog
ryanio Apr 15, 2020
b0fc357
Update lerna dep and release scripts
ryanio Apr 15, 2020
4185ffa
Document gulpfile
ryanio Apr 15, 2020
68fa5e1
Run build on different lerna version lifecycle segment
ryanio Apr 15, 2020
7cdcca9
Use web3.js for root package name
ryanio Apr 15, 2020
a66e541
v1.2.7-rc.0
ryanio Apr 15, 2020
a5bfd01
v1.2.7
ryanio Apr 24, 2020
c42d3e8
Update package-locks
ryanio Apr 24, 2020
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
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,4 +184,4 @@ Released with 1.0.0-beta.37 code base.

### Fixed

- Fix intermittent CI build issues with `dtslint`. (#3479)
- Fix intermittent CI build issues with `dtslint`. (#3479)
2 changes: 1 addition & 1 deletion dist/web3.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions gulpfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ var ugliyOptions = {
}
};

// Apply lerna.json version to root package.json
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think these comments are non-related to this PR.. see point 4.1 of the contribution guidelines.

gulp.task('version', function() {
if (!lernaJSON.version) {
throw new Error('version property is missing from lerna.json');
Expand All @@ -143,6 +144,7 @@ gulp.task('lint', function() {
.pipe(jshint.reporter('default'));
});

// Delete dist folder
gulp.task('clean', gulp.series('lint', function(cb) {
del([DEST]).then(cb.bind(null, null));
}));
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.2.5",
"version": "1.2.7",
"lerna": "2.0.0",
"command": {
"init": {
Expand Down
13 changes: 7 additions & 6 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "web3",
"name": "web3.js",
nivida marked this conversation as resolved.
Show resolved Hide resolved
"private": true,
"version": "1.2.6",
"version": "1.2.7",
"description": "Ethereum JavaScript API wrapper repository",
"license": "LGPL-3.0",
"engines": {
Expand All @@ -20,10 +20,11 @@
}
],
"scripts": {
"version": "npm run build-all",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't those modified or additional commands not be a separate PR to be aligned with the contribution guidelines from @cgewecke?

Copy link
Contributor

@michaelsbradleyjr michaelsbradleyjr Apr 15, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NOT a good idea to have a script named the same as a discrete step in the NPM release-lifecycle unless you fully intend to follow the documented behavior (not sure lerna can/will/do/acknowledge that re: the root package.json in a lerna publish scenario)...

Run AFTER bumping the package version, but BEFORE commit.

See: https://docs.npmjs.com/misc/scripts

Maybe that's the case, but NOTE-ing out of caution.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes thanks that was exactly our intention, it is to build the minified file after bumping package versions but before committing the working state.

Copy link
Contributor

@michaelsbradleyjr michaelsbradleyjr Apr 15, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmmm... not entirely sure, but sounds like maybe "files" in package.json (in child packages) could be added / edited; and that .gitignore (root or children) could be adjusted to ignore *.min.js. Main point: if you're specifying a "version" script, something's probably not right.

It's been awhile since I looked closely at this monorepo, but if you have .npmignore in root or child packages, nuke with prejudice and prefer "files" in all child packages' package.json — it will save you a world of trouble.

Copy link
Contributor

@michaelsbradleyjr michaelsbradleyjr Apr 15, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, consider "prepublishOnly'" in package.json scripts.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmmm... not entirely sure, but sounds like maybe "files" in package.json (in child packages) could be added / edited; and that .gitignore (root or children) could be adjusted to ignore *.min.js. Main point: if you're specifying a "version" script, something's probably not right.

I agree.. I've added the filesproperty to the package.json files in 2.x...

and that .gitignore (root or children) could be adjusted to ignore *.min.js.

Sadly no.. I've noticed the min file has to be on GitHub because many do use it for their tutorials and courses or of whatever reason :-)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ryanio

NOT a good idea to have a script named the same as a discrete step

I would add this command/alias to the required places without defining a version command because this is for some/many devs a "hidden logic" :D

Copy link
Collaborator

@cgewecke cgewecke Apr 15, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's more about this in the lerna documentation for version command lifecycle scripts.

"postinstall": "lerna bootstrap",
"build": "gulp",
"build-all": "gulp all",
"release": "lerna bootstrap; lerna publish",
"build": "lerna bootstrap && gulp",
"build-all": "lerna bootstrap && gulp all",
"publish": "lerna publish",
"bootstrap": "lerna bootstrap",
"watch": "gulp watch",
"docs": "cd docs; make html;",
Expand Down Expand Up @@ -132,7 +133,7 @@
"karma-firefox-launcher": "^1.2.0",
"karma-mocha": "^1.3.0",
"karma-spec-reporter": "0.0.32",
"lerna": "^3.18.3",
"lerna": "^3.20.2",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What exactly was the reason to bump two minor versions of lerna? 🤔

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The lerna project is quite good about adhering to semver, so this should only pick-up bug fixes and new featuresl

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, I agree and know.. just thought it is out of the scope of this PR idk (4.1 contribution rules) :-)

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For additional background: the existence of several moderate/high vulnerability audit warnings originating in Lerna was flagged by a longtime contributor in this 2744 comment, yesterday.

"mocha": "^6.2.1",
"nyc": "^14.1.1",
"pify": "^4.0.1",
Expand Down
10 changes: 6 additions & 4 deletions packages/web3-bzz/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/web3-bzz/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "web3-bzz",
"version": "1.2.6",
"version": "1.2.7",
"description": "Web3 module to interact with the Swarm network.",
"repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-bzz",
"license": "LGPL-3.0",
Expand Down
10 changes: 6 additions & 4 deletions packages/web3-core-helpers/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions packages/web3-core-helpers/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "web3-core-helpers",
"version": "1.2.6",
"version": "1.2.7",
"description": "Web3 core tools helper for sub packages. This is an internal package.",
"repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-core-helpers",
"license": "LGPL-3.0",
Expand All @@ -14,8 +14,8 @@
"main": "src/index.js",
"dependencies": {
"underscore": "1.9.1",
"web3-eth-iban": "1.2.6",
"web3-utils": "1.2.6"
"web3-eth-iban": "1.2.7",
"web3-utils": "1.2.7"
},
"devDependencies": {
"@types/node": "^12.12.5",
Expand Down
10 changes: 6 additions & 4 deletions packages/web3-core-method/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions packages/web3-core-method/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "web3-core-method",
"version": "1.2.6",
"version": "1.2.7",
"description": "Creates the methods on the web3 modules. This is an internal package.",
"repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-core-method",
"license": "LGPL-3.0",
Expand All @@ -14,10 +14,10 @@
"main": "src/index.js",
"dependencies": {
"underscore": "1.9.1",
"web3-core-helpers": "1.2.6",
"web3-core-promievent": "1.2.6",
"web3-core-subscriptions": "1.2.6",
"web3-utils": "1.2.6"
"web3-core-helpers": "1.2.7",
"web3-core-promievent": "1.2.7",
"web3-core-subscriptions": "1.2.7",
"web3-utils": "1.2.7"
},
"devDependencies": {
"dtslint": "^3.4.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/web3-core-promievent/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/web3-core-promievent/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "web3-core-promievent",
"version": "1.2.6",
"version": "1.2.7",
"description": "This package extends the EventEmitter with the Promise class to allow chaining as well as multiple final states of a function.",
"repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-core-promievent",
"license": "LGPL-3.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/web3-core-requestmanager/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions packages/web3-core-requestmanager/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "web3-core-requestmanager",
"version": "1.2.6",
"version": "1.2.7",
"description": "Web3 module to handle requests to external providers.",
"repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-core-requestmanager",
"license": "LGPL-3.0",
Expand All @@ -10,9 +10,9 @@
"main": "src/index.js",
"dependencies": {
"underscore": "1.9.1",
"web3-core-helpers": "1.2.6",
"web3-providers-http": "1.2.6",
"web3-providers-ipc": "1.2.6",
"web3-providers-ws": "1.2.6"
"web3-core-helpers": "1.2.7",
"web3-providers-http": "1.2.7",
"web3-providers-ipc": "1.2.7",
"web3-providers-ws": "1.2.7"
}
}
10 changes: 6 additions & 4 deletions packages/web3-core-subscriptions/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/web3-core-subscriptions/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "web3-core-subscriptions",
"version": "1.2.6",
"version": "1.2.7",
"description": "Manages web3 subscriptions. This is an internal package.",
"repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-core-subscriptions",
"license": "LGPL-3.0",
Expand All @@ -15,7 +15,7 @@
"dependencies": {
"eventemitter3": "3.1.2",
"underscore": "1.9.1",
"web3-core-helpers": "1.2.6"
"web3-core-helpers": "1.2.7"
},
"devDependencies": {
"dtslint": "^3.4.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/web3-core/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions packages/web3-core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "web3-core",
"version": "1.2.6",
"version": "1.2.7",
"description": "Web3 core tools for sub packages. This is an internal package.",
"repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-core",
"license": "LGPL-3.0",
Expand All @@ -16,10 +16,10 @@
"@types/bn.js": "^4.11.4",
"@types/node": "^12.6.1",
"bignumber.js": "^9.0.0",
"web3-core-helpers": "1.2.6",
"web3-core-method": "1.2.6",
"web3-core-requestmanager": "1.2.6",
"web3-utils": "1.2.6"
"web3-core-helpers": "1.2.7",
"web3-core-method": "1.2.7",
"web3-core-requestmanager": "1.2.7",
"web3-utils": "1.2.7"
},
"devDependencies": {
"dtslint": "^3.4.1",
Expand Down
10 changes: 6 additions & 4 deletions packages/web3-eth-abi/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/web3-eth-abi/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "web3-eth-abi",
"version": "1.2.6",
"version": "1.2.7",
"description": "Web3 module encode and decode EVM in/output.",
"repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-eth-abi",
"license": "LGPL-3.0",
Expand All @@ -15,7 +15,7 @@
"dependencies": {
"ethers": "4.0.0-beta.3",
"underscore": "1.9.1",
"web3-utils": "1.2.6"
"web3-utils": "1.2.7"
},
"devDependencies": {
"dtslint": "^3.4.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/web3-eth-accounts/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading