@vercel/next 4.1.0 → 4.1.2

package/dist/index.js

@@ -9971,6 +9971,7 @@ async function createLambdaFromPseudoLayers({
   layers,
   isStreaming,
   nextVersion,
+  experimentalAllowBundling,
   ...lambdaOptions
 }) {
   await createLambdaSema.acquire();
@@ -10007,7 +10008,8 @@ async function createLambdaFromPseudoLayers({
     framework: {
       slug: "nextjs",
       version: nextVersion
-    }
+    },
+    experimentalAllowBundling
   });
 }
 async function getExportIntent(entryPath) {
@@ -10365,7 +10367,8 @@ async function getPageLambdaGroups({
   lambdaCompressedByteLimit,
   internalPages,
   pageExtensions,
-  inversedAppPathManifest
+  inversedAppPathManifest,
+  experimentalAllowBundling
 }) {
   const groups = [];
   for (const page of pages) {
@@ -10392,7 +10395,7 @@ async function getPageLambdaGroups({
       });
       opts = { ...vercelConfigOpts, ...opts };
     }
-    let matchingGroup = groups.find((group) => {
+    let matchingGroup = experimentalAllowBundling ? void 0 : groups.find((group) => {
       const matches = group.maxDuration === opts.maxDuration && group.memory === opts.memory && group.isPrerenders === isPrerenderRoute && group.isExperimentalPPR === isExperimentalPPR;
       if (matches) {
         let newTracedFilesSize = group.pseudoLayerBytes;
@@ -10703,6 +10706,9 @@ var onPrerenderRoute = (prerenderRouteArgs) => async (routeKey, {
     } = pr);
   }
   let isAppPathRoute = false;
+  if (appDir && experimentalPPR) {
+    isAppPathRoute = true;
+  }
   if (appDir && srcRoute && (!dataRoute || dataRoute?.endsWith(".rsc"))) {
     isAppPathRoute = true;
   }
@@ -10786,7 +10792,6 @@ var onPrerenderRoute = (prerenderRouteArgs) => async (routeKey, {
     if (routeKey !== "/index" && routeKey.endsWith("/index")) {
       routeKey = `${routeKey}/index`;
       routeFileNoExt = routeKey;
-      origRouteFileNoExt = routeKey;
     }
   }
   let outputPathPage = import_path2.default.posix.join(entryDirectory, routeFileNoExt);
@@ -10841,13 +10846,16 @@ var onPrerenderRoute = (prerenderRouteArgs) => async (routeKey, {
     const lambdaId = pageLambdaMap[outputSrcPathPage];
     lambda = lambdas[lambdaId];
   } else {
-    const outputSrcPathPage = normalizeIndexOutput(
-      srcRoute == null ? outputPathPageOrig : import_path2.default.posix.join(
-        entryDirectory,
-        srcRoute === "/" ? "/index" : srcRoute
-      ),
-      isServerMode
+    let outputSrcPathPage = srcRoute == null ? outputPathPageOrig : import_path2.default.posix.join(
+      entryDirectory,
+      srcRoute === "/" ? "/index" : srcRoute
     );
+    if (!isAppPathRoute) {
+      outputSrcPathPage = normalizeIndexOutput(
+        outputSrcPathPage,
+        isServerMode
+      );
+    }
     lambda = lambdas[outputSrcPathPage];
   }
   if (!isAppPathRoute && !isNotFound && initialRevalidate === false) {
@@ -10973,10 +10981,16 @@ var onPrerenderRoute = (prerenderRouteArgs) => async (routeKey, {
           routesManifest,
           locale2
         );
-        const localeOutputPathPage = normalizeIndexOutput(
-          import_path2.default.posix.join(entryDirectory, localeRouteFileNoExt),
-          isServerMode
+        let localeOutputPathPage = import_path2.default.posix.join(
+          entryDirectory,
+          localeRouteFileNoExt
         );
+        if (!isAppPathRoute) {
+          localeOutputPathPage = normalizeIndexOutput(
+            localeOutputPathPage,
+            isServerMode
+          );
+        }
         const origPrerenderPage = prerenders[outputPathPage];
         prerenders[localeOutputPathPage] = {
           ...origPrerenderPage,
@@ -11280,14 +11294,15 @@ async function getMiddlewareBundle({
         shortPath = normalizeEdgeFunctionPath(shortPath, appPathRoutesManifest);
       }
       if (routesManifest?.basePath) {
-        shortPath = normalizeIndexOutput(
-          import_path2.default.posix.join(
-            "./",
-            routesManifest?.basePath,
-            shortPath.replace(/^\//, "")
-          ),
-          true
+        const isAppPathRoute = !!appPathRoutesManifest[shortPath];
+        shortPath = import_path2.default.posix.join(
+          "./",
+          routesManifest?.basePath,
+          shortPath.replace(/^\//, "")
         );
+        if (!isAppPathRoute) {
+          shortPath = normalizeIndexOutput(shortPath, true);
+        }
       }
       worker.edgeFunction.name = shortPath;
       source.edgeFunctions[shortPath] = worker.edgeFunction;
@@ -11939,6 +11954,27 @@ var CORRECT_MIDDLEWARE_ORDER_VERSION = "v12.1.7-canary.29";
 var NEXT_DATA_MIDDLEWARE_RESOLVING_VERSION = "v12.1.7-canary.33";
 var EMPTY_ALLOW_QUERY_FOR_PRERENDERED_VERSION = "v12.2.0";
 var CORRECTED_MANIFESTS_VERSION = "v12.2.0";
+var PRELOAD_CHUNKS = {
+  APP_ROUTER_PAGES: [
+    ".next/server/webpack-runtime.js",
+    "next/dist/client/components/action-async-storage.external.js",
+    "next/dist/client/components/request-async-storage.external.js",
+    "next/dist/client/components/static-generation-async-storage.external.js",
+    "next/dist/compiled/next-server/app-page.runtime.prod.js"
+  ],
+  APP_ROUTER_HANDLER: [
+    ".next/server/webpack-runtime.js",
+    "next/dist/compiled/next-server/app-route.runtime.prod.js"
+  ],
+  PAGES_ROUTER_PAGES: [
+    ".next/server/webpack-runtime.js",
+    "next/dist/compiled/next-server/pages.runtime.prod.js"
+  ],
+  PAGES_ROUTER_API: [
+    ".next/server/webpack-api-runtime.js",
+    "next/dist/compiled/next-server/pages-api.runtime.prod.js"
+  ]
+};
 var BUNDLED_SERVER_NEXT_VERSION = "v13.5.4";
 var BUNDLED_SERVER_NEXT_PATH = "next/dist/compiled/next-server/server.runtime.prod.js";
 async function serverBuild({
@@ -11984,6 +12020,9 @@ async function serverBuild({
   variantsManifest
 }) {
   lambdaPages = Object.assign({}, lambdaPages, lambdaAppPaths);
+  const experimentalAllowBundling = Boolean(
+    process.env.NEXT_EXPERIMENTAL_FUNCTION_BUNDLING
+  );
   const lambdas = {};
   const prerenders = {};
   const lambdaPageKeys = Object.keys(lambdaPages);
@@ -12020,7 +12059,7 @@ async function serverBuild({
     for (const rewrite of afterFilesRewrites) {
       if (rewrite.src && rewrite.dest) {
         rewrite.src = rewrite.src.replace(
-          "(?:/)?",
+          /\/?\(\?:\/\)\?/,
           "(?<rscsuff>(\\.prefetch)?\\.rsc)?(?:/)?"
         );
         let destQueryIndex = rewrite.dest.indexOf("?");
@@ -12497,6 +12536,7 @@ async function serverBuild({
     );
     const pageExtensions = requiredServerFilesManifest.config?.pageExtensions;
     const pageLambdaGroups = await getPageLambdaGroups({
+      experimentalAllowBundling,
       entryPath: projectDir,
       config,
       functionsConfigManifest,
@@ -12516,6 +12556,7 @@ async function serverBuild({
       group.isPages = true;
     }
     const appRouterLambdaGroups = await getPageLambdaGroups({
+      experimentalAllowBundling,
       entryPath: projectDir,
       config,
       functionsConfigManifest,
@@ -12533,6 +12574,7 @@ async function serverBuild({
       inversedAppPathManifest
     });
     const appRouteHandlersLambdaGroups = await getPageLambdaGroups({
+      experimentalAllowBundling,
       entryPath: projectDir,
       config,
       functionsConfigManifest,
@@ -12681,8 +12723,40 @@ async function serverBuild({
           });
         }
       }
+      let launcherData2 = group.isAppRouter ? appLauncher : launcher;
+      let preloadChunks = [];
+      if (process.env.VERCEL_NEXT_PRELOAD_COMMON === "1") {
+        const nextPackageDir = import_path4.default.dirname(
+          (0, import_resolve_from.default)(projectDir, "next/package.json")
+        );
+        if (group.isPages) {
+          preloadChunks = PRELOAD_CHUNKS.PAGES_ROUTER_PAGES;
+        } else if (group.isApiLambda) {
+          preloadChunks = PRELOAD_CHUNKS.PAGES_ROUTER_API;
+        } else if (group.isAppRouter && !group.isAppRouteHandler) {
+          preloadChunks = PRELOAD_CHUNKS.APP_ROUTER_PAGES;
+        } else if (group.isAppRouteHandler) {
+          preloadChunks = PRELOAD_CHUNKS.APP_ROUTER_HANDLER;
+        }
+        const normalizedPreloadChunks = [];
+        for (const preloadChunk of preloadChunks) {
+          const absoluteChunk = preloadChunk.startsWith(".next") ? import_path4.default.join(projectDir, preloadChunk) : import_path4.default.join(nextPackageDir, "..", preloadChunk);
+          if (group.pseudoLayer[import_path4.default.join(".", import_path4.default.relative(baseDir, absoluteChunk))]) {
+            normalizedPreloadChunks.push(
+              // relative files need to be prefixed with ./ for require
+              preloadChunk.startsWith(".next") ? `./${preloadChunk}` : preloadChunk
+            );
+          }
+        }
+        if (normalizedPreloadChunks.length > 0) {
+          launcherData2 = launcherData2.replace(
+            "// @preserve next-server-preload-target",
+            normalizedPreloadChunks.map((name) => `require('${name}');`).join("\n")
+          );
+        }
+      }
       const launcherFiles = {
-        [import_path4.default.join(import_path4.default.relative(baseDir, projectDir), "___next_launcher.cjs")]: new import_build_utils2.FileBlob({ data: group.isAppRouter ? appLauncher : launcher })
+        [import_path4.default.join(import_path4.default.relative(baseDir, projectDir), "___next_launcher.cjs")]: new import_build_utils2.FileBlob({ data: launcherData2 })
       };
       const operationType = getOperationType({ group, prerenderManifest });
       const options = {
@@ -12700,7 +12774,8 @@ async function serverBuild({
         runtime: nodeVersion.runtime,
         maxDuration: group.maxDuration,
         isStreaming: group.isStreaming,
-        nextVersion
+        nextVersion,
+        experimentalAllowBundling
       };
       const lambda = await createLambdaFromPseudoLayers(options);
       const isPPR = experimental.ppr && group.isAppRouter && !group.isAppRouteHandler;
@@ -12726,10 +12801,10 @@ async function serverBuild({
             );
           });
         }
-        let outputName = normalizeIndexOutput(
-          import_path4.default.posix.join(entryDirectory, pageNoExt),
-          true
-        );
+        let outputName = import_path4.default.posix.join(entryDirectory, pageNoExt);
+        if (!group.isAppRouter && !group.isAppRouteHandler) {
+          outputName = normalizeIndexOutput(outputName, true);
+        }
         if (isPPR) {
           if (!revalidate) {
             throw new Error("Invariant: PPR lambda isn't set");
@@ -12983,9 +13058,10 @@ async function serverBuild({
       if (ogRoute.endsWith("/route")) {
         continue;
       }
-      const pathname = normalizeIndexOutput(
-        import_path4.default.posix.join("./", entryDirectory, route === "/" ? "/index" : route),
-        true
+      const pathname = import_path4.default.posix.join(
+        "./",
+        entryDirectory,
+        route === "/" ? "/index" : route
       );
       if (lambdas[pathname]) {
         lambdas[`${pathname}.rsc`] = lambdas[pathname];

package/dist/server-launcher.js

@@ -12,6 +12,7 @@ if (process.env.NODE_ENV !== "production" && region !== "dev1") {
 }
 // @preserve pre-next-server-target
 const NextServer = require("__NEXT_SERVER_PATH__").default;
+// @preserve next-server-preload-target
 const conf = __NEXT_CONFIG__;
 const nextServer = new NextServer({
   conf,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/next",
-  "version": "4.1.0",
+  "version": "4.1.2",
   "license": "Apache-2.0",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/next-js",
@@ -13,7 +13,7 @@
     "dist"
   ],
   "dependencies": {
-    "@vercel/nft": "0.26.2"
+    "@vercel/nft": "0.26.4"
   },
   "devDependencies": {
     "@types/aws-lambda": "8.10.19",
@@ -30,7 +30,7 @@
     "@types/semver": "6.0.0",
     "@types/text-table": "0.2.1",
     "@types/webpack-sources": "3.2.0",
-    "@vercel/build-utils": "7.5.1",
+    "@vercel/build-utils": "7.7.0",
     "@vercel/routing-utils": "3.1.0",
     "async-sema": "3.0.1",
     "buffer-crc32": "0.2.13",