@vercel/next 3.1.26 → 3.1.28

package/dist/index.js

@@ -43356,7 +43356,11 @@ const build = async ({ files, workPath, repoRootPath, entrypoint, config = {}, m
     else {
         (0, build_utils_1.debug)('Preparing serverless function files...');
         const pagesDir = path_1.default.join(entryPath, outputDirectory, isServerMode ? 'server' : 'serverless', 'pages');
+        let appDir = null;
         const appPathRoutesManifest = await (0, fs_extra_1.readJSON)(path_1.default.join(entryPath, outputDirectory, 'app-path-routes-manifest.json')).catch(() => null);
+        if (appPathRoutesManifest) {
+            appDir = path_1.default.join(pagesDir, '../app');
+        }
         const { pages, appPaths: lambdaAppPaths } = await getServerlessPages({
             pagesDir,
             entryPath,
@@ -44002,9 +44006,10 @@ const build = async ({ files, workPath, repoRootPath, entrypoint, config = {}, m
             console.timeEnd(allLambdasLabel);
         }
         const prerenderRoute = (0, utils_1.onPrerenderRoute)({
+            appDir,
+            pagesDir,
             hasPages404,
             static404Page,
-            pagesDir,
             pageLambdaMap,
             lambdas,
             isServerMode,
@@ -44012,6 +44017,7 @@ const build = async ({ files, workPath, repoRootPath, entrypoint, config = {}, m
             entryDirectory,
             routesManifest,
             prerenderManifest,
+            appPathRoutesManifest,
             isSharedLambdas,
             canUsePreviewMode,
         });
@@ -45338,6 +45344,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
         console.timeEnd(lambdaCreationLabel);
     }
     const prerenderRoute = (0, utils_1.onPrerenderRoute)({
+        appDir,
         pagesDir,
         pageLambdaMap: {},
         lambdas,
@@ -45345,6 +45352,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
         entryDirectory,
         routesManifest,
         prerenderManifest,
+        appPathRoutesManifest,
         isServerMode: true,
         isSharedLambdas: false,
         canUsePreviewMode,
@@ -47028,7 +47036,7 @@ const onPrerenderRouteInitial = (prerenderManifest, canUsePreviewMode, entryDire
 exports.onPrerenderRouteInitial = onPrerenderRouteInitial;
 let prerenderGroup = 1;
 const onPrerenderRoute = (prerenderRouteArgs) => (routeKey, { isBlocking, isFallback, isOmitted, locale, }) => {
-    const { pagesDir, hasPages404, static404Page, entryDirectory, prerenderManifest, isSharedLambdas, isServerMode, canUsePreviewMode, lambdas, prerenders, pageLambdaMap, routesManifest, isCorrectNotFoundRoutes, isEmptyAllowQueryForPrendered, } = prerenderRouteArgs;
+    const { appDir, pagesDir, hasPages404, 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',
@@ -47064,28 +47072,6 @@ const onPrerenderRoute = (prerenderRouteArgs) => (routeKey, { isBlocking, isFall
         routeFileNoExt, routesManifest, locale);
     }
     const isNotFound = prerenderManifest.notFoundRoutes.includes(routeKey);
-    const htmlFsRef = isBlocking || (isNotFound && !static404Page)
-        ? // Blocking pages do not have an HTML fallback
-            null
-        : new build_utils_1.FileFsRef({
-            fsPath: path_1.default.join(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.
-                    `${isOmitted || isNotFound
-                        ? addLocaleOrDefault('/404', routesManifest, locale)
-                        : routeFileNoExt}.html`),
-        });
-    const jsonFsRef = 
-    // JSON data does not exist for fallback or blocking pages
-    isFallback || isBlocking || (isNotFound && !static404Page)
-        ? null
-        : new build_utils_1.FileFsRef({
-            fsPath: path_1.default.join(pagesDir, `${isOmitted || isNotFound
-                ? addLocaleOrDefault('/404.html', routesManifest, locale)
-                : routeFileNoExt + '.json'}`),
-        });
     let initialRevalidate;
     let srcRoute;
     let dataRoute;
@@ -47114,6 +47100,35 @@ const onPrerenderRoute = (prerenderRouteArgs) => (routeKey, { isBlocking, isFall
         const pr = prerenderManifest.staticRoutes[routeKey];
         ({ initialRevalidate, srcRoute, dataRoute } = pr);
     }
+    let isAppPathRoute = false;
+    // TODO: leverage manifest to determine app paths more accurately
+    if (appDir && srcRoute && dataRoute.endsWith('.rsc')) {
+        isAppPathRoute = true;
+    }
+    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 && 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.
+                    `${isOmitted || isNotFound
+                        ? addLocaleOrDefault('/404', routesManifest, locale)
+                        : routeFileNoExt}.html`),
+        });
+    const jsonFsRef = 
+    // JSON data does not exist for fallback or blocking pages
+    isFallback || isBlocking || (isNotFound && !static404Page)
+        ? null
+        : new build_utils_1.FileFsRef({
+            fsPath: path_1.default.join(isAppPathRoute && appDir ? appDir : pagesDir, `${isOmitted || isNotFound
+                ? addLocaleOrDefault('/404.html', routesManifest, locale)
+                : isAppPathRoute
+                    ? dataRoute
+                    : routeFileNoExt + '.json'}`),
+        });
     const outputPathPage = normalizeIndexOutput(path_1.default.posix.join(entryDirectory, routeFileNoExt), isServerMode);
     const outputPathPageOrig = path_1.default.posix.join(entryDirectory, origRouteFileNoExt);
     let lambda;

package/dist/server-build.js

@@ -495,6 +495,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
         console.timeEnd(lambdaCreationLabel);
     }
     const prerenderRoute = (0, utils_1.onPrerenderRoute)({
+        appDir,
         pagesDir,
         pageLambdaMap: {},
         lambdas,
@@ -502,6 +503,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
         entryDirectory,
         routesManifest,
         prerenderManifest,
+        appPathRoutesManifest,
         isServerMode: true,
         isSharedLambdas: false,
         canUsePreviewMode,

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 { pagesDir, hasPages404, static404Page, entryDirectory, prerenderManifest, isSharedLambdas, isServerMode, canUsePreviewMode, lambdas, prerenders, pageLambdaMap, routesManifest, isCorrectNotFoundRoutes, isEmptyAllowQueryForPrendered, } = prerenderRouteArgs;
+    const { appDir, pagesDir, hasPages404, 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',
@@ -1063,28 +1063,6 @@ const onPrerenderRoute = (prerenderRouteArgs) => (routeKey, { isBlocking, isFall
         routeFileNoExt, routesManifest, locale);
     }
     const isNotFound = prerenderManifest.notFoundRoutes.includes(routeKey);
-    const htmlFsRef = isBlocking || (isNotFound && !static404Page)
-        ? // Blocking pages do not have an HTML fallback
-            null
-        : new build_utils_1.FileFsRef({
-            fsPath: path_1.default.join(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.
-                    `${isOmitted || isNotFound
-                        ? addLocaleOrDefault('/404', routesManifest, locale)
-                        : routeFileNoExt}.html`),
-        });
-    const jsonFsRef = 
-    // JSON data does not exist for fallback or blocking pages
-    isFallback || isBlocking || (isNotFound && !static404Page)
-        ? null
-        : new build_utils_1.FileFsRef({
-            fsPath: path_1.default.join(pagesDir, `${isOmitted || isNotFound
-                ? addLocaleOrDefault('/404.html', routesManifest, locale)
-                : routeFileNoExt + '.json'}`),
-        });
     let initialRevalidate;
     let srcRoute;
     let dataRoute;
@@ -1113,6 +1091,35 @@ const onPrerenderRoute = (prerenderRouteArgs) => (routeKey, { isBlocking, isFall
         const pr = prerenderManifest.staticRoutes[routeKey];
         ({ initialRevalidate, srcRoute, dataRoute } = pr);
     }
+    let isAppPathRoute = false;
+    // TODO: leverage manifest to determine app paths more accurately
+    if (appDir && srcRoute && dataRoute.endsWith('.rsc')) {
+        isAppPathRoute = true;
+    }
+    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 && 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.
+                    `${isOmitted || isNotFound
+                        ? addLocaleOrDefault('/404', routesManifest, locale)
+                        : routeFileNoExt}.html`),
+        });
+    const jsonFsRef = 
+    // JSON data does not exist for fallback or blocking pages
+    isFallback || isBlocking || (isNotFound && !static404Page)
+        ? null
+        : new build_utils_1.FileFsRef({
+            fsPath: path_1.default.join(isAppPathRoute && appDir ? appDir : pagesDir, `${isOmitted || isNotFound
+                ? addLocaleOrDefault('/404.html', routesManifest, locale)
+                : isAppPathRoute
+                    ? dataRoute
+                    : routeFileNoExt + '.json'}`),
+        });
     const outputPathPage = normalizeIndexOutput(path_1.default.posix.join(entryDirectory, routeFileNoExt), isServerMode);
     const outputPathPageOrig = path_1.default.posix.join(entryDirectory, origRouteFileNoExt);
     let lambda;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/next",
-  "version": "3.1.26",
+  "version": "3.1.28",
   "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.4.3",
+    "@vercel/build-utils": "5.4.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": "619ca9342156758efdb0db8adaf20e0d4a1493e4"
+  "gitHead": "51d968314f5914138defa2a9fe724324d53efdd1"
 }