@vercel/next 3.2.1 → 3.2.3

package/dist/index.js

@@ -45177,7 +45177,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                 fileList = [];
                 const curPagesDir = isAppPath && appDir ? appDir : pagesDir;
                 const pageDir = path_1.default.dirname(path_1.default.join(curPagesDir, originalPagePath));
-                const normalizedBaseDir = `${baseDir}${baseDir.endsWith('/') ? '' : '/'}`;
+                const normalizedBaseDir = `${baseDir}${baseDir.endsWith(path_1.default.sep) ? '' : path_1.default.sep}`;
                 files.forEach((file) => {
                     const absolutePath = path_1.default.join(pageDir, file);
                     // ensure we don't attempt including files outside
@@ -45414,7 +45414,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
             const route = prerenderManifest.notFoundRoutes[i];
             const isLastRoute = i === prerenderManifest.notFoundRoutes.length - 1;
             if (prerenderManifest.staticRoutes[route]?.initialRevalidate === false) {
-                if (currentRouteSrc.length + route.length + 1 >= 4096) {
+                if (currentRouteSrc.length + route.length + 1 >= 4000) {
                     pushRoute(currentRouteSrc);
                     currentRouteSrc = starterRouteSrc;
                 }
@@ -45501,7 +45501,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
     if (appPathRoutesManifest) {
         // create .rsc variant for app lambdas and edge functions
         // to match prerenders so we can route the same when the
-        // __flight__ header is present
+        // __rsc__ header is present
         const edgeFunctions = middleware.edgeFunctions;
         for (let route of Object.values(appPathRoutesManifest)) {
             route = path_1.default.posix.join('./', route === '/' ? '/index' : route);
@@ -45658,6 +45658,12 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                             .join('|')})?[/]?404/?`,
                         status: 404,
                         continue: true,
+                        missing: [
+                            {
+                                type: 'header',
+                                key: 'x-prerender-revalidate',
+                            },
+                        ],
                     },
                 ]
                 : [
@@ -45665,6 +45671,12 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                         src: path_1.default.posix.join('/', entryDirectory, '404/?'),
                         status: 404,
                         continue: true,
+                        missing: [
+                            {
+                                type: 'header',
+                                key: 'x-prerender-revalidate',
+                            },
+                        ],
                     },
                 ]),
             // Make sure to 500 when visiting /500 directly for static 500
@@ -45700,7 +45712,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                         has: [
                             {
                                 type: 'header',
-                                key: '__flight__',
+                                key: '__rsc__',
                             },
                         ],
                         dest: path_1.default.posix.join('/', entryDirectory, '/$1.rsc'),
@@ -47066,7 +47078,7 @@ const onPrerenderRouteInitial = (prerenderManifest, canUsePreviewMode, entryDire
 exports.onPrerenderRouteInitial = onPrerenderRouteInitial;
 let prerenderGroup = 1;
 const onPrerenderRoute = (prerenderRouteArgs) => (routeKey, { isBlocking, isFallback, isOmitted, locale, }) => {
-    const { appDir, pagesDir, hasPages404, static404Page, entryDirectory, prerenderManifest, isSharedLambdas, isServerMode, canUsePreviewMode, lambdas, prerenders, pageLambdaMap, routesManifest, isCorrectNotFoundRoutes, isEmptyAllowQueryForPrendered, } = prerenderRouteArgs;
+    const { appDir, pagesDir, static404Page, entryDirectory, prerenderManifest, isSharedLambdas, isServerMode, canUsePreviewMode, lambdas, prerenders, pageLambdaMap, routesManifest, isCorrectNotFoundRoutes, isEmptyAllowQueryForPrendered, } = prerenderRouteArgs;
     if (isBlocking && isFallback) {
         throw new build_utils_1.NowBuildError({
             code: 'NEXT_ISBLOCKING_ISFALLBACK',
@@ -47190,11 +47202,10 @@ const onPrerenderRoute = (prerenderRouteArgs) => (routeKey, { isBlocking, isFall
                 message: 'invariant: htmlFsRef != null && jsonFsRef != null',
             });
         }
-        // If revalidate isn't enabled we force the /404 route to be static
-        // to match next start behavior otherwise getStaticProps would be
-        // recalled for each 404 URL path since Prerender is cached based
-        // on the URL path
-        if (!canUsePreviewMode || (hasPages404 && routeKey === '/404')) {
+        // if preview mode/On-Demand ISR can't be leveraged
+        // we can output pure static outputs instead of prerenders
+        if (!canUsePreviewMode ||
+            (routeKey === '/404' && !lambdas[outputPathPage])) {
             htmlFsRef.contentType = _1.htmlContentType;
             prerenders[outputPathPage] = htmlFsRef;
             prerenders[outputPathData] = jsonFsRef;

package/dist/server-build.js

@@ -328,7 +328,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                 fileList = [];
                 const curPagesDir = isAppPath && appDir ? appDir : pagesDir;
                 const pageDir = path_1.default.dirname(path_1.default.join(curPagesDir, originalPagePath));
-                const normalizedBaseDir = `${baseDir}${baseDir.endsWith('/') ? '' : '/'}`;
+                const normalizedBaseDir = `${baseDir}${baseDir.endsWith(path_1.default.sep) ? '' : path_1.default.sep}`;
                 files.forEach((file) => {
                     const absolutePath = path_1.default.join(pageDir, file);
                     // ensure we don't attempt including files outside
@@ -565,7 +565,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
             const route = prerenderManifest.notFoundRoutes[i];
             const isLastRoute = i === prerenderManifest.notFoundRoutes.length - 1;
             if (prerenderManifest.staticRoutes[route]?.initialRevalidate === false) {
-                if (currentRouteSrc.length + route.length + 1 >= 4096) {
+                if (currentRouteSrc.length + route.length + 1 >= 4000) {
                     pushRoute(currentRouteSrc);
                     currentRouteSrc = starterRouteSrc;
                 }
@@ -652,7 +652,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
     if (appPathRoutesManifest) {
         // create .rsc variant for app lambdas and edge functions
         // to match prerenders so we can route the same when the
-        // __flight__ header is present
+        // __rsc__ header is present
         const edgeFunctions = middleware.edgeFunctions;
         for (let route of Object.values(appPathRoutesManifest)) {
             route = path_1.default.posix.join('./', route === '/' ? '/index' : route);
@@ -809,6 +809,12 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                             .join('|')})?[/]?404/?`,
                         status: 404,
                         continue: true,
+                        missing: [
+                            {
+                                type: 'header',
+                                key: 'x-prerender-revalidate',
+                            },
+                        ],
                     },
                 ]
                 : [
@@ -816,6 +822,12 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                         src: path_1.default.posix.join('/', entryDirectory, '404/?'),
                         status: 404,
                         continue: true,
+                        missing: [
+                            {
+                                type: 'header',
+                                key: 'x-prerender-revalidate',
+                            },
+                        ],
                     },
                 ]),
             // Make sure to 500 when visiting /500 directly for static 500
@@ -851,7 +863,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                         has: [
                             {
                                 type: 'header',
-                                key: '__flight__',
+                                key: '__rsc__',
                             },
                         ],
                         dest: path_1.default.posix.join('/', entryDirectory, '/$1.rsc'),

package/dist/utils.js

@@ -1027,7 +1027,7 @@ const onPrerenderRouteInitial = (prerenderManifest, canUsePreviewMode, entryDire
 exports.onPrerenderRouteInitial = onPrerenderRouteInitial;
 let prerenderGroup = 1;
 const onPrerenderRoute = (prerenderRouteArgs) => (routeKey, { isBlocking, isFallback, isOmitted, locale, }) => {
-    const { appDir, pagesDir, hasPages404, static404Page, entryDirectory, prerenderManifest, isSharedLambdas, isServerMode, canUsePreviewMode, lambdas, prerenders, pageLambdaMap, routesManifest, isCorrectNotFoundRoutes, isEmptyAllowQueryForPrendered, } = prerenderRouteArgs;
+    const { appDir, pagesDir, static404Page, entryDirectory, prerenderManifest, isSharedLambdas, isServerMode, canUsePreviewMode, lambdas, prerenders, pageLambdaMap, routesManifest, isCorrectNotFoundRoutes, isEmptyAllowQueryForPrendered, } = prerenderRouteArgs;
     if (isBlocking && isFallback) {
         throw new build_utils_1.NowBuildError({
             code: 'NEXT_ISBLOCKING_ISFALLBACK',
@@ -1151,11 +1151,10 @@ const onPrerenderRoute = (prerenderRouteArgs) => (routeKey, { isBlocking, isFall
                 message: 'invariant: htmlFsRef != null && jsonFsRef != null',
             });
         }
-        // If revalidate isn't enabled we force the /404 route to be static
-        // to match next start behavior otherwise getStaticProps would be
-        // recalled for each 404 URL path since Prerender is cached based
-        // on the URL path
-        if (!canUsePreviewMode || (hasPages404 && routeKey === '/404')) {
+        // if preview mode/On-Demand ISR can't be leveraged
+        // we can output pure static outputs instead of prerenders
+        if (!canUsePreviewMode ||
+            (routeKey === '/404' && !lambdas[outputPathPage])) {
             htmlFsRef.contentType = _1.htmlContentType;
             prerenders[outputPathPage] = htmlFsRef;
             prerenders[outputPathData] = jsonFsRef;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/next",
-  "version": "3.2.1",
+  "version": "3.2.3",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/next-js",
@@ -44,7 +44,7 @@
     "@types/semver": "6.0.0",
     "@types/text-table": "0.2.1",
     "@types/webpack-sources": "3.2.0",
-    "@vercel/build-utils": "5.5.3",
+    "@vercel/build-utils": "5.5.4",
     "@vercel/nft": "0.22.1",
     "@vercel/routing-utils": "2.0.2",
     "async-sema": "3.0.1",
@@ -69,5 +69,5 @@
     "typescript": "4.5.2",
     "webpack-sources": "3.2.3"
   },
-  "gitHead": "8814fc15159c78432375d7bb6a99c2e42125de5d"
+  "gitHead": "45bd855250436b73bee892c53f0407e1f24bc689"
 }