@vercel/next 3.8.8 → 3.9.1

package/dist/index.js

@@ -40971,7 +40971,7 @@ const build = async ({ files, workPath, repoRootPath, entrypoint, config = {}, m
         cwd: entryPath,
     });
     let hasLegacyRoutes = false;
-    const hasFunctionsConfig = !!config.functions;
+    const hasFunctionsConfig = Boolean(config.functions);
     if (await (0, fs_extra_1.pathExists)(dotNextStatic)) {
         console.warn('WARNING: You should not upload the `.next` directory.');
     }
@@ -41137,7 +41137,8 @@ const build = async ({ files, workPath, repoRootPath, entrypoint, config = {}, m
     const requiredServerFilesManifest = isServerMode
         ? await (0, utils_1.getRequiredServerFilesManifest)(entryPath, outputDirectory)
         : false;
-    isServerMode = !!requiredServerFilesManifest;
+    isServerMode = Boolean(requiredServerFilesManifest);
+    const functionsConfigManifest = await (0, utils_1.getFunctionsConfigManifest)(entryPath, outputDirectory);
     const routesManifest = await (0, utils_1.getRoutesManifest)(entryPath, outputDirectory, nextVersion);
     const imagesManifest = await (0, utils_1.getImagesManifest)(entryPath, outputDirectory);
     const prerenderManifest = await (0, utils_1.getPrerenderManifest)(entryPath, outputDirectory);
@@ -41709,6 +41710,7 @@ const build = async ({ files, workPath, repoRootPath, entrypoint, config = {}, m
             }
             return (0, server_build_1.serverBuild)({
                 config,
+                functionsConfigManifest,
                 nextVersion,
                 trailingSlash,
                 appPathRoutesManifest,
@@ -41876,6 +41878,7 @@ const build = async ({ files, workPath, repoRootPath, entrypoint, config = {}, m
             const initialPageLambdaGroups = await (0, utils_1.getPageLambdaGroups)({
                 entryPath,
                 config,
+                functionsConfigManifest,
                 pages: nonApiPages,
                 prerenderRoutes: new Set(),
                 pageTraces,
@@ -41891,6 +41894,7 @@ const build = async ({ files, workPath, repoRootPath, entrypoint, config = {}, m
             const initialApiLambdaGroups = await (0, utils_1.getPageLambdaGroups)({
                 entryPath,
                 config,
+                functionsConfigManifest,
                 pages: apiPages,
                 prerenderRoutes: new Set(),
                 pageTraces,
@@ -43099,7 +43103,7 @@ const CORRECT_MIDDLEWARE_ORDER_VERSION = 'v12.1.7-canary.29';
 const NEXT_DATA_MIDDLEWARE_RESOLVING_VERSION = 'v12.1.7-canary.33';
 const EMPTY_ALLOW_QUERY_FOR_PRERENDERED_VERSION = 'v12.2.0';
 const CORRECTED_MANIFESTS_VERSION = 'v12.2.0';
-async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs, baseDir, workPath, entryPath, nodeVersion, buildId, escapedBuildId, dynamicPrefix, entryDirectory, outputDirectory, redirects, beforeFilesRewrites, afterFilesRewrites, fallbackRewrites, headers, dataRoutes, hasIsr404Page, hasIsr500Page, imagesManifest, wildcardConfig, routesManifest, staticPages, lambdaPages, nextVersion, lambdaAppPaths, canUsePreviewMode, trailingSlash, prerenderManifest, appPathRoutesManifest, omittedPrerenderRoutes, trailingSlashRedirects, isCorrectLocaleAPIRoutes, lambdaCompressedByteLimit, requiredServerFilesManifest, }) {
+async function serverBuild({ dynamicPages, pagesDir, config = {}, functionsConfigManifest, privateOutputs, baseDir, workPath, entryPath, nodeVersion, buildId, escapedBuildId, dynamicPrefix, entryDirectory, outputDirectory, redirects, beforeFilesRewrites, afterFilesRewrites, fallbackRewrites, headers, dataRoutes, hasIsr404Page, hasIsr500Page, imagesManifest, wildcardConfig, routesManifest, staticPages, lambdaPages, nextVersion, lambdaAppPaths, canUsePreviewMode, trailingSlash, prerenderManifest, appPathRoutesManifest, omittedPrerenderRoutes, trailingSlashRedirects, isCorrectLocaleAPIRoutes, lambdaCompressedByteLimit, requiredServerFilesManifest, }) {
     lambdaPages = Object.assign({}, lambdaPages, lambdaAppPaths);
     const lambdas = {};
     const prerenders = {};
@@ -43141,15 +43145,17 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
     };
     const { i18n } = routesManifest;
     const hasPages404 = routesManifest.pages404;
+    let localePrefixed404 = false;
     let static404Page = staticPages[path_1.default.posix.join(entryDirectory, '404')] && hasPages404
         ? path_1.default.posix.join(entryDirectory, '404')
         : staticPages[path_1.default.posix.join(entryDirectory, '_errors/404')]
             ? path_1.default.posix.join(entryDirectory, '_errors/404')
             : undefined;
     if (!static404Page && i18n) {
-        static404Page = staticPages[path_1.default.posix.join(entryDirectory, i18n.defaultLocale, '404')]
-            ? path_1.default.posix.join(entryDirectory, i18n.defaultLocale, '404')
-            : undefined;
+        if (staticPages[path_1.default.posix.join(entryDirectory, i18n.defaultLocale, '404')]) {
+            localePrefixed404 = true;
+            static404Page = path_1.default.posix.join(entryDirectory, i18n.defaultLocale, '404');
+        }
     }
     if (!hasStatic500 && i18n) {
         hasStatic500 =
@@ -43473,6 +43479,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
         const pageLambdaGroups = await (0, utils_1.getPageLambdaGroups)({
             entryPath: projectDir,
             config,
+            functionsConfigManifest,
             pages: nonApiPages,
             prerenderRoutes,
             pageTraces,
@@ -43487,6 +43494,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
         const appRouterLambdaGroups = await (0, utils_1.getPageLambdaGroups)({
             entryPath: projectDir,
             config,
+            functionsConfigManifest,
             pages: appRouterPages,
             prerenderRoutes,
             pageTraces,
@@ -43507,6 +43515,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
         const apiLambdaGroups = await (0, utils_1.getPageLambdaGroups)({
             entryPath: projectDir,
             config,
+            functionsConfigManifest,
             pages: apiPages,
             prerenderRoutes,
             pageTraces,
@@ -43635,6 +43644,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                 // this is handled in onPrerenderRoute for SSG pages
                 if (i18n &&
                     !isPrerender &&
+                    !group.isAppRouter &&
                     (!isCorrectLocaleAPIRoutes ||
                         !(pageNoExt === 'api' || pageNoExt.startsWith('api/')))) {
                     for (const locale of i18n.locales) {
@@ -43662,6 +43672,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
         isSharedLambdas: false,
         canUsePreviewMode,
         static404Page,
+        localePrefixed404,
         hasPages404: routesManifest.pages404,
         isCorrectNotFoundRoutes,
         isEmptyAllowQueryForPrendered,
@@ -43692,7 +43703,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, inversedAppPathManifest).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, inversedAppPathManifest));
     const { staticFiles, publicDirectoryFiles, staticDirectoryFiles } = await (0, utils_1.getStaticFiles)(entryPath, entryDirectory, outputDirectory);
     const normalizeNextDataRoute = (isOverride = false) => {
         return isNextDataServerResolving
@@ -43790,6 +43801,7 @@ 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 appNotFoundPath = path_1.default.posix.join('.', entryDirectory, '_not-found');
     return {
         wildcard: wildcardConfig,
         images: (0, utils_1.getImagesConfig)(imagesManifest),
@@ -44210,7 +44222,11 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                             hasIsr404Page ||
                             lambdas[path_1.default.posix.join(entryDirectory, '404')]
                             ? '/404'
-                            : '/_error'),
+                            : appPathRoutesManifest &&
+                                (middleware.edgeFunctions[appNotFoundPath] ||
+                                    lambdas[appNotFoundPath])
+                                ? '/_not-found'
+                                : '/_error'),
                         status: 404,
                     },
                 ]),
@@ -44380,7 +44396,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.isApiPage = exports.getOperationType = exports.upgradeMiddlewareManifest = exports.getMiddlewareManifest = exports.getMiddlewareBundle = exports.getSourceFilePathFromPage = exports.isDynamicRoute = exports.normalizePage = exports.getImagesConfig = exports.getNextConfig = exports.normalizePackageJson = exports.validateEntrypoint = exports.excludeFiles = exports.getPrivateOutputs = exports.updateRouteSrc = exports.getNextServerPath = exports.normalizeIndexOutput = exports.getStaticFiles = exports.onPrerenderRoute = exports.onPrerenderRouteInitial = exports.detectLambdaLimitExceeding = exports.outputFunctionFileSizeInfo = exports.getPageLambdaGroups = exports.MAX_UNCOMPRESSED_LAMBDA_SIZE = exports.addLocaleOrDefault = exports.normalizeLocalePath = exports.getPrerenderManifest = exports.getRequiredServerFilesManifest = exports.getExportStatus = exports.getExportIntent = exports.createLambdaFromPseudoLayers = exports.createPseudoLayer = exports.ExperimentalTraceVersion = exports.collectTracedFiles = exports.getFilesMapFromReasons = exports.filterStaticPages = exports.getImagesManifest = exports.localizeDynamicRoutes = exports.getDynamicRoutes = exports.getRoutesManifest = exports.prettyBytes = exports.MIB = exports.KIB = void 0;
+exports.isApiPage = exports.getOperationType = exports.upgradeMiddlewareManifest = exports.getMiddlewareManifest = exports.getFunctionsConfigManifest = exports.getMiddlewareBundle = exports.getSourceFilePathFromPage = exports.isDynamicRoute = exports.normalizePage = exports.getImagesConfig = exports.getNextConfig = exports.normalizePackageJson = exports.validateEntrypoint = exports.excludeFiles = exports.getPrivateOutputs = exports.updateRouteSrc = exports.getNextServerPath = exports.normalizeIndexOutput = exports.getStaticFiles = exports.onPrerenderRoute = exports.onPrerenderRouteInitial = exports.detectLambdaLimitExceeding = exports.outputFunctionFileSizeInfo = exports.getPageLambdaGroups = exports.MAX_UNCOMPRESSED_LAMBDA_SIZE = exports.addLocaleOrDefault = exports.normalizeLocalePath = exports.getPrerenderManifest = exports.getRequiredServerFilesManifest = exports.getExportStatus = exports.getExportIntent = exports.createLambdaFromPseudoLayers = exports.createPseudoLayer = exports.ExperimentalTraceVersion = exports.collectTracedFiles = exports.getFilesMapFromReasons = exports.filterStaticPages = exports.getImagesManifest = exports.localizeDynamicRoutes = exports.getDynamicRoutes = exports.getRoutesManifest = exports.prettyBytes = exports.MIB = exports.KIB = void 0;
 const build_utils_1 = __webpack_require__(3445);
 const async_sema_1 = __webpack_require__(7905);
 const buffer_crc32_1 = __importDefault(__webpack_require__(2227));
@@ -44682,7 +44698,7 @@ async function getDynamicRoutes(entryPath, entryDirectory, dynamicPages, isDev,
     return routes;
 }
 exports.getDynamicRoutes = getDynamicRoutes;
-function localizeDynamicRoutes(dynamicRoutes, dynamicPrefix, entryDirectory, staticPages, prerenderManifest, routesManifest, isServerMode, isCorrectLocaleAPIRoutes) {
+function localizeDynamicRoutes(dynamicRoutes, dynamicPrefix, entryDirectory, staticPages, prerenderManifest, routesManifest, isServerMode, isCorrectLocaleAPIRoutes, inversedAppPathRoutesManifest) {
     return dynamicRoutes.map((route) => {
         // i18n is already handled for middleware
         if (route.middleware !== undefined || route.middlewarePath !== undefined)
@@ -44695,9 +44711,12 @@ function localizeDynamicRoutes(dynamicRoutes, dynamicPrefix, entryDirectory, sta
             const isBlocking = prerenderManifest.blockingFallbackRoutes[pathname];
             const isApiRoute = pathnameNoPrefix === '/api' || pathnameNoPrefix?.startsWith('/api/');
             const isAutoExport = staticPages[addLocaleOrDefault(pathname, routesManifest).substring(1)];
+            const isAppRoute = inversedAppPathRoutesManifest?.[pathnameNoPrefix || ''];
             const isLocalePrefixed = isFallback || isBlocking || isAutoExport || isServerMode;
             route.src = route.src.replace('^', `^${dynamicPrefix ? `${dynamicPrefix}[/]?` : '[/]?'}(?${isLocalePrefixed ? '<nextLocale>' : ':'}${i18n.locales.map(locale => (0, escape_string_regexp_1.default)(locale)).join('|')})?`);
-            if (isLocalePrefixed && !(isCorrectLocaleAPIRoutes && isApiRoute)) {
+            if (isLocalePrefixed &&
+                !(isCorrectLocaleAPIRoutes && isApiRoute) &&
+                !isAppRoute) {
                 // ensure destination has locale prefix to match prerender output
                 // path so that the prerender object is used
                 route.dest = route.dest.replace(`${path_1.default.posix.join('/', entryDirectory, '/')}`, `${path_1.default.posix.join('/', entryDirectory, '$nextLocale', '/')}`);
@@ -45224,23 +45243,28 @@ exports.addLocaleOrDefault = addLocaleOrDefault;
 exports.MAX_UNCOMPRESSED_LAMBDA_SIZE = 250 * exports.MIB;
 const LAMBDA_RESERVED_UNCOMPRESSED_SIZE = 2.5 * exports.MIB;
 const LAMBDA_RESERVED_COMPRESSED_SIZE = 250 * exports.KIB;
-async function getPageLambdaGroups({ entryPath, config, pages, prerenderRoutes, pageTraces, compressedPages, tracedPseudoLayer, initialPseudoLayer, initialPseudoLayerUncompressed, lambdaCompressedByteLimit, internalPages, pageExtensions, }) {
+async function getPageLambdaGroups({ entryPath, config, functionsConfigManifest, pages, prerenderRoutes, pageTraces, compressedPages, tracedPseudoLayer, initialPseudoLayer, initialPseudoLayerUncompressed, lambdaCompressedByteLimit, internalPages, pageExtensions, }) {
     const groups = [];
     for (const page of pages) {
         const newPages = [...internalPages, page];
         const routeName = normalizePage(page.replace(/\.js$/, ''));
         const isPrerenderRoute = prerenderRoutes.has(routeName);
         let opts = {};
+        if (functionsConfigManifest &&
+            functionsConfigManifest.functions[routeName]) {
+            opts = functionsConfigManifest.functions[routeName];
+        }
         if (config && config.functions) {
             const sourceFile = await getSourceFilePathFromPage({
                 workPath: entryPath,
                 page,
                 pageExtensions,
             });
-            opts = await (0, build_utils_1.getLambdaOptionsFromFunction)({
+            const vercelConfigOpts = await (0, build_utils_1.getLambdaOptionsFromFunction)({
                 sourceFile,
                 config,
             });
+            opts = { ...vercelConfigOpts, ...opts };
         }
         let matchingGroup = groups.find(group => {
             const matches = group.maxDuration === opts.maxDuration &&
@@ -45474,7 +45498,7 @@ const onPrerenderRouteInitial = (prerenderManifest, canUsePreviewMode, entryDire
 exports.onPrerenderRouteInitial = onPrerenderRouteInitial;
 let prerenderGroup = 1;
 const onPrerenderRoute = (prerenderRouteArgs) => (routeKey, { isBlocking, isFallback, isOmitted, locale, }) => {
-    const { appDir, pagesDir, static404Page, entryDirectory, prerenderManifest, isSharedLambdas, isServerMode, canUsePreviewMode, lambdas, prerenders, pageLambdaMap, routesManifest, isCorrectNotFoundRoutes, isEmptyAllowQueryForPrendered, } = prerenderRouteArgs;
+    const { appDir, pagesDir, static404Page, localePrefixed404, entryDirectory, prerenderManifest, isSharedLambdas, isServerMode, canUsePreviewMode, lambdas, prerenders, pageLambdaMap, routesManifest, isCorrectNotFoundRoutes, isEmptyAllowQueryForPrendered, } = prerenderRouteArgs;
     if (isBlocking && isFallback) {
         throw new build_utils_1.NowBuildError({
             code: 'NEXT_ISBLOCKING_ISFALLBACK',
@@ -45574,7 +45598,9 @@ const onPrerenderRoute = (prerenderRouteArgs) => (routeKey, { isBlocking, isFall
                         : // Otherwise, the route itself should exist as a static HTML
                             // file.
                             `${isOmittedOrNotFound
-                                ? addLocaleOrDefault('/404', routesManifest, locale)
+                                ? localePrefixed404
+                                    ? addLocaleOrDefault('/404', routesManifest, locale)
+                                    : '/404'
                                 : routeFileNoExt}.html`),
                 });
     }
@@ -45586,7 +45612,9 @@ const onPrerenderRoute = (prerenderRouteArgs) => (routeKey, { isBlocking, isFall
             fsPath: path_1.default.join(isAppPathRoute && !isOmittedOrNotFound && appDir
                 ? appDir
                 : pagesDir, `${isOmittedOrNotFound
-                ? addLocaleOrDefault('/404.html', routesManifest, locale)
+                ? localePrefixed404
+                    ? addLocaleOrDefault('/404.html', routesManifest, locale)
+                    : '/404.html'
                 : isAppPathRoute
                     ? dataRoute
                     : routeFileNoExt + '.json'}`),
@@ -46053,7 +46081,9 @@ async function getMiddlewareBundle({ entryPath, outputDirectory, routesManifest,
                 shortPath = shortPath.replace(/^pages\//, '');
             }
             else if (shortPath.startsWith('app/') &&
-                (shortPath.endsWith('/page') || shortPath.endsWith('/route'))) {
+                (shortPath.endsWith('/page') ||
+                    shortPath.endsWith('/route') ||
+                    shortPath === 'app/_not-found')) {
                 const ogRoute = shortPath.replace(/^app\//, '/');
                 shortPath = (appPathRoutesManifest[ogRoute] ||
                     shortPath.replace(/(^|\/)(page|route)$/, '')).replace(/^\//, '');
@@ -46111,6 +46141,24 @@ async function getMiddlewareBundle({ entryPath, outputDirectory, routesManifest,
     };
 }
 exports.getMiddlewareBundle = getMiddlewareBundle;
+/**
+ * Attempts to read the functions config manifest from the pre-defined
+ * location. If the manifest can't be found it will resolve to
+ * undefined.
+ */
+async function getFunctionsConfigManifest(entryPath, outputDirectory) {
+    const functionConfigManifestPath = path_1.default.join(entryPath, outputDirectory, './server/functions-config-manifest.json');
+    const hasManifest = await fs_extra_1.default
+        .access(functionConfigManifestPath)
+        .then(() => true)
+        .catch(() => false);
+    if (!hasManifest) {
+        return;
+    }
+    const manifest = await fs_extra_1.default.readJSON(functionConfigManifestPath);
+    return manifest.version === 1 ? manifest : undefined;
+}
+exports.getFunctionsConfigManifest = getFunctionsConfigManifest;
 /**
  * Attempts to read the middleware manifest from the pre-defined
  * location. If the manifest can't be found it will resolve to

package/dist/server-build.js

@@ -21,7 +21,7 @@ const CORRECT_MIDDLEWARE_ORDER_VERSION = 'v12.1.7-canary.29';
 const NEXT_DATA_MIDDLEWARE_RESOLVING_VERSION = 'v12.1.7-canary.33';
 const EMPTY_ALLOW_QUERY_FOR_PRERENDERED_VERSION = 'v12.2.0';
 const CORRECTED_MANIFESTS_VERSION = 'v12.2.0';
-async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs, baseDir, workPath, entryPath, nodeVersion, buildId, escapedBuildId, dynamicPrefix, entryDirectory, outputDirectory, redirects, beforeFilesRewrites, afterFilesRewrites, fallbackRewrites, headers, dataRoutes, hasIsr404Page, hasIsr500Page, imagesManifest, wildcardConfig, routesManifest, staticPages, lambdaPages, nextVersion, lambdaAppPaths, canUsePreviewMode, trailingSlash, prerenderManifest, appPathRoutesManifest, omittedPrerenderRoutes, trailingSlashRedirects, isCorrectLocaleAPIRoutes, lambdaCompressedByteLimit, requiredServerFilesManifest, }) {
+async function serverBuild({ dynamicPages, pagesDir, config = {}, functionsConfigManifest, privateOutputs, baseDir, workPath, entryPath, nodeVersion, buildId, escapedBuildId, dynamicPrefix, entryDirectory, outputDirectory, redirects, beforeFilesRewrites, afterFilesRewrites, fallbackRewrites, headers, dataRoutes, hasIsr404Page, hasIsr500Page, imagesManifest, wildcardConfig, routesManifest, staticPages, lambdaPages, nextVersion, lambdaAppPaths, canUsePreviewMode, trailingSlash, prerenderManifest, appPathRoutesManifest, omittedPrerenderRoutes, trailingSlashRedirects, isCorrectLocaleAPIRoutes, lambdaCompressedByteLimit, requiredServerFilesManifest, }) {
     lambdaPages = Object.assign({}, lambdaPages, lambdaAppPaths);
     const lambdas = {};
     const prerenders = {};
@@ -63,15 +63,17 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
     };
     const { i18n } = routesManifest;
     const hasPages404 = routesManifest.pages404;
+    let localePrefixed404 = false;
     let static404Page = staticPages[path_1.default.posix.join(entryDirectory, '404')] && hasPages404
         ? path_1.default.posix.join(entryDirectory, '404')
         : staticPages[path_1.default.posix.join(entryDirectory, '_errors/404')]
             ? path_1.default.posix.join(entryDirectory, '_errors/404')
             : undefined;
     if (!static404Page && i18n) {
-        static404Page = staticPages[path_1.default.posix.join(entryDirectory, i18n.defaultLocale, '404')]
-            ? path_1.default.posix.join(entryDirectory, i18n.defaultLocale, '404')
-            : undefined;
+        if (staticPages[path_1.default.posix.join(entryDirectory, i18n.defaultLocale, '404')]) {
+            localePrefixed404 = true;
+            static404Page = path_1.default.posix.join(entryDirectory, i18n.defaultLocale, '404');
+        }
     }
     if (!hasStatic500 && i18n) {
         hasStatic500 =
@@ -395,6 +397,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
         const pageLambdaGroups = await (0, utils_1.getPageLambdaGroups)({
             entryPath: projectDir,
             config,
+            functionsConfigManifest,
             pages: nonApiPages,
             prerenderRoutes,
             pageTraces,
@@ -409,6 +412,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
         const appRouterLambdaGroups = await (0, utils_1.getPageLambdaGroups)({
             entryPath: projectDir,
             config,
+            functionsConfigManifest,
             pages: appRouterPages,
             prerenderRoutes,
             pageTraces,
@@ -429,6 +433,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
         const apiLambdaGroups = await (0, utils_1.getPageLambdaGroups)({
             entryPath: projectDir,
             config,
+            functionsConfigManifest,
             pages: apiPages,
             prerenderRoutes,
             pageTraces,
@@ -557,6 +562,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                 // this is handled in onPrerenderRoute for SSG pages
                 if (i18n &&
                     !isPrerender &&
+                    !group.isAppRouter &&
                     (!isCorrectLocaleAPIRoutes ||
                         !(pageNoExt === 'api' || pageNoExt.startsWith('api/')))) {
                     for (const locale of i18n.locales) {
@@ -584,6 +590,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
         isSharedLambdas: false,
         canUsePreviewMode,
         static404Page,
+        localePrefixed404,
         hasPages404: routesManifest.pages404,
         isCorrectNotFoundRoutes,
         isEmptyAllowQueryForPrendered,
@@ -614,7 +621,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, inversedAppPathManifest).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, inversedAppPathManifest));
     const { staticFiles, publicDirectoryFiles, staticDirectoryFiles } = await (0, utils_1.getStaticFiles)(entryPath, entryDirectory, outputDirectory);
     const normalizeNextDataRoute = (isOverride = false) => {
         return isNextDataServerResolving
@@ -712,6 +719,7 @@ 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 appNotFoundPath = path_1.default.posix.join('.', entryDirectory, '_not-found');
     return {
         wildcard: wildcardConfig,
         images: (0, utils_1.getImagesConfig)(imagesManifest),
@@ -1132,7 +1140,11 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                             hasIsr404Page ||
                             lambdas[path_1.default.posix.join(entryDirectory, '404')]
                             ? '/404'
-                            : '/_error'),
+                            : appPathRoutesManifest &&
+                                (middleware.edgeFunctions[appNotFoundPath] ||
+                                    lambdas[appNotFoundPath])
+                                ? '/_not-found'
+                                : '/_error'),
                         status: 404,
                     },
                 ]),

package/dist/utils.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isApiPage = exports.getOperationType = exports.upgradeMiddlewareManifest = exports.getMiddlewareManifest = exports.getMiddlewareBundle = exports.getSourceFilePathFromPage = exports.isDynamicRoute = exports.normalizePage = exports.getImagesConfig = exports.getNextConfig = exports.normalizePackageJson = exports.validateEntrypoint = exports.excludeFiles = exports.getPrivateOutputs = exports.updateRouteSrc = exports.getNextServerPath = exports.normalizeIndexOutput = exports.getStaticFiles = exports.onPrerenderRoute = exports.onPrerenderRouteInitial = exports.detectLambdaLimitExceeding = exports.outputFunctionFileSizeInfo = exports.getPageLambdaGroups = exports.MAX_UNCOMPRESSED_LAMBDA_SIZE = exports.addLocaleOrDefault = exports.normalizeLocalePath = exports.getPrerenderManifest = exports.getRequiredServerFilesManifest = exports.getExportStatus = exports.getExportIntent = exports.createLambdaFromPseudoLayers = exports.createPseudoLayer = exports.ExperimentalTraceVersion = exports.collectTracedFiles = exports.getFilesMapFromReasons = exports.filterStaticPages = exports.getImagesManifest = exports.localizeDynamicRoutes = exports.getDynamicRoutes = exports.getRoutesManifest = exports.prettyBytes = exports.MIB = exports.KIB = void 0;
+exports.isApiPage = exports.getOperationType = exports.upgradeMiddlewareManifest = exports.getMiddlewareManifest = exports.getFunctionsConfigManifest = exports.getMiddlewareBundle = exports.getSourceFilePathFromPage = exports.isDynamicRoute = exports.normalizePage = exports.getImagesConfig = exports.getNextConfig = exports.normalizePackageJson = exports.validateEntrypoint = exports.excludeFiles = exports.getPrivateOutputs = exports.updateRouteSrc = exports.getNextServerPath = exports.normalizeIndexOutput = exports.getStaticFiles = exports.onPrerenderRoute = exports.onPrerenderRouteInitial = exports.detectLambdaLimitExceeding = exports.outputFunctionFileSizeInfo = exports.getPageLambdaGroups = exports.MAX_UNCOMPRESSED_LAMBDA_SIZE = exports.addLocaleOrDefault = exports.normalizeLocalePath = exports.getPrerenderManifest = exports.getRequiredServerFilesManifest = exports.getExportStatus = exports.getExportIntent = exports.createLambdaFromPseudoLayers = exports.createPseudoLayer = exports.ExperimentalTraceVersion = exports.collectTracedFiles = exports.getFilesMapFromReasons = exports.filterStaticPages = exports.getImagesManifest = exports.localizeDynamicRoutes = exports.getDynamicRoutes = exports.getRoutesManifest = exports.prettyBytes = exports.MIB = exports.KIB = void 0;
 const build_utils_1 = require("@vercel/build-utils");
 const async_sema_1 = require("async-sema");
 const buffer_crc32_1 = __importDefault(require("buffer-crc32"));
@@ -328,7 +328,7 @@ async function getDynamicRoutes(entryPath, entryDirectory, dynamicPages, isDev,
     return routes;
 }
 exports.getDynamicRoutes = getDynamicRoutes;
-function localizeDynamicRoutes(dynamicRoutes, dynamicPrefix, entryDirectory, staticPages, prerenderManifest, routesManifest, isServerMode, isCorrectLocaleAPIRoutes) {
+function localizeDynamicRoutes(dynamicRoutes, dynamicPrefix, entryDirectory, staticPages, prerenderManifest, routesManifest, isServerMode, isCorrectLocaleAPIRoutes, inversedAppPathRoutesManifest) {
     return dynamicRoutes.map((route) => {
         // i18n is already handled for middleware
         if (route.middleware !== undefined || route.middlewarePath !== undefined)
@@ -341,9 +341,12 @@ function localizeDynamicRoutes(dynamicRoutes, dynamicPrefix, entryDirectory, sta
             const isBlocking = prerenderManifest.blockingFallbackRoutes[pathname];
             const isApiRoute = pathnameNoPrefix === '/api' || pathnameNoPrefix?.startsWith('/api/');
             const isAutoExport = staticPages[addLocaleOrDefault(pathname, routesManifest).substring(1)];
+            const isAppRoute = inversedAppPathRoutesManifest?.[pathnameNoPrefix || ''];
             const isLocalePrefixed = isFallback || isBlocking || isAutoExport || isServerMode;
             route.src = route.src.replace('^', `^${dynamicPrefix ? `${dynamicPrefix}[/]?` : '[/]?'}(?${isLocalePrefixed ? '<nextLocale>' : ':'}${i18n.locales.map(locale => (0, escape_string_regexp_1.default)(locale)).join('|')})?`);
-            if (isLocalePrefixed && !(isCorrectLocaleAPIRoutes && isApiRoute)) {
+            if (isLocalePrefixed &&
+                !(isCorrectLocaleAPIRoutes && isApiRoute) &&
+                !isAppRoute) {
                 // ensure destination has locale prefix to match prerender output
                 // path so that the prerender object is used
                 route.dest = route.dest.replace(`${path_1.default.posix.join('/', entryDirectory, '/')}`, `${path_1.default.posix.join('/', entryDirectory, '$nextLocale', '/')}`);
@@ -870,23 +873,28 @@ exports.addLocaleOrDefault = addLocaleOrDefault;
 exports.MAX_UNCOMPRESSED_LAMBDA_SIZE = 250 * exports.MIB;
 const LAMBDA_RESERVED_UNCOMPRESSED_SIZE = 2.5 * exports.MIB;
 const LAMBDA_RESERVED_COMPRESSED_SIZE = 250 * exports.KIB;
-async function getPageLambdaGroups({ entryPath, config, pages, prerenderRoutes, pageTraces, compressedPages, tracedPseudoLayer, initialPseudoLayer, initialPseudoLayerUncompressed, lambdaCompressedByteLimit, internalPages, pageExtensions, }) {
+async function getPageLambdaGroups({ entryPath, config, functionsConfigManifest, pages, prerenderRoutes, pageTraces, compressedPages, tracedPseudoLayer, initialPseudoLayer, initialPseudoLayerUncompressed, lambdaCompressedByteLimit, internalPages, pageExtensions, }) {
     const groups = [];
     for (const page of pages) {
         const newPages = [...internalPages, page];
         const routeName = normalizePage(page.replace(/\.js$/, ''));
         const isPrerenderRoute = prerenderRoutes.has(routeName);
         let opts = {};
+        if (functionsConfigManifest &&
+            functionsConfigManifest.functions[routeName]) {
+            opts = functionsConfigManifest.functions[routeName];
+        }
         if (config && config.functions) {
             const sourceFile = await getSourceFilePathFromPage({
                 workPath: entryPath,
                 page,
                 pageExtensions,
             });
-            opts = await (0, build_utils_1.getLambdaOptionsFromFunction)({
+            const vercelConfigOpts = await (0, build_utils_1.getLambdaOptionsFromFunction)({
                 sourceFile,
                 config,
             });
+            opts = { ...vercelConfigOpts, ...opts };
         }
         let matchingGroup = groups.find(group => {
             const matches = group.maxDuration === opts.maxDuration &&
@@ -1120,7 +1128,7 @@ const onPrerenderRouteInitial = (prerenderManifest, canUsePreviewMode, entryDire
 exports.onPrerenderRouteInitial = onPrerenderRouteInitial;
 let prerenderGroup = 1;
 const onPrerenderRoute = (prerenderRouteArgs) => (routeKey, { isBlocking, isFallback, isOmitted, locale, }) => {
-    const { appDir, pagesDir, static404Page, entryDirectory, prerenderManifest, isSharedLambdas, isServerMode, canUsePreviewMode, lambdas, prerenders, pageLambdaMap, routesManifest, isCorrectNotFoundRoutes, isEmptyAllowQueryForPrendered, } = prerenderRouteArgs;
+    const { appDir, pagesDir, static404Page, localePrefixed404, entryDirectory, prerenderManifest, isSharedLambdas, isServerMode, canUsePreviewMode, lambdas, prerenders, pageLambdaMap, routesManifest, isCorrectNotFoundRoutes, isEmptyAllowQueryForPrendered, } = prerenderRouteArgs;
     if (isBlocking && isFallback) {
         throw new build_utils_1.NowBuildError({
             code: 'NEXT_ISBLOCKING_ISFALLBACK',
@@ -1220,7 +1228,9 @@ const onPrerenderRoute = (prerenderRouteArgs) => (routeKey, { isBlocking, isFall
                         : // Otherwise, the route itself should exist as a static HTML
                             // file.
                             `${isOmittedOrNotFound
-                                ? addLocaleOrDefault('/404', routesManifest, locale)
+                                ? localePrefixed404
+                                    ? addLocaleOrDefault('/404', routesManifest, locale)
+                                    : '/404'
                                 : routeFileNoExt}.html`),
                 });
     }
@@ -1232,7 +1242,9 @@ const onPrerenderRoute = (prerenderRouteArgs) => (routeKey, { isBlocking, isFall
             fsPath: path_1.default.join(isAppPathRoute && !isOmittedOrNotFound && appDir
                 ? appDir
                 : pagesDir, `${isOmittedOrNotFound
-                ? addLocaleOrDefault('/404.html', routesManifest, locale)
+                ? localePrefixed404
+                    ? addLocaleOrDefault('/404.html', routesManifest, locale)
+                    : '/404.html'
                 : isAppPathRoute
                     ? dataRoute
                     : routeFileNoExt + '.json'}`),
@@ -1699,7 +1711,9 @@ async function getMiddlewareBundle({ entryPath, outputDirectory, routesManifest,
                 shortPath = shortPath.replace(/^pages\//, '');
             }
             else if (shortPath.startsWith('app/') &&
-                (shortPath.endsWith('/page') || shortPath.endsWith('/route'))) {
+                (shortPath.endsWith('/page') ||
+                    shortPath.endsWith('/route') ||
+                    shortPath === 'app/_not-found')) {
                 const ogRoute = shortPath.replace(/^app\//, '/');
                 shortPath = (appPathRoutesManifest[ogRoute] ||
                     shortPath.replace(/(^|\/)(page|route)$/, '')).replace(/^\//, '');
@@ -1757,6 +1771,24 @@ async function getMiddlewareBundle({ entryPath, outputDirectory, routesManifest,
     };
 }
 exports.getMiddlewareBundle = getMiddlewareBundle;
+/**
+ * Attempts to read the functions config manifest from the pre-defined
+ * location. If the manifest can't be found it will resolve to
+ * undefined.
+ */
+async function getFunctionsConfigManifest(entryPath, outputDirectory) {
+    const functionConfigManifestPath = path_1.default.join(entryPath, outputDirectory, './server/functions-config-manifest.json');
+    const hasManifest = await fs_extra_1.default
+        .access(functionConfigManifestPath)
+        .then(() => true)
+        .catch(() => false);
+    if (!hasManifest) {
+        return;
+    }
+    const manifest = await fs_extra_1.default.readJSON(functionConfigManifestPath);
+    return manifest.version === 1 ? manifest : undefined;
+}
+exports.getFunctionsConfigManifest = getFunctionsConfigManifest;
 /**
  * Attempts to read the middleware manifest from the pre-defined
  * location. If the manifest can't be found it will resolve to

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/next",
-  "version": "3.8.8",
+  "version": "3.9.1",
   "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.8.0",
+    "@vercel/build-utils": "6.8.2",
     "@vercel/nft": "0.22.5",
     "@vercel/routing-utils": "2.2.1",
     "async-sema": "3.0.1",