Merge branch 'greenkeeper/eslint-5.0.0'

EuropeanRespiratorySociety · Jul 3, 2018 · ed53b95 · ed53b95
2 parents 7cccd69 + 63a169a
commit ed53b95
Show file tree

Hide file tree

Showing 2 changed files with 164 additions and 72 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -15,7 +15,7 @@
   "scripts": {
     "build": "webpack --env build --mode production",
     "dev": "webpack --progress --colors --watch --env dev --mode development",
-    "eslint": "eslint src/. test/. --config .eslintrc.json",
+    "eslint": "eslint src --config .eslintrc.json",
     "test": "npm run eslint && nyc mocha --require @babel/register --colors ./test/lib --recursive",
     "test:watch": "mocha --require @babel/register --colors -w ./test/lib --recursive",
     "test:watch-composition": "mocha --require @babel/register --colors -w ./test/lib/composition.test.js",
@@ -54,7 +54,7 @@
     "babel-preset-es2015": "6.24.1",
     "chai": "4.1.2",
     "coveralls": "^3.0.0",
-    "eslint": "^4.19.0",
+    "eslint": "^5.0.1",
     "eslint-loader": "2.0.0",
     "istanbul": "^0.4.5",
     "mocha": "5.2.0",