about summary refs log tree commit diff
path: root/package.json
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2018-11-30 20:16:26 +0100
committerThibaut Girka <thib@sitedethib.com>2018-11-30 20:16:26 +0100
commitbc8411ec870e579bd2411827f3b8a1d4ecf44796 (patch)
treeb203a43bcb54017dcb24a3937f6e0aa767e225d2 /package.json
parentb65daa25faab0fbefd367b3cbbe4d32bfd8c5820 (diff)
parentbfec030a4e3be37e4986d7ec5cb1bda968ba549a (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'package.json')
-rw-r--r--package.json3
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",