diff options
author | ThibG <thib@sitedethib.com> | 2018-11-30 22:37:58 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-30 22:37:58 +0100 |
commit | 3cbe0c26bbc2a9a70542ca6d43336d06aae8f42d (patch) | |
tree | 750732633da28b3ed719883ee00db0593fb44fde /package.json | |
parent | 76320bf6d8ff09cfbea911a5d0f466aa160d313f (diff) | |
parent | bc8411ec870e579bd2411827f3b8a1d4ecf44796 (diff) |
Merge pull request #837 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'package.json')
-rw-r--r-- | package.json | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/package.json b/package.json index 68ff199f2..05dc489fe 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "build:production": "cross-env RAILS_ENV=production NODE_ENV=production ./bin/webpack", "manage:translations": "node ./config/webpack/translationRunner.js", "start": "node ./streaming/index.js", - "test": "npm-run-all test:lint test:jest", + "test": "npm run test:lint && npm run test:jest", "test:lint": "eslint -c .eslintrc.yml --ext=js app/javascript/ config/webpack/ streaming/", "test:jest": "cross-env NODE_ENV=test jest --coverage" }, @@ -78,7 +78,6 @@ "mini-css-extract-plugin": "^0.4.2", "mkdirp": "^0.5.1", "node-sass": "^4.9.2", - "npm-run-all": "^4.1.2", "npmlog": "^4.1.2", "object-assign": "^4.1.1", "object-fit-images": "^3.2.3", |