From a5bbe7d6eb9e73e4573021e81276bd239b67462d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=80=E5=88=9A?= Date: Fri, 31 Dec 2021 15:57:31 +0800 Subject: [PATCH 1/5] fix(webpackDevServer): update webpack-dev-server + fix deprecation warning --- .../config/webpackDevServer.config.js | 34 +++++++++++-------- packages/react-scripts/package.json | 2 +- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/packages/react-scripts/config/webpackDevServer.config.js b/packages/react-scripts/config/webpackDevServer.config.js index 522a81b9b2b..7347d24bbca 100644 --- a/packages/react-scripts/config/webpackDevServer.config.js +++ b/packages/react-scripts/config/webpackDevServer.config.js @@ -109,27 +109,31 @@ module.exports = function (proxy, allowedHost) { }, // `proxy` is run between `before` and `after` `webpack-dev-server` hooks proxy, - onBeforeSetupMiddleware(devServer) { - // Keep `evalSourceMapMiddleware` - // middlewares before `redirectServedPath` otherwise will not have any effect - // This lets us fetch source contents from webpack for the error overlay - devServer.app.use(evalSourceMapMiddleware(devServer)); + setupMiddlewares(middlewares, devServer) { + if (!devServer) { + throw new Error('webpack-dev-server is not defined'); + } if (fs.existsSync(paths.proxySetup)) { // This registers user provided middleware for proxy reasons require(paths.proxySetup)(devServer.app); } - }, - onAfterSetupMiddleware(devServer) { - // Redirect to `PUBLIC_URL` or `homepage` from `package.json` if url not match - devServer.app.use(redirectServedPath(paths.publicUrlOrPath)); - // This service worker file is effectively a 'no-op' that will reset any - // previous service worker registered for the same host:port combination. - // We do this in development to avoid hitting the production cache if - // it used the same host and port. - // https://github.com/facebook/create-react-app/issues/2272#issuecomment-302832432 - devServer.app.use(noopServiceWorkerMiddleware(paths.publicUrlOrPath)); + middlewares.unshift( + // Keep `evalSourceMapMiddleware` + // middlewares before `redirectServedPath` otherwise will not have any effect + // This lets us fetch source contents from webpack for the error overlay + evalSourceMapMiddleware(devServer), + // Redirect to `PUBLIC_URL` or `homepage` from `package.json` if url not match + redirectServedPath(paths.publicUrlOrPath), + // This service worker file is effectively a 'no-op' that will reset any + // previous service worker registered for the same host:port combination. + // We do this in development to avoid hitting the production cache if + // https://github.com/facebook/create-react-app/issues/2272#issuecomment-302832432 + noopServiceWorkerMiddleware(paths.publicUrlOrPath) + ); + + return middlewares; }, }; }; diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json index 99b82701669..297cad6a762 100644 --- a/packages/react-scripts/package.json +++ b/packages/react-scripts/package.json @@ -72,7 +72,7 @@ "tailwindcss": "^3.0.2", "terser-webpack-plugin": "^5.2.5", "webpack": "^5.64.4", - "webpack-dev-server": "^4.6.0", + "webpack-dev-server": "^4.7.2", "webpack-manifest-plugin": "^4.0.2", "workbox-webpack-plugin": "^6.4.1" }, From 2dff88610f9ad215349424d1769b88e0a0d2fa1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=80=E5=88=9A?= Date: Wed, 12 Jan 2022 17:51:00 +0800 Subject: [PATCH 2/5] chore(deps): update webpack-dev-server --- packages/react-scripts/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json index 297cad6a762..1d67d42e776 100644 --- a/packages/react-scripts/package.json +++ b/packages/react-scripts/package.json @@ -72,7 +72,7 @@ "tailwindcss": "^3.0.2", "terser-webpack-plugin": "^5.2.5", "webpack": "^5.64.4", - "webpack-dev-server": "^4.7.2", + "webpack-dev-server": "^4.7.3", "webpack-manifest-plugin": "^4.0.2", "workbox-webpack-plugin": "^6.4.1" }, From c295bd6309a837ae4e1ff48f1e09abcf20b7822d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=80=E5=88=9A?= Date: Wed, 14 Sep 2022 19:34:55 +0800 Subject: [PATCH 3/5] fix(webpackDevServer): remove useless prompts --- packages/react-scripts/config/webpackDevServer.config.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packages/react-scripts/config/webpackDevServer.config.js b/packages/react-scripts/config/webpackDevServer.config.js index 7347d24bbca..4b29aa8b3db 100644 --- a/packages/react-scripts/config/webpackDevServer.config.js +++ b/packages/react-scripts/config/webpackDevServer.config.js @@ -110,10 +110,6 @@ module.exports = function (proxy, allowedHost) { // `proxy` is run between `before` and `after` `webpack-dev-server` hooks proxy, setupMiddlewares(middlewares, devServer) { - if (!devServer) { - throw new Error('webpack-dev-server is not defined'); - } - if (fs.existsSync(paths.proxySetup)) { // This registers user provided middleware for proxy reasons require(paths.proxySetup)(devServer.app); From 7a4128751fe86c41b5244de3ecfbfb003a6367af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=80=E5=88=9A?= Date: Wed, 14 Sep 2022 19:39:11 +0800 Subject: [PATCH 4/5] fix(webpackDevServer): Correct the order of middlewares --- packages/react-scripts/config/webpackDevServer.config.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/react-scripts/config/webpackDevServer.config.js b/packages/react-scripts/config/webpackDevServer.config.js index 4b29aa8b3db..5dbbda18d71 100644 --- a/packages/react-scripts/config/webpackDevServer.config.js +++ b/packages/react-scripts/config/webpackDevServer.config.js @@ -119,7 +119,10 @@ module.exports = function (proxy, allowedHost) { // Keep `evalSourceMapMiddleware` // middlewares before `redirectServedPath` otherwise will not have any effect // This lets us fetch source contents from webpack for the error overlay - evalSourceMapMiddleware(devServer), + evalSourceMapMiddleware(devServer) + ); + + middlewares.push( // Redirect to `PUBLIC_URL` or `homepage` from `package.json` if url not match redirectServedPath(paths.publicUrlOrPath), // This service worker file is effectively a 'no-op' that will reset any From d7b696dc3e47d9d64bd54df4fe2decb768bf5188 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=80=E5=88=9A?= Date: Wed, 16 Nov 2022 19:12:53 +0800 Subject: [PATCH 5/5] fix(webpackDevServer): fix 'https' is deprecated --- packages/react-scripts/config/getHttpsConfig.js | 11 +++++++---- .../react-scripts/config/webpackDevServer.config.js | 4 +--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/packages/react-scripts/config/getHttpsConfig.js b/packages/react-scripts/config/getHttpsConfig.js index 4fec7936b2f..2c529c0ee37 100644 --- a/packages/react-scripts/config/getHttpsConfig.js +++ b/packages/react-scripts/config/getHttpsConfig.js @@ -60,15 +60,18 @@ function getHttpsConfig() { if (isHttps && SSL_CRT_FILE && SSL_KEY_FILE) { const crtFile = path.resolve(paths.appPath, SSL_CRT_FILE); const keyFile = path.resolve(paths.appPath, SSL_KEY_FILE); - const config = { + const options = { cert: readEnvFile(crtFile, 'SSL_CRT_FILE'), key: readEnvFile(keyFile, 'SSL_KEY_FILE'), }; - validateKeyAndCerts({ ...config, keyFile, crtFile }); - return config; + validateKeyAndCerts({ ...options, keyFile, crtFile }); + return { + type: 'https', + options, + }; } - return isHttps; + return 'http'; } module.exports = getHttpsConfig; diff --git a/packages/react-scripts/config/webpackDevServer.config.js b/packages/react-scripts/config/webpackDevServer.config.js index 5dbbda18d71..66f4b663166 100644 --- a/packages/react-scripts/config/webpackDevServer.config.js +++ b/packages/react-scripts/config/webpackDevServer.config.js @@ -20,7 +20,6 @@ const host = process.env.HOST || '0.0.0.0'; const sockHost = process.env.WDS_SOCKET_HOST; const sockPath = process.env.WDS_SOCKET_PATH; // default: '/ws' const sockPort = process.env.WDS_SOCKET_PORT; - module.exports = function (proxy, allowedHost) { const disableFirewall = !proxy || process.env.DANGEROUSLY_DISABLE_HOST_CHECK === 'true'; @@ -98,8 +97,7 @@ module.exports = function (proxy, allowedHost) { // remove last slash so user can land on `/test` instead of `/test/` publicPath: paths.publicUrlOrPath.slice(0, -1), }, - - https: getHttpsConfig(), + server: getHttpsConfig(), host, historyApiFallback: { // Paths with dots should still use the history fallback.