Skip to content

Commit

Permalink
Solve Merge Conflicts for #4939 (#4987)
Browse files Browse the repository at this point in the history
* Use && instead of ; to join composite commands

* npm i rimraf --save-dev

* Change command to run rimraf

* npm i

* Cut redundant command covered in test:cov

* Split checklist item into 2

* Use 'have' for grammatical consistency

* Add bash keyword before script source

* Add line to changelog with PR #

* Ran npm i

* npm i

Co-authored-by: WBT <WBT@users.noreply.github.com>
  • Loading branch information
spacesailor24 and wbt authored Apr 28, 2022
1 parent 63b3cfc commit 69c0b1a
Show file tree
Hide file tree
Showing 4 changed files with 27,391 additions and 403 deletions.
4 changes: 2 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ Fixes #(issue)
- [ ] My changes generate no new warnings.
- [ ] Any dependent changes have been merged and published in downstream modules.
- [ ] I ran `npm run dtslint` with success and extended the tests and types if necessary.
- [ ] I ran `npm run test:unit` with success.
- [ ] I ran `npm run test:cov` and my test cases cover all the lines and branches of the added code.
- [ ] I ran `npm run build` and tested `dist/web3.min.js` in a browser.
- [ ] I ran `npm run build` with success.
- [ ] I have tested the built `dist/web3.min.js` in a browser.
- [ ] I have tested my code on the live network.
- [ ] I have checked the Deploy Preview and it looks correct.
- [ ] I have updated the `CHANGELOG.md` file in the root folder.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -539,6 +539,7 @@ Released with 1.0.0-beta.37 code base.
- fixed build issues of 1.7.2

## [Unreleased]
- Improve npm script commands for development purposes (#4848)

## [1.7.4]

Expand Down
Loading

0 comments on commit 69c0b1a

Please sign in to comment.