Fix trailing slash (#262)

* fix trailing slash

* fix rewrite simple form

Author: conico974

examples/pages-router/next.config.js

@@ -5,6 +5,8 @@ const nextConfig = {
   reactStrictMode: true,
   output: "standalone",
   outputFileTracing: "../sst",
+  rewrites: () => [{ source: "/rewrite", destination: "/" }],
+  trailingSlash: true,
 };
 
 module.exports = nextConfig;

packages/open-next/src/adapters/config/util.ts

@@ -45,11 +45,13 @@ export function loadRoutesManifest(nextDir: string) {
   };
 
   return {
-    rewrites: {
-      beforeFiles: routesManifest.rewrites.beforeFiles ?? [],
-      afterFiles: routesManifest.rewrites.afterFiles ?? [],
-      fallback: routesManifest.rewrites.fallback ?? [],
-    },
+    rewrites: Array.isArray(routesManifest.rewrites)
+      ? { beforeFiles: [], afterFiles: routesManifest.rewrites, fallback: [] }
+      : {
+          beforeFiles: routesManifest.rewrites.beforeFiles ?? [],
+          afterFiles: routesManifest.rewrites.afterFiles ?? [],
+          fallback: routesManifest.rewrites.fallback ?? [],
+        },
     redirects: routesManifest.redirects ?? [],
     routes: {
       static: routesManifest.staticRoutes ?? [],

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

@@ -1,5 +1,6 @@
 import { compile, Match, match, PathFunction } from "path-to-regexp";
 
+import { NextConfig } from "../config";
 import { InternalEvent, InternalResult } from "../event-mapper";
 import { debug } from "../logger";
 import {
@@ -170,7 +171,40 @@ export function handleRedirects(
   event: InternalEvent,
   redirects: RedirectDefinition[],
 ): InternalResult | undefined {
-  const { internalEvent, __rewrite } = handleRewrites(event, redirects);
+  if (
+    NextConfig.trailingSlash &&
+    !event.rawPath.endsWith("/") &&
+    !event.headers["x-nextjs-data"]
+  ) {
+    return {
+      type: event.type,
+      statusCode: 308,
+      headers: {
+        Location: event.url + "/",
+      },
+      body: "",
+      isBase64Encoded: false,
+    };
+    // eslint-disable-next-line sonarjs/elseif-without-else
+  } else if (
+    !NextConfig.trailingSlash &&
+    event.rawPath.endsWith("/") &&
+    event.rawPath !== "/"
+  ) {
+    return {
+      type: event.type,
+      statusCode: 308,
+      headers: {
+        Location: event.url.replace(/\/$/, ""),
+      },
+      body: "",
+      isBase64Encoded: false,
+    };
+  }
+  const { internalEvent, __rewrite } = handleRewrites(
+    event,
+    redirects.filter((r) => !r.internal),
+  );
   if (__rewrite && !__rewrite.internal) {
     return {
       type: event.type,

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

@@ -101,11 +101,13 @@ export interface RoutesManifest {
   dynamicRoutes: RouteDefinition[];
   staticRoutes: RouteDefinition[];
   dataRoutes: DataRouteDefinition[];
-  rewrites: {
-    beforeFiles: RewriteDefinition[];
-    afterFiles: RewriteDefinition[];
-    fallback: RewriteDefinition[];
-  };
+  rewrites:
+    | {
+        beforeFiles: RewriteDefinition[];
+        afterFiles: RewriteDefinition[];
+        fallback: RewriteDefinition[];
+      }
+    | RewriteDefinition[];
   redirects: RedirectDefinition[];
   headers?: Header[];
 }

packages/tests-e2e/tests/pagesRouter/isr.test.ts

@@ -4,8 +4,8 @@ import { expect, test } from "@playwright/test";
 test("Incremental Static Regeneration", async ({ page }) => {
   test.setTimeout(45000);
   await page.goto("/");
-  await page.locator("[href='/isr']").click();
-  await page.waitForURL("/isr");
+  await page.locator("[href='/isr/']").click();
+  await page.waitForURL("/isr/");
   // Load the page a couple times to regenerate ISR
 
   let el = page.getByText("Time:");

packages/tests-e2e/tests/pagesRouter/rewrite.test.ts

@@ -0,0 +1,8 @@
+import { expect, test } from "@playwright/test";
+
+test("Single Rewrite", async ({ page }) => {
+  await page.goto("/rewrite");
+
+  let el = page.getByText("Nextjs Pages Router");
+  await expect(el).toBeVisible();
+});

packages/tests-e2e/tests/pagesRouter/ssr.test.ts

@@ -3,9 +3,9 @@ import { expect, test } from "@playwright/test";
 
 test("Server Side Render", async ({ page }) => {
   await page.goto("/");
-  await page.locator('[href="/ssr"]').click();
+  await page.locator('[href="/ssr/"]').click();
 
-  await page.waitForURL("/ssr");
+  await page.waitForURL("/ssr/");
   let el = page.getByText("Time:");
   await expect(el).toBeVisible();
   let time = await el.textContent();

packages/tests-e2e/tests/pagesRouter/trailing.test.ts

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