Support OPTIONS requests in staticHandler.queryRoute

remix-run · Jan 17, 2023 · 12b3369 · 12b3369
1 parent a929a00
commit 12b3369
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/.changeset/real-panthers-hear.md b/.changeset/real-panthers-hear.md
@@ -0,0 +1,5 @@
+---
+"@remix-run/router": patch
+---
+
+Support `OPTIONS` requests in `staticHandler.queryRoute`
diff --git a/packages/router/__tests__/router-test.ts b/packages/router/__tests__/router-test.ts
@@ -12518,6 +12518,14 @@ describe("a router", () => {
         expect(data).toBe("PARENT LOADER");
       });
 
+      it("should support OPTIONS requests", async () => {
+        let { queryRoute } = createStaticHandler(SSR_ROUTES);
+        let data = await queryRoute(
+          createRequest("/parent", { method: "OPTIONS" })
+        );
+        expect(data).toBe("PARENT LOADER");
+      });
+
       it("should support singular route load navigations (primitives)", async () => {
         let { queryRoute } = createStaticHandler(SSR_ROUTES);
         let data;
@@ -13276,15 +13284,15 @@ describe("a router", () => {
 
         it("should handle unsupported methods with a 405 Response", async () => {
           try {
-            await queryRoute(createRequest("/", { method: "OPTIONS" }), {
+            await queryRoute(createRequest("/", { method: "TRACE" }), {
               routeId: "root",
             });
             expect(false).toBe(true);
           } catch (data) {
             expect(isRouteErrorResponse(data)).toBe(true);
             expect(data.status).toBe(405);
             expect(data.error).toEqual(
-              new Error('Invalid request method "OPTIONS"')
+              new Error('Invalid request method "TRACE"')
             );
             expect(data.internal).toBe(true);
           }

diff --git a/packages/router/router.ts b/packages/router/router.ts
@@ -2421,7 +2421,7 @@ export function createStaticHandler(
     let matches = matchRoutes(dataRoutes, location, basename);
 
     // SSR supports HEAD requests while SPA doesn't
-    if (!isValidMethod(method) && method !== "head") {
+    if (!isValidMethod(method) && method !== "head" && method !== "options") {
       throw getInternalRouterError(405, { method });
     } else if (!matches) {
       throw getInternalRouterError(404, { pathname: location.pathname });