Skip to content
This repository has been archived by the owner on Feb 26, 2024. It is now read-only.

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
davidmurdoch committed Jun 13, 2019
2 parents 6190dd1 + 4ddb821 commit 69545e3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion npm-shrinkwrap.json

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

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ganache-core",
"version": "2.5.5",
"version": "2.5.6",
"main": "./index.js",
"engines": {
"node": ">=8.9.0"
Expand All @@ -15,7 +15,7 @@
"build": "webpack-cli --config ./webpack/node/core.webpack.config.js",
"build-web": "webpack-cli --config ./webpack/web-experimental/core.webpack.config.js",
"format": "prettier --write \"{lib,perf,test}/**/*.js\" && eslint --fix --ignore-path .gitignore .",
"prepublishOnly": "npm run test && npm run build && npm run test-build && cp npm-shrinkwrap.json npm-shrinkwrap.json.bak && npm prune --only=prod",
"prepublishOnly": "npm run test && npm run build && npm run test-build && cp npm-shrinkwrap.json npm-shrinkwrap.json.bak && rm -rf node_modules/web3-providers-ws/node_modules/websocket/.git && npm prune --only=prod",
"postpublish": "rm npm-shrinkwrap.json && mv npm-shrinkwrap.json.bak npm-shrinkwrap.json && npm ci",
"test": "npm run _lint && npm run nyc_mocha",
"test-build": "cross-env TEST_BUILD=node npm run _mocha",
Expand Down

0 comments on commit 69545e3

Please sign in to comment.