Merge pull request webpack#5920 from webpack/feature/next-update-deps-and-lint

sokra · web-flow · commit 5fae802d9288 · 2017-11-07T09:04:21.000+01:00
chore(deps): update all minor and patch deps, remove lint errors
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -51,7 +51,7 @@ module.exports = {
 		}],
 		"no-console": "off",
 		"valid-jsdoc": "error",
-		"node/no-unsupported-features": ["error", { version: 4 }],
+		"node/no-unsupported-features": "error",
 		"node/no-deprecated-api": "error",
 		"node/no-missing-import": "error",
 		"node/no-missing-require": [
diff --git a/.travis.yml b/.travis.yml
@@ -24,9 +24,6 @@ matrix:
     - os: linux
       node_js: "6"
       env: NO_WATCH_TESTS=1 JOB_PART=integration
-    - os: linux
-      node_js: "4"
-      env: NO_WATCH_TESTS=1 JOB_PART=integration
     - os: osx
       node_js: "8"
       env: NO_WATCH_TESTS=1 JOB_PART=integration
diff --git a/circle.yml b/circle.yml
@@ -8,7 +8,7 @@ machine:
 
 dependencies:
   pre:
-    - case $CIRCLE_NODE_INDEX in 0) NODE_VERSION=4 ;; 1) NODE_VERSION=8 ;; esac; nvm install $NODE_VERSION && nvm alias default $NODE_VERSION
+    - case $CIRCLE_NODE_INDEX in 0) NODE_VERSION=6 ;; 1) NODE_VERSION=8 ;; esac; nvm install $NODE_VERSION && nvm alias default $NODE_VERSION
   override:
     - yarn
     - yarn link || true && yarn link webpack
diff --git a/package.json b/package.json
@@ -69,7 +69,7 @@
     "worker-loader": "^0.8.0"
   },
   "engines": {
-    "node": ">=4.3.0 <5.0.0 || >=5.10"
+    "node": ">=6.11.5"
   },
   "repository": {
     "type": "git",
diff --git a/test/configCases/extract-text/issue-14/index.js b/test/configCases/extract-text/issue-14/index.js
@@ -1,4 +1,4 @@
-var should = require("should");
+require("should");
 var path = require("path");
 var fs = require("fs");
 
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-var should = require("should");`
	`1`	`+require("should");`
`2`	`2`	`var path = require("path");`
`3`	`3`	`var fs = require("fs");`
`4`	`4`