@vercel/next 3.5.0 → 3.5.2

package/dist/index.js

@@ -41579,6 +41579,8 @@ const build = async ({ files, workPath, repoRootPath, entrypoint, config = {}, m
                 ...Object.entries(prerenderManifest.fallbackRoutes),
                 ...Object.entries(prerenderManifest.blockingFallbackRoutes),
             ].forEach(([, { dataRouteRegex, dataRoute }]) => {
+                if (!dataRoute || !dataRouteRegex)
+                    return;
                 dataRoutes.push({
                     // Next.js provided data route regex
                     src: dataRouteRegex.replace(/^\^/, `^${appMountPrefixNoTrailingSlash}`),
@@ -42433,7 +42435,8 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
         });
     }
     const pageMatchesApi = (page) => {
-        return page.startsWith('api/') || page === 'api.js';
+        return (!appPathRoutesManifest?.[page] &&
+            (page.startsWith('api/') || page === 'api.js'));
     };
     const { i18n } = routesManifest;
     const hasPages404 = routesManifest.pages404;
@@ -43049,7 +43052,16 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
         // to match prerenders so we can route the same when the
         // __rsc__ header is present
         const edgeFunctions = middleware.edgeFunctions;
+        // allow looking up original route from normalized route
+        const inverseAppPathManifest = {};
+        for (const ogRoute of Object.keys(appPathRoutesManifest)) {
+            inverseAppPathManifest[appPathRoutesManifest[ogRoute]] = ogRoute;
+        }
         for (let route of Object.values(appPathRoutesManifest)) {
+            const ogRoute = inverseAppPathManifest[route];
+            if (ogRoute.endsWith('/route')) {
+                continue;
+            }
             route = path_1.default.posix.join('./', route === '/' ? '/index' : route);
             if (lambdas[route]) {
                 lambdas[`${route}.rsc`] = lambdas[route];
@@ -43060,6 +43072,8 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
         }
     }
     const rscHeader = routesManifest.rsc?.header?.toLowerCase() || '__rsc__';
+    const rscVaryHeader = routesManifest?.rsc?.varyHeader ||
+        'RSC, Next-Router-State-Tree, Next-Router-Prefetch';
     const completeDynamicRoutes = [];
     if (appDir) {
         for (const route of dynamicRoutes) {
@@ -43270,7 +43284,9 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                             },
                         ],
                         dest: path_1.default.posix.join('/', entryDirectory, '/index.rsc'),
+                        headers: { vary: rscVaryHeader },
                         continue: true,
+                        override: true,
                     },
                     {
                         src: `^${path_1.default.posix.join('/', entryDirectory, '/((?!.+\\.rsc).+?)(?:/)?$')}`,
@@ -43281,7 +43297,9 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                             },
                         ],
                         dest: path_1.default.posix.join('/', entryDirectory, '/$1.rsc'),
+                        headers: { vary: rscVaryHeader },
                         continue: true,
+                        override: true,
                     },
                 ]
                 : []),
@@ -44286,7 +44304,8 @@ async function getPrerenderManifest(entryPath, outputDirectory) {
             return ret;
         }
         case 2:
-        case 3: {
+        case 3:
+        case 4: {
             const routes = Object.keys(manifest.routes);
             const lazyRoutes = Object.keys(manifest.dynamicRoutes);
             const ret = {
@@ -44303,12 +44322,20 @@ async function getPrerenderManifest(entryPath, outputDirectory) {
             }
             routes.forEach(route => {
                 const { initialRevalidateSeconds, dataRoute, srcRoute } = manifest.routes[route];
+                let initialStatus;
+                let initialHeaders;
+                if (manifest.version === 4) {
+                    initialStatus = manifest.routes[route].initialStatus;
+                    initialHeaders = manifest.routes[route].initialHeaders;
+                }
                 ret.staticRoutes[route] = {
                     initialRevalidate: initialRevalidateSeconds === false
                         ? false
                         : Math.max(1, initialRevalidateSeconds),
                     dataRoute,
                     srcRoute,
+                    initialStatus,
+                    initialHeaders,
                 };
             });
             lazyRoutes.forEach(lazyRoute => {
@@ -44642,7 +44669,7 @@ const onPrerenderRouteInitial = (prerenderManifest, canUsePreviewMode, entryDire
     const pr = prerenderManifest.staticRoutes[routeKey];
     const { initialRevalidate, srcRoute, dataRoute } = pr;
     const route = srcRoute || routeKey;
-    const isAppPathRoute = appDir && dataRoute?.endsWith('.rsc');
+    const isAppPathRoute = appDir && (!dataRoute || dataRoute?.endsWith('.rsc'));
     const routeNoLocale = routesManifest?.i18n
         ? normalizeLocalePath(routeKey, routesManifest.i18n.locales).pathname
         : routeKey;
@@ -44724,6 +44751,8 @@ const onPrerenderRoute = (prerenderRouteArgs) => (routeKey, { isBlocking, isFall
     let initialRevalidate;
     let srcRoute;
     let dataRoute;
+    let initialStatus;
+    let initialHeaders;
     if (isFallback || isBlocking) {
         const pr = isFallback
             ? prerenderManifest.fallbackRoutes[routeKey]
@@ -44747,32 +44776,49 @@ const onPrerenderRoute = (prerenderRouteArgs) => (routeKey, { isBlocking, isFall
     }
     else {
         const pr = prerenderManifest.staticRoutes[routeKey];
-        ({ initialRevalidate, srcRoute, dataRoute } = pr);
+        ({
+            initialRevalidate,
+            srcRoute,
+            dataRoute,
+            initialHeaders,
+            initialStatus,
+        } = pr);
     }
     let isAppPathRoute = false;
     // TODO: leverage manifest to determine app paths more accurately
-    if (appDir && srcRoute && dataRoute.endsWith('.rsc')) {
+    if (appDir && srcRoute && (!dataRoute || dataRoute?.endsWith('.rsc'))) {
         isAppPathRoute = true;
     }
     const isOmittedOrNotFound = isOmitted || isNotFound;
-    const htmlFsRef = isBlocking || (isNotFound && !static404Page)
-        ? // Blocking pages do not have an HTML fallback
-            null
-        : new build_utils_1.FileFsRef({
-            fsPath: path_1.default.join(isAppPathRoute && !isOmittedOrNotFound && appDir
-                ? appDir
-                : pagesDir, isFallback
-                ? // Fallback pages have a special file.
-                    addLocaleOrDefault(prerenderManifest.fallbackRoutes[routeKey].fallback, routesManifest, locale)
-                : // Otherwise, the route itself should exist as a static HTML
-                    // file.
-                    `${isOmittedOrNotFound
-                        ? addLocaleOrDefault('/404', routesManifest, locale)
-                        : routeFileNoExt}.html`),
+    let htmlFsRef;
+    if (appDir && !dataRoute && isAppPathRoute && !(isBlocking || isFallback)) {
+        const contentType = initialHeaders?.['content-type'];
+        htmlFsRef = new build_utils_1.FileFsRef({
+            fsPath: path_1.default.join(appDir, `${routeFileNoExt}.body`),
+            contentType: contentType || 'text/html;charset=utf-8',
         });
+    }
+    else {
+        htmlFsRef =
+            isBlocking || (isNotFound && !static404Page)
+                ? // Blocking pages do not have an HTML fallback
+                    null
+                : new build_utils_1.FileFsRef({
+                    fsPath: path_1.default.join(isAppPathRoute && !isOmittedOrNotFound && appDir
+                        ? appDir
+                        : pagesDir, isFallback
+                        ? // Fallback pages have a special file.
+                            addLocaleOrDefault(prerenderManifest.fallbackRoutes[routeKey].fallback, routesManifest, locale)
+                        : // Otherwise, the route itself should exist as a static HTML
+                            // file.
+                            `${isOmittedOrNotFound
+                                ? addLocaleOrDefault('/404', routesManifest, locale)
+                                : routeFileNoExt}.html`),
+                });
+    }
     const jsonFsRef = 
     // JSON data does not exist for fallback or blocking pages
-    isFallback || isBlocking || (isNotFound && !static404Page)
+    isFallback || isBlocking || (isNotFound && !static404Page) || !dataRoute
         ? null
         : new build_utils_1.FileFsRef({
             fsPath: path_1.default.join(isAppPathRoute && !isOmittedOrNotFound && appDir
@@ -44798,13 +44844,16 @@ const onPrerenderRoute = (prerenderRouteArgs) => (routeKey, { isBlocking, isFall
     }
     const outputPathPageOrig = path_1.default.posix.join(entryDirectory, origRouteFileNoExt);
     let lambda;
-    let outputPathData = path_1.default.posix.join(entryDirectory, dataRoute);
-    if (nonDynamicSsg || isFallback || isOmitted) {
-        outputPathData = outputPathData.replace(new RegExp(`${(0, escape_string_regexp_1.default)(origRouteFileNoExt)}.json$`), 
-        // ensure we escape "$" correctly while replacing as "$" is a special
-        // character, we need to do double escaping as first is for the initial
-        // replace on the routeFile and then the second on the outputPath
-        `${routeFileNoExt.replace(/\$/g, '$$$$')}.json`);
+    let outputPathData = null;
+    if (dataRoute) {
+        outputPathData = path_1.default.posix.join(entryDirectory, dataRoute);
+        if (nonDynamicSsg || isFallback || isOmitted) {
+            outputPathData = outputPathData.replace(new RegExp(`${(0, escape_string_regexp_1.default)(origRouteFileNoExt)}.json$`), 
+            // ensure we escape "$" correctly while replacing as "$" is a special
+            // character, we need to do double escaping as first is for the initial
+            // replace on the routeFile and then the second on the outputPath
+            `${routeFileNoExt.replace(/\$/g, '$$$$')}.json`);
+        }
     }
     if (isSharedLambdas) {
         const outputSrcPathPage = normalizeIndexOutput(path_1.default.join('/', srcRoute == null
@@ -44823,7 +44872,7 @@ const onPrerenderRoute = (prerenderRouteArgs) => (routeKey, { isBlocking, isFall
         if (htmlFsRef == null || jsonFsRef == null) {
             throw new build_utils_1.NowBuildError({
                 code: 'NEXT_HTMLFSREF_JSONFSREF',
-                message: 'invariant: htmlFsRef != null && jsonFsRef != null',
+                message: `invariant: htmlFsRef != null && jsonFsRef != null ${routeFileNoExt}`,
             });
         }
         // if preview mode/On-Demand ISR can't be leveraged
@@ -44832,7 +44881,9 @@ const onPrerenderRoute = (prerenderRouteArgs) => (routeKey, { isBlocking, isFall
             (routeKey === '/404' && !lambdas[outputPathPage])) {
             htmlFsRef.contentType = _1.htmlContentType;
             prerenders[outputPathPage] = htmlFsRef;
-            prerenders[outputPathData] = jsonFsRef;
+            if (outputPathData) {
+                prerenders[outputPathData] = jsonFsRef;
+            }
         }
     }
     const isNotFoundPreview = isCorrectNotFoundRoutes &&
@@ -44886,9 +44937,9 @@ const onPrerenderRoute = (prerenderRouteArgs) => (routeKey, { isBlocking, isFall
                 allowQuery = [];
             }
         }
-        const rscVaryHeader = routesManifest?.rsc?.varyHeader ||
-            '__rsc__, __next_router_state_tree__, __next_router_prefetch__';
-        const rscContentTypeHeader = routesManifest?.rsc?.contentTypeHeader || 'application/octet-stream';
+        const rscEnabled = !!routesManifest?.rsc;
+        const rscVaryHeader = routesManifest?.rsc?.varyHeader || 'RSC, Next-Router-State-Tree, Next-Router-Prefetch';
+        const rscContentTypeHeader = routesManifest?.rsc?.contentTypeHeader || 'text/x-component';
         prerenders[outputPathPage] = new build_utils_1.Prerender({
             expiration: initialRevalidate,
             lambda,
@@ -44896,59 +44947,66 @@ const onPrerenderRoute = (prerenderRouteArgs) => (routeKey, { isBlocking, isFall
             fallback: htmlFsRef,
             group: prerenderGroup,
             bypassToken: prerenderManifest.bypassToken,
+            initialStatus,
+            initialHeaders,
             ...(isNotFound
                 ? {
                     initialStatus: 404,
                 }
                 : {}),
-            ...(isAppPathRoute
-                ? {
-                    initialHeaders: {
-                        vary: rscVaryHeader,
-                    },
-                }
-                : {}),
-        });
-        prerenders[outputPathData] = new build_utils_1.Prerender({
-            expiration: initialRevalidate,
-            lambda,
-            allowQuery,
-            fallback: jsonFsRef,
-            group: prerenderGroup,
-            bypassToken: prerenderManifest.bypassToken,
-            ...(isNotFound
-                ? {
-                    initialStatus: 404,
-                }
-                : {}),
-            ...(isAppPathRoute
+            ...(rscEnabled
                 ? {
                     initialHeaders: {
-                        'content-type': rscContentTypeHeader,
+                        ...initialHeaders,
                         vary: rscVaryHeader,
                     },
                 }
                 : {}),
         });
+        if (outputPathData) {
+            prerenders[outputPathData] = new build_utils_1.Prerender({
+                expiration: initialRevalidate,
+                lambda,
+                allowQuery,
+                fallback: jsonFsRef,
+                group: prerenderGroup,
+                bypassToken: prerenderManifest.bypassToken,
+                ...(isNotFound
+                    ? {
+                        initialStatus: 404,
+                    }
+                    : {}),
+                ...(rscEnabled
+                    ? {
+                        initialHeaders: {
+                            'content-type': rscContentTypeHeader,
+                            vary: rscVaryHeader,
+                        },
+                    }
+                    : {}),
+            });
+        }
         ++prerenderGroup;
         if (routesManifest?.i18n && isBlocking) {
             for (const locale of routesManifest.i18n.locales) {
                 const localeRouteFileNoExt = addLocaleOrDefault(routeFileNoExt, routesManifest, locale);
                 const localeOutputPathPage = normalizeIndexOutput(path_1.default.posix.join(entryDirectory, localeRouteFileNoExt), isServerMode);
-                const localeOutputPathData = outputPathData.replace(new RegExp(`${(0, escape_string_regexp_1.default)(origRouteFileNoExt)}.json$`), `${localeRouteFileNoExt}${localeRouteFileNoExt !== origRouteFileNoExt &&
-                    origRouteFileNoExt === '/index'
-                    ? '/index'
-                    : ''}.json`);
                 const origPrerenderPage = prerenders[outputPathPage];
-                const origPrerenderData = prerenders[outputPathData];
                 prerenders[localeOutputPathPage] = {
                     ...origPrerenderPage,
                     group: prerenderGroup,
                 };
-                prerenders[localeOutputPathData] = {
-                    ...origPrerenderData,
-                    group: prerenderGroup,
-                };
+                if (outputPathData) {
+                    const localeOutputPathData = outputPathData.replace(new RegExp(`${(0, escape_string_regexp_1.default)(origRouteFileNoExt)}.json$`), `${localeRouteFileNoExt}${localeRouteFileNoExt !== origRouteFileNoExt &&
+                        origRouteFileNoExt === '/index'
+                        ? '/index'
+                        : ''}.json`);
+                    const origPrerenderData = prerenders[outputPathData];
+                    prerenders[localeOutputPathData] = {
+                        ...origPrerenderData,
+                        group: prerenderGroup,
+                    };
+                }
                 ++prerenderGroup;
             }
         }
@@ -45180,9 +45238,11 @@ async function getMiddlewareBundle({ entryPath, outputDirectory, routesManifest,
             if (shortPath.startsWith('pages/')) {
                 shortPath = shortPath.replace(/^pages\//, '');
             }
-            else if (shortPath.startsWith('app/') && shortPath.endsWith('/page')) {
+            else if (shortPath.startsWith('app/') &&
+                (shortPath.endsWith('/page') || shortPath.endsWith('/route'))) {
                 shortPath =
-                    shortPath.replace(/^app\//, '').replace(/(^|\/)page$/, '') || 'index';
+                    shortPath.replace(/^app\//, '').replace(/(^|\/)(page|route)$/, '') ||
+                        'index';
             }
             if (routesManifest?.basePath) {
                 shortPath = path_1.default.posix

package/dist/server-build.js

@@ -47,7 +47,8 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
         });
     }
     const pageMatchesApi = (page) => {
-        return page.startsWith('api/') || page === 'api.js';
+        return (!appPathRoutesManifest?.[page] &&
+            (page.startsWith('api/') || page === 'api.js'));
     };
     const { i18n } = routesManifest;
     const hasPages404 = routesManifest.pages404;
@@ -663,7 +664,16 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
         // to match prerenders so we can route the same when the
         // __rsc__ header is present
         const edgeFunctions = middleware.edgeFunctions;
+        // allow looking up original route from normalized route
+        const inverseAppPathManifest = {};
+        for (const ogRoute of Object.keys(appPathRoutesManifest)) {
+            inverseAppPathManifest[appPathRoutesManifest[ogRoute]] = ogRoute;
+        }
         for (let route of Object.values(appPathRoutesManifest)) {
+            const ogRoute = inverseAppPathManifest[route];
+            if (ogRoute.endsWith('/route')) {
+                continue;
+            }
             route = path_1.default.posix.join('./', route === '/' ? '/index' : route);
             if (lambdas[route]) {
                 lambdas[`${route}.rsc`] = lambdas[route];
@@ -674,6 +684,8 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
         }
     }
     const rscHeader = routesManifest.rsc?.header?.toLowerCase() || '__rsc__';
+    const rscVaryHeader = routesManifest?.rsc?.varyHeader ||
+        'RSC, Next-Router-State-Tree, Next-Router-Prefetch';
     const completeDynamicRoutes = [];
     if (appDir) {
         for (const route of dynamicRoutes) {
@@ -884,7 +896,9 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                             },
                         ],
                         dest: path_1.default.posix.join('/', entryDirectory, '/index.rsc'),
+                        headers: { vary: rscVaryHeader },
                         continue: true,
+                        override: true,
                     },
                     {
                         src: `^${path_1.default.posix.join('/', entryDirectory, '/((?!.+\\.rsc).+?)(?:/)?$')}`,
@@ -895,7 +909,9 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                             },
                         ],
                         dest: path_1.default.posix.join('/', entryDirectory, '/$1.rsc'),
+                        headers: { vary: rscVaryHeader },
                         continue: true,
+                        override: true,
                     },
                 ]
                 : []),

package/dist/utils.js

@@ -658,7 +658,8 @@ async function getPrerenderManifest(entryPath, outputDirectory) {
             return ret;
         }
         case 2:
-        case 3: {
+        case 3:
+        case 4: {
             const routes = Object.keys(manifest.routes);
             const lazyRoutes = Object.keys(manifest.dynamicRoutes);
             const ret = {
@@ -675,12 +676,20 @@ async function getPrerenderManifest(entryPath, outputDirectory) {
             }
             routes.forEach(route => {
                 const { initialRevalidateSeconds, dataRoute, srcRoute } = manifest.routes[route];
+                let initialStatus;
+                let initialHeaders;
+                if (manifest.version === 4) {
+                    initialStatus = manifest.routes[route].initialStatus;
+                    initialHeaders = manifest.routes[route].initialHeaders;
+                }
                 ret.staticRoutes[route] = {
                     initialRevalidate: initialRevalidateSeconds === false
                         ? false
                         : Math.max(1, initialRevalidateSeconds),
                     dataRoute,
                     srcRoute,
+                    initialStatus,
+                    initialHeaders,
                 };
             });
             lazyRoutes.forEach(lazyRoute => {
@@ -1014,7 +1023,7 @@ const onPrerenderRouteInitial = (prerenderManifest, canUsePreviewMode, entryDire
     const pr = prerenderManifest.staticRoutes[routeKey];
     const { initialRevalidate, srcRoute, dataRoute } = pr;
     const route = srcRoute || routeKey;
-    const isAppPathRoute = appDir && dataRoute?.endsWith('.rsc');
+    const isAppPathRoute = appDir && (!dataRoute || dataRoute?.endsWith('.rsc'));
     const routeNoLocale = routesManifest?.i18n
         ? normalizeLocalePath(routeKey, routesManifest.i18n.locales).pathname
         : routeKey;
@@ -1096,6 +1105,8 @@ const onPrerenderRoute = (prerenderRouteArgs) => (routeKey, { isBlocking, isFall
     let initialRevalidate;
     let srcRoute;
     let dataRoute;
+    let initialStatus;
+    let initialHeaders;
     if (isFallback || isBlocking) {
         const pr = isFallback
             ? prerenderManifest.fallbackRoutes[routeKey]
@@ -1119,32 +1130,49 @@ const onPrerenderRoute = (prerenderRouteArgs) => (routeKey, { isBlocking, isFall
     }
     else {
         const pr = prerenderManifest.staticRoutes[routeKey];
-        ({ initialRevalidate, srcRoute, dataRoute } = pr);
+        ({
+            initialRevalidate,
+            srcRoute,
+            dataRoute,
+            initialHeaders,
+            initialStatus,
+        } = pr);
     }
     let isAppPathRoute = false;
     // TODO: leverage manifest to determine app paths more accurately
-    if (appDir && srcRoute && dataRoute.endsWith('.rsc')) {
+    if (appDir && srcRoute && (!dataRoute || dataRoute?.endsWith('.rsc'))) {
         isAppPathRoute = true;
     }
     const isOmittedOrNotFound = isOmitted || isNotFound;
-    const htmlFsRef = isBlocking || (isNotFound && !static404Page)
-        ? // Blocking pages do not have an HTML fallback
-            null
-        : new build_utils_1.FileFsRef({
-            fsPath: path_1.default.join(isAppPathRoute && !isOmittedOrNotFound && appDir
-                ? appDir
-                : pagesDir, isFallback
-                ? // Fallback pages have a special file.
-                    addLocaleOrDefault(prerenderManifest.fallbackRoutes[routeKey].fallback, routesManifest, locale)
-                : // Otherwise, the route itself should exist as a static HTML
-                    // file.
-                    `${isOmittedOrNotFound
-                        ? addLocaleOrDefault('/404', routesManifest, locale)
-                        : routeFileNoExt}.html`),
+    let htmlFsRef;
+    if (appDir && !dataRoute && isAppPathRoute && !(isBlocking || isFallback)) {
+        const contentType = initialHeaders?.['content-type'];
+        htmlFsRef = new build_utils_1.FileFsRef({
+            fsPath: path_1.default.join(appDir, `${routeFileNoExt}.body`),
+            contentType: contentType || 'text/html;charset=utf-8',
         });
+    }
+    else {
+        htmlFsRef =
+            isBlocking || (isNotFound && !static404Page)
+                ? // Blocking pages do not have an HTML fallback
+                    null
+                : new build_utils_1.FileFsRef({
+                    fsPath: path_1.default.join(isAppPathRoute && !isOmittedOrNotFound && appDir
+                        ? appDir
+                        : pagesDir, isFallback
+                        ? // Fallback pages have a special file.
+                            addLocaleOrDefault(prerenderManifest.fallbackRoutes[routeKey].fallback, routesManifest, locale)
+                        : // Otherwise, the route itself should exist as a static HTML
+                            // file.
+                            `${isOmittedOrNotFound
+                                ? addLocaleOrDefault('/404', routesManifest, locale)
+                                : routeFileNoExt}.html`),
+                });
+    }
     const jsonFsRef = 
     // JSON data does not exist for fallback or blocking pages
-    isFallback || isBlocking || (isNotFound && !static404Page)
+    isFallback || isBlocking || (isNotFound && !static404Page) || !dataRoute
         ? null
         : new build_utils_1.FileFsRef({
             fsPath: path_1.default.join(isAppPathRoute && !isOmittedOrNotFound && appDir
@@ -1170,13 +1198,16 @@ const onPrerenderRoute = (prerenderRouteArgs) => (routeKey, { isBlocking, isFall
     }
     const outputPathPageOrig = path_1.default.posix.join(entryDirectory, origRouteFileNoExt);
     let lambda;
-    let outputPathData = path_1.default.posix.join(entryDirectory, dataRoute);
-    if (nonDynamicSsg || isFallback || isOmitted) {
-        outputPathData = outputPathData.replace(new RegExp(`${(0, escape_string_regexp_1.default)(origRouteFileNoExt)}.json$`), 
-        // ensure we escape "$" correctly while replacing as "$" is a special
-        // character, we need to do double escaping as first is for the initial
-        // replace on the routeFile and then the second on the outputPath
-        `${routeFileNoExt.replace(/\$/g, '$$$$')}.json`);
+    let outputPathData = null;
+    if (dataRoute) {
+        outputPathData = path_1.default.posix.join(entryDirectory, dataRoute);
+        if (nonDynamicSsg || isFallback || isOmitted) {
+            outputPathData = outputPathData.replace(new RegExp(`${(0, escape_string_regexp_1.default)(origRouteFileNoExt)}.json$`), 
+            // ensure we escape "$" correctly while replacing as "$" is a special
+            // character, we need to do double escaping as first is for the initial
+            // replace on the routeFile and then the second on the outputPath
+            `${routeFileNoExt.replace(/\$/g, '$$$$')}.json`);
+        }
     }
     if (isSharedLambdas) {
         const outputSrcPathPage = normalizeIndexOutput(path_1.default.join('/', srcRoute == null
@@ -1195,7 +1226,7 @@ const onPrerenderRoute = (prerenderRouteArgs) => (routeKey, { isBlocking, isFall
         if (htmlFsRef == null || jsonFsRef == null) {
             throw new build_utils_1.NowBuildError({
                 code: 'NEXT_HTMLFSREF_JSONFSREF',
-                message: 'invariant: htmlFsRef != null && jsonFsRef != null',
+                message: `invariant: htmlFsRef != null && jsonFsRef != null ${routeFileNoExt}`,
             });
         }
         // if preview mode/On-Demand ISR can't be leveraged
@@ -1204,7 +1235,9 @@ const onPrerenderRoute = (prerenderRouteArgs) => (routeKey, { isBlocking, isFall
             (routeKey === '/404' && !lambdas[outputPathPage])) {
             htmlFsRef.contentType = _1.htmlContentType;
             prerenders[outputPathPage] = htmlFsRef;
-            prerenders[outputPathData] = jsonFsRef;
+            if (outputPathData) {
+                prerenders[outputPathData] = jsonFsRef;
+            }
         }
     }
     const isNotFoundPreview = isCorrectNotFoundRoutes &&
@@ -1258,9 +1291,9 @@ const onPrerenderRoute = (prerenderRouteArgs) => (routeKey, { isBlocking, isFall
                 allowQuery = [];
             }
         }
-        const rscVaryHeader = routesManifest?.rsc?.varyHeader ||
-            '__rsc__, __next_router_state_tree__, __next_router_prefetch__';
-        const rscContentTypeHeader = routesManifest?.rsc?.contentTypeHeader || 'application/octet-stream';
+        const rscEnabled = !!routesManifest?.rsc;
+        const rscVaryHeader = routesManifest?.rsc?.varyHeader || 'RSC, Next-Router-State-Tree, Next-Router-Prefetch';
+        const rscContentTypeHeader = routesManifest?.rsc?.contentTypeHeader || 'text/x-component';
         prerenders[outputPathPage] = new build_utils_1.Prerender({
             expiration: initialRevalidate,
             lambda,
@@ -1268,59 +1301,66 @@ const onPrerenderRoute = (prerenderRouteArgs) => (routeKey, { isBlocking, isFall
             fallback: htmlFsRef,
             group: prerenderGroup,
             bypassToken: prerenderManifest.bypassToken,
+            initialStatus,
+            initialHeaders,
             ...(isNotFound
                 ? {
                     initialStatus: 404,
                 }
                 : {}),
-            ...(isAppPathRoute
-                ? {
-                    initialHeaders: {
-                        vary: rscVaryHeader,
-                    },
-                }
-                : {}),
-        });
-        prerenders[outputPathData] = new build_utils_1.Prerender({
-            expiration: initialRevalidate,
-            lambda,
-            allowQuery,
-            fallback: jsonFsRef,
-            group: prerenderGroup,
-            bypassToken: prerenderManifest.bypassToken,
-            ...(isNotFound
-                ? {
-                    initialStatus: 404,
-                }
-                : {}),
-            ...(isAppPathRoute
+            ...(rscEnabled
                 ? {
                     initialHeaders: {
-                        'content-type': rscContentTypeHeader,
+                        ...initialHeaders,
                         vary: rscVaryHeader,
                     },
                 }
                 : {}),
         });
+        if (outputPathData) {
+            prerenders[outputPathData] = new build_utils_1.Prerender({
+                expiration: initialRevalidate,
+                lambda,
+                allowQuery,
+                fallback: jsonFsRef,
+                group: prerenderGroup,
+                bypassToken: prerenderManifest.bypassToken,
+                ...(isNotFound
+                    ? {
+                        initialStatus: 404,
+                    }
+                    : {}),
+                ...(rscEnabled
+                    ? {
+                        initialHeaders: {
+                            'content-type': rscContentTypeHeader,
+                            vary: rscVaryHeader,
+                        },
+                    }
+                    : {}),
+            });
+        }
         ++prerenderGroup;
         if (routesManifest?.i18n && isBlocking) {
             for (const locale of routesManifest.i18n.locales) {
                 const localeRouteFileNoExt = addLocaleOrDefault(routeFileNoExt, routesManifest, locale);
                 const localeOutputPathPage = normalizeIndexOutput(path_1.default.posix.join(entryDirectory, localeRouteFileNoExt), isServerMode);
-                const localeOutputPathData = outputPathData.replace(new RegExp(`${(0, escape_string_regexp_1.default)(origRouteFileNoExt)}.json$`), `${localeRouteFileNoExt}${localeRouteFileNoExt !== origRouteFileNoExt &&
-                    origRouteFileNoExt === '/index'
-                    ? '/index'
-                    : ''}.json`);
                 const origPrerenderPage = prerenders[outputPathPage];
-                const origPrerenderData = prerenders[outputPathData];
                 prerenders[localeOutputPathPage] = {
                     ...origPrerenderPage,
                     group: prerenderGroup,
                 };
-                prerenders[localeOutputPathData] = {
-                    ...origPrerenderData,
-                    group: prerenderGroup,
-                };
+                if (outputPathData) {
+                    const localeOutputPathData = outputPathData.replace(new RegExp(`${(0, escape_string_regexp_1.default)(origRouteFileNoExt)}.json$`), `${localeRouteFileNoExt}${localeRouteFileNoExt !== origRouteFileNoExt &&
+                        origRouteFileNoExt === '/index'
+                        ? '/index'
+                        : ''}.json`);
+                    const origPrerenderData = prerenders[outputPathData];
+                    prerenders[localeOutputPathData] = {
+                        ...origPrerenderData,
+                        group: prerenderGroup,
+                    };
+                }
                 ++prerenderGroup;
             }
         }
@@ -1552,9 +1592,11 @@ async function getMiddlewareBundle({ entryPath, outputDirectory, routesManifest,
             if (shortPath.startsWith('pages/')) {
                 shortPath = shortPath.replace(/^pages\//, '');
             }
-            else if (shortPath.startsWith('app/') && shortPath.endsWith('/page')) {
+            else if (shortPath.startsWith('app/') &&
+                (shortPath.endsWith('/page') || shortPath.endsWith('/route'))) {
                 shortPath =
-                    shortPath.replace(/^app\//, '').replace(/(^|\/)page$/, '') || 'index';
+                    shortPath.replace(/^app\//, '').replace(/(^|\/)(page|route)$/, '') ||
+                        'index';
             }
             if (routesManifest?.basePath) {
                 shortPath = path_1.default.posix

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/next",
-  "version": "3.5.0",
+  "version": "3.5.2",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/next-js",
@@ -71,5 +71,5 @@
     "typescript": "4.5.2",
     "webpack-sources": "3.2.3"
   },
-  "gitHead": "70a53515bd12202f895c369504e2d5be6c9469f4"
+  "gitHead": "b30f000d2ab37bea5ec67c5461bb68d1a007cc3b"
 }