feat: enable OPTIONS middleware by default

webpack · Jul 30, 2022 · da16ee5 · da16ee5
1 parent c373320
commit da16ee5
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 85 deletions.
diff --git a/lib/Server.js b/lib/Server.js
@@ -199,7 +199,6 @@ const schema = require("./options.json");
  * @property {boolean} [setupExitSignals]
  * @property {boolean | ClientConfiguration} [client]
  * @property {Headers | ((req: Request, res: Response, context: DevMiddlewareContext<Request, Response>) => Headers)} [headers]
- * @property {boolean} [optionsMethod]
  * @property {(devServer: Server) => void} [onAfterSetupMiddleware]
  * @property {(devServer: Server) => void} [onBeforeSetupMiddleware]
  * @property {(devServer: Server) => void} [onListening]
@@ -2131,7 +2130,8 @@ class Server {
         middleware: this.setHeaders.bind(this),
       });
     }
-    if (this.options.optionsMethod) {
+
+    {
       /**
        *
        * @param {Request} req
@@ -2151,7 +2151,7 @@ class Server {
       };
 
       middlewares.push({
-        name: "options-request-response",
+        name: "options-middleware",
         path: "*",
         middleware: optionsRequestResponseMiddleware,
       });

diff --git a/lib/options.json b/lib/options.json
@@ -458,13 +458,6 @@
       "description": "Allows to set custom headers on response.",
       "link": "https://webpack.js.org/configuration/dev-server/#devserverheaders"
     },
-    "OptionsMethod": {
-      "type": "boolean",
-      "description": "Response with 204 httpCode when receive an OPTIONS request",
-      "cli": {
-        "exclude": true
-      }
-    },
     "HistoryApiFallback": {
       "anyOf": [
         {
@@ -1178,9 +1171,6 @@
     "headers": {
       "$ref": "#/definitions/Headers"
     },
-    "optionsMethod": {
-      "$ref": "#/definitions/OptionsMethod"
-    },
     "historyApiFallback": {
       "$ref": "#/definitions/HistoryApiFallback"
     },

diff --git a/test/e2e/options-request-response.test.js → test/e2e/options-middleware.test.js b/test/e2e/options-request-response.test.js → test/e2e/options-middleware.test.js
@@ -50,7 +50,6 @@ describe("handle options-request correctly", () => {
           "Access-Control-Allow-Origin": "*",
           "Access-Control-Allow-Headers": "*",
         },
-        optionsMethod: true,
       },
       compiler
     );