From 0ed31b1f0d07aa8cfd35a2c56872c84d05c66edf Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Mon, 26 Feb 2018 02:29:16 -0600 Subject: [PATCH 1/2] update webpack dependency to v4.x --- package.json | 6 +++--- test/Server.test.js | 4 ++-- test/fixtures/server-test/webpack.config.js | 4 +++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 9f6f471ea..3f5a73940 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "author": "Tobias Koppers @sokra", "description": "Offers a dev middleware for webpack, which arguments a live bundle to a directory", "peerDependencies": { - "webpack": "^1.0.0 || ^2.0.0 || ^3.0.0" + "webpack": "^1.0.0 || ^2.0.0 || ^3.0.0 || ^4.0.0" }, "dependencies": { "memory-fs": "~0.4.1", @@ -17,14 +17,14 @@ "codecov.io": "^0.1.6", "eslint": "^4.0.0", "express": "^4.14.0", - "file-loader": "^0.11.2", + "file-loader": "^1.1.9", "istanbul": "^0.4.5", "mocha": "^3.0.2", "mocha-sinon": "^2.0.0", "should": "^11.1.0", "sinon": "^2.3.8", "supertest": "^3.0.0", - "webpack": "^3.0.0" + "webpack": "^4.0.0" }, "license": "MIT", "engines": { diff --git a/test/Server.test.js b/test/Server.test.js index ee90c0f29..ed07e2872 100644 --- a/test/Server.test.js +++ b/test/Server.test.js @@ -45,7 +45,7 @@ describe("Server", function() { it("GET request to bundle file", function(done) { request(app).get("/public/bundle.js") .expect("Content-Type", "application/javascript; charset=UTF-8") - .expect("Content-Length", "2823") + .expect("Content-Length", "3435") .expect(200, /console\.log\("Hey\."\)/, done); }); @@ -138,7 +138,7 @@ describe("Server", function() { it("GET request to bundle file", function(done) { request(app).get("/bundle.js") - .expect("Content-Length", "2823") + .expect("Content-Length", "3435") .expect(200, /console\.log\("Hey\."\)/, done); }); }); diff --git a/test/fixtures/server-test/webpack.config.js b/test/fixtures/server-test/webpack.config.js index b5c9e4c1f..7d188bc49 100644 --- a/test/fixtures/server-test/webpack.config.js +++ b/test/fixtures/server-test/webpack.config.js @@ -1,4 +1,6 @@ module.exports = { + mode: "development", + devtool: false, context: __dirname, entry: "./foo.js", output: { @@ -6,7 +8,7 @@ module.exports = { path: "/" }, module: { - loaders: [ + rules: [ { test: /\.(svg|html)$/, loader: "file-loader", From 0700c9e27c7746ecedb3a5a2fb951876a1b38fd2 Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Mon, 26 Feb 2018 02:50:03 -0600 Subject: [PATCH 2/2] remove node 4 tests from travis --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 015be4d15..3a828f71f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ sudo: false language: node_js node_js: - - "4" - "6" - "7" - "8"