@vercel/next 3.1.19 → 3.1.22

package/dist/index.js

@@ -12114,7 +12114,7 @@ async function analyze(id, code, job) {
                 .filter(name => !excludeAssetExtensions.has(path_1.default.extname(name)) &&
                 !excludeAssetFiles.has(path_1.default.basename(name)) &&
                 !name.endsWith('/'))
-                .forEach(file => assets.add(file));
+                .forEach(file => deps.add(file));
         });
     }
     async function processRequireArg(expression, isImport = false) {
@@ -12147,7 +12147,7 @@ async function analyze(id, code, job) {
     let scope = rollup_pluginutils_1.attachScopes(ast, 'scope');
     if (isAst(ast)) {
         wrappers_1.handleWrappers(ast);
-        await special_cases_1.default({ id, ast, emitAsset: path => assets.add(path), emitAssetDirectory, job });
+        await special_cases_1.default({ id, ast, emitDependency: path => deps.add(path), emitAsset: path => assets.add(path), emitAssetDirectory, job });
     }
     async function backtrack(parent, context) {
         // computing a static expression outward
@@ -12234,6 +12234,18 @@ async function analyze(id, code, job) {
                     await processRequireArg(node.arguments[0]);
                     return;
                 }
+                else if ((!isESM || job.mixedModules) &&
+                    node.callee.type === 'MemberExpression' &&
+                    node.callee.object.type === 'Identifier' &&
+                    node.callee.object.name === 'require' &&
+                    knownBindings.require.shadowDepth === 0 &&
+                    node.callee.property.type === 'Identifier' &&
+                    !node.callee.computed &&
+                    node.callee.property.name === 'resolve' &&
+                    node.arguments.length) {
+                    await processRequireArg(node.arguments[0]);
+                    return;
+                }
                 const calleeValue = job.analysis.evaluatePureExpressions && await computePureStaticValue(node.callee, false);
                 // if we have a direct pure static function,
                 // and that function has a [TRIGGER] symbol -> trigger asset emission from it
@@ -12918,12 +12930,15 @@ class Job {
             return;
         if (path.endsWith('.node'))
             return await sharedlib_emit_1.sharedLibEmit(path, this);
-        // js files require the "type": "module" lookup, so always emit the package.json
-        if (path.endsWith('.js')) {
-            const pjsonBoundary = await this.getPjsonBoundary(path);
-            if (pjsonBoundary)
-                await this.emitFile(pjsonBoundary + path_1.sep + 'package.json', 'resolve', path);
-        }
+        const handlePjsonBoundary = async (item) => {
+            // js files require the "type": "module" lookup, so always emit the package.json
+            if (item.endsWith(".js")) {
+                const pjsonBoundary = await this.getPjsonBoundary(item);
+                if (pjsonBoundary)
+                    await this.emitFile(pjsonBoundary + path_1.sep + "package.json", "resolve", item);
+            }
+        };
+        await handlePjsonBoundary(path);
         let analyzeResult;
         const cachedAnalysis = this.analysisCache.get(path);
         if (cachedAnalysis) {
@@ -12933,6 +12948,9 @@ class Job {
             const source = await this.readFile(path);
             if (source === null)
                 throw new Error('File ' + path + ' does not exist.');
+            // analyze should not have any side-effects e.g. calling `job.emitFile` 
+            // directly as this will not be included in the cachedAnalysis and won't
+            // be emit for successive runs that leverage the cache
             analyzeResult = await analyze_1.default(path, source.toString(), this);
             this.analysisCache.set(path, analyzeResult);
         }
@@ -12941,12 +12959,8 @@ class Job {
             this.esmFileList.add(path_1.relative(this.base, path));
         await Promise.all([
             ...[...assets].map(async (asset) => {
-                const ext = path_1.extname(asset);
-                if (ext === '.js' || ext === '.mjs' || ext === '.node' || ext === '' ||
-                    this.ts && (ext === '.ts' || ext === '.tsx') && asset.startsWith(this.base) && asset.slice(this.base.length).indexOf(path_1.sep + 'node_modules' + path_1.sep) === -1)
-                    await this.emitDependency(asset, path);
-                else
-                    await this.emitFile(asset, 'asset', path);
+                await handlePjsonBoundary(asset);
+                await this.emitFile(asset, 'asset', path);
             }),
             ...[...deps].map(async (dep) => {
                 try {
@@ -13777,18 +13791,18 @@ const specialCases = {
             emitAsset(path_1.resolve(path_1.dirname(id), '../data/geo.dat'));
         }
     },
-    'pixelmatch'({ id, emitAsset }) {
+    'pixelmatch'({ id, emitDependency }) {
         if (id.endsWith('pixelmatch/index.js')) {
-            emitAsset(path_1.resolve(path_1.dirname(id), 'bin/pixelmatch'));
+            emitDependency(path_1.resolve(path_1.dirname(id), 'bin/pixelmatch'));
         }
     }
 };
-async function handleSpecialCases({ id, ast, emitAsset, emitAssetDirectory, job }) {
+async function handleSpecialCases({ id, ast, emitDependency, emitAsset, emitAssetDirectory, job }) {
     const pkgName = get_package_base_1.getPackageName(id);
     const specialCase = specialCases[pkgName || ''];
     id = id.replace(/\\/g, '/');
     if (specialCase)
-        await specialCase({ id, ast, emitAsset, emitAssetDirectory, job });
+        await specialCase({ id, ast, emitDependency, emitAsset, emitAssetDirectory, job });
 }
 exports.default = handleSpecialCases;
 ;
@@ -42910,6 +42924,10 @@ const build = async ({ files, workPath, repoRootPath, entrypoint, config = {}, m
         ? // eslint-disable-next-line @typescript-eslint/no-non-null-asserted-optional-chain
             path_1.default.join('/', routesManifest?.i18n.defaultLocale, '/404')
         : '/404']?.initialRevalidate === 'number';
+    const hasIsr500Page = typeof prerenderManifest.staticRoutes[routesManifest?.i18n
+        ? // eslint-disable-next-line @typescript-eslint/no-non-null-asserted-optional-chain
+            path_1.default.join('/', routesManifest?.i18n.defaultLocale, '/500')
+        : '/500']?.initialRevalidate === 'number';
     const wildcardConfig = routesManifest?.i18n?.domains && routesManifest.i18n.domains.length > 0
         ? routesManifest.i18n.domains.map(item => {
             return {
@@ -43287,7 +43305,7 @@ const build = async ({ files, workPath, repoRootPath, entrypoint, config = {}, m
             nextFiles['next.config.js'] = filesAfterBuild['next.config.js'];
         }
         const pagesDir = path_1.default.join(entryPath, outputDirectory, 'server', 'static', buildId, 'pages');
-        const pages = await getServerlessPages({
+        const { pages } = await getServerlessPages({
             pagesDir,
             entryPath,
             outputDirectory,
@@ -43337,10 +43355,12 @@ const build = async ({ files, workPath, repoRootPath, entrypoint, config = {}, m
     else {
         (0, build_utils_1.debug)('Preparing serverless function files...');
         const pagesDir = path_1.default.join(entryPath, outputDirectory, isServerMode ? 'server' : 'serverless', 'pages');
-        const pages = await getServerlessPages({
+        const appPathRoutesManifest = await (0, fs_extra_1.readJSON)(path_1.default.join(entryPath, outputDirectory, 'app-path-routes-manifest.json')).catch(() => null);
+        const { pages, appPaths: lambdaAppPaths } = await getServerlessPages({
             pagesDir,
             entryPath,
             outputDirectory,
+            appPathRoutesManifest,
         });
         const isApiPage = (page) => page
             .replace(/\\/g, '/')
@@ -43470,10 +43490,12 @@ const build = async ({ files, workPath, repoRootPath, entrypoint, config = {}, m
                 config,
                 nextVersion,
                 trailingSlash,
+                appPathRoutesManifest,
                 dynamicPages,
                 canUsePreviewMode,
                 staticPages,
                 lambdaPages: pages,
+                lambdaAppPaths,
                 omittedPrerenderRoutes,
                 isCorrectLocaleAPIRoutes,
                 pagesDir,
@@ -43501,6 +43523,7 @@ const build = async ({ files, workPath, repoRootPath, entrypoint, config = {}, m
                 requiredServerFilesManifest,
                 privateOutputs,
                 hasIsr404Page,
+                hasIsr500Page,
             });
         }
         // > 1 because _error is a lambda but isn't used if a static 404 is available
@@ -44438,15 +44461,30 @@ const prepareCache = async ({ workPath, repoRootPath, entrypoint, config = {}, }
 };
 exports.prepareCache = prepareCache;
 async function getServerlessPages(params) {
-    const [pages, middlewareManifest] = await Promise.all([
+    const [pages, appPaths, middlewareManifest] = await Promise.all([
         (0, build_utils_1.glob)('**/!(_middleware).js', params.pagesDir),
+        params.appPathRoutesManifest
+            ? (0, build_utils_1.glob)('**/page.js', path_1.default.join(params.pagesDir, '../app'))
+            : Promise.resolve({}),
         (0, utils_1.getMiddlewareManifest)(params.entryPath, params.outputDirectory),
     ]);
+    const normalizedAppPaths = {};
+    if (params.appPathRoutesManifest) {
+        for (const [entry, normalizedEntry] of Object.entries(params.appPathRoutesManifest)) {
+            const normalizedPath = `${path_1.default.join('.', normalizedEntry)}.js`;
+            const globPath = `${path_1.default.join('.', entry)}.js`;
+            if (appPaths[globPath]) {
+                normalizedAppPaths[normalizedPath] = appPaths[globPath];
+            }
+        }
+    }
     // Edge Functions do not consider as Serverless Functions
     for (const edgeFunctionFile of Object.keys(middlewareManifest?.functions ?? {})) {
-        delete pages[edgeFunctionFile.slice(1) + '.js'];
+        const edgePath = edgeFunctionFile.slice(1) + '.js';
+        delete normalizedAppPaths[edgePath];
+        delete pages[edgePath];
     }
-    return pages;
+    return { pages, appPaths: normalizedAppPaths };
 }
 
 
@@ -44825,13 +44863,20 @@ 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, imagesManifest, wildcardConfig, routesManifest, staticPages, lambdaPages, nextVersion, canUsePreviewMode, trailingSlash, prerenderManifest, omittedPrerenderRoutes, trailingSlashRedirects, isCorrectLocaleAPIRoutes, lambdaCompressedByteLimit, requiredServerFilesManifest, }) {
+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, }) {
+    lambdaPages = Object.assign({}, lambdaPages, lambdaAppPaths);
     const lambdas = {};
     const prerenders = {};
     const lambdaPageKeys = Object.keys(lambdaPages);
     const internalPages = ['_app.js', '_error.js', '_document.js'];
     const pageBuildTraces = await (0, build_utils_1.glob)('**/*.js.nft.json', pagesDir);
     const isEmptyAllowQueryForPrendered = semver_1.default.gte(nextVersion, EMPTY_ALLOW_QUERY_FOR_PRERENDERED_VERSION);
+    let appBuildTraces = {};
+    let appDir = null;
+    if (appPathRoutesManifest) {
+        appDir = path_1.default.join(pagesDir, '../app');
+        appBuildTraces = await (0, build_utils_1.glob)('**/*.js.nft.json', appDir);
+    }
     const isCorrectNotFoundRoutes = semver_1.default.gte(nextVersion, CORRECT_NOT_FOUND_ROUTES_VERSION);
     const isCorrectMiddlewareOrder = semver_1.default.gte(nextVersion, CORRECT_MIDDLEWARE_ORDER_VERSION);
     const isCorrectManifests = semver_1.default.gte(nextVersion, CORRECTED_MANIFESTS_VERSION);
@@ -45068,9 +45113,21 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
         const compressedPages = {};
         const mergedPageKeys = [...nonApiPages, ...apiPages, ...internalPages];
         const traceCache = {};
+        const getOriginalPagePath = (page) => {
+            let originalPagePath = page;
+            if (appDir && lambdaAppPaths[page]) {
+                const { fsPath } = lambdaAppPaths[page];
+                originalPagePath = path_1.default.relative(appDir, fsPath);
+            }
+            return originalPagePath;
+        };
+        const getBuildTraceFile = (page) => {
+            return (pageBuildTraces[page + '.nft.json'] ||
+                appBuildTraces[page + '.nft.json']);
+        };
         const pathsToTrace = mergedPageKeys
             .map(page => {
-            if (!pageBuildTraces[page + '.nft.json']) {
+            if (!getBuildTraceFile(page)) {
                 return lambdaPages[page].fsPath;
             }
         })
@@ -45088,13 +45145,31 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
         }
         for (const page of mergedPageKeys) {
             const tracedFiles = {};
-            const pageBuildTrace = pageBuildTraces[page + '.nft.json'];
+            const originalPagePath = getOriginalPagePath(page);
+            const pageBuildTrace = getBuildTraceFile(originalPagePath);
             let fileList;
             let reasons;
             if (pageBuildTrace) {
                 const { files } = JSON.parse(await fs_extra_1.default.readFile(pageBuildTrace.fsPath, 'utf8'));
+                // TODO: this will be moved to a separate worker in the future
+                // although currently this is needed in the lambda
+                const isAppPath = appDir && lambdaAppPaths[page];
+                const serverComponentFile = isAppPath
+                    ? pageBuildTrace.fsPath.replace(/\.js\.nft\.json$/, '.__sc_client__.js')
+                    : null;
+                if (serverComponentFile && (await fs_extra_1.default.pathExists(serverComponentFile))) {
+                    files.push(path_1.default.relative(path_1.default.dirname(pageBuildTrace.fsPath), serverComponentFile));
+                    try {
+                        const scTrace = JSON.parse(await fs_extra_1.default.readFile(`${serverComponentFile}.nft.json`, 'utf8'));
+                        scTrace.files.forEach((file) => files.push(file));
+                    }
+                    catch (err) {
+                        /* non-fatal for now */
+                    }
+                }
                 fileList = [];
-                const pageDir = path_1.default.dirname(path_1.default.join(pagesDir, page));
+                const curPagesDir = isAppPath && appDir ? appDir : pagesDir;
+                const pageDir = path_1.default.dirname(path_1.default.join(curPagesDir, originalPagePath));
                 const normalizedBaseDir = `${baseDir}${baseDir.endsWith('/') ? '' : '/'}`;
                 files.forEach((file) => {
                     const absolutePath = path_1.default.join(pageDir, file);
@@ -45671,7 +45746,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                         .map(route => {
                         route = Object.assign({}, route);
                         route.src = path_1.default.posix.join('^/', entryDirectory, '_next/data/', escapedBuildId, route.src.replace(/(^\^|\$$)/g, '') + '.json$');
-                        const { pathname } = new URL(route.dest || '/', 'http://n');
+                        const { pathname, search } = new URL(route.dest || '/', 'http://n');
                         let isPrerender = !!prerenders[path_1.default.join('./', pathname)];
                         if (routesManifest.i18n) {
                             for (const locale of routesManifest.i18n?.locales || []) {
@@ -45683,7 +45758,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                             }
                         }
                         if (isPrerender) {
-                            route.dest = `/_next/data/${buildId}${pathname}.json`;
+                            route.dest = `/_next/data/${buildId}${pathname}.json${search || ''}`;
                         }
                         return route;
                     })
@@ -45784,31 +45859,34 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                         status: 404,
                     },
                 ]),
-            // static 500 page if present
-            ...(!hasStatic500
-                ? []
-                : i18n
-                    ? [
-                        {
-                            src: `${path_1.default.join('/', entryDirectory, '/')}(?<nextLocale>${i18n.locales
-                                .map(locale => (0, escape_string_regexp_1.default)(locale))
-                                .join('|')})(/.*|$)`,
-                            dest: path_1.default.join('/', entryDirectory, '/$nextLocale/500'),
-                            status: 500,
-                        },
-                        {
-                            src: path_1.default.join('/', entryDirectory, '.*'),
-                            dest: path_1.default.join('/', entryDirectory, `/${i18n.defaultLocale}/500`),
-                            status: 500,
-                        },
-                    ]
-                    : [
-                        {
-                            src: path_1.default.join('/', entryDirectory, '.*'),
-                            dest: path_1.default.join('/', entryDirectory, '/500'),
-                            status: 500,
-                        },
-                    ]),
+            // custom 500 page if present
+            ...(i18n && (hasStatic500 || hasIsr500Page || lambdaPages['500.js'])
+                ? [
+                    {
+                        src: `${path_1.default.join('/', entryDirectory, '/')}(?<nextLocale>${i18n.locales
+                            .map(locale => (0, escape_string_regexp_1.default)(locale))
+                            .join('|')})(/.*|$)`,
+                        dest: path_1.default.join('/', entryDirectory, '/$nextLocale/500'),
+                        status: 500,
+                        caseSensitive: true,
+                    },
+                    {
+                        src: path_1.default.join('/', entryDirectory, '.*'),
+                        dest: path_1.default.join('/', entryDirectory, `/${i18n.defaultLocale}/500`),
+                        status: 500,
+                    },
+                ]
+                : [
+                    {
+                        src: path_1.default.join('/', entryDirectory, '.*'),
+                        dest: path_1.default.join('/', entryDirectory, hasStatic500 ||
+                            hasIsr500Page ||
+                            lambdas[path_1.default.join(entryDirectory, '500')]
+                            ? '/500'
+                            : '/_error'),
+                        status: 500,
+                    },
+                ]),
         ],
     };
 }
@@ -45942,7 +46020,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.getMiddlewareManifest = exports.getMiddlewareBundle = exports.getSourceFilePathFromPage = exports.isDynamicRoute = exports.normalizePage = 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 = void 0;
+exports.upgradeMiddlewareManifest = exports.getMiddlewareManifest = exports.getMiddlewareBundle = exports.getSourceFilePathFromPage = exports.isDynamicRoute = exports.normalizePage = 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 = void 0;
 const build_utils_1 = __webpack_require__(3445);
 const async_sema_1 = __webpack_require__(7916);
 const buffer_crc32_1 = __importDefault(__webpack_require__(360));
@@ -47359,7 +47437,7 @@ async function getMiddlewareBundle({ entryPath, outputDirectory, routesManifest,
                             }),
                         });
                     })(),
-                    routeSrc: getRouteSrc(edgeFunction, routesManifest),
+                    routeMatchers: getRouteMatchers(edgeFunction, routesManifest),
                 };
             }
             catch (e) {
@@ -47382,26 +47460,29 @@ async function getMiddlewareBundle({ entryPath, outputDirectory, routesManifest,
             if (worker.type === 'function') {
                 continue;
             }
-            const route = {
-                continue: true,
-                src: worker.routeSrc,
-                missing: [
-                    {
-                        type: 'header',
-                        key: 'x-prerender-revalidate',
-                        value: prerenderBypassToken,
-                    },
-                ],
-            };
-            route.middlewarePath = shortPath;
-            if (isCorrectMiddlewareOrder) {
-                route.override = true;
-            }
-            if (routesManifest.version > 3 && isDynamicRoute(worker.page)) {
-                source.dynamicRouteMap.set(worker.page, route);
-            }
-            else {
-                source.staticRoutes.push(route);
+            for (const matcher of worker.routeMatchers) {
+                const route = {
+                    continue: true,
+                    src: matcher.regexp,
+                    has: matcher.has,
+                    missing: [
+                        {
+                            type: 'header',
+                            key: 'x-prerender-revalidate',
+                            value: prerenderBypassToken,
+                        },
+                    ],
+                };
+                route.middlewarePath = shortPath;
+                if (isCorrectMiddlewareOrder) {
+                    route.override = true;
+                }
+                if (routesManifest.version > 3 && isDynamicRoute(worker.page)) {
+                    source.dynamicRouteMap.set(worker.page, route);
+                }
+                else {
+                    source.staticRoutes.push(route);
+                }
             }
         }
         return source;
@@ -47427,28 +47508,70 @@ async function getMiddlewareManifest(entryPath, outputDirectory) {
     if (!hasManifest) {
         return;
     }
-    return fs_extra_1.default.readJSON(middlewareManifestPath);
+    const manifest = (await fs_extra_1.default.readJSON(middlewareManifestPath));
+    return manifest.version === 1
+        ? upgradeMiddlewareManifest(manifest)
+        : manifest;
 }
 exports.getMiddlewareManifest = getMiddlewareManifest;
+function upgradeMiddlewareManifest(v1) {
+    function updateInfo(v1Info) {
+        const { regexp, ...rest } = v1Info;
+        return {
+            ...rest,
+            matchers: [{ regexp }],
+        };
+    }
+    const middleware = Object.fromEntries(Object.entries(v1.middleware).map(([p, info]) => [p, updateInfo(info)]));
+    const functions = v1.functions
+        ? Object.fromEntries(Object.entries(v1.functions).map(([p, info]) => [p, updateInfo(info)]))
+        : undefined;
+    return {
+        ...v1,
+        version: 2,
+        middleware,
+        functions,
+    };
+}
+exports.upgradeMiddlewareManifest = upgradeMiddlewareManifest;
 /**
  * For an object containing middleware info and a routes manifest this will
  * generate a string with the route that will activate the middleware on
  * Vercel Proxy.
  *
- * @param param0 The middleware info including regexp and page.
+ * @param param0 The middleware info including matchers and page.
  * @param param1 The routes manifest
- * @returns A regexp string for the middleware route.
+ * @returns matchers for the middleware route.
  */
-function getRouteSrc({ regexp, page }, { basePath = '', i18n }) {
-    if (page === '/') {
-        return regexp.replace('_next', `${basePath?.substring(1) ? `${basePath?.substring(1)}/` : ''}_next`);
-    }
-    const locale = i18n?.locales.length
-        ? `(?:/(${i18n.locales
-            .map(locale => (0, escape_string_regexp_1.default)(locale))
-            .join('|')}))?`
-        : '';
-    return `(?:^${basePath}${locale}${regexp.substring(1)})`;
+function getRouteMatchers(info, { basePath = '', i18n }) {
+    function getRegexp(regexp) {
+        if (info.page === '/') {
+            return regexp;
+        }
+        const locale = i18n?.locales.length
+            ? `(?:/(${i18n.locales
+                .map(locale => (0, escape_string_regexp_1.default)(locale))
+                .join('|')}))?`
+            : '';
+        return `(?:^${basePath}${locale}${regexp.substring(1)})`;
+    }
+    function normalizeHas(has) {
+        return has.map(v => v.type === 'header'
+            ? {
+                ...v,
+                key: v.key.toLowerCase(),
+            }
+            : v);
+    }
+    return info.matchers.map(matcher => {
+        const m = {
+            regexp: getRegexp(matcher.regexp),
+        };
+        if (matcher.has) {
+            m.has = normalizeHas(matcher.has);
+        }
+        return m;
+    });
 }
 /**
  * Makes the sources more human-readable in the source map

package/dist/server-build.js

@@ -21,13 +21,20 @@ 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, imagesManifest, wildcardConfig, routesManifest, staticPages, lambdaPages, nextVersion, canUsePreviewMode, trailingSlash, prerenderManifest, omittedPrerenderRoutes, trailingSlashRedirects, isCorrectLocaleAPIRoutes, lambdaCompressedByteLimit, requiredServerFilesManifest, }) {
+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, }) {
+    lambdaPages = Object.assign({}, lambdaPages, lambdaAppPaths);
     const lambdas = {};
     const prerenders = {};
     const lambdaPageKeys = Object.keys(lambdaPages);
     const internalPages = ['_app.js', '_error.js', '_document.js'];
     const pageBuildTraces = await (0, build_utils_1.glob)('**/*.js.nft.json', pagesDir);
     const isEmptyAllowQueryForPrendered = semver_1.default.gte(nextVersion, EMPTY_ALLOW_QUERY_FOR_PRERENDERED_VERSION);
+    let appBuildTraces = {};
+    let appDir = null;
+    if (appPathRoutesManifest) {
+        appDir = path_1.default.join(pagesDir, '../app');
+        appBuildTraces = await (0, build_utils_1.glob)('**/*.js.nft.json', appDir);
+    }
     const isCorrectNotFoundRoutes = semver_1.default.gte(nextVersion, CORRECT_NOT_FOUND_ROUTES_VERSION);
     const isCorrectMiddlewareOrder = semver_1.default.gte(nextVersion, CORRECT_MIDDLEWARE_ORDER_VERSION);
     const isCorrectManifests = semver_1.default.gte(nextVersion, CORRECTED_MANIFESTS_VERSION);
@@ -264,9 +271,21 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
         const compressedPages = {};
         const mergedPageKeys = [...nonApiPages, ...apiPages, ...internalPages];
         const traceCache = {};
+        const getOriginalPagePath = (page) => {
+            let originalPagePath = page;
+            if (appDir && lambdaAppPaths[page]) {
+                const { fsPath } = lambdaAppPaths[page];
+                originalPagePath = path_1.default.relative(appDir, fsPath);
+            }
+            return originalPagePath;
+        };
+        const getBuildTraceFile = (page) => {
+            return (pageBuildTraces[page + '.nft.json'] ||
+                appBuildTraces[page + '.nft.json']);
+        };
         const pathsToTrace = mergedPageKeys
             .map(page => {
-            if (!pageBuildTraces[page + '.nft.json']) {
+            if (!getBuildTraceFile(page)) {
                 return lambdaPages[page].fsPath;
             }
         })
@@ -284,13 +303,31 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
         }
         for (const page of mergedPageKeys) {
             const tracedFiles = {};
-            const pageBuildTrace = pageBuildTraces[page + '.nft.json'];
+            const originalPagePath = getOriginalPagePath(page);
+            const pageBuildTrace = getBuildTraceFile(originalPagePath);
             let fileList;
             let reasons;
             if (pageBuildTrace) {
                 const { files } = JSON.parse(await fs_extra_1.default.readFile(pageBuildTrace.fsPath, 'utf8'));
+                // TODO: this will be moved to a separate worker in the future
+                // although currently this is needed in the lambda
+                const isAppPath = appDir && lambdaAppPaths[page];
+                const serverComponentFile = isAppPath
+                    ? pageBuildTrace.fsPath.replace(/\.js\.nft\.json$/, '.__sc_client__.js')
+                    : null;
+                if (serverComponentFile && (await fs_extra_1.default.pathExists(serverComponentFile))) {
+                    files.push(path_1.default.relative(path_1.default.dirname(pageBuildTrace.fsPath), serverComponentFile));
+                    try {
+                        const scTrace = JSON.parse(await fs_extra_1.default.readFile(`${serverComponentFile}.nft.json`, 'utf8'));
+                        scTrace.files.forEach((file) => files.push(file));
+                    }
+                    catch (err) {
+                        /* non-fatal for now */
+                    }
+                }
                 fileList = [];
-                const pageDir = path_1.default.dirname(path_1.default.join(pagesDir, page));
+                const curPagesDir = isAppPath && appDir ? appDir : pagesDir;
+                const pageDir = path_1.default.dirname(path_1.default.join(curPagesDir, originalPagePath));
                 const normalizedBaseDir = `${baseDir}${baseDir.endsWith('/') ? '' : '/'}`;
                 files.forEach((file) => {
                     const absolutePath = path_1.default.join(pageDir, file);
@@ -867,7 +904,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                         .map(route => {
                         route = Object.assign({}, route);
                         route.src = path_1.default.posix.join('^/', entryDirectory, '_next/data/', escapedBuildId, route.src.replace(/(^\^|\$$)/g, '') + '.json$');
-                        const { pathname } = new URL(route.dest || '/', 'http://n');
+                        const { pathname, search } = new URL(route.dest || '/', 'http://n');
                         let isPrerender = !!prerenders[path_1.default.join('./', pathname)];
                         if (routesManifest.i18n) {
                             for (const locale of routesManifest.i18n?.locales || []) {
@@ -879,7 +916,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                             }
                         }
                         if (isPrerender) {
-                            route.dest = `/_next/data/${buildId}${pathname}.json`;
+                            route.dest = `/_next/data/${buildId}${pathname}.json${search || ''}`;
                         }
                         return route;
                     })
@@ -980,31 +1017,34 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                         status: 404,
                     },
                 ]),
-            // static 500 page if present
-            ...(!hasStatic500
-                ? []
-                : i18n
-                    ? [
-                        {
-                            src: `${path_1.default.join('/', entryDirectory, '/')}(?<nextLocale>${i18n.locales
-                                .map(locale => (0, escape_string_regexp_1.default)(locale))
-                                .join('|')})(/.*|$)`,
-                            dest: path_1.default.join('/', entryDirectory, '/$nextLocale/500'),
-                            status: 500,
-                        },
-                        {
-                            src: path_1.default.join('/', entryDirectory, '.*'),
-                            dest: path_1.default.join('/', entryDirectory, `/${i18n.defaultLocale}/500`),
-                            status: 500,
-                        },
-                    ]
-                    : [
-                        {
-                            src: path_1.default.join('/', entryDirectory, '.*'),
-                            dest: path_1.default.join('/', entryDirectory, '/500'),
-                            status: 500,
-                        },
-                    ]),
+            // custom 500 page if present
+            ...(i18n && (hasStatic500 || hasIsr500Page || lambdaPages['500.js'])
+                ? [
+                    {
+                        src: `${path_1.default.join('/', entryDirectory, '/')}(?<nextLocale>${i18n.locales
+                            .map(locale => (0, escape_string_regexp_1.default)(locale))
+                            .join('|')})(/.*|$)`,
+                        dest: path_1.default.join('/', entryDirectory, '/$nextLocale/500'),
+                        status: 500,
+                        caseSensitive: true,
+                    },
+                    {
+                        src: path_1.default.join('/', entryDirectory, '.*'),
+                        dest: path_1.default.join('/', entryDirectory, `/${i18n.defaultLocale}/500`),
+                        status: 500,
+                    },
+                ]
+                : [
+                    {
+                        src: path_1.default.join('/', entryDirectory, '.*'),
+                        dest: path_1.default.join('/', entryDirectory, hasStatic500 ||
+                            hasIsr500Page ||
+                            lambdas[path_1.default.join(entryDirectory, '500')]
+                            ? '/500'
+                            : '/_error'),
+                        status: 500,
+                    },
+                ]),
         ],
     };
 }

package/dist/utils.js

@@ -22,7 +22,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMiddlewareManifest = exports.getMiddlewareBundle = exports.getSourceFilePathFromPage = exports.isDynamicRoute = exports.normalizePage = 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 = void 0;
+exports.upgradeMiddlewareManifest = exports.getMiddlewareManifest = exports.getMiddlewareBundle = exports.getSourceFilePathFromPage = exports.isDynamicRoute = exports.normalizePage = 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 = 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"));
@@ -1439,7 +1439,7 @@ async function getMiddlewareBundle({ entryPath, outputDirectory, routesManifest,
                             }),
                         });
                     })(),
-                    routeSrc: getRouteSrc(edgeFunction, routesManifest),
+                    routeMatchers: getRouteMatchers(edgeFunction, routesManifest),
                 };
             }
             catch (e) {
@@ -1462,26 +1462,29 @@ async function getMiddlewareBundle({ entryPath, outputDirectory, routesManifest,
             if (worker.type === 'function') {
                 continue;
             }
-            const route = {
-                continue: true,
-                src: worker.routeSrc,
-                missing: [
-                    {
-                        type: 'header',
-                        key: 'x-prerender-revalidate',
-                        value: prerenderBypassToken,
-                    },
-                ],
-            };
-            route.middlewarePath = shortPath;
-            if (isCorrectMiddlewareOrder) {
-                route.override = true;
-            }
-            if (routesManifest.version > 3 && isDynamicRoute(worker.page)) {
-                source.dynamicRouteMap.set(worker.page, route);
-            }
-            else {
-                source.staticRoutes.push(route);
+            for (const matcher of worker.routeMatchers) {
+                const route = {
+                    continue: true,
+                    src: matcher.regexp,
+                    has: matcher.has,
+                    missing: [
+                        {
+                            type: 'header',
+                            key: 'x-prerender-revalidate',
+                            value: prerenderBypassToken,
+                        },
+                    ],
+                };
+                route.middlewarePath = shortPath;
+                if (isCorrectMiddlewareOrder) {
+                    route.override = true;
+                }
+                if (routesManifest.version > 3 && isDynamicRoute(worker.page)) {
+                    source.dynamicRouteMap.set(worker.page, route);
+                }
+                else {
+                    source.staticRoutes.push(route);
+                }
             }
         }
         return source;
@@ -1507,28 +1510,70 @@ async function getMiddlewareManifest(entryPath, outputDirectory) {
     if (!hasManifest) {
         return;
     }
-    return fs_extra_1.default.readJSON(middlewareManifestPath);
+    const manifest = (await fs_extra_1.default.readJSON(middlewareManifestPath));
+    return manifest.version === 1
+        ? upgradeMiddlewareManifest(manifest)
+        : manifest;
 }
 exports.getMiddlewareManifest = getMiddlewareManifest;
+function upgradeMiddlewareManifest(v1) {
+    function updateInfo(v1Info) {
+        const { regexp, ...rest } = v1Info;
+        return {
+            ...rest,
+            matchers: [{ regexp }],
+        };
+    }
+    const middleware = Object.fromEntries(Object.entries(v1.middleware).map(([p, info]) => [p, updateInfo(info)]));
+    const functions = v1.functions
+        ? Object.fromEntries(Object.entries(v1.functions).map(([p, info]) => [p, updateInfo(info)]))
+        : undefined;
+    return {
+        ...v1,
+        version: 2,
+        middleware,
+        functions,
+    };
+}
+exports.upgradeMiddlewareManifest = upgradeMiddlewareManifest;
 /**
  * For an object containing middleware info and a routes manifest this will
  * generate a string with the route that will activate the middleware on
  * Vercel Proxy.
  *
- * @param param0 The middleware info including regexp and page.
+ * @param param0 The middleware info including matchers and page.
  * @param param1 The routes manifest
- * @returns A regexp string for the middleware route.
+ * @returns matchers for the middleware route.
  */
-function getRouteSrc({ regexp, page }, { basePath = '', i18n }) {
-    if (page === '/') {
-        return regexp.replace('_next', `${basePath?.substring(1) ? `${basePath?.substring(1)}/` : ''}_next`);
-    }
-    const locale = i18n?.locales.length
-        ? `(?:/(${i18n.locales
-            .map(locale => (0, escape_string_regexp_1.default)(locale))
-            .join('|')}))?`
-        : '';
-    return `(?:^${basePath}${locale}${regexp.substring(1)})`;
+function getRouteMatchers(info, { basePath = '', i18n }) {
+    function getRegexp(regexp) {
+        if (info.page === '/') {
+            return regexp;
+        }
+        const locale = i18n?.locales.length
+            ? `(?:/(${i18n.locales
+                .map(locale => (0, escape_string_regexp_1.default)(locale))
+                .join('|')}))?`
+            : '';
+        return `(?:^${basePath}${locale}${regexp.substring(1)})`;
+    }
+    function normalizeHas(has) {
+        return has.map(v => v.type === 'header'
+            ? {
+                ...v,
+                key: v.key.toLowerCase(),
+            }
+            : v);
+    }
+    return info.matchers.map(matcher => {
+        const m = {
+            regexp: getRegexp(matcher.regexp),
+        };
+        if (matcher.has) {
+            m.has = normalizeHas(matcher.has);
+        }
+        return m;
+    });
 }
 /**
  * Makes the sources more human-readable in the source map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/next",
-  "version": "3.1.19",
+  "version": "3.1.22",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/next-js",
@@ -44,8 +44,8 @@
     "@types/semver": "6.0.0",
     "@types/text-table": "0.2.1",
     "@types/webpack-sources": "3.2.0",
-    "@vercel/build-utils": "5.3.1",
-    "@vercel/nft": "0.21.0",
+    "@vercel/build-utils": "5.4.0",
+    "@vercel/nft": "0.22.0",
     "@vercel/routing-utils": "2.0.2",
     "async-sema": "3.0.1",
     "buffer-crc32": "0.2.13",
@@ -69,5 +69,5 @@
     "typescript": "4.5.2",
     "webpack-sources": "3.2.3"
   },
-  "gitHead": "09c85f63d2aa47c147260d343767f6eea60e352c"
+  "gitHead": "e7e0a55b72bc73c26661f7b2a3caa0884a5d1764"
 }