@vercel/next 3.8.3 → 3.8.5

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,15 @@ 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);
+            if (lambdaAppPaths[page]) {
+                appRouterPages.push(page);
             }
-            else if (appDir && lambdaAppPaths[page]) {
-                streamingPages.push(page);
+            else if (pageMatchesApi(page)) {
+                apiPages.push(page);
             }
             else {
                 nonApiPages.push(page);
@@ -43358,6 +43359,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 +43371,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 +43480,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 +43494,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 +43529,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 +43539,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 +43599,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: {

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,15 @@ 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);
+            if (lambdaAppPaths[page]) {
+                appRouterPages.push(page);
             }
-            else if (appDir && lambdaAppPaths[page]) {
-                streamingPages.push(page);
+            else if (pageMatchesApi(page)) {
+                apiPages.push(page);
             }
             else {
                 nonApiPages.push(page);
@@ -284,6 +285,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 +297,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 +406,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 +420,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 +455,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 +465,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 +525,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: {

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/next",
-  "version": "3.8.3",
+  "version": "3.8.5",
   "license": "Apache-2.0",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/next-js",
@@ -26,7 +26,7 @@
     "@types/semver": "6.0.0",
     "@types/text-table": "0.2.1",
     "@types/webpack-sources": "3.2.0",
-    "@vercel/build-utils": "6.7.2",
+    "@vercel/build-utils": "6.7.3",
     "@vercel/nft": "0.22.5",
     "@vercel/routing-utils": "2.2.1",
     "async-sema": "3.0.1",