Fix prefetch rewrite case for RSC

vercel · May 3, 2024 · 4577857 · 4577857
1 parent 4b0716b
commit 4577857
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 1 deletion.
diff --git a/packages/next/src/server-build.ts b/packages/next/src/server-build.ts
@@ -251,7 +251,7 @@ export async function serverBuild({
       if (rewrite.src && rewrite.dest) {
         rewrite.src = rewrite.src.replace(
           /\/?\(\?:\/\)\?/,
-          '(?<rscsuff>(\\.prefetch)?\\.rsc)?(?:/)?'
+          `(?<rscsuff>${experimental.ppr ? '(\\.prefetch)?' : ''}\\.rsc)?(?:/)?`
         );
         let destQueryIndex = rewrite.dest.indexOf('?');
 

diff --git a/packages/next/test/fixtures/00-app-dir-no-ppr/app/products/[productId]/page.jsx b/packages/next/test/fixtures/00-app-dir-no-ppr/app/products/[productId]/page.jsx
@@ -0,0 +1,7 @@
+export default function Page() {
+  return (
+    <>
+      product page
+    </>
+  )
+}
diff --git a/packages/next/test/fixtures/00-app-dir-no-ppr/next.config.js b/packages/next/test/fixtures/00-app-dir-no-ppr/next.config.js
@@ -13,6 +13,10 @@ module.exports = {
         source: '/rewritten-to-index',
         destination: '/?fromRewrite=1',
       },
+      {
+        source: '/to-product/:productId.html',
+        destination: '/products/:productId',
+      },
     ];
   },
 };
diff --git a/packages/next/test/fixtures/00-app-dir-no-ppr/vercel.json b/packages/next/test/fixtures/00-app-dir-no-ppr/vercel.json
@@ -18,6 +18,30 @@
     }
   ],
   "probes": [
+    {
+      "path": "/to-product/product-id.html",
+      "status": 200,
+      "mustContain": "<html"
+    },
+    {
+      "path": "/to-product/product-id.html",
+      "status": 200,
+      "mustNotContain": "<html",
+      "mustContain": ":",
+      "headers": {
+        "RSC": 1
+      }
+    },
+    {
+      "path": "/to-product/product-id.html",
+      "status": 200,
+      "mustNotContain": ".prefetch",
+      "mustContain": ":",
+      "headers": {
+        "RSC": 1,
+        "Next-Router-Prefetch": 1
+      }
+    },
     {
       "path": "/nested/blog-fallback-false/first",
       "status": 200,