test: add cases for staticOptions normalization (#4969)

webpack · Aug 6, 2023 · a8b82b0 · a8b82b0
1 parent a87dc53
commit a8b82b0
Show file tree

Hide file tree

Showing 3 changed files with 73 additions and 2 deletions.
diff --git a/lib/Server.js b/lib/Server.js
@@ -852,10 +852,9 @@ class Server {
             typeof optionsForStatic.directory !== "undefined"
               ? optionsForStatic.directory
               : def.directory,
-          // TODO: do merge in the next major release
           staticOptions:
             typeof optionsForStatic.staticOptions !== "undefined"
-              ? optionsForStatic.staticOptions
+              ? { ...def.staticOptions, ...optionsForStatic.staticOptions }
               : def.staticOptions,
           publicPath:
             // eslint-disable-next-line no-nested-ternary

diff --git a/test/__snapshots__/normalize-options.test.js.snap.webpack5 b/test/__snapshots__/normalize-options.test.js.snap.webpack5
@@ -2045,6 +2045,65 @@ exports[`normalize options static is an object 1`] = `
 }
 `;
 
+exports[`normalize options static is an object with staticOptions 1`] = `
+{
+  "allowedHosts": "auto",
+  "bonjour": false,
+  "client": {
+    "logging": "info",
+    "overlay": true,
+    "reconnect": 10,
+    "webSocketURL": {},
+  },
+  "compress": true,
+  "devMiddleware": {},
+  "historyApiFallback": false,
+  "host": undefined,
+  "hot": true,
+  "liveReload": true,
+  "open": [],
+  "port": "<auto>",
+  "server": {
+    "options": {},
+    "type": "http",
+  },
+  "setupExitSignals": true,
+  "static": [
+    {
+      "directory": "/static/path",
+      "publicPath": [
+        "/",
+      ],
+      "serveIndex": {
+        "icons": true,
+      },
+      "staticOptions": {
+        "immutable": true,
+        "redirect": true,
+      },
+      "watch": {
+        "alwaysStat": true,
+        "atomic": false,
+        "followSymlinks": false,
+        "ignoreInitial": true,
+        "ignorePermissionErrors": true,
+        "ignored": undefined,
+        "interval": undefined,
+        "persistent": true,
+        "usePolling": false,
+      },
+    },
+  ],
+  "watchFiles": [],
+  "webSocketServer": {
+    "options": {
+      "path": "/ws",
+    },
+    "type": "ws",
+  },
+}
+`;
+
 exports[`normalize options static is false 1`] = `
 {
   "allowedHosts": "auto",

diff --git a/test/normalize-options.test.js b/test/normalize-options.test.js
@@ -380,6 +380,19 @@ describe("normalize options", () => {
         },
       },
     },
+    {
+      title: "static is an object with staticOptions",
+      multiCompiler: false,
+      options: {
+        static: {
+          directory: "/static/path",
+          staticOptions: {
+            redirect: true,
+            immutable: true,
+          },
+        },
+      },
+    },
     {
       title: "static directory is an absolute url and throws error",
       multiCompiler: false,