@vercel/next 3.1.18 → 3.1.21

package/dist/index.js

@@ -42910,6 +42910,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 +43291,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 +43341,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 +43476,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 +43509,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 +44447,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 +44849,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 +45099,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 +45131,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 +45732,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 +45744,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 +45845,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,
+                    },
+                ]),
         ],
     };
 }
@@ -47377,6 +47441,11 @@ async function getMiddlewareBundle({ entryPath, outputDirectory, routesManifest,
             const shortPath = edgeFile.replace(/^pages\//, '');
             worker.edgeFunction.name = shortPath;
             source.edgeFunctions[shortPath] = worker.edgeFunction;
+            // we don't add the route for edge functions as these
+            // are already added in the routes-manifest under dynamicRoutes
+            if (worker.type === 'function') {
+                continue;
+            }
             const route = {
                 continue: true,
                 src: worker.routeSrc,
@@ -47388,14 +47457,9 @@ async function getMiddlewareBundle({ entryPath, outputDirectory, routesManifest,
                     },
                 ],
             };
-            if (worker.type === 'function') {
-                route.dest = shortPath;
-            }
-            else {
-                route.middlewarePath = shortPath;
-                if (isCorrectMiddlewareOrder) {
-                    route.override = true;
-                }
+            route.middlewarePath = shortPath;
+            if (isCorrectMiddlewareOrder) {
+                route.override = true;
             }
             if (routesManifest.version > 3 && isDynamicRoute(worker.page)) {
                 source.dynamicRouteMap.set(worker.page, route);

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

@@ -1457,6 +1457,11 @@ async function getMiddlewareBundle({ entryPath, outputDirectory, routesManifest,
             const shortPath = edgeFile.replace(/^pages\//, '');
             worker.edgeFunction.name = shortPath;
             source.edgeFunctions[shortPath] = worker.edgeFunction;
+            // we don't add the route for edge functions as these
+            // are already added in the routes-manifest under dynamicRoutes
+            if (worker.type === 'function') {
+                continue;
+            }
             const route = {
                 continue: true,
                 src: worker.routeSrc,
@@ -1468,14 +1473,9 @@ async function getMiddlewareBundle({ entryPath, outputDirectory, routesManifest,
                     },
                 ],
             };
-            if (worker.type === 'function') {
-                route.dest = shortPath;
-            }
-            else {
-                route.middlewarePath = shortPath;
-                if (isCorrectMiddlewareOrder) {
-                    route.override = true;
-                }
+            route.middlewarePath = shortPath;
+            if (isCorrectMiddlewareOrder) {
+                route.override = true;
             }
             if (routesManifest.version > 3 && isDynamicRoute(worker.page)) {
                 source.dynamicRouteMap.set(worker.page, route);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/next",
-  "version": "3.1.18",
+  "version": "3.1.21",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/next-js",
@@ -44,7 +44,7 @@
     "@types/semver": "6.0.0",
     "@types/text-table": "0.2.1",
     "@types/webpack-sources": "3.2.0",
-    "@vercel/build-utils": "5.3.1",
+    "@vercel/build-utils": "5.3.2",
     "@vercel/nft": "0.21.0",
     "@vercel/routing-utils": "2.0.2",
     "async-sema": "3.0.1",
@@ -69,5 +69,5 @@
     "typescript": "4.5.2",
     "webpack-sources": "3.2.3"
   },
-  "gitHead": "b52d01f809b80734ed1ab61df82f299f11a04720"
+  "gitHead": "6700630feb23bdb4e94ea727911a9e10aa546361"
 }