@vercel/next 3.4.7 → 3.5.1

package/dist/index.js

@@ -40896,10 +40896,7 @@ const build = async ({ files, workPath, repoRootPath, entrypoint, config = {}, m
             outputDirectory,
             appPathRoutesManifest,
         });
-        const isApiPage = (page) => page
-            .replace(/\\/g, '/')
-            .match(/(serverless|server)\/pages\/api(\/|\.js$)/);
-        const canUsePreviewMode = Object.keys(pages).some(page => isApiPage(pages[page].fsPath));
+        const canUsePreviewMode = Object.keys(pages).some(page => (0, utils_1.isApiPage)(pages[page].fsPath));
         staticPages = await (0, utils_1.filterStaticPages)(await (0, build_utils_1.glob)('**/*.html', pagesDir), dynamicPages, entryDirectory, exports.htmlContentType, prerenderManifest, routesManifest);
         hasStatic500 = !!staticPages[path_1.default.posix.join(entryDirectory, '500')];
         // this can be either 404.html in latest versions
@@ -41109,7 +41106,7 @@ const build = async ({ files, workPath, repoRootPath, entrypoint, config = {}, m
             const route = `/${page.replace(/\.js$/, '')}`;
             if (route === '/_error' && static404Page)
                 continue;
-            if (isApiPage(pagePath)) {
+            if ((0, utils_1.isApiPage)(pagePath)) {
                 apiPages.push(page);
             }
             else if (!nonLambdaSsgPages.has(route)) {
@@ -41214,6 +41211,9 @@ const build = async ({ files, workPath, repoRootPath, entrypoint, config = {}, m
                 lambdaCompressedByteLimit,
                 internalPages: [],
             });
+            for (const group of initialApiLambdaGroups) {
+                group.isApiLambda = true;
+            }
             (0, build_utils_1.debug)(JSON.stringify({
                 apiLambdaGroups: initialApiLambdaGroups.map(group => ({
                     pages: group.pages,
@@ -41250,7 +41250,7 @@ const build = async ({ files, workPath, repoRootPath, entrypoint, config = {}, m
                     const pageFileName = path_1.default.normalize(path_1.default.relative(workPath, pages[page].fsPath));
                     const pathname = page.replace(/\.js$/, '');
                     const routeIsDynamic = (0, utils_1.isDynamicRoute)(pathname);
-                    routeIsApi = isApiPage(pageFileName);
+                    routeIsApi = (0, utils_1.isApiPage)(pageFileName);
                     if (routeIsDynamic) {
                         dynamicPages.push((0, utils_1.normalizePage)(pathname));
                     }
@@ -41366,6 +41366,10 @@ const build = async ({ files, workPath, repoRootPath, entrypoint, config = {}, m
                             },
                         ],
                         handler: path_1.default.join(path_1.default.relative(baseDir, entryPath), '___next_launcher.cjs'),
+                        operationType: (0, utils_1.getOperationType)({
+                            prerenderManifest,
+                            pageFileName,
+                        }),
                         runtime: nodeVersion.runtime,
                         nextVersion,
                         ...lambdaOptions,
@@ -41383,6 +41387,7 @@ const build = async ({ files, workPath, repoRootPath, entrypoint, config = {}, m
                             },
                         ],
                         handler: path_1.default.join(path_1.default.relative(baseDir, entryPath), '___next_launcher.cjs'),
+                        operationType: (0, utils_1.getOperationType)({ pageFileName }),
                         runtime: nodeVersion.runtime,
                         nextVersion,
                         ...lambdaOptions,
@@ -41521,6 +41526,10 @@ const build = async ({ files, workPath, repoRootPath, entrypoint, config = {}, m
                 for (const page of groupPageKeys) {
                     pageLambdaMap[page] = group.lambdaIdentifier;
                 }
+                const operationType = (0, utils_1.getOperationType)({
+                    group,
+                    prerenderManifest,
+                });
                 lambdas[group.lambdaIdentifier] =
                     await (0, utils_1.createLambdaFromPseudoLayers)({
                         files: {
@@ -41529,6 +41538,7 @@ const build = async ({ files, workPath, repoRootPath, entrypoint, config = {}, m
                         },
                         layers: [group.pseudoLayer],
                         handler: path_1.default.join(path_1.default.relative(baseDir, entryPath), '___next_launcher.cjs'),
+                        operationType,
                         runtime: nodeVersion.runtime,
                         nextVersion,
                     });
@@ -41569,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}`),
@@ -42788,6 +42800,9 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
             lambdaCompressedByteLimit,
             internalPages,
         });
+        for (const group of apiLambdaGroups) {
+            group.isApiLambda = true;
+        }
         (0, build_utils_1.debug)(JSON.stringify({
             apiLambdaGroups: apiLambdaGroups.map(group => ({
                 pages: group.pages,
@@ -42871,6 +42886,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                     });
                 }
             }
+            const operationType = (0, utils_1.getOperationType)({ group, prerenderManifest });
             const lambda = await (0, utils_1.createLambdaFromPseudoLayers)({
                 files: {
                     ...launcherFiles,
@@ -42878,6 +42894,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                 },
                 layers: [group.pseudoLayer, groupPageFiles],
                 handler: path_1.default.join(path_1.default.relative(baseDir, requiredServerFilesManifest.appDir || entryPath), '___next_launcher.cjs'),
+                operationType,
                 memory: group.memory,
                 runtime: nodeVersion.runtime,
                 maxDuration: group.maxDuration,
@@ -43045,6 +43062,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) {
@@ -43255,7 +43274,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).+?)(?:/)?$')}`,
@@ -43266,7 +43287,9 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                             },
                         ],
                         dest: path_1.default.posix.join('/', entryDirectory, '/$1.rsc'),
+                        headers: { vary: rscVaryHeader },
                         continue: true,
+                        override: true,
                     },
                 ]
                 : []),
@@ -43635,7 +43658,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.upgradeMiddlewareManifest = exports.getMiddlewareManifest = exports.getMiddlewareBundle = exports.getSourceFilePathFromPage = exports.isDynamicRoute = exports.normalizePage = exports.getImagesConfig = exports.getNextConfig = exports.normalizePackageJson = exports.validateEntrypoint = exports.excludeFiles = exports.getPrivateOutputs = exports.updateRouteSrc = exports.getNextServerPath = exports.normalizeIndexOutput = exports.getStaticFiles = exports.onPrerenderRoute = exports.onPrerenderRouteInitial = exports.detectLambdaLimitExceeding = exports.outputFunctionFileSizeInfo = exports.getPageLambdaGroups = exports.MAX_UNCOMPRESSED_LAMBDA_SIZE = exports.addLocaleOrDefault = exports.normalizeLocalePath = exports.getPrerenderManifest = exports.getRequiredServerFilesManifest = exports.getExportStatus = exports.getExportIntent = exports.createLambdaFromPseudoLayers = exports.createPseudoLayer = exports.ExperimentalTraceVersion = exports.collectTracedFiles = exports.getFilesMapFromReasons = exports.filterStaticPages = exports.getImagesManifest = exports.localizeDynamicRoutes = exports.getDynamicRoutes = exports.getRoutesManifest = exports.prettyBytes = exports.MIB = exports.KIB = void 0;
+exports.isApiPage = exports.getOperationType = exports.upgradeMiddlewareManifest = exports.getMiddlewareManifest = exports.getMiddlewareBundle = exports.getSourceFilePathFromPage = exports.isDynamicRoute = exports.normalizePage = exports.getImagesConfig = exports.getNextConfig = exports.normalizePackageJson = exports.validateEntrypoint = exports.excludeFiles = exports.getPrivateOutputs = exports.updateRouteSrc = exports.getNextServerPath = exports.normalizeIndexOutput = exports.getStaticFiles = exports.onPrerenderRoute = exports.onPrerenderRouteInitial = exports.detectLambdaLimitExceeding = exports.outputFunctionFileSizeInfo = exports.getPageLambdaGroups = exports.MAX_UNCOMPRESSED_LAMBDA_SIZE = exports.addLocaleOrDefault = exports.normalizeLocalePath = exports.getPrerenderManifest = exports.getRequiredServerFilesManifest = exports.getExportStatus = exports.getExportIntent = exports.createLambdaFromPseudoLayers = exports.createPseudoLayer = exports.ExperimentalTraceVersion = exports.collectTracedFiles = exports.getFilesMapFromReasons = exports.filterStaticPages = exports.getImagesManifest = exports.localizeDynamicRoutes = exports.getDynamicRoutes = exports.getRoutesManifest = exports.prettyBytes = exports.MIB = exports.KIB = void 0;
 const build_utils_1 = __webpack_require__(3445);
 const async_sema_1 = __webpack_require__(7905);
 const buffer_crc32_1 = __importDefault(__webpack_require__(2227));
@@ -44271,7 +44294,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 = {
@@ -44288,12 +44312,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 => {
@@ -44473,6 +44505,7 @@ async function getPageLambdaGroups({ entryPath, config, pages, prerenderRoutes,
                 pages: [page],
                 ...opts,
                 isPrerenders: isPrerenderRoute,
+                isApiLambda: !!isApiPage(page),
                 pseudoLayerBytes: initialPseudoLayer.pseudoLayerBytes,
                 pseudoLayerUncompressedBytes: initialPseudoLayerUncompressed,
                 pseudoLayer: Object.assign({}, initialPseudoLayer.pseudoLayer),
@@ -44626,7 +44659,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;
@@ -44708,6 +44741,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]
@@ -44731,32 +44766,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
@@ -44782,13 +44834,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
@@ -44807,7 +44862,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
@@ -44816,7 +44871,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 &&
@@ -44870,9 +44927,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,
@@ -44880,59 +44937,66 @@ const onPrerenderRoute = (prerenderRouteArgs) => (routeKey, { isBlocking, isFall
             fallback: htmlFsRef,
             group: prerenderGroup,
             bypassToken: prerenderManifest.bypassToken,
+            initialStatus,
+            initialHeaders,
             ...(isNotFound
                 ? {
                     initialStatus: 404,
                 }
                 : {}),
-            ...(isAppPathRoute
+            ...(rscEnabled
                 ? {
                     initialHeaders: {
+                        ...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
-                ? {
-                    initialHeaders: {
-                        'content-type': rscContentTypeHeader,
-                        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;
             }
         }
@@ -45164,9 +45228,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
@@ -45314,6 +45380,32 @@ function transformSourceMap(sourcemap) {
     });
     return { ...sourcemap, sources };
 }
+function getOperationType({ group, prerenderManifest, pageFileName, }) {
+    if (group?.isApiLambda || isApiPage(pageFileName)) {
+        return 'API';
+    }
+    if (group?.isPrerenders) {
+        return 'ISR';
+    }
+    if (pageFileName && prerenderManifest) {
+        const { blockingFallbackRoutes = {}, fallbackRoutes = {} } = prerenderManifest;
+        if (pageFileName in blockingFallbackRoutes ||
+            pageFileName in fallbackRoutes) {
+            return 'ISR';
+        }
+    }
+    return 'SSR';
+}
+exports.getOperationType = getOperationType;
+function isApiPage(page) {
+    if (!page) {
+        return false;
+    }
+    return page
+        .replace(/\\/g, '/')
+        .match(/(serverless|server)\/pages\/api(\/|\.js$)/);
+}
+exports.isApiPage = isApiPage;
 
 
 /***/ }),

package/dist/server-build.js

@@ -412,6 +412,9 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
             lambdaCompressedByteLimit,
             internalPages,
         });
+        for (const group of apiLambdaGroups) {
+            group.isApiLambda = true;
+        }
         (0, build_utils_1.debug)(JSON.stringify({
             apiLambdaGroups: apiLambdaGroups.map(group => ({
                 pages: group.pages,
@@ -495,6 +498,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                     });
                 }
             }
+            const operationType = (0, utils_1.getOperationType)({ group, prerenderManifest });
             const lambda = await (0, utils_1.createLambdaFromPseudoLayers)({
                 files: {
                     ...launcherFiles,
@@ -502,6 +506,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                 },
                 layers: [group.pseudoLayer, groupPageFiles],
                 handler: path_1.default.join(path_1.default.relative(baseDir, requiredServerFilesManifest.appDir || entryPath), '___next_launcher.cjs'),
+                operationType,
                 memory: group.memory,
                 runtime: nodeVersion.runtime,
                 maxDuration: group.maxDuration,
@@ -669,6 +674,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) {
@@ -879,7 +886,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).+?)(?:/)?$')}`,
@@ -890,7 +899,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

@@ -22,7 +22,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.upgradeMiddlewareManifest = exports.getMiddlewareManifest = exports.getMiddlewareBundle = exports.getSourceFilePathFromPage = exports.isDynamicRoute = exports.normalizePage = exports.getImagesConfig = exports.getNextConfig = exports.normalizePackageJson = exports.validateEntrypoint = exports.excludeFiles = exports.getPrivateOutputs = exports.updateRouteSrc = exports.getNextServerPath = exports.normalizeIndexOutput = exports.getStaticFiles = exports.onPrerenderRoute = exports.onPrerenderRouteInitial = exports.detectLambdaLimitExceeding = exports.outputFunctionFileSizeInfo = exports.getPageLambdaGroups = exports.MAX_UNCOMPRESSED_LAMBDA_SIZE = exports.addLocaleOrDefault = exports.normalizeLocalePath = exports.getPrerenderManifest = exports.getRequiredServerFilesManifest = exports.getExportStatus = exports.getExportIntent = exports.createLambdaFromPseudoLayers = exports.createPseudoLayer = exports.ExperimentalTraceVersion = exports.collectTracedFiles = exports.getFilesMapFromReasons = exports.filterStaticPages = exports.getImagesManifest = exports.localizeDynamicRoutes = exports.getDynamicRoutes = exports.getRoutesManifest = exports.prettyBytes = exports.MIB = exports.KIB = void 0;
+exports.isApiPage = exports.getOperationType = exports.upgradeMiddlewareManifest = exports.getMiddlewareManifest = exports.getMiddlewareBundle = exports.getSourceFilePathFromPage = exports.isDynamicRoute = exports.normalizePage = exports.getImagesConfig = exports.getNextConfig = exports.normalizePackageJson = exports.validateEntrypoint = exports.excludeFiles = exports.getPrivateOutputs = exports.updateRouteSrc = exports.getNextServerPath = exports.normalizeIndexOutput = exports.getStaticFiles = exports.onPrerenderRoute = exports.onPrerenderRouteInitial = exports.detectLambdaLimitExceeding = exports.outputFunctionFileSizeInfo = exports.getPageLambdaGroups = exports.MAX_UNCOMPRESSED_LAMBDA_SIZE = exports.addLocaleOrDefault = exports.normalizeLocalePath = exports.getPrerenderManifest = exports.getRequiredServerFilesManifest = exports.getExportStatus = exports.getExportIntent = exports.createLambdaFromPseudoLayers = exports.createPseudoLayer = exports.ExperimentalTraceVersion = exports.collectTracedFiles = exports.getFilesMapFromReasons = exports.filterStaticPages = exports.getImagesManifest = exports.localizeDynamicRoutes = exports.getDynamicRoutes = exports.getRoutesManifest = exports.prettyBytes = exports.MIB = exports.KIB = void 0;
 const build_utils_1 = require("@vercel/build-utils");
 const async_sema_1 = require("async-sema");
 const buffer_crc32_1 = __importDefault(require("buffer-crc32"));
@@ -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 => {
@@ -860,6 +869,7 @@ async function getPageLambdaGroups({ entryPath, config, pages, prerenderRoutes,
                 pages: [page],
                 ...opts,
                 isPrerenders: isPrerenderRoute,
+                isApiLambda: !!isApiPage(page),
                 pseudoLayerBytes: initialPseudoLayer.pseudoLayerBytes,
                 pseudoLayerUncompressedBytes: initialPseudoLayerUncompressed,
                 pseudoLayer: Object.assign({}, initialPseudoLayer.pseudoLayer),
@@ -1013,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;
@@ -1095,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]
@@ -1118,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
@@ -1169,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
@@ -1194,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
@@ -1203,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 &&
@@ -1257,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,
@@ -1267,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;
             }
         }
@@ -1551,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
@@ -1701,3 +1744,29 @@ function transformSourceMap(sourcemap) {
     });
     return { ...sourcemap, sources };
 }
+function getOperationType({ group, prerenderManifest, pageFileName, }) {
+    if (group?.isApiLambda || isApiPage(pageFileName)) {
+        return 'API';
+    }
+    if (group?.isPrerenders) {
+        return 'ISR';
+    }
+    if (pageFileName && prerenderManifest) {
+        const { blockingFallbackRoutes = {}, fallbackRoutes = {} } = prerenderManifest;
+        if (pageFileName in blockingFallbackRoutes ||
+            pageFileName in fallbackRoutes) {
+            return 'ISR';
+        }
+    }
+    return 'SSR';
+}
+exports.getOperationType = getOperationType;
+function isApiPage(page) {
+    if (!page) {
+        return false;
+    }
+    return page
+        .replace(/\\/g, '/')
+        .match(/(serverless|server)\/pages\/api(\/|\.js$)/);
+}
+exports.isApiPage = isApiPage;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/next",
-  "version": "3.4.7",
+  "version": "3.5.1",
   "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": "3d98d1cdea151b7125deb082c2c8469c865027d0"
+  "gitHead": "2fd33152219e7a2485b85b698e339c9c5cee23cf"
 }