Publish Stable

- vercel@28.4.16
 - @vercel/next@3.2.10

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vercel",
-  "version": "28.4.15",
+  "version": "28.4.16",
   "preferGlobal": true,
   "license": "Apache-2.0",
   "description": "The command-line interface for Vercel",
@@ -44,7 +44,7 @@
     "@vercel/build-utils": "5.5.7",
     "@vercel/go": "2.2.15",
     "@vercel/hydrogen": "0.0.29",
-    "@vercel/next": "3.2.9",
+    "@vercel/next": "3.2.10",
     "@vercel/node": "2.6.2",
     "@vercel/python": "3.1.24",
     "@vercel/redwood": "1.0.34",

packages/next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/next",
-  "version": "3.2.9",
+  "version": "3.2.10",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/next-js",

packages/next/src/server-build.ts

@@ -1137,7 +1137,24 @@ export async function serverBuild({
     }
   }
 
-  const rscHeader = routesManifest.rsc?.header || '__rsc__';
+  const rscHeader = routesManifest.rsc?.header?.toLowerCase() || '__rsc__';
+  const completeDynamicRoutes: typeof dynamicRoutes = [];
+
+  if (appDir) {
+    for (const route of dynamicRoutes) {
+      completeDynamicRoutes.push(route);
+      completeDynamicRoutes.push({
+        ...route,
+        src: route.src.replace(
+          new RegExp(escapeStringRegexp('(?:/)?$')),
+          '(?:\\.rsc)?(?:/)?$'
+        ),
+        dest: route.dest?.replace(/($|\?)/, '.rsc$1'),
+      });
+    }
+  } else {
+    completeDynamicRoutes.push(...dynamicRoutes);
+  }
 
   return {
     wildcard: wildcardConfig,
@@ -1313,8 +1330,16 @@ export async function serverBuild({
 
       // middleware comes directly after redirects but before
       // beforeFiles rewrites as middleware is not a "file" route
+      ...(routesManifest?.skipMiddlewareUrlNormalize
+        ? denormalizeNextDataRoute(true)
+        : []),
+
       ...(isCorrectMiddlewareOrder ? middleware.staticRoutes : []),
 
+      ...(routesManifest?.skipMiddlewareUrlNormalize
+        ? normalizeNextDataRoute(true)
+        : []),
+
       ...beforeFilesRewrites,
 
       // Make sure to 404 for the /404 path itself
@@ -1504,7 +1529,7 @@ export async function serverBuild({
         ? // when resolving data routes for middleware we need to include
           // all dynamic routes including non-SSG/SSP so that the priority
           // is correct
-          dynamicRoutes
+          completeDynamicRoutes
             .map(route => {
               route = Object.assign({}, route);
               let normalizedSrc = route.src;
@@ -1579,7 +1604,7 @@ export async function serverBuild({
 
       // Dynamic routes (must come after dataRoutes as dataRoutes are more
       // specific)
-      ...dynamicRoutes,
+      ...completeDynamicRoutes,
 
       ...(isNextDataServerResolving
         ? [

packages/next/src/utils.ts

@@ -213,6 +213,7 @@ type RoutesManifestOld = {
     header: string;
     varyHeader: string;
   };
+  skipMiddlewareUrlNormalize?: boolean;
 };
 
 type RoutesManifestV4 = Omit<RoutesManifestOld, 'dynamicRoutes' | 'version'> & {

packages/next/test/fixtures/00-app-dir-edge/next.config.js

@@ -2,8 +2,5 @@ module.exports = {
   experimental: {
     appDir: true,
     runtime: 'experimental-edge',
-    serverComponents: true,
-    legacyBrowsers: false,
-    browsersListForSwc: true,
   },
 };

packages/next/test/fixtures/00-app-dir-edge/vercel.json

@@ -15,7 +15,7 @@
       "path": "/edge",
       "status": 200,
       "headers": {
-        "__rsc__": "1"
+        "RSC": "1"
       },
       "mustContain": "M1:{",
       "mustNotContain": "<html"
@@ -24,7 +24,7 @@
       "path": "/edge",
       "status": 200,
       "headers": {
-        "__rsc__": "1"
+        "RSC": "1"
       },
       "responseHeaders": {
         "content-type": "application/octet-stream"
@@ -39,7 +39,7 @@
       "path": "/",
       "status": 200,
       "headers": {
-        "__rsc__": "1"
+        "RSC": "1"
       },
       "mustContain": "M1:{",
       "mustNotContain": "<html"
@@ -48,7 +48,7 @@
       "path": "/",
       "status": 200,
       "headers": {
-        "__rsc__": "1"
+        "RSC": "1"
       },
       "responseHeaders": {
         "content-type": "application/octet-stream"

packages/next/test/fixtures/00-app-dir-static/next.config.js

@@ -2,9 +2,6 @@ module.exports = {
   experimental: {
     appDir: true,
     runtime: 'nodejs',
-    serverComponents: true,
-    legacyBrowsers: false,
-    browsersListForSwc: true,
   },
   rewrites: async () => {
     return [

packages/next/test/fixtures/00-app-dir-static/vercel.json

@@ -11,14 +11,14 @@
       "status": 200,
       "mustContain": "hello from app/dashboard",
       "responseHeaders": {
-        "vary": "__rsc__, __next_router_state_tree__, __next_router_prefetch__"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
       }
     },
     {
       "path": "/dashboard",
       "status": 200,
       "headers": {
-        "__rsc__": "1"
+        "RSC": "1"
       },
       "mustContain": "M1:{",
       "mustNotContain": "<html"
@@ -27,11 +27,11 @@
       "path": "/dashboard",
       "status": 200,
       "headers": {
-        "__rsc__": "1"
+        "RSC": "1"
       },
       "responseHeaders": {
         "content-type": "application/octet-stream",
-        "vary": "__rsc__, __next_router_state_tree__, __next_router_prefetch__"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
       }
     },
     {
@@ -63,7 +63,7 @@
       "path": "/",
       "status": 200,
       "headers": {
-        "__rsc__": "1"
+        "RSC": "1"
       },
       "mustContain": "M1:{",
       "mustNotContain": "<html"

packages/next/test/fixtures/00-app-dir/app/dashboard/deployments/[id]/settings/page.js

@@ -0,0 +1,10 @@
+export default function DeploymentsPage(props) {
+  return (
+    <>
+      <p>
+        hello from app/dashboard/deployments/[id]/settings. ID is:{' '}
+        {props.params.id}
+      </p>
+    </>
+  );
+}

packages/next/test/fixtures/00-app-dir/app/dashboard/deployments/catchall/[[...rest]]/page.js

@@ -0,0 +1,3 @@
+export default function Page() {
+  return <p>catchall</p>;
+}

packages/next/test/fixtures/00-app-dir/next.config.js

@@ -2,9 +2,6 @@ module.exports = {
   experimental: {
     appDir: true,
     runtime: 'nodejs',
-    serverComponents: true,
-    legacyBrowsers: false,
-    browsersListForSwc: true,
   },
   rewrites: async () => {
     return [

packages/next/test/fixtures/00-app-dir/vercel.json

@@ -6,19 +6,59 @@
     }
   ],
   "probes": [
+    {
+      "path": "/dashboard/deployments/123/settings",
+      "status": 200,
+      "mustContain": "hello from app/dashboard/deployments/[id]/settings",
+      "responseHeaders": {
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
+      }
+    },
+    {
+      "path": "/dashboard/deployments/123/settings",
+      "status": 200,
+      "responseHeaders": {
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
+      },
+      "headers": {
+        "RSC": "1"
+      },
+      "mustContain": "M1:{",
+      "mustNotContain": "<html"
+    },
+    {
+      "path": "/dashboard/deployments/catchall/something",
+      "status": 200,
+      "mustContain": "catchall",
+      "responseHeaders": {
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
+      }
+    },
+    {
+      "path": "/dashboard/deployments/catchall/something",
+      "status": 200,
+      "responseHeaders": {
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
+      },
+      "headers": {
+        "RSC": "1"
+      },
+      "mustContain": "M1:{",
+      "mustNotContain": "<html"
+    },
     {
       "path": "/dashboard",
       "status": 200,
       "mustContain": "hello from app/dashboard",
       "responseHeaders": {
-        "vary": "__rsc__, __next_router_state_tree__, __next_router_prefetch__"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
       }
     },
     {
       "path": "/dashboard",
       "status": 200,
       "headers": {
-        "__rsc__": "1"
+        "RSC": "1"
       },
       "mustContain": "M1:{",
       "mustNotContain": "<html"
@@ -27,11 +67,11 @@
       "path": "/dashboard",
       "status": 200,
       "headers": {
-        "__rsc__": "1"
+        "RSC": "1"
       },
       "responseHeaders": {
         "content-type": "application/octet-stream",
-        "vary": "__rsc__, __next_router_state_tree__, __next_router_prefetch__"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
       }
     },
     {
@@ -68,7 +108,7 @@
       "path": "/",
       "status": 200,
       "headers": {
-        "__rsc__": "1"
+        "RSC": "1"
       },
       "mustContain": "M1:{",
       "mustNotContain": "<html"