@vercel/next 4.1.5 → 4.2.0

package/dist/index.js

@@ -10640,8 +10640,7 @@ var onPrerenderRoute = (prerenderRouteArgs) => async (routeKey, {
     pageLambdaMap,
     routesManifest,
     isCorrectNotFoundRoutes,
-    isEmptyAllowQueryForPrendered,
-    omittedPrerenderRoutes
+    isEmptyAllowQueryForPrendered
   } = prerenderRouteArgs;
   if (isBlocking && isFallback) {
     throw new import_build_utils.NowBuildError({
@@ -10801,10 +10800,12 @@ 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);
@@ -10930,13 +10931,17 @@ var onPrerenderRoute = (prerenderRouteArgs) => async (routeKey, {
           "Invariant: experimentalStreamingLambdaPaths doesn't exist"
         );
       }
-      if (srcRoute && !omittedPrerenderRoutes.has(srcRoute)) {
+      experimentalStreamingLambdaPath = experimentalStreamingLambdaPaths.get(
+        pathnameToOutputName(entryDirectory, routeKey, addedIndexSuffix)
+      );
+      if (!experimentalStreamingLambdaPath && srcRoute) {
         experimentalStreamingLambdaPath = experimentalStreamingLambdaPaths.get(
           pathnameToOutputName(entryDirectory, srcRoute)
         );
-      } else {
-        experimentalStreamingLambdaPath = experimentalStreamingLambdaPaths.get(
-          pathnameToOutputName(entryDirectory, routeKey)
+      }
+      if (!experimentalStreamingLambdaPath) {
+        throw new Error(
+          `Invariant: experimentalStreamingLambdaPath is undefined for routeKey=${routeKey} and srcRoute=${srcRoute ?? "null"}`
         );
       }
     }
@@ -11095,9 +11100,12 @@ 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) {
-  if (pathname === "/")
+function pathnameToOutputName(entryDirectory, pathname, addedIndexSuffix = false) {
+  if (pathname === "/") {
     pathname = "/index";
+  } else if (addedIndexSuffix) {
+    pathname = pathname.replace(/\/index$/, "");
+  }
   return import_path2.default.posix.join(entryDirectory, pathname);
 }
 function getPostponeResumePathname(entryDirectory, pathname) {
@@ -11299,7 +11307,8 @@ async function getMiddlewareBundle({
                 framework: {
                   slug: "nextjs",
                   version: nextVersion
-                }
+                },
+                environment: edgeFunction.environments
               });
             })(),
             routeMatchers: getRouteMatchers(edgeFunction, routesManifest)
@@ -11400,14 +11409,21 @@ async function getMiddlewareManifest(entryPath, outputDirectory) {
   const manifest = await import_fs_extra3.default.readJSON(
     middlewareManifestPath
   );
-  return manifest.version === 1 ? upgradeMiddlewareManifest(manifest) : manifest;
+  if (manifest.version === 1) {
+    return upgradeMiddlewareManifestV1(manifest);
+  }
+  if (manifest.version === 2) {
+    return upgradeMiddlewareManifestV2(manifest);
+  }
+  return manifest;
 }
-function upgradeMiddlewareManifest(v1) {
+function upgradeMiddlewareManifestV1(v1) {
   function updateInfo(v1Info) {
     const { regexp, ...rest } = v1Info;
     return {
       ...rest,
-      matchers: [{ regexp }]
+      matchers: [{ regexp }],
+      environments: {}
     };
   }
   const middleware = Object.fromEntries(
@@ -11418,7 +11434,28 @@ function upgradeMiddlewareManifest(v1) {
   ) : void 0;
   return {
     ...v1,
-    version: 2,
+    version: 3,
+    middleware,
+    functions
+  };
+}
+function upgradeMiddlewareManifestV2(v2) {
+  function updateInfo(v2Info) {
+    const { ...rest } = v2Info;
+    return {
+      ...rest,
+      environments: {}
+    };
+  }
+  const middleware = Object.fromEntries(
+    Object.entries(v2.middleware).map(([p, info]) => [p, updateInfo(info)])
+  );
+  const functions = v2.functions ? Object.fromEntries(
+    Object.entries(v2.functions).map(([p, info]) => [p, updateInfo(info)])
+  ) : void 0;
+  return {
+    ...v2,
+    version: 3,
     middleware,
     functions
   };
@@ -12828,23 +12865,22 @@ async function serverBuild({
             const key = getPostponeResumePathname(entryDirectory, pageName);
             lambdas[key] = lambda;
             experimentalStreamingLambdaPaths.set(outputName, key);
-          } else {
-            for (const [
-              routePathname,
-              { srcRoute, experimentalPPR }
-            ] of Object.entries(prerenderManifest.staticRoutes)) {
-              if (srcRoute !== pagePathname || !experimentalPPR)
-                continue;
-              if (routePathname === pagePathname)
-                continue;
-              const key = getPostponeResumePathname(
-                entryDirectory,
-                routePathname
-              );
-              lambdas[key] = lambda;
-              outputName = import_path4.default.posix.join(entryDirectory, routePathname);
-              experimentalStreamingLambdaPaths.set(outputName, key);
-            }
+          }
+          for (const [
+            routePathname,
+            { srcRoute, experimentalPPR }
+          ] of Object.entries(prerenderManifest.staticRoutes)) {
+            if (srcRoute !== pagePathname || !experimentalPPR)
+              continue;
+            if (routePathname === pagePathname)
+              continue;
+            const key = getPostponeResumePathname(
+              entryDirectory,
+              routePathname
+            );
+            lambdas[key] = lambda;
+            outputName = import_path4.default.posix.join(entryDirectory, routePathname);
+            experimentalStreamingLambdaPaths.set(outputName, key);
           }
           continue;
         }
@@ -12887,8 +12923,7 @@ async function serverBuild({
     localePrefixed404,
     hasPages404: routesManifest.pages404,
     isCorrectNotFoundRoutes,
-    isEmptyAllowQueryForPrendered,
-    omittedPrerenderRoutes
+    isEmptyAllowQueryForPrendered
   });
   await Promise.all(
     Object.keys(prerenderManifest.staticRoutes).map(
@@ -15260,8 +15295,7 @@ More info: http://err.sh/vercel/vercel/next-functions-config-optimized-lambdas`
       prerenderManifest,
       appPathRoutesManifest,
       isSharedLambdas,
-      canUsePreviewMode,
-      omittedPrerenderRoutes
+      canUsePreviewMode
     });
     await Promise.all(
       Object.keys(prerenderManifest.staticRoutes).map(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/next",
-  "version": "4.1.5",
+  "version": "4.2.0",
   "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": "7.8.0",
+    "@vercel/build-utils": "7.11.0",
     "@vercel/routing-utils": "3.1.0",
     "async-sema": "3.0.1",
     "buffer-crc32": "0.2.13",