@vercel/next 4.2.10 → 4.2.12

package/dist/index.js

@@ -11971,7 +11971,9 @@ function normalizePage(page) {
   if (!page.startsWith("/")) {
     page = `/${page}`;
   }
-  page = page.replace(/\/index$/, "/");
+  if (page === "/index") {
+    page = "/";
+  }
   return page;
 }
 async function getRoutesManifest(entryPath, outputDirectory, nextVersion) {
@@ -12017,8 +12019,8 @@ async function getDynamicRoutes({
   bypassToken,
   isServerMode,
   dynamicMiddlewareRouteMap,
-  experimentalPPRRoutes,
-  hasActionOutputSupport
+  hasActionOutputSupport,
+  isAppPPREnabled
 }) {
   if (routesManifest) {
     switch (routesManifest.version) {
@@ -12072,7 +12074,7 @@ async function getDynamicRoutes({
               }
             ];
           }
-          if (experimentalPPRRoutes.has(page)) {
+          if (isAppPPREnabled) {
             let dest = route.dest?.replace(/($|\?)/, ".prefetch.rsc$1");
             if (page === "/" || page === "/index") {
               dest = dest?.replace(/([^/]+\.prefetch\.rsc(\?.*|$))/, "__$1");
@@ -12656,6 +12658,9 @@ async function getSourceFilePathFromPage({
       }
     }
   }
+  if (page === "/_not-found/page") {
+    return "";
+  }
   console.log(
     `WARNING: Unable to find source file for page ${page} with extensions: ${extensionsToTry.join(
       ", "
@@ -12713,17 +12718,19 @@ async function getPageLambdaGroups({
     const routeName = normalizePage(page.replace(/\.js$/, ""));
     const isPrerenderRoute = prerenderRoutes.has(routeName);
     const isExperimentalPPR = experimentalPPRRoutes?.has(routeName) ?? false;
+    const isStreaming = !isPrerenderRoute || isExperimentalPPR;
     let opts = {};
     if (functionsConfigManifest && functionsConfigManifest.functions[routeName]) {
       opts = functionsConfigManifest.functions[routeName];
     }
     if (config && config.functions) {
-      const pageFromManifest = inversedAppPathManifest?.[routeName];
       const sourceFile = await getSourceFilePathFromPage({
         workPath: entryPath,
-        // since this function is used by both `pages` and `app`, the manifest might not be provided
-        // so fallback to normal behavior of just checking the `page`.
-        page: pageFromManifest ?? page,
+        page: normalizeSourceFilePageFromManifest(
+          routeName,
+          page,
+          inversedAppPathManifest
+        ),
         pageExtensions
       });
       const vercelConfigOpts = await (0, import_build_utils.getLambdaOptionsFromFunction)({
@@ -12758,6 +12765,7 @@ async function getPageLambdaGroups({
         ...opts,
         isPrerenders: isPrerenderRoute,
         isExperimentalPPR,
+        isStreaming,
         isApiLambda: !!isApiPage(page),
         pseudoLayerBytes: initialPseudoLayer.pseudoLayerBytes,
         pseudoLayerUncompressedBytes: initialPseudoLayerUncompressed,
@@ -12779,6 +12787,28 @@ async function getPageLambdaGroups({
   }
   return groups;
 }
+function normalizeSourceFilePageFromManifest(routeName, page, inversedAppPathManifest) {
+  const pageFromManifest = inversedAppPathManifest?.[routeName];
+  if (!pageFromManifest) {
+    return page;
+  }
+  const metadataConventions = [
+    "/favicon.",
+    "/icon.",
+    "/apple-icon.",
+    "/opengraph-image.",
+    "/twitter-image.",
+    "/sitemap.",
+    "/robots."
+  ];
+  const isSpecialFile = metadataConventions.some(
+    (convention) => routeName.startsWith(convention)
+  );
+  if (isSpecialFile) {
+    return routeName;
+  }
+  return pageFromManifest;
+}
 var outputFunctionFileSizeInfo = (pages, pseudoLayer, pseudoLayerUncompressedBytes, compressedPages) => {
   const exceededLimitOutput = [];
   console.log(
@@ -13102,14 +13132,6 @@ var onPrerenderRoute = (prerenderRouteArgs) => async (routeKey, {
   if (isOmittedOrNotFound) {
     initialStatus = 404;
   }
-  let addedIndexSuffix = false;
-  if (isAppPathRoute) {
-    if (routeKey !== "/index" && routeKey.endsWith("/index")) {
-      routeKey = `${routeKey}/index`;
-      routeFileNoExt = routeKey;
-      addedIndexSuffix = true;
-    }
-  }
   let outputPathPage = import_path2.default.posix.join(entryDirectory, routeFileNoExt);
   if (!isAppPathRoute) {
     outputPathPage = normalizeIndexOutput(outputPathPage, isServerMode);
@@ -13234,7 +13256,7 @@ var onPrerenderRoute = (prerenderRouteArgs) => async (routeKey, {
         );
       }
       experimentalStreamingLambdaPath = experimentalStreamingLambdaPaths.get(
-        pathnameToOutputName(entryDirectory, routeKey, addedIndexSuffix)
+        pathnameToOutputName(entryDirectory, routeKey)
       );
       if (!experimentalStreamingLambdaPath && srcRoute) {
         experimentalStreamingLambdaPath = experimentalStreamingLambdaPaths.get(
@@ -13413,11 +13435,9 @@ function normalizeIndexOutput(outputName, isServerMode) {
 function getNextServerPath(nextVersion) {
   return import_semver.default.gte(nextVersion, "v11.0.2-canary.4") ? "next/dist/server" : "next/dist/next-server/server";
 }
-function pathnameToOutputName(entryDirectory, pathname, addedIndexSuffix = false) {
+function pathnameToOutputName(entryDirectory, pathname) {
   if (pathname === "/") {
     pathname = "/index";
-  } else if (addedIndexSuffix) {
-    pathname = pathname.replace(/\/index$/, "");
   }
   return import_path2.default.posix.join(entryDirectory, pathname);
 }
@@ -14397,8 +14417,15 @@ async function serverBuild({
   isCorrectLocaleAPIRoutes,
   requiredServerFilesManifest,
   variantsManifest,
-  experimentalPPRRoutes
+  experimentalPPRRoutes,
+  isAppPPREnabled
 }) {
+  if (isAppPPREnabled) {
+    (0, import_build_utils2.debug)(
+      "experimentalPPRRoutes",
+      JSON.stringify(Array.from(experimentalPPRRoutes))
+    );
+  }
   lambdaPages = Object.assign({}, lambdaPages, lambdaAppPaths);
   const experimentalAllowBundling = Boolean(
     process.env.NEXT_EXPERIMENTAL_FUNCTION_BUNDLING
@@ -14420,16 +14447,13 @@ async function serverBuild({
       inversedAppPathManifest[appPathRoutesManifest[ogRoute]] = ogRoute;
     }
   }
-  const experimental = {
-    ppr: requiredServerFilesManifest.config.experimental?.ppr === true || requiredServerFilesManifest.config.experimental?.ppr === "incremental"
-  };
   let appRscPrefetches = {};
   let appBuildTraces = {};
   let appDir = null;
   if (appPathRoutesManifest) {
     appDir = import_path4.default.join(pagesDir, "../app");
     appBuildTraces = await (0, import_build_utils2.glob)("**/*.js.nft.json", appDir);
-    appRscPrefetches = experimental.ppr ? {} : await (0, import_build_utils2.glob)(`**/*${RSC_PREFETCH_SUFFIX}`, appDir);
+    appRscPrefetches = isAppPPREnabled ? {} : await (0, import_build_utils2.glob)(`**/*${RSC_PREFETCH_SUFFIX}`, appDir);
     const rscContentTypeHeader = routesManifest?.rsc?.contentTypeHeader || RSC_CONTENT_TYPE;
     appRscPrefetches = normalizePrefetches(appRscPrefetches);
     for (const value of Object.values(appRscPrefetches)) {
@@ -14441,7 +14465,7 @@ async function serverBuild({
       if (rewrite.src && rewrite.dest) {
         rewrite.src = rewrite.src.replace(
           /\/?\(\?:\/\)\?/,
-          `(?<rscsuff>${experimental.ppr ? "(\\.prefetch)?" : ""}\\.rsc)?(?:/)?`
+          `(?<rscsuff>${isAppPPREnabled ? "(\\.prefetch)?" : ""}\\.rsc)?(?:/)?`
         );
         let destQueryIndex = rewrite.dest.indexOf("?");
         if (destQueryIndex === -1) {
@@ -14955,9 +14979,6 @@ async function serverBuild({
     });
     const appRouterStreamingActionLambdaGroups = [];
     for (const group of appRouterLambdaGroups) {
-      if (!group.isPrerenders || group.isExperimentalPPR) {
-        group.isStreaming = true;
-      }
       group.isAppRouter = true;
       if (hasActionOutputSupport) {
         appRouterStreamingActionLambdaGroups.push({
@@ -14968,9 +14989,6 @@ async function serverBuild({
       }
     }
     for (const group of appRouteHandlersLambdaGroups) {
-      if (!group.isPrerenders) {
-        group.isStreaming = true;
-      }
       group.isAppRouter = true;
       group.isAppRouteHandler = true;
     }
@@ -14998,24 +15016,32 @@ async function serverBuild({
           apiLambdaGroups: apiLambdaGroups.map((group) => ({
             pages: group.pages,
             isPrerender: group.isPrerenders,
+            isStreaming: group.isStreaming,
+            isExperimentalPPR: group.isExperimentalPPR,
             pseudoLayerBytes: group.pseudoLayerBytes,
             uncompressedLayerBytes: group.pseudoLayerUncompressedBytes
           })),
           pageLambdaGroups: pageLambdaGroups.map((group) => ({
             pages: group.pages,
             isPrerender: group.isPrerenders,
+            isStreaming: group.isStreaming,
+            isExperimentalPPR: group.isExperimentalPPR,
             pseudoLayerBytes: group.pseudoLayerBytes,
             uncompressedLayerBytes: group.pseudoLayerUncompressedBytes
           })),
           appRouterLambdaGroups: appRouterLambdaGroups.map((group) => ({
             pages: group.pages,
             isPrerender: group.isPrerenders,
+            isStreaming: group.isStreaming,
+            isExperimentalPPR: group.isExperimentalPPR,
             pseudoLayerBytes: group.pseudoLayerBytes,
             uncompressedLayerBytes: group.pseudoLayerUncompressedBytes
           })),
           appRouterStreamingPrerenderLambdaGroups: appRouterStreamingActionLambdaGroups.map((group) => ({
             pages: group.pages,
             isPrerender: group.isPrerenders,
+            isStreaming: group.isStreaming,
+            isExperimentalPPR: group.isExperimentalPPR,
             pseudoLayerBytes: group.pseudoLayerBytes,
             uncompressedLayerBytes: group.pseudoLayerUncompressedBytes
           })),
@@ -15023,6 +15049,8 @@ async function serverBuild({
             (group) => ({
               pages: group.pages,
               isPrerender: group.isPrerenders,
+              isStreaming: group.isStreaming,
+              isExperimentalPPR: group.isExperimentalPPR,
               pseudoLayerBytes: group.pseudoLayerBytes,
               uncompressedLayerBytes: group.pseudoLayerUncompressedBytes
             })
@@ -15159,9 +15187,8 @@ async function serverBuild({
         options.layers.push(appNotFoundPsuedoLayer.pseudoLayer);
       }
       const lambda = await createLambdaFromPseudoLayers(options);
-      const isPPR = experimental.ppr && group.isAppRouter && !group.isAppRouteHandler;
       let revalidate;
-      if (isPPR) {
+      if (group.isExperimentalPPR) {
         if (!options.isStreaming) {
           throw new Error("Invariant: PPR lambda isn't streaming");
         }
@@ -15172,9 +15199,9 @@ async function serverBuild({
       }
       for (const pageFilename of group.pages) {
         const pageName = pageFilename.replace(/\.js$/, "");
-        const pagePath = import_path4.default.posix.join("/", pageName);
-        const pagePathname = pagePath === "/index" ? "/" : pagePath;
+        const pagePathname = normalizePage(pageName);
         let isPrerender = prerenderRoutes.has(pagePathname);
+        const isRoutePPREnabled = experimentalPPRRoutes.has(pagePathname);
         if (!isPrerender && routesManifest?.i18n) {
           isPrerender = routesManifest.i18n.locales.some((locale) => {
             return prerenderRoutes.has(
@@ -15186,7 +15213,7 @@ async function serverBuild({
         if (group.isActionLambda) {
           outputName = `${outputName}.action`;
         }
-        if (isPPR) {
+        if (isRoutePPREnabled) {
           if (!revalidate) {
             throw new Error("Invariant: PPR lambda isn't set");
           }
@@ -15235,6 +15262,12 @@ async function serverBuild({
     }
     console.timeEnd(lambdaCreationLabel);
   }
+  if (isAppPPREnabled) {
+    (0, import_build_utils2.debug)(
+      "experimentalStreamingLambdaPaths",
+      JSON.stringify(Array.from(experimentalStreamingLambdaPaths))
+    );
+  }
   const prerenderRoute = onPrerenderRoute({
     appDir,
     pagesDir,
@@ -15310,7 +15343,7 @@ async function serverBuild({
     bypassToken: prerenderManifest.bypassToken || "",
     isServerMode: true,
     dynamicMiddlewareRouteMap: middleware.dynamicRouteMap,
-    experimentalPPRRoutes,
+    isAppPPREnabled,
     hasActionOutputSupport
   }).then(
     (arr) => localizeDynamicRoutes(
@@ -15463,13 +15496,13 @@ async function serverBuild({
       );
       if (lambdas[pathname]) {
         lambdas[`${pathname}.rsc`] = lambdas[pathname];
-        if (experimental.ppr) {
+        if (isAppPPREnabled) {
           lambdas[`${pathname}${RSC_PREFETCH_SUFFIX}`] = lambdas[pathname];
         }
       }
       if (edgeFunctions[pathname]) {
         edgeFunctions[`${pathname}.rsc`] = edgeFunctions[pathname];
-        if (experimental.ppr) {
+        if (isAppPPREnabled) {
           edgeFunctions[`${pathname}${RSC_PREFETCH_SUFFIX}`] = edgeFunctions[pathname];
         }
         if (hasActionOutputSupport) {
@@ -15482,10 +15515,10 @@ async function serverBuild({
   const rscPrefetchHeader = routesManifest.rsc?.prefetchHeader?.toLowerCase();
   const rscVaryHeader = routesManifest?.rsc?.varyHeader || "RSC, Next-Router-State-Tree, Next-Router-Prefetch";
   const appNotFoundPath = import_path4.default.posix.join(".", entryDirectory, "_not-found");
-  if (experimental.ppr && !rscPrefetchHeader) {
+  if (isAppPPREnabled && !rscPrefetchHeader) {
     throw new Error("Invariant: cannot use PPR without 'rsc.prefetchHeader'");
   }
-  if (experimental.ppr) {
+  if (isAppPPREnabled) {
     for (const { srcRoute, dataRoute, experimentalPPR } of Object.values(
       prerenderManifest.staticRoutes
     )) {
@@ -15695,7 +15728,7 @@ async function serverBuild({
       // to prevent a local/deploy mismatch
       ...!isCorrectMiddlewareOrder ? middleware.staticRoutes : [],
       ...appDir ? [
-        ...rscPrefetchHeader && experimental.ppr ? [
+        ...rscPrefetchHeader && isAppPPREnabled ? [
           {
             src: `^${import_path4.default.posix.join("/", entryDirectory, "/")}`,
             has: [
@@ -16213,10 +16246,14 @@ var build = async ({
   const nextVersionRange = await getNextVersionRange(entryPath);
   const nodeVersion = await (0, import_build_utils3.getNodeVersion)(entryPath, void 0, config, meta);
   const spawnOpts = (0, import_build_utils3.getSpawnOptions)(meta, nodeVersion);
-  const { cliType, lockfileVersion } = await (0, import_build_utils3.scanParentDirs)(entryPath);
+  const { cliType, lockfileVersion, packageJson } = await (0, import_build_utils3.scanParentDirs)(
+    entryPath,
+    true
+  );
   spawnOpts.env = (0, import_build_utils3.getEnvForPackageManager)({
     cliType,
     lockfileVersion,
+    packageJsonPackageManager: packageJson?.packageManager,
     nodeVersion,
     env: spawnOpts.env || {}
   });
@@ -17005,6 +17042,7 @@ More info: http://err.sh/vercel/vercel/next-functions-config-optimized-lambdas`
         continue;
       experimentalPPRRoutes.add(route);
     }
+    const isAppPPREnabled = requiredServerFilesManifest ? requiredServerFilesManifest.config.experimental?.ppr === true || requiredServerFilesManifest.config.experimental?.ppr === "incremental" : false;
     if (requiredServerFilesManifest) {
       if (!routesManifest) {
         throw new Error(
@@ -17052,7 +17090,8 @@ More info: http://err.sh/vercel/vercel/next-functions-config-optimized-lambdas`
         hasIsr404Page,
         hasIsr500Page,
         variantsManifest,
-        experimentalPPRRoutes
+        experimentalPPRRoutes,
+        isAppPPREnabled
       });
     }
     const pageKeys = Object.keys(pages);
@@ -17448,7 +17487,7 @@ More info: http://err.sh/vercel/vercel/next-functions-config-optimized-lambdas`
       canUsePreviewMode,
       bypassToken: prerenderManifest.bypassToken || "",
       isServerMode,
-      experimentalPPRRoutes,
+      isAppPPREnabled: false,
       hasActionOutputSupport: false
     }).then(
       (arr) => localizeDynamicRoutes(
@@ -17475,7 +17514,7 @@ More info: http://err.sh/vercel/vercel/next-functions-config-optimized-lambdas`
         canUsePreviewMode,
         bypassToken: prerenderManifest.bypassToken || "",
         isServerMode,
-        experimentalPPRRoutes,
+        isAppPPREnabled: false,
         hasActionOutputSupport: false
       }).then(
         (arr) => arr.map((route) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/next",
-  "version": "4.2.10",
+  "version": "4.2.12",
   "license": "Apache-2.0",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/next-js",
@@ -30,7 +30,7 @@
     "@types/semver": "6.0.0",
     "@types/text-table": "0.2.1",
     "@types/webpack-sources": "3.2.0",
-    "@vercel/build-utils": "8.1.0",
+    "@vercel/build-utils": "8.2.0",
     "@vercel/routing-utils": "3.1.0",
     "async-sema": "3.0.1",
     "buffer-crc32": "0.2.13",