fix skip trailing slash redirect (#323)

Author: conico974

examples/app-pages-router/next.config.js

@@ -8,6 +8,8 @@ const nextConfig = {
   experimental: {
     serverActions: true,
   },
+  trailingSlash: true,
+  skipTrailingSlashRedirect: true,
 };
 
 module.exports = nextConfig;

packages/open-next/src/adapters/routing/matcher.ts

@@ -168,42 +168,44 @@ export function handleRedirects(
   event: InternalEvent,
   redirects: RedirectDefinition[],
 ): InternalResult | undefined {
-  if (
-    NextConfig.trailingSlash &&
-    !event.headers["x-nextjs-data"] &&
-    !event.rawPath.endsWith("/") &&
-    !event.rawPath.match(/[\w-]+\.[\w]+$/g)
-  ) {
-    const headersLocation = event.url.split("?");
-    return {
-      type: event.type,
-      statusCode: 308,
-      headers: {
-        Location: `${headersLocation[0]}/${
-          headersLocation[1] ? `?${headersLocation[1]}` : ""
-        }`,
-      },
-      body: "",
-      isBase64Encoded: false,
-    };
-    // eslint-disable-next-line sonarjs/elseif-without-else
-  } else if (
-    !NextConfig.trailingSlash &&
-    event.rawPath.endsWith("/") &&
-    event.rawPath !== "/"
-  ) {
-    const headersLocation = event.url.split("?");
-    return {
-      type: event.type,
-      statusCode: 308,
-      headers: {
-        Location: `${headersLocation[0].replace(/\/$/, "")}${
-          headersLocation[1] ? `?${headersLocation[1]}` : ""
-        }`,
-      },
-      body: "",
-      isBase64Encoded: false,
-    };
+  if (!NextConfig.skipTrailingSlashRedirect) {
+    if (
+      NextConfig.trailingSlash &&
+      !event.headers["x-nextjs-data"] &&
+      !event.rawPath.endsWith("/") &&
+      !event.rawPath.match(/[\w-]+\.[\w]+$/g)
+    ) {
+      const headersLocation = event.url.split("?");
+      return {
+        type: event.type,
+        statusCode: 308,
+        headers: {
+          Location: `${headersLocation[0]}/${
+            headersLocation[1] ? `?${headersLocation[1]}` : ""
+          }`,
+        },
+        body: "",
+        isBase64Encoded: false,
+      };
+      // eslint-disable-next-line sonarjs/elseif-without-else
+    } else if (
+      !NextConfig.trailingSlash &&
+      event.rawPath.endsWith("/") &&
+      event.rawPath !== "/"
+    ) {
+      const headersLocation = event.url.split("?");
+      return {
+        type: event.type,
+        statusCode: 308,
+        headers: {
+          Location: `${headersLocation[0].replace(/\/$/, "")}${
+            headersLocation[1] ? `?${headersLocation[1]}` : ""
+          }`,
+        },
+        body: "",
+        isBase64Encoded: false,
+      };
+    }
   }
   const { internalEvent, __rewrite } = handleRewrites(
     event,

packages/open-next/src/adapters/types/next-types.ts

@@ -63,6 +63,7 @@ export type Header = {
 export interface NextConfig {
   basePath?: string;
   trailingSlash?: string;
+  skipTrailingSlashRedirect?: boolean;
   i18n?: {
     locales: string[];
   };

packages/tests-e2e/tests/appPagesRouter/skip_trailing.test.ts

@@ -0,0 +1,8 @@
+import { expect, test } from "@playwright/test";
+
+test("skipTrailingSlashRedirect redirect", async ({ page }) => {
+  const response = await page.goto("/ssr");
+
+  expect(response?.request().redirectedFrom()).toBeNull();
+  expect(response?.request().url()).toMatch(/\/ssr$/);
+});