refactor: move proxy normalization (#3359)

* fix: move proxy normalization

* fix: move proxy normalization

Author: anshumanv

lib/Server.js

@@ -170,72 +170,6 @@ class Server {
   setupProxyFeature() {
     const { createProxyMiddleware } = require('http-proxy-middleware');
 
-    /**
-     * Assume a proxy configuration specified as:
-     * proxy: {
-     *   'context': { options }
-     * }
-     * OR
-     * proxy: {
-     *   'context': 'target'
-     * }
-     */
-    if (!Array.isArray(this.options.proxy)) {
-      if (Object.prototype.hasOwnProperty.call(this.options.proxy, 'target')) {
-        this.options.proxy = [this.options.proxy];
-      } else {
-        this.options.proxy = Object.keys(this.options.proxy).map((context) => {
-          let proxyOptions;
-          // For backwards compatibility reasons.
-          const correctedContext = context
-            .replace(/^\*$/, '**')
-            .replace(/\/\*$/, '');
-
-          if (typeof this.options.proxy[context] === 'string') {
-            proxyOptions = {
-              context: correctedContext,
-              target: this.options.proxy[context],
-            };
-          } else {
-            proxyOptions = Object.assign({}, this.options.proxy[context]);
-            proxyOptions.context = correctedContext;
-          }
-
-          const getLogLevelForProxy = (level) => {
-            if (level === 'none') {
-              return 'silent';
-            }
-
-            if (level === 'log') {
-              return 'info';
-            }
-
-            if (level === 'verbose') {
-              return 'debug';
-            }
-
-            return level;
-          };
-
-          const configs = getCompilerConfigArray(this.compiler);
-          const configWithDevServer =
-            configs.find((config) => config.devServer) || configs[0];
-
-          if (typeof proxyOptions.logLevel === 'undefined') {
-            proxyOptions.logLevel = getLogLevelForProxy(
-              configWithDevServer.infrastructureLogging.level
-            );
-          }
-
-          if (typeof proxyOptions.logProvider === 'undefined') {
-            proxyOptions.logProvider = () => this.logger;
-          }
-
-          return proxyOptions;
-        });
-      }
-    }
-
     const getProxyMiddleware = (proxyConfig) => {
       const context = proxyConfig.context || proxyConfig.path;
 

lib/utils/normalizeOptions.js

@@ -157,6 +157,7 @@ function normalizeOptions(compiler, options, logger) {
     };
   }
 
+  // https option
   if (options.https) {
     const getCertificate = require('./getCertificate');
 
@@ -189,6 +190,74 @@ function normalizeOptions(compiler, options, logger) {
     options.https.key = options.https.key || fakeCert;
     options.https.cert = options.https.cert || fakeCert;
   }
+
+  /**
+   * Assume a proxy configuration specified as:
+   * proxy: {
+   *   'context': { options }
+   * }
+   * OR
+   * proxy: {
+   *   'context': 'target'
+   * }
+   */
+  if (typeof options.proxy !== 'undefined') {
+    if (!Array.isArray(options.proxy)) {
+      if (Object.prototype.hasOwnProperty.call(options.proxy, 'target')) {
+        options.proxy = [options.proxy];
+      } else {
+        options.proxy = Object.keys(options.proxy).map((context) => {
+          let proxyOptions;
+          // For backwards compatibility reasons.
+          const correctedContext = context
+            .replace(/^\*$/, '**')
+            .replace(/\/\*$/, '');
+
+          if (typeof options.proxy[context] === 'string') {
+            proxyOptions = {
+              context: correctedContext,
+              target: options.proxy[context],
+            };
+          } else {
+            proxyOptions = Object.assign({}, options.proxy[context]);
+            proxyOptions.context = correctedContext;
+          }
+
+          const getLogLevelForProxy = (level) => {
+            if (level === 'none') {
+              return 'silent';
+            }
+
+            if (level === 'log') {
+              return 'info';
+            }
+
+            if (level === 'verbose') {
+              return 'debug';
+            }
+
+            return level;
+          };
+
+          const configs = getCompilerConfigArray(compiler);
+          const configWithDevServer =
+            configs.find((config) => config.devServer) || configs[0];
+
+          if (typeof proxyOptions.logLevel === 'undefined') {
+            proxyOptions.logLevel = getLogLevelForProxy(
+              configWithDevServer.infrastructureLogging.level
+            );
+          }
+
+          if (typeof proxyOptions.logProvider === 'undefined') {
+            proxyOptions.logProvider = () => logger;
+          }
+
+          return proxyOptions;
+        });
+      }
+    }
+  }
 }
 
 module.exports = normalizeOptions;