@vercel/next 3.8.2 → 3.8.4

package/dist/index.js

@@ -43242,7 +43242,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
         console.time(lambdaCreationLabel);
         const apiPages = [];
         const nonApiPages = [];
-        const streamingPages = [];
+        const appRouterPages = [];
         lambdaPageKeys.forEach(page => {
             if (internalPages.includes(page) &&
                 page !== '404.js' &&
@@ -43253,14 +43253,17 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
             if (nonLambdaSsgPages.has(pathname)) {
                 return;
             }
-            if ((0, utils_1.isDynamicRoute)(pathname)) {
-                dynamicPages.push((0, utils_1.normalizePage)(pathname));
+            const normalizedPathname = (0, utils_1.normalizePage)(pathname);
+            if ((0, utils_1.isDynamicRoute)(normalizedPathname)) {
+                dynamicPages.push(normalizedPathname);
             }
             if (pageMatchesApi(page)) {
                 apiPages.push(page);
             }
-            else if (appDir && lambdaAppPaths[page]) {
-                streamingPages.push(page);
+            else if ((appPathRoutesManifest?.[`${normalizedPathname}/page`] ||
+                appPathRoutesManifest?.[`${normalizedPathname}/route`]) &&
+                lambdaAppPaths[page]) {
+                appRouterPages.push(page);
             }
             else {
                 nonApiPages.push(page);
@@ -43358,6 +43361,9 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
             compress: false,
         })}`)
             .replace('__NEXT_SERVER_PATH__', `${(0, utils_1.getNextServerPath)(nextVersion)}/next-server.js`);
+        const appLauncher = launcher.replace('// pre-next-server-target', `process.env.__NEXT_PRIVATE_PREBUNDLED_REACT = "${requiredServerFilesManifest.config?.experimental?.serverActions
+            ? 'experimental'
+            : 'next'}"`);
         if (entryDirectory !== '.' &&
             path_1.default.posix.join('/', entryDirectory) !== routesManifest.basePath) {
             // we normalize the entryDirectory in the request URL since
@@ -43367,14 +43373,11 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                 .join('/', entryDirectory)
                 .replace(/\//g, '\\/')}/, '')`);
         }
-        const launcherFiles = {
-            [path_1.default.join(path_1.default.relative(baseDir, projectDir), '___next_launcher.cjs')]: new build_utils_1.FileBlob({ data: launcher }),
-        };
         const pageTraces = {};
         const compressedPages = {};
         const mergedPageKeys = [
             ...nonApiPages,
-            ...streamingPages,
+            ...appRouterPages,
             ...apiPages,
             ...internalPages,
         ];
@@ -43479,10 +43482,10 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
             internalPages,
             pageExtensions,
         });
-        const streamingPageLambdaGroups = await (0, utils_1.getPageLambdaGroups)({
+        const appRouterLambdaGroups = await (0, utils_1.getPageLambdaGroups)({
             entryPath: projectDir,
             config,
-            pages: streamingPages,
+            pages: appRouterPages,
             prerenderRoutes,
             pageTraces,
             compressedPages,
@@ -43493,10 +43496,11 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
             internalPages,
             pageExtensions,
         });
-        for (const group of streamingPageLambdaGroups) {
+        for (const group of appRouterLambdaGroups) {
             if (!group.isPrerenders) {
                 group.isStreaming = true;
             }
+            group.isAppRouter = true;
         }
         const apiLambdaGroups = await (0, utils_1.getPageLambdaGroups)({
             entryPath: projectDir,
@@ -43527,7 +43531,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                 pseudoLayerBytes: group.pseudoLayerBytes,
                 uncompressedLayerBytes: group.pseudoLayerUncompressedBytes,
             })),
-            streamingPageLambdaGroups: streamingPageLambdaGroups.map(group => ({
+            appRouterLambdaGroups: appRouterLambdaGroups.map(group => ({
                 pages: group.pages,
                 isPrerender: group.isPrerenders,
                 pseudoLayerBytes: group.pseudoLayerBytes,
@@ -43537,7 +43541,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
         }, null, 2));
         const combinedGroups = [
             ...pageLambdaGroups,
-            ...streamingPageLambdaGroups,
+            ...appRouterLambdaGroups,
             ...apiLambdaGroups,
         ];
         await (0, utils_1.detectLambdaLimitExceeding)(combinedGroups, lambdaCompressedByteLimit, compressedPages);
@@ -43597,6 +43601,9 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                     });
                 }
             }
+            const launcherFiles = {
+                [path_1.default.join(path_1.default.relative(baseDir, projectDir), '___next_launcher.cjs')]: new build_utils_1.FileBlob({ data: group.isAppRouter ? appLauncher : launcher }),
+            };
             const operationType = (0, utils_1.getOperationType)({ group, prerenderManifest });
             const lambda = await (0, utils_1.createLambdaFromPseudoLayers)({
                 files: {
@@ -43682,7 +43689,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
     });
     const isNextDataServerResolving = middleware.staticRoutes.length > 0 &&
         semver_1.default.gte(nextVersion, NEXT_DATA_MIDDLEWARE_RESOLVING_VERSION);
-    const dynamicRoutes = await (0, utils_1.getDynamicRoutes)(entryPath, entryDirectory, dynamicPages, false, routesManifest, omittedPrerenderRoutes, canUsePreviewMode, prerenderManifest.bypassToken || '', true, middleware.dynamicRouteMap).then(arr => (0, utils_1.localizeDynamicRoutes)(arr, dynamicPrefix, entryDirectory, staticPages, prerenderManifest, routesManifest, true, isCorrectLocaleAPIRoutes));
+    const dynamicRoutes = await (0, utils_1.getDynamicRoutes)(entryPath, entryDirectory, dynamicPages, false, routesManifest, omittedPrerenderRoutes, canUsePreviewMode, prerenderManifest.bypassToken || '', true, middleware.dynamicRouteMap, inversedAppPathManifest).then(arr => (0, utils_1.localizeDynamicRoutes)(arr, dynamicPrefix, entryDirectory, staticPages, prerenderManifest, routesManifest, true, isCorrectLocaleAPIRoutes));
     const { staticFiles, publicDirectoryFiles, staticDirectoryFiles } = await (0, utils_1.getStaticFiles)(entryPath, entryDirectory, outputDirectory);
     const normalizeNextDataRoute = (isOverride = false) => {
         return isNextDataServerResolving
@@ -43780,20 +43787,6 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
     const rscHeader = routesManifest.rsc?.header?.toLowerCase() || '__rsc__';
     const rscVaryHeader = routesManifest?.rsc?.varyHeader ||
         'RSC, Next-Router-State-Tree, Next-Router-Prefetch';
-    const completeDynamicRoutes = [];
-    if (appDir) {
-        for (const route of dynamicRoutes) {
-            completeDynamicRoutes.push({
-                ...route,
-                src: route.src.replace(new RegExp((0, escape_string_regexp_1.default)('(?:/)?$')), '(?:\\.rsc)(?:/)?$'),
-                dest: route.dest?.replace(/($|\?)/, '.rsc$1'),
-            });
-            completeDynamicRoutes.push(route);
-        }
-    }
-    else {
-        completeDynamicRoutes.push(...dynamicRoutes);
-    }
     return {
         wildcard: wildcardConfig,
         images: (0, utils_1.getImagesConfig)(imagesManifest),
@@ -44089,7 +44082,8 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                 ? // when resolving data routes for middleware we need to include
                     // all dynamic routes including non-SSG/SSP so that the priority
                     // is correct
-                    completeDynamicRoutes
+                    dynamicRoutes
+                        .filter(route => !route.src.includes('.rsc'))
                         .map(route => {
                         route = Object.assign({}, route);
                         let normalizedSrc = route.src;
@@ -44135,7 +44129,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                 : []),
             // Dynamic routes (must come after dataRoutes as dataRoutes are more
             // specific)
-            ...completeDynamicRoutes,
+            ...dynamicRoutes,
             ...(isNextDataServerResolving
                 ? [
                     {
@@ -44551,7 +44545,7 @@ async function getRoutesManifest(entryPath, outputDirectory, nextVersion) {
     return routesManifest;
 }
 exports.getRoutesManifest = getRoutesManifest;
-async function getDynamicRoutes(entryPath, entryDirectory, dynamicPages, isDev, routesManifest, omittedRoutes, canUsePreviewMode, bypassToken, isServerMode, dynamicMiddlewareRouteMap) {
+async function getDynamicRoutes(entryPath, entryDirectory, dynamicPages, isDev, routesManifest, omittedRoutes, canUsePreviewMode, bypassToken, isServerMode, dynamicMiddlewareRouteMap, appPathRoutesManifest) {
     if (routesManifest) {
         switch (routesManifest.version) {
             case 1:
@@ -44569,15 +44563,19 @@ async function getDynamicRoutes(entryPath, entryDirectory, dynamicPages, isDev,
             }
             case 3:
             case 4: {
-                return routesManifest.dynamicRoutes
-                    .filter(({ page }) => canUsePreviewMode || !omittedRoutes?.has(page))
-                    .map(params => {
+                const routes = [];
+                for (const dynamicRoute of routesManifest.dynamicRoutes) {
+                    if (!canUsePreviewMode && omittedRoutes?.has(dynamicRoute.page)) {
+                        continue;
+                    }
+                    const params = dynamicRoute;
                     if ('isMiddleware' in params) {
                         const route = dynamicMiddlewareRouteMap?.get(params.page);
                         if (!route) {
                             throw new Error(`Could not find dynamic middleware route for ${params.page}`);
                         }
-                        return route;
+                        routes.push(route);
+                        continue;
                     }
                     const { page, namedRegex, regex, routeKeys } = params;
                     const route = {
@@ -44606,8 +44604,17 @@ async function getDynamicRoutes(entryPath, entryDirectory, dynamicPages, isDev,
                             },
                         ];
                     }
-                    return route;
-                });
+                    if (appPathRoutesManifest?.[page]) {
+                        routes.push({
+                            ...route,
+                            src: route.src.replace(new RegExp((0, escape_string_regexp_1.default)('(?:/)?$')), '(?:\\.rsc)(?:/)?$'),
+                            dest: route.dest?.replace(/($|\?)/, '.rsc$1'),
+                        });
+                    }
+                    routes.push(route);
+                    continue;
+                }
+                return routes;
             }
             default: {
                 // update MIN_ROUTES_MANIFEST_VERSION

package/dist/server-build.js

@@ -168,7 +168,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
         console.time(lambdaCreationLabel);
         const apiPages = [];
         const nonApiPages = [];
-        const streamingPages = [];
+        const appRouterPages = [];
         lambdaPageKeys.forEach(page => {
             if (internalPages.includes(page) &&
                 page !== '404.js' &&
@@ -179,14 +179,17 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
             if (nonLambdaSsgPages.has(pathname)) {
                 return;
             }
-            if ((0, utils_1.isDynamicRoute)(pathname)) {
-                dynamicPages.push((0, utils_1.normalizePage)(pathname));
+            const normalizedPathname = (0, utils_1.normalizePage)(pathname);
+            if ((0, utils_1.isDynamicRoute)(normalizedPathname)) {
+                dynamicPages.push(normalizedPathname);
             }
             if (pageMatchesApi(page)) {
                 apiPages.push(page);
             }
-            else if (appDir && lambdaAppPaths[page]) {
-                streamingPages.push(page);
+            else if ((appPathRoutesManifest?.[`${normalizedPathname}/page`] ||
+                appPathRoutesManifest?.[`${normalizedPathname}/route`]) &&
+                lambdaAppPaths[page]) {
+                appRouterPages.push(page);
             }
             else {
                 nonApiPages.push(page);
@@ -284,6 +287,9 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
             compress: false,
         })}`)
             .replace('__NEXT_SERVER_PATH__', `${(0, utils_1.getNextServerPath)(nextVersion)}/next-server.js`);
+        const appLauncher = launcher.replace('// pre-next-server-target', `process.env.__NEXT_PRIVATE_PREBUNDLED_REACT = "${requiredServerFilesManifest.config?.experimental?.serverActions
+            ? 'experimental'
+            : 'next'}"`);
         if (entryDirectory !== '.' &&
             path_1.default.posix.join('/', entryDirectory) !== routesManifest.basePath) {
             // we normalize the entryDirectory in the request URL since
@@ -293,14 +299,11 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                 .join('/', entryDirectory)
                 .replace(/\//g, '\\/')}/, '')`);
         }
-        const launcherFiles = {
-            [path_1.default.join(path_1.default.relative(baseDir, projectDir), '___next_launcher.cjs')]: new build_utils_1.FileBlob({ data: launcher }),
-        };
         const pageTraces = {};
         const compressedPages = {};
         const mergedPageKeys = [
             ...nonApiPages,
-            ...streamingPages,
+            ...appRouterPages,
             ...apiPages,
             ...internalPages,
         ];
@@ -405,10 +408,10 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
             internalPages,
             pageExtensions,
         });
-        const streamingPageLambdaGroups = await (0, utils_1.getPageLambdaGroups)({
+        const appRouterLambdaGroups = await (0, utils_1.getPageLambdaGroups)({
             entryPath: projectDir,
             config,
-            pages: streamingPages,
+            pages: appRouterPages,
             prerenderRoutes,
             pageTraces,
             compressedPages,
@@ -419,10 +422,11 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
             internalPages,
             pageExtensions,
         });
-        for (const group of streamingPageLambdaGroups) {
+        for (const group of appRouterLambdaGroups) {
             if (!group.isPrerenders) {
                 group.isStreaming = true;
             }
+            group.isAppRouter = true;
         }
         const apiLambdaGroups = await (0, utils_1.getPageLambdaGroups)({
             entryPath: projectDir,
@@ -453,7 +457,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                 pseudoLayerBytes: group.pseudoLayerBytes,
                 uncompressedLayerBytes: group.pseudoLayerUncompressedBytes,
             })),
-            streamingPageLambdaGroups: streamingPageLambdaGroups.map(group => ({
+            appRouterLambdaGroups: appRouterLambdaGroups.map(group => ({
                 pages: group.pages,
                 isPrerender: group.isPrerenders,
                 pseudoLayerBytes: group.pseudoLayerBytes,
@@ -463,7 +467,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
         }, null, 2));
         const combinedGroups = [
             ...pageLambdaGroups,
-            ...streamingPageLambdaGroups,
+            ...appRouterLambdaGroups,
             ...apiLambdaGroups,
         ];
         await (0, utils_1.detectLambdaLimitExceeding)(combinedGroups, lambdaCompressedByteLimit, compressedPages);
@@ -523,6 +527,9 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                     });
                 }
             }
+            const launcherFiles = {
+                [path_1.default.join(path_1.default.relative(baseDir, projectDir), '___next_launcher.cjs')]: new build_utils_1.FileBlob({ data: group.isAppRouter ? appLauncher : launcher }),
+            };
             const operationType = (0, utils_1.getOperationType)({ group, prerenderManifest });
             const lambda = await (0, utils_1.createLambdaFromPseudoLayers)({
                 files: {
@@ -608,7 +615,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
     });
     const isNextDataServerResolving = middleware.staticRoutes.length > 0 &&
         semver_1.default.gte(nextVersion, NEXT_DATA_MIDDLEWARE_RESOLVING_VERSION);
-    const dynamicRoutes = await (0, utils_1.getDynamicRoutes)(entryPath, entryDirectory, dynamicPages, false, routesManifest, omittedPrerenderRoutes, canUsePreviewMode, prerenderManifest.bypassToken || '', true, middleware.dynamicRouteMap).then(arr => (0, utils_1.localizeDynamicRoutes)(arr, dynamicPrefix, entryDirectory, staticPages, prerenderManifest, routesManifest, true, isCorrectLocaleAPIRoutes));
+    const dynamicRoutes = await (0, utils_1.getDynamicRoutes)(entryPath, entryDirectory, dynamicPages, false, routesManifest, omittedPrerenderRoutes, canUsePreviewMode, prerenderManifest.bypassToken || '', true, middleware.dynamicRouteMap, inversedAppPathManifest).then(arr => (0, utils_1.localizeDynamicRoutes)(arr, dynamicPrefix, entryDirectory, staticPages, prerenderManifest, routesManifest, true, isCorrectLocaleAPIRoutes));
     const { staticFiles, publicDirectoryFiles, staticDirectoryFiles } = await (0, utils_1.getStaticFiles)(entryPath, entryDirectory, outputDirectory);
     const normalizeNextDataRoute = (isOverride = false) => {
         return isNextDataServerResolving
@@ -706,20 +713,6 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
     const rscHeader = routesManifest.rsc?.header?.toLowerCase() || '__rsc__';
     const rscVaryHeader = routesManifest?.rsc?.varyHeader ||
         'RSC, Next-Router-State-Tree, Next-Router-Prefetch';
-    const completeDynamicRoutes = [];
-    if (appDir) {
-        for (const route of dynamicRoutes) {
-            completeDynamicRoutes.push({
-                ...route,
-                src: route.src.replace(new RegExp((0, escape_string_regexp_1.default)('(?:/)?$')), '(?:\\.rsc)(?:/)?$'),
-                dest: route.dest?.replace(/($|\?)/, '.rsc$1'),
-            });
-            completeDynamicRoutes.push(route);
-        }
-    }
-    else {
-        completeDynamicRoutes.push(...dynamicRoutes);
-    }
     return {
         wildcard: wildcardConfig,
         images: (0, utils_1.getImagesConfig)(imagesManifest),
@@ -1015,7 +1008,8 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                 ? // when resolving data routes for middleware we need to include
                     // all dynamic routes including non-SSG/SSP so that the priority
                     // is correct
-                    completeDynamicRoutes
+                    dynamicRoutes
+                        .filter(route => !route.src.includes('.rsc'))
                         .map(route => {
                         route = Object.assign({}, route);
                         let normalizedSrc = route.src;
@@ -1061,7 +1055,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                 : []),
             // Dynamic routes (must come after dataRoutes as dataRoutes are more
             // specific)
-            ...completeDynamicRoutes,
+            ...dynamicRoutes,
             ...(isNextDataServerResolving
                 ? [
                     {

package/dist/server-launcher.js

@@ -13,6 +13,7 @@ if (process.env.NODE_ENV !== 'production' && region !== 'dev1') {
     console.warn(`Warning: NODE_ENV was incorrectly set to "${process.env.NODE_ENV}", this value is being overridden to "production"`);
     process.env.NODE_ENV = 'production';
 }
+// pre-next-server-target
 // eslint-disable-next-line
 const NextServer = require('__NEXT_SERVER_PATH__').default;
 const nextServer = new NextServer({

package/dist/utils.js

@@ -194,7 +194,7 @@ async function getRoutesManifest(entryPath, outputDirectory, nextVersion) {
     return routesManifest;
 }
 exports.getRoutesManifest = getRoutesManifest;
-async function getDynamicRoutes(entryPath, entryDirectory, dynamicPages, isDev, routesManifest, omittedRoutes, canUsePreviewMode, bypassToken, isServerMode, dynamicMiddlewareRouteMap) {
+async function getDynamicRoutes(entryPath, entryDirectory, dynamicPages, isDev, routesManifest, omittedRoutes, canUsePreviewMode, bypassToken, isServerMode, dynamicMiddlewareRouteMap, appPathRoutesManifest) {
     if (routesManifest) {
         switch (routesManifest.version) {
             case 1:
@@ -212,15 +212,19 @@ async function getDynamicRoutes(entryPath, entryDirectory, dynamicPages, isDev,
             }
             case 3:
             case 4: {
-                return routesManifest.dynamicRoutes
-                    .filter(({ page }) => canUsePreviewMode || !omittedRoutes?.has(page))
-                    .map(params => {
+                const routes = [];
+                for (const dynamicRoute of routesManifest.dynamicRoutes) {
+                    if (!canUsePreviewMode && omittedRoutes?.has(dynamicRoute.page)) {
+                        continue;
+                    }
+                    const params = dynamicRoute;
                     if ('isMiddleware' in params) {
                         const route = dynamicMiddlewareRouteMap?.get(params.page);
                         if (!route) {
                             throw new Error(`Could not find dynamic middleware route for ${params.page}`);
                         }
-                        return route;
+                        routes.push(route);
+                        continue;
                     }
                     const { page, namedRegex, regex, routeKeys } = params;
                     const route = {
@@ -249,8 +253,17 @@ async function getDynamicRoutes(entryPath, entryDirectory, dynamicPages, isDev,
                             },
                         ];
                     }
-                    return route;
-                });
+                    if (appPathRoutesManifest?.[page]) {
+                        routes.push({
+                            ...route,
+                            src: route.src.replace(new RegExp((0, escape_string_regexp_1.default)('(?:/)?$')), '(?:\\.rsc)(?:/)?$'),
+                            dest: route.dest?.replace(/($|\?)/, '.rsc$1'),
+                        });
+                    }
+                    routes.push(route);
+                    continue;
+                }
+                return routes;
             }
             default: {
                 // update MIN_ROUTES_MANIFEST_VERSION

package/package.json

@@ -1,18 +1,9 @@
 {
   "name": "@vercel/next",
-  "version": "3.8.2",
+  "version": "3.8.4",
   "license": "Apache-2.0",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/next-js",
-  "scripts": {
-    "build": "node build.js",
-    "build-dev": "node build.js --dev",
-    "test": "jest --env node --verbose --bail --runInBand --testTimeout=360000",
-    "test-unit": "pnpm test test/unit/",
-    "test-next-local": "pnpm test test/integration/*.test.js test/integration/*.test.ts",
-    "test-next-local:middleware": "pnpm test test/integration/middleware.test.ts",
-    "test-e2e": "rm -f test/builder-info.json; pnpm test test/fixtures/**/*.test.js"
-  },
   "repository": {
     "type": "git",
     "url": "https://github.com/vercel/vercel.git",
@@ -60,5 +51,13 @@
     "text-table": "0.2.0",
     "webpack-sources": "3.2.3"
   },
-  "gitHead": "f8749e1ff1d69fe25421a1f0f9309542ea50ad6e"
-}
+  "scripts": {
+    "build": "node build.js",
+    "build-dev": "node build.js --dev",
+    "test": "jest --env node --verbose --bail --runInBand --testTimeout=360000",
+    "test-unit": "pnpm test test/unit/",
+    "test-next-local": "pnpm test test/integration/*.test.js test/integration/*.test.ts",
+    "test-next-local:middleware": "pnpm test test/integration/middleware.test.ts",
+    "test-e2e": "rm -f test/builder-info.json; pnpm test test/fixtures/**/*.test.js"
+  }
+}