From 346e0dace0f8cd5b196ac8c130edf2c7db8d8ae1 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 15 Apr 2021 14:21:46 +0300
Subject: [PATCH 1/3] chore(deps): update dependency http-proxy-middleware to
 ^1.1.2 (#3187)

Co-authored-by: Renovate Bot <bot@renovateapp.com>
---
 package-lock.json | 14 +++++++-------
 package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e62dbc51f7..24ce2bcdb9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18,7 +18,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",
@@ -8511,9 +8511,9 @@
       }
     },
     "node_modules/http-proxy-middleware": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-1.1.1.tgz",
-      "integrity": "sha512-FIDg9zPvOwMhQ3XKB2+vdxK6WWbVAH7s5QpqQCif7a1TNL76GNAATWA1sy6q2gSfss8UJ/Nwza3N6QnFkKclpA==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-1.1.2.tgz",
+      "integrity": "sha512-YRFUeOG3q85FJjAaYVJUoNRW9a73SDlOtAyQOS5PHLr18QeZ/vEhxywNoOPiEO8BxCegz4RXzTHcvyLEGB78UA==",
       "dependencies": {
         "@types/http-proxy": "^1.17.5",
         "http-proxy": "^1.18.1",
@@ -25237,9 +25237,9 @@
       }
     },
     "http-proxy-middleware": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-1.1.1.tgz",
-      "integrity": "sha512-FIDg9zPvOwMhQ3XKB2+vdxK6WWbVAH7s5QpqQCif7a1TNL76GNAATWA1sy6q2gSfss8UJ/Nwza3N6QnFkKclpA==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-1.1.2.tgz",
+      "integrity": "sha512-YRFUeOG3q85FJjAaYVJUoNRW9a73SDlOtAyQOS5PHLr18QeZ/vEhxywNoOPiEO8BxCegz4RXzTHcvyLEGB78UA==",
       "requires": {
         "@types/http-proxy": "^1.17.5",
         "http-proxy": "^1.18.1",
diff --git a/package.json b/package.json
index 820c42e651..3773700960 100644
--- 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",

From fd6251213290d1c22d57f5af25f0b3a153617902 Mon Sep 17 00:00:00 2001
From: Nitin Kumar <snitin315@gmail.com>
Date: Thu, 15 Apr 2021 16:55:40 +0530
Subject: [PATCH 2/3] refactor: remove stale code (#3190)

---
 .../schema/webpack.config.no-dev-stats.js     | 25 -------------------
 1 file changed, 25 deletions(-)
 delete mode 100644 test/fixtures/schema/webpack.config.no-dev-stats.js

diff --git a/test/fixtures/schema/webpack.config.no-dev-stats.js b/test/fixtures/schema/webpack.config.no-dev-stats.js
deleted file mode 100644
index ca283ec392..0000000000
--- a/test/fixtures/schema/webpack.config.no-dev-stats.js
+++ /dev/null
@@ -1,25 +0,0 @@
-'use strict';
-
-module.exports = {
-  entry: './app.js',
-  stats: {
-    assetsSort: 'size',
-  },
-  devServer: {
-    host: '_foo',
-    public: '_public',
-    publicPath: '_publicPath',
-    hot: '_hot',
-    clientLogging: '_clientLogging',
-    contentBase: '_contentBase',
-    watchContentBase: '_watchContentBase',
-    https: '_https',
-    historyApiFallback: '_historyApiFallback',
-    compress: '_compress',
-    firewall: '_firewall',
-    open: '_open',
-    openPage: '_openPage',
-    useLocalIp: '_useLocalIp',
-    port: '_port',
-  },
-};

From 384c4f54de3cc791ab015924c6630e34f3adc03c Mon Sep 17 00:00:00 2001
From: Nitin Kumar <snitin315@gmail.com>
Date: Thu, 15 Apr 2021 16:55:58 +0530
Subject: [PATCH 3/3] docs: fix `--client-progress` example (#3189)

---
 examples/cli/progress/README.md         | 2 +-
 examples/cli/progress/webpack.config.js | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/examples/cli/progress/README.md b/examples/cli/progress/README.md
index 402acc3bca..83a904b69a 100644
--- 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
index 9f8f0044d0..e0e5363925 100644
--- 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,
-  },
 });