@vercel/next 3.2.5 → 3.2.7

package/dist/server-build.js

@@ -69,7 +69,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
     const lstatResults = {};
     const nonLambdaSsgPages = new Set();
     Object.keys(prerenderManifest.staticRoutes).forEach(route => {
-        const result = (0, utils_1.onPrerenderRouteInitial)(prerenderManifest, canUsePreviewMode, entryDirectory, nonLambdaSsgPages, route, routesManifest.pages404, routesManifest);
+        const result = (0, utils_1.onPrerenderRouteInitial)(prerenderManifest, canUsePreviewMode, entryDirectory, nonLambdaSsgPages, route, routesManifest.pages404, routesManifest, appDir);
         if (result && result.static404Page) {
             static404Page = result.static404Page;
         }
@@ -143,6 +143,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
         console.time(lambdaCreationLabel);
         const apiPages = [];
         const nonApiPages = [];
+        const streamingPages = [];
         lambdaPageKeys.forEach(page => {
             if (internalPages.includes(page) &&
                 page !== '404.js' &&
@@ -159,6 +160,9 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
             if (pageMatchesApi(page)) {
                 apiPages.push(page);
             }
+            else if (appDir && lambdaAppPaths[page]) {
+                streamingPages.push(page);
+            }
             else {
                 nonApiPages.push(page);
             }
@@ -269,7 +273,12 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
         };
         const pageTraces = {};
         const compressedPages = {};
-        const mergedPageKeys = [...nonApiPages, ...apiPages, ...internalPages];
+        const mergedPageKeys = [
+            ...nonApiPages,
+            ...streamingPages,
+            ...apiPages,
+            ...internalPages,
+        ];
         const traceCache = {};
         const getOriginalPagePath = (page) => {
             let originalPagePath = page;
@@ -371,6 +380,25 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
             internalPages,
             pageExtensions,
         });
+        const streamingPageLambdaGroups = await (0, utils_1.getPageLambdaGroups)({
+            entryPath: requiredServerFilesManifest.appDir || entryPath,
+            config,
+            pages: streamingPages,
+            prerenderRoutes,
+            pageTraces,
+            compressedPages,
+            tracedPseudoLayer: tracedPseudoLayer.pseudoLayer,
+            initialPseudoLayer,
+            lambdaCompressedByteLimit,
+            initialPseudoLayerUncompressed: uncompressedInitialSize,
+            internalPages,
+            pageExtensions,
+        });
+        for (const group of streamingPageLambdaGroups) {
+            if (!group.isPrerenders) {
+                group.isStreaming = true;
+            }
+        }
         const apiLambdaGroups = await (0, utils_1.getPageLambdaGroups)({
             entryPath: requiredServerFilesManifest.appDir || entryPath,
             config,
@@ -397,9 +425,19 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                 pseudoLayerBytes: group.pseudoLayerBytes,
                 uncompressedLayerBytes: group.pseudoLayerUncompressedBytes,
             })),
+            streamingPageLambdaGroups: streamingPageLambdaGroups.map(group => ({
+                pages: group.pages,
+                isPrerender: group.isPrerenders,
+                pseudoLayerBytes: group.pseudoLayerBytes,
+                uncompressedLayerBytes: group.pseudoLayerUncompressedBytes,
+            })),
             nextServerLayerSize: initialPseudoLayer.pseudoLayerBytes,
         }, null, 2));
-        const combinedGroups = [...pageLambdaGroups, ...apiLambdaGroups];
+        const combinedGroups = [
+            ...pageLambdaGroups,
+            ...streamingPageLambdaGroups,
+            ...apiLambdaGroups,
+        ];
         await (0, utils_1.detectLambdaLimitExceeding)(combinedGroups, lambdaCompressedByteLimit, compressedPages);
         for (const group of combinedGroups) {
             const groupPageFiles = {};
@@ -467,6 +505,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                 memory: group.memory,
                 runtime: nodeVersion.runtime,
                 maxDuration: group.maxDuration,
+                isStreaming: group.isStreaming,
             });
             for (const page of group.pages) {
                 const pageNoExt = page.replace(/\.js$/, '');
@@ -537,48 +576,6 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
         semver_1.default.gte(nextVersion, NEXT_DATA_MIDDLEWARE_RESOLVING_VERSION);
     const dynamicRoutes = await (0, utils_1.getDynamicRoutes)(entryPath, entryDirectory, dynamicPages, false, routesManifest, omittedPrerenderRoutes, canUsePreviewMode, prerenderManifest.bypassToken || '', true, middleware.dynamicRouteMap).then(arr => (0, utils_1.localizeDynamicRoutes)(arr, dynamicPrefix, entryDirectory, staticPages, prerenderManifest, routesManifest, true, isCorrectLocaleAPIRoutes));
     const { staticFiles, publicDirectoryFiles, staticDirectoryFiles } = await (0, utils_1.getStaticFiles)(entryPath, entryDirectory, outputDirectory);
-    const notFoundPreviewRoutes = [];
-    if (prerenderManifest.notFoundRoutes?.length > 0 && canUsePreviewMode) {
-        // we combine routes into one src here to reduce the number of needed
-        // routes since only the status is being modified and we don't want
-        // to exceed the routes limit
-        const starterRouteSrc = `^${entryDirectory !== '.'
-            ? `${path_1.default.posix.join('/', entryDirectory)}()`
-            : '()'}`;
-        let currentRouteSrc = starterRouteSrc;
-        const pushRoute = (src) => {
-            notFoundPreviewRoutes.push({
-                src,
-                missing: [
-                    {
-                        type: 'cookie',
-                        key: '__prerender_bypass',
-                        value: prerenderManifest.bypassToken || undefined,
-                    },
-                    {
-                        type: 'cookie',
-                        key: '__next_preview_data',
-                    },
-                ],
-                status: 404,
-            });
-        };
-        for (let i = 0; i < prerenderManifest.notFoundRoutes.length; i++) {
-            const route = prerenderManifest.notFoundRoutes[i];
-            const isLastRoute = i === prerenderManifest.notFoundRoutes.length - 1;
-            if (prerenderManifest.staticRoutes[route]?.initialRevalidate === false) {
-                if (currentRouteSrc.length + route.length + 1 >= 4000) {
-                    pushRoute(currentRouteSrc);
-                    currentRouteSrc = starterRouteSrc;
-                }
-                // add to existing route src if src length limit isn't reached
-                currentRouteSrc = `${currentRouteSrc.substring(0, currentRouteSrc.length - 1)}${currentRouteSrc[currentRouteSrc.length - 2] === '(' ? '' : '|'}${route}/?)`;
-                if (isLastRoute) {
-                    pushRoute(currentRouteSrc);
-                }
-            }
-        }
-    }
     const normalizeNextDataRoute = (isOverride = false) => {
         return isNextDataServerResolving
             ? [
@@ -799,9 +796,6 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
             // beforeFiles rewrites as middleware is not a "file" route
             ...(isCorrectMiddlewareOrder ? middleware.staticRoutes : []),
             ...beforeFilesRewrites,
-            // ensure prerender's for notFound: true static routes
-            // have 404 status code when not in preview mode
-            ...notFoundPreviewRoutes,
             // Make sure to 404 for the /404 path itself
             ...(i18n
                 ? [
@@ -1039,18 +1033,6 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                 continue: true,
                 important: true,
             },
-            ...(appDir
-                ? [
-                    {
-                        src: path_1.default.posix.join('/', entryDirectory, '/(.*).rsc$'),
-                        headers: {
-                            'content-type': 'application/octet-stream',
-                        },
-                        continue: true,
-                        important: true,
-                    },
-                ]
-                : []),
             // TODO: remove below workaround when `/` is allowed to be output
             // different than `/index`
             {

package/dist/utils.js

@@ -460,7 +460,7 @@ exports.createPseudoLayer = createPseudoLayer;
 // measured with 1, 2, 5, 10, and `os.cpus().length || 5`
 // and sema(1) produced the best results
 const createLambdaSema = new async_sema_1.Sema(1);
-async function createLambdaFromPseudoLayers({ files: baseFiles, layers, ...lambdaOptions }) {
+async function createLambdaFromPseudoLayers({ files: baseFiles, layers, isStreaming, ...lambdaOptions }) {
     await createLambdaSema.acquire();
     const files = {};
     const addedFiles = new Set();
@@ -488,6 +488,11 @@ async function createLambdaFromPseudoLayers({ files: baseFiles, layers, ...lambd
     createLambdaSema.release();
     return new build_utils_1.NodejsLambda({
         ...lambdaOptions,
+        ...(isStreaming
+            ? {
+                experimentalResponseStreaming: true,
+            }
+            : {}),
         files,
         shouldAddHelpers: false,
         shouldAddSourcemapSupport: false,
@@ -982,13 +987,14 @@ const detectLambdaLimitExceeding = async (lambdaGroups, compressedSizeLimit, com
 };
 exports.detectLambdaLimitExceeding = detectLambdaLimitExceeding;
 // checks if prerender files are all static or not before creating lambdas
-const onPrerenderRouteInitial = (prerenderManifest, canUsePreviewMode, entryDirectory, nonLambdaSsgPages, routeKey, hasPages404, routesManifest) => {
+const onPrerenderRouteInitial = (prerenderManifest, canUsePreviewMode, entryDirectory, nonLambdaSsgPages, routeKey, hasPages404, routesManifest, appDir) => {
     let static404Page;
     let static500Page;
     // Get the route file as it'd be mounted in the builder output
     const pr = prerenderManifest.staticRoutes[routeKey];
-    const { initialRevalidate, srcRoute } = pr;
+    const { initialRevalidate, srcRoute, dataRoute } = pr;
     const route = srcRoute || routeKey;
+    const isAppPathRoute = appDir && dataRoute?.endsWith('.rsc');
     const routeNoLocale = routesManifest?.i18n
         ? normalizeLocalePath(routeKey, routesManifest.i18n.locales).pathname
         : routeKey;
@@ -1000,7 +1006,11 @@ const onPrerenderRouteInitial = (prerenderManifest, canUsePreviewMode, entryDire
     if (routeNoLocale === '/500') {
         static500Page = path_1.default.posix.join(entryDirectory, routeKey);
     }
-    if (initialRevalidate === false &&
+    if (
+    // App paths must be Prerenders to ensure Vary header is
+    // correctly added
+    !isAppPathRoute &&
+        initialRevalidate === false &&
         (!canUsePreviewMode || (hasPages404 && routeNoLocale === '/404')) &&
         !prerenderManifest.fallbackRoutes[route] &&
         !prerenderManifest.blockingFallbackRoutes[route]) {
@@ -1120,7 +1130,19 @@ const onPrerenderRoute = (prerenderRouteArgs) => (routeKey, { isBlocking, isFall
                     ? dataRoute
                     : routeFileNoExt + '.json'}`),
         });
-    const outputPathPage = normalizeIndexOutput(path_1.default.posix.join(entryDirectory, routeFileNoExt), isServerMode);
+    if (isAppPathRoute) {
+        // for literal index routes we need to append an additional /index
+        // due to the proxy's normalizing for /index routes
+        if (routeKey !== '/index' && routeKey.endsWith('/index')) {
+            routeKey = `${routeKey}/index`;
+            routeFileNoExt = routeKey;
+            origRouteFileNoExt = routeKey;
+        }
+    }
+    let outputPathPage = path_1.default.posix.join(entryDirectory, routeFileNoExt);
+    if (!isAppPathRoute) {
+        outputPathPage = normalizeIndexOutput(outputPathPage, isServerMode);
+    }
     const outputPathPageOrig = path_1.default.posix.join(entryDirectory, origRouteFileNoExt);
     let lambda;
     let outputPathData = path_1.default.posix.join(entryDirectory, dataRoute);
@@ -1144,7 +1166,7 @@ const onPrerenderRoute = (prerenderRouteArgs) => (routeKey, { isBlocking, isFall
             : path_1.default.posix.join(entryDirectory, srcRoute === '/' ? '/index' : srcRoute), isServerMode);
         lambda = lambdas[outputSrcPathPage];
     }
-    if (!isNotFound && initialRevalidate === false) {
+    if (!isAppPathRoute && !isNotFound && initialRevalidate === false) {
         if (htmlFsRef == null || jsonFsRef == null) {
             throw new build_utils_1.NowBuildError({
                 code: 'NEXT_HTMLFSREF_JSONFSREF',
@@ -1218,6 +1240,18 @@ const onPrerenderRoute = (prerenderRouteArgs) => (routeKey, { isBlocking, isFall
             fallback: htmlFsRef,
             group: prerenderGroup,
             bypassToken: prerenderManifest.bypassToken,
+            ...(isNotFound
+                ? {
+                    initialStatus: 404,
+                }
+                : {}),
+            ...(isAppPathRoute
+                ? {
+                    initialHeaders: {
+                        vary: '__rsc__, __next_router_state_tree__, __next_router_prefetch__',
+                    },
+                }
+                : {}),
         });
         prerenders[outputPathData] = new build_utils_1.Prerender({
             expiration: initialRevalidate,
@@ -1226,6 +1260,19 @@ const onPrerenderRoute = (prerenderRouteArgs) => (routeKey, { isBlocking, isFall
             fallback: jsonFsRef,
             group: prerenderGroup,
             bypassToken: prerenderManifest.bypassToken,
+            ...(isNotFound
+                ? {
+                    initialStatus: 404,
+                }
+                : {}),
+            ...(isAppPathRoute
+                ? {
+                    initialHeaders: {
+                        'content-type': 'application/octet-stream',
+                        vary: '__rsc__, __next_router_state_tree__, __next_router_prefetch__',
+                    },
+                }
+                : {}),
         });
         ++prerenderGroup;
         if (routesManifest?.i18n && isBlocking) {
@@ -1477,6 +1524,11 @@ async function getMiddlewareBundle({ entryPath, outputDirectory, routesManifest,
                 shortPath =
                     shortPath.replace(/^app\//, '').replace(/(^|\/)page$/, '') || 'index';
             }
+            if (routesManifest?.basePath) {
+                shortPath = path_1.default.posix
+                    .join(routesManifest.basePath, shortPath)
+                    .replace(/^\//, '');
+            }
             worker.edgeFunction.name = shortPath;
             source.edgeFunctions[shortPath] = worker.edgeFunction;
             // we don't add the route for edge functions as these

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/next",
-  "version": "3.2.5",
+  "version": "3.2.7",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/next-js",
@@ -44,9 +44,9 @@
     "@types/semver": "6.0.0",
     "@types/text-table": "0.2.1",
     "@types/webpack-sources": "3.2.0",
-    "@vercel/build-utils": "5.5.5",
+    "@vercel/build-utils": "5.5.6",
     "@vercel/nft": "0.22.1",
-    "@vercel/routing-utils": "2.0.2",
+    "@vercel/routing-utils": "2.1.0",
     "async-sema": "3.0.1",
     "buffer-crc32": "0.2.13",
     "cheerio": "1.0.0-rc.10",
@@ -69,5 +69,5 @@
     "typescript": "4.5.2",
     "webpack-sources": "3.2.3"
   },
-  "gitHead": "40f38948a04d83a9e260ddd455685d74e3eb9209"
+  "gitHead": "a630e1989613052f64411fd7e5468de58c5999ba"
 }