Merge branch 'master' into fix-warning

webpack · Apr 15, 2021 · 0c211bc · 0c211bc
2 parents 0a3fd49 + 384c4f5
commit 0c211bc
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 37 deletions.
diff --git a/examples/cli/progress/README.md b/examples/cli/progress/README.md
@@ -1,7 +1,7 @@
 # CLI: Progress Option
 
 ```shell
-npm run webpack-dev-server -- --open
+npm run webpack-dev-server -- --open --client-progress
 ```
 
 ## What Should Happen

diff --git a/examples/cli/progress/webpack.config.js b/examples/cli/progress/webpack.config.js
@@ -7,7 +7,4 @@ const { setup } = require('../../util');
 module.exports = setup({
   context: __dirname,
   entry: './app.js',
-  client: {
-    progress: true,
-  },
 });
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -43,7 +43,7 @@
     "find-cache-dir": "^3.3.1",
     "graceful-fs": "^4.2.6",
     "html-entities": "^2.3.2",
-    "http-proxy-middleware": "^1.1.1",
+    "http-proxy-middleware": "^1.1.2",
     "internal-ip": "^6.2.0",
     "ipaddr.js": "^2.0.0",
     "is-absolute-url": "^3.0.3",

diff --git a/test/fixtures/schema/webpack.config.no-dev-stats.js b/test/fixtures/schema/webpack.config.no-dev-stats.js