refactor: code

Author: alexander-akait

lib/Server.js

@@ -520,70 +520,51 @@ class Server {
         ? options.hot
         : true;
 
-    // normalize the `server` option
-    const defaultServerType = "http";
-    const defaultServerOptions = { requestCert: false };
-
-    switch (typeof options.server) {
-      case "undefined":
-        options.server = {};
-        if (options.http2) {
-          options.server = {
-            type: "spdy",
-            options: defaultServerOptions,
-          };
-        } else if (options.https) {
-          options.server = {
-            type: "https",
-            options:
-              typeof options.https === "object"
-                ? options.https
-                : defaultServerOptions,
-          };
-        } else {
-          options.server.type = defaultServerType;
-        }
-        break;
-      case "string":
-        options.server = {
-          type: options.server,
-        };
-        if (options.server.type !== "http") {
-          options.server.options = defaultServerOptions;
-        }
-        break;
-      case "object":
-        if (typeof options.https === "object") {
-          options.server.options = {
-            ...defaultServerOptions,
-            ...options.https,
-            ...options.server.options,
-          };
-        } else {
-          options.server.options = {
-            ...defaultServerOptions,
-            ...options.server.options,
-          };
-        }
-        break;
-      default:
-        options.server = {
-          type: defaultServerType,
-          options: defaultServerOptions,
-        };
+    const isHTTPs = Boolean(options.https);
+    const isSPDY = Boolean(options.http2);
+
+    options.server = {
+      type:
+        // eslint-disable-next-line no-nested-ternary
+        typeof options.server === "string"
+          ? options.server
+          : // eslint-disable-next-line no-nested-ternary
+          typeof (options.server || {}).type === "string"
+          ? options.server.type
+          : // eslint-disable-next-line no-nested-ternary
+          isSPDY
+          ? "spdy"
+          : isHTTPs
+          ? "https"
+          : "http",
+      options: {
+        ...options.https,
+        ...(options.server || {}).options,
+      },
+    };
+
+    if (
+      options.server.type === "spdy" &&
+      typeof options.server.options.spdy === "undefined"
+    ) {
+      options.server.options.spdy = {
+        protocols: ["h2", "http/1.1"],
+      };
     }
 
-    // server options
-    if (options.server.options) {
-      const { server } = options;
+    if (options.server.type === "https" || options.server.type === "spdy") {
+      if (typeof options.server.options.requestCert === "undefined") {
+        options.server.options.requestCert = false;
+      }
+
       // TODO remove the `cacert` option in favor `ca` in the next major release
       for (const property of ["cacert", "ca", "cert", "crl", "key", "pfx"]) {
-        if (typeof server.options[property] === "undefined") {
+        if (typeof options.server.options[property] === "undefined") {
           // eslint-disable-next-line no-continue
           continue;
         }
 
-        const value = server.options[property];
+        const value = options.server.options[property];
         const readFile = (item) => {
           if (
             Buffer.isBuffer(item) ||
@@ -606,14 +587,14 @@ class Server {
           }
         };
 
-        server.options[property] = Array.isArray(value)
+        options.server.options[property] = Array.isArray(value)
           ? value.map((item) => readFile(item))
           : readFile(value);
       }
 
       let fakeCert;
 
-      if (!server.options.key || !server.options.cert) {
+      if (!options.server.options.key || !options.server.options.cert) {
         const certificateDir = Server.findCacheDir();
         const certificatePath = path.join(certificateDir, "server.pem");
         let certificateExists;
@@ -728,20 +709,20 @@ class Server {
         this.logger.info(`SSL certificate: ${certificatePath}`);
       }
 
-      if (server.options.cacert) {
+      if (options.server.options.cacert) {
         if (options.server.options.ca) {
           this.logger.warn(
             "Do not specify 'ca' and 'cacert' options together, the 'ca' option will be used."
           );
         } else {
-          server.options.ca = options.server.options.cacert;
+          options.server.options.ca = options.server.options.cacert;
         }
 
-        delete server.options.cacert;
+        delete options.server.options.cacert;
       }
 
-      server.options.key = server.options.key || fakeCert;
-      server.options.cert = server.options.cert || fakeCert;
+      options.server.options.key = options.server.options.key || fakeCert;
+      options.server.options.cert = options.server.options.cert || fakeCert;
     }
 
     if (typeof options.ipc === "boolean") {
@@ -1606,27 +1587,11 @@ class Server {
   }
 
   createServer() {
-    switch (this.options.server.type) {
-      case "https":
-        this.server = require("https").createServer(
-          this.options.server.options,
-          this.app
-        );
-        break;
-      case "spdy":
-        this.server = require("spdy").createServer(
-          {
-            ...this.options.server.options,
-            spdy: {
-              protocols: ["h2", "http/1.1"],
-            },
-          },
-          this.app
-        );
-        break;
-      default:
-        this.server = require("http").createServer(this.app);
-    }
+    // eslint-disable-next-line import/no-dynamic-require
+    this.server = require(this.options.server.type).createServer(
+      this.options.server.options,
+      this.app
+    );
 
     this.server.on("connection", (socket) => {
       // Add socket to list

lib/options.json

@@ -634,10 +634,10 @@
     "Server": {
       "anyOf": [
         {
-          "enum": ["http", "https", "spdy"],
-          "cli": {
-            "exclude": true
-          }
+          "$ref": "#/definitions/ServerEnum"
+        },
+        {
+          "$ref": "#/definitions/ServerString"
         },
         {
           "$ref": "#/definitions/ServerObject"
@@ -649,6 +649,19 @@
     "ServerType": {
       "enum": ["http", "https", "spdy"]
     },
+    "ServerEnum": {
+      "enum": ["http", "https", "spdy"],
+      "cli": {
+        "exclude": true
+      }
+    },
+    "ServerString": {
+      "type": "string",
+      "minLength": 1,
+      "cli": {
+        "exclude": true
+      }
+    },
     "ServerObject": {
       "type": "object",
       "properties": {

test/__snapshots__/validate-options.test.js.snap.webpack4

@@ -617,7 +617,7 @@ exports[`options validate should throw an error on the "server" option with '{"t
 exports[`options validate should throw an error on the "server" option with '{"type":"https","options":{"ca":true}}' value 1`] = `
 "ValidationError: Invalid options object. Dev Server has been initialized using an options object that does not match the API schema.
  - options.server should be one of these:
-   \\"http\\" | \\"https\\" | \\"spdy\\" | object { type?, options? }
+   \\"http\\" | \\"https\\" | \\"spdy\\" | non-empty string | object { type?, options? }
    -> Allows to set server and options (by default 'http').
    -> Read more at https://webpack.js.org/configuration/dev-server/#devserverserver
    Details:
@@ -634,7 +634,7 @@ exports[`options validate should throw an error on the "server" option with '{"t
 exports[`options validate should throw an error on the "server" option with '{"type":"https","options":{"cert":true}}' value 1`] = `
 "ValidationError: Invalid options object. Dev Server has been initialized using an options object that does not match the API schema.
  - options.server should be one of these:
-   \\"http\\" | \\"https\\" | \\"spdy\\" | object { type?, options? }
+   \\"http\\" | \\"https\\" | \\"spdy\\" | non-empty string | object { type?, options? }
    -> Allows to set server and options (by default 'http').
    -> Read more at https://webpack.js.org/configuration/dev-server/#devserverserver
    Details:
@@ -651,7 +651,7 @@ exports[`options validate should throw an error on the "server" option with '{"t
 exports[`options validate should throw an error on the "server" option with '{"type":"https","options":{"key":10}}' value 1`] = `
 "ValidationError: Invalid options object. Dev Server has been initialized using an options object that does not match the API schema.
  - options.server should be one of these:
-   \\"http\\" | \\"https\\" | \\"spdy\\" | object { type?, options? }
+   \\"http\\" | \\"https\\" | \\"spdy\\" | non-empty string | object { type?, options? }
    -> Allows to set server and options (by default 'http').
    -> Read more at https://webpack.js.org/configuration/dev-server/#devserverserver
    Details:
@@ -674,7 +674,7 @@ exports[`options validate should throw an error on the "server" option with '{"t
 exports[`options validate should throw an error on the "server" option with '{"type":"https","options":{"pfx":10}}' value 1`] = `
 "ValidationError: Invalid options object. Dev Server has been initialized using an options object that does not match the API schema.
  - options.server should be one of these:
-   \\"http\\" | \\"https\\" | \\"spdy\\" | object { type?, options? }
+   \\"http\\" | \\"https\\" | \\"spdy\\" | non-empty string | object { type?, options? }
    -> Allows to set server and options (by default 'http').
    -> Read more at https://webpack.js.org/configuration/dev-server/#devserverserver
    Details:
@@ -694,38 +694,6 @@ exports[`options validate should throw an error on the "server" option with '{"t
    -> Request for an SSL certificate."
 `;
 
-exports[`options validate should throw an error on the "server" option with '{"type":"invalid"}' value 1`] = `
-"ValidationError: Invalid options object. Dev Server has been initialized using an options object that does not match the API schema.
- - options.server.type should be one of these:
-   \\"http\\" | \\"https\\" | \\"spdy\\""
-`;
-
-exports[`options validate should throw an error on the "server" option with 'http2' value 1`] = `
-"ValidationError: Invalid options object. Dev Server has been initialized using an options object that does not match the API schema.
- - options.server should be one of these:
-   \\"http\\" | \\"https\\" | \\"spdy\\" | object { type?, options? }
-   -> Allows to set server and options (by default 'http').
-   -> Read more at https://webpack.js.org/configuration/dev-server/#devserverserver
-   Details:
-    * options.server should be one of these:
-      \\"http\\" | \\"https\\" | \\"spdy\\"
-    * options.server should be an object:
-      object { type?, options? }"
-`;
-
-exports[`options validate should throw an error on the "server" option with 'invalid' value 1`] = `
-"ValidationError: Invalid options object. Dev Server has been initialized using an options object that does not match the API schema.
- - options.server should be one of these:
-   \\"http\\" | \\"https\\" | \\"spdy\\" | object { type?, options? }
-   -> Allows to set server and options (by default 'http').
-   -> Read more at https://webpack.js.org/configuration/dev-server/#devserverserver
-   Details:
-    * options.server should be one of these:
-      \\"http\\" | \\"https\\" | \\"spdy\\"
-    * options.server should be an object:
-      object { type?, options? }"
-`;
-
 exports[`options validate should throw an error on the "static" option with '' value 1`] = `
 "ValidationError: Invalid options object. Dev Server has been initialized using an options object that does not match the API schema.
  - options.static should be a non-empty string."

test/__snapshots__/validate-options.test.js.snap.webpack5

@@ -617,7 +617,7 @@ exports[`options validate should throw an error on the "server" option with '{"t
 exports[`options validate should throw an error on the "server" option with '{"type":"https","options":{"ca":true}}' value 1`] = `
 "ValidationError: Invalid options object. Dev Server has been initialized using an options object that does not match the API schema.
  - options.server should be one of these:
-   \\"http\\" | \\"https\\" | \\"spdy\\" | object { type?, options? }
+   \\"http\\" | \\"https\\" | \\"spdy\\" | non-empty string | object { type?, options? }
    -> Allows to set server and options (by default 'http').
    -> Read more at https://webpack.js.org/configuration/dev-server/#devserverserver
    Details:
@@ -634,7 +634,7 @@ exports[`options validate should throw an error on the "server" option with '{"t
 exports[`options validate should throw an error on the "server" option with '{"type":"https","options":{"cert":true}}' value 1`] = `
 "ValidationError: Invalid options object. Dev Server has been initialized using an options object that does not match the API schema.
  - options.server should be one of these:
-   \\"http\\" | \\"https\\" | \\"spdy\\" | object { type?, options? }
+   \\"http\\" | \\"https\\" | \\"spdy\\" | non-empty string | object { type?, options? }
    -> Allows to set server and options (by default 'http').
    -> Read more at https://webpack.js.org/configuration/dev-server/#devserverserver
    Details:
@@ -651,7 +651,7 @@ exports[`options validate should throw an error on the "server" option with '{"t
 exports[`options validate should throw an error on the "server" option with '{"type":"https","options":{"key":10}}' value 1`] = `
 "ValidationError: Invalid options object. Dev Server has been initialized using an options object that does not match the API schema.
  - options.server should be one of these:
-   \\"http\\" | \\"https\\" | \\"spdy\\" | object { type?, options? }
+   \\"http\\" | \\"https\\" | \\"spdy\\" | non-empty string | object { type?, options? }
    -> Allows to set server and options (by default 'http').
    -> Read more at https://webpack.js.org/configuration/dev-server/#devserverserver
    Details:
@@ -674,7 +674,7 @@ exports[`options validate should throw an error on the "server" option with '{"t
 exports[`options validate should throw an error on the "server" option with '{"type":"https","options":{"pfx":10}}' value 1`] = `
 "ValidationError: Invalid options object. Dev Server has been initialized using an options object that does not match the API schema.
  - options.server should be one of these:
-   \\"http\\" | \\"https\\" | \\"spdy\\" | object { type?, options? }
+   \\"http\\" | \\"https\\" | \\"spdy\\" | non-empty string | object { type?, options? }
    -> Allows to set server and options (by default 'http').
    -> Read more at https://webpack.js.org/configuration/dev-server/#devserverserver
    Details:
@@ -694,38 +694,6 @@ exports[`options validate should throw an error on the "server" option with '{"t
    -> Request for an SSL certificate."
 `;
 
-exports[`options validate should throw an error on the "server" option with '{"type":"invalid"}' value 1`] = `
-"ValidationError: Invalid options object. Dev Server has been initialized using an options object that does not match the API schema.
- - options.server.type should be one of these:
-   \\"http\\" | \\"https\\" | \\"spdy\\""
-`;
-
-exports[`options validate should throw an error on the "server" option with 'http2' value 1`] = `
-"ValidationError: Invalid options object. Dev Server has been initialized using an options object that does not match the API schema.
- - options.server should be one of these:
-   \\"http\\" | \\"https\\" | \\"spdy\\" | object { type?, options? }
-   -> Allows to set server and options (by default 'http').
-   -> Read more at https://webpack.js.org/configuration/dev-server/#devserverserver
-   Details:
-    * options.server should be one of these:
-      \\"http\\" | \\"https\\" | \\"spdy\\"
-    * options.server should be an object:
-      object { type?, options? }"
-`;
-
-exports[`options validate should throw an error on the "server" option with 'invalid' value 1`] = `
-"ValidationError: Invalid options object. Dev Server has been initialized using an options object that does not match the API schema.
- - options.server should be one of these:
-   \\"http\\" | \\"https\\" | \\"spdy\\" | object { type?, options? }
-   -> Allows to set server and options (by default 'http').
-   -> Read more at https://webpack.js.org/configuration/dev-server/#devserverserver
-   Details:
-    * options.server should be one of these:
-      \\"http\\" | \\"https\\" | \\"spdy\\"
-    * options.server should be an object:
-      object { type?, options? }"
-`;
-
 exports[`options validate should throw an error on the "static" option with '' value 1`] = `
 "ValidationError: Invalid options object. Dev Server has been initialized using an options object that does not match the API schema.
  - options.static should be a non-empty string."