@vercel/next 2.9.0 → 3.0.1-canary.0

package/dist/server-build.js

@@ -17,14 +17,15 @@ const escape_string_regexp_1 = __importDefault(require("escape-string-regexp"));
 const pretty_bytes_1 = __importDefault(require("pretty-bytes"));
 // related PR: https://github.com/vercel/next.js/pull/30046
 const CORRECT_NOT_FOUND_ROUTES_VERSION = 'v12.0.1';
+const CORRECT_MIDDLEWARE_ORDER_VERSION = 'v12.1.7-canary.29';
 async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs, baseDir, workPath, entryPath, nodeVersion, escapedBuildId, dynamicPrefix, entryDirectory, outputDirectory, redirects, beforeFilesRewrites, afterFilesRewrites, fallbackRewrites, headers, dataRoutes, hasIsr404Page, imagesManifest, wildcardConfig, routesManifest, staticPages, lambdaPages, nextVersion, canUsePreviewMode, prerenderManifest, omittedPrerenderRoutes, trailingSlashRedirects, isCorrectLocaleAPIRoutes, lambdaCompressedByteLimit, requiredServerFilesManifest, }) {
-    var _a, _b, _c, _d;
     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 isCorrectNotFoundRoutes = semver_1.default.gte(nextVersion, CORRECT_NOT_FOUND_ROUTES_VERSION);
+    const isCorrectMiddlewareOrder = semver_1.default.gte(nextVersion, CORRECT_MIDDLEWARE_ORDER_VERSION);
     let hasStatic500 = !!staticPages[path_1.default.join(entryDirectory, '500')];
     if (lambdaPageKeys.length === 0) {
         throw new build_utils_1.NowBuildError({
@@ -274,7 +275,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                 cache: traceCache,
                 processCwd: requiredServerFilesManifest.appDir || entryPath,
             });
-            traceResult.esmFileList.forEach(file => traceResult === null || traceResult === void 0 ? void 0 : traceResult.fileList.add(file));
+            traceResult.esmFileList.forEach(file => traceResult?.fileList.add(file));
             parentFilesMap = (0, utils_1.getFilesMapFromReasons)(traceResult.fileList, traceResult.reasons);
         }
         for (const page of mergedPageKeys) {
@@ -298,11 +299,11 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                 reasons = new Map();
             }
             else {
-                fileList = Array.from((parentFilesMap === null || parentFilesMap === void 0 ? void 0 : parentFilesMap.get(path_1.default.relative(baseDir, lambdaPages[page].fsPath))) || []);
+                fileList = Array.from(parentFilesMap?.get(path_1.default.relative(baseDir, lambdaPages[page].fsPath)) || []);
                 if (!fileList) {
                     throw new Error(`Invariant: Failed to trace ${page}, missing fileList`);
                 }
-                reasons = (traceResult === null || traceResult === void 0 ? void 0 : traceResult.reasons) || new Map();
+                reasons = traceResult?.reasons || new Map();
             }
             await Promise.all(fileList.map((0, utils_1.collectTracedFiles)(baseDir, lstatResults, lstatSema, reasons, tracedFiles)));
             pageTraces[page] = tracedFiles;
@@ -318,7 +319,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
             const file = initialPseudoLayer.pseudoLayer[cur];
             return prev + file.uncompressedSize || 0;
         }, 0);
-        const pageExtensions = (_a = requiredServerFilesManifest.config) === null || _a === void 0 ? void 0 : _a.pageExtensions;
+        const pageExtensions = requiredServerFilesManifest.config?.pageExtensions;
         const pageLambdaGroups = await (0, utils_1.getPageLambdaGroups)(requiredServerFilesManifest.appDir || entryPath, config, nonApiPages, prerenderRoutes, pageTraces, compressedPages, tracedPseudoLayer.pseudoLayer, initialPseudoLayer.pseudoLayerBytes, initialPseudoLayerSize, lambdaCompressedByteLimit, internalPages, pageExtensions);
         const apiLambdaGroups = await (0, utils_1.getPageLambdaGroups)(requiredServerFilesManifest.appDir || entryPath, config, apiPages, prerenderRoutes, pageTraces, compressedPages, tracedPseudoLayer.pseudoLayer, initialPseudoLayer.pseudoLayerBytes, initialPseudoLayerSize, lambdaCompressedByteLimit, internalPages);
         (0, build_utils_1.debug)(JSON.stringify({
@@ -358,7 +359,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
             for (const page of group.pages) {
                 const pageNoExt = page.replace(/\.js$/, '');
                 let isPrerender = prerenderRoutes.has(path_1.default.join('/', pageNoExt === 'index' ? '' : pageNoExt));
-                if (!isPrerender && (routesManifest === null || routesManifest === void 0 ? void 0 : routesManifest.i18n)) {
+                if (!isPrerender && routesManifest?.i18n) {
                     isPrerender = routesManifest.i18n.locales.some(locale => {
                         return prerenderRoutes.has(path_1.default.join('/', locale, pageNoExt === 'index' ? '' : pageNoExt));
                     });
@@ -405,7 +406,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
         });
     }
     prerenderRoutes.forEach(route => {
-        if (routesManifest === null || routesManifest === void 0 ? void 0 : routesManifest.i18n) {
+        if (routesManifest?.i18n) {
             route = (0, utils_1.normalizeLocalePath)(route, routesManifest.i18n.locales).pathname;
         }
         delete lambdas[path_1.default.join('.', entryDirectory, route === '/' ? 'index' : route)];
@@ -414,11 +415,12 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
         entryPath,
         outputDirectory,
         routesManifest,
+        isCorrectMiddlewareOrder,
     });
     const dynamicRoutes = await (0, utils_1.getDynamicRoutes)(entryPath, entryDirectory, dynamicPages, false, routesManifest, omittedPrerenderRoutes, canUsePreviewMode, prerenderManifest.bypassToken || '', true, middleware.dynamicRouteMap).then(arr => (0, utils_1.localizeDynamicRoutes)(arr, dynamicPrefix, entryDirectory, staticPages, prerenderManifest, routesManifest, true, isCorrectLocaleAPIRoutes));
     const { staticFiles, publicDirectoryFiles, staticDirectoryFiles } = await (0, utils_1.getStaticFiles)(entryPath, entryDirectory, outputDirectory);
     const notFoundPreviewRoutes = [];
-    if (((_b = prerenderManifest.notFoundRoutes) === null || _b === void 0 ? void 0 : _b.length) > 0 && canUsePreviewMode) {
+    if (prerenderManifest.notFoundRoutes?.length > 0 && canUsePreviewMode) {
         // we combine routes into one src here to reduce the number of needed
         // routes since only the status is being modified and we don't want
         // to exceed the routes limit
@@ -444,7 +446,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
         for (let i = 0; i < prerenderManifest.notFoundRoutes.length; i++) {
             const route = prerenderManifest.notFoundRoutes[i];
             const isLastRoute = i === prerenderManifest.notFoundRoutes.length - 1;
-            if (((_c = prerenderManifest.staticRoutes[route]) === null || _c === void 0 ? void 0 : _c.initialRevalidate) === false) {
+            if (prerenderManifest.staticRoutes[route]?.initialRevalidate === false) {
                 if (currentRouteSrc.length + route.length + 1 >= 4096) {
                     pushRoute(currentRouteSrc);
                     currentRouteSrc = starterRouteSrc;
@@ -459,7 +461,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
     }
     return {
         wildcard: wildcardConfig,
-        images: ((_d = imagesManifest === null || imagesManifest === void 0 ? void 0 : imagesManifest.images) === null || _d === void 0 ? void 0 : _d.loader) === 'default'
+        images: imagesManifest?.images?.loader === 'default'
             ? {
                 domains: imagesManifest.images.domains,
                 sizes: imagesManifest.images.sizes,
@@ -580,6 +582,9 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
             ...notFoundPreviewRoutes,
             ...headers,
             ...redirects,
+            // middleware comes directly after redirects but before
+            // beforeFiles rewrites as middleware is not a "file" route
+            ...(isCorrectMiddlewareOrder ? middleware.staticRoutes : []),
             ...beforeFilesRewrites,
             // Make sure to 404 for the /404 path itself
             ...(i18n
@@ -619,13 +624,16 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                             continue: true,
                         },
                     ]),
-            ...middleware.staticRoutes,
+            // while middleware was in beta the order came right before
+            // handle: 'filesystem' we maintain this for older versions
+            // to prevent a local/deploy mismatch
+            ...(!isCorrectMiddlewareOrder ? middleware.staticRoutes : []),
             // Next.js page lambdas, `static/` folder, reserved assets, and `public/`
             // folder
             { handle: 'filesystem' },
             // ensure the basePath prefixed _next/image is rewritten to the root
             // _next/image path
-            ...((routesManifest === null || routesManifest === void 0 ? void 0 : routesManifest.basePath)
+            ...(routesManifest?.basePath
                 ? [
                     {
                         src: path_1.default.join('/', entryDirectory, '_next/image/?'),
@@ -676,7 +684,9 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                 ? []
                 : [
                     {
-                        src: `${path_1.default.join('/', entryDirectory, '/')}(?:${i18n === null || i18n === void 0 ? void 0 : i18n.locales.map(locale => (0, escape_string_regexp_1.default)(locale)).join('|')})/(.*)`,
+                        src: `${path_1.default.join('/', entryDirectory, '/')}(?:${i18n?.locales
+                            .map(locale => (0, escape_string_regexp_1.default)(locale))
+                            .join('|')})/(.*)`,
                         dest: '/$1',
                         check: true,
                     },

package/dist/sourcemapped.js

@@ -69,7 +69,7 @@ async function getSourceMap(content, fullFilePath) {
         }
         return convert_source_map_1.default.fromComment(content).toObject();
     }
-    catch (_a) {
+    catch {
         return null;
     }
 }

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.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"));
@@ -156,8 +156,7 @@ async function getRoutesManifest(entryPath, outputDirectory, nextVersion) {
             code: 'NEXT_NO_ROUTES_MANIFEST',
         });
     }
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
-    const routesManifest = require(pathRoutesManifest);
+    const routesManifest = await fs_extra_1.default.readJSON(pathRoutesManifest);
     // remove temporary array based routeKeys from v1/v2 of routes
     // manifest since it can result in invalid routes
     for (const route of routesManifest.dataRoutes || []) {
@@ -181,23 +180,23 @@ async function getDynamicRoutes(entryPath, entryDirectory, dynamicPages, isDev,
             case 1:
             case 2: {
                 return routesManifest.dynamicRoutes
-                    .filter(({ page }) => canUsePreviewMode || !(omittedRoutes === null || omittedRoutes === void 0 ? void 0 : omittedRoutes.has(page)))
+                    .filter(({ page }) => canUsePreviewMode || !omittedRoutes?.has(page))
                     .map(({ page, regex }) => {
                     return {
                         src: regex,
                         dest: !isDev ? path_1.default.join('/', entryDirectory, page) : page,
                         check: true,
-                        status: canUsePreviewMode && (omittedRoutes === null || omittedRoutes === void 0 ? void 0 : omittedRoutes.has(page)) ? 404 : undefined,
+                        status: canUsePreviewMode && omittedRoutes?.has(page) ? 404 : undefined,
                     };
                 });
             }
             case 3:
             case 4: {
                 return routesManifest.dynamicRoutes
-                    .filter(({ page }) => canUsePreviewMode || !(omittedRoutes === null || omittedRoutes === void 0 ? void 0 : omittedRoutes.has(page)))
+                    .filter(({ page }) => canUsePreviewMode || !omittedRoutes?.has(page))
                     .map(params => {
                     if ('isMiddleware' in params) {
-                        const route = dynamicMiddlewareRouteMap === null || dynamicMiddlewareRouteMap === void 0 ? void 0 : dynamicMiddlewareRouteMap.get(params.page);
+                        const route = dynamicMiddlewareRouteMap?.get(params.page);
                         if (!route) {
                             throw new Error(`Could not find dynamic middleware route for ${params.page}`);
                         }
@@ -215,7 +214,7 @@ async function getDynamicRoutes(entryPath, entryDirectory, dynamicPages, isDev,
                     if (!isServerMode) {
                         route.check = true;
                     }
-                    if (isServerMode && canUsePreviewMode && (omittedRoutes === null || omittedRoutes === void 0 ? void 0 : omittedRoutes.has(page))) {
+                    if (isServerMode && canUsePreviewMode && omittedRoutes?.has(page)) {
                         // only match this route when in preview mode so
                         // preview works for non-prerender fallback: false pages
                         route.has = [
@@ -252,7 +251,8 @@ async function getDynamicRoutes(entryPath, entryDirectory, dynamicPages, isDev,
     let getRouteRegex = undefined;
     let getSortedRoutes;
     try {
-        ({ getRouteRegex, getSortedRoutes } = require((0, resolve_from_1.default)(entryPath, 'next-server/dist/lib/router/utils')));
+        // NOTE: `eval('require')` is necessary to avoid bad transpilation to `__webpack_require__`
+        ({ getRouteRegex, getSortedRoutes } = eval('require')((0, resolve_from_1.default)(entryPath, 'next-server/dist/lib/router/utils')));
         if (typeof getRouteRegex !== 'function') {
             getRouteRegex = undefined;
         }
@@ -260,7 +260,8 @@ async function getDynamicRoutes(entryPath, entryDirectory, dynamicPages, isDev,
     catch (_) { } // eslint-disable-line no-empty
     if (!getRouteRegex || !getSortedRoutes) {
         try {
-            ({ getRouteRegex, getSortedRoutes } = require((0, resolve_from_1.default)(entryPath, 'next/dist/next-server/lib/router/utils')));
+            // NOTE: `eval('require')` is necessary to avoid bad transpilation to `__webpack_require__`
+            ({ getRouteRegex, getSortedRoutes } = eval('require')((0, resolve_from_1.default)(entryPath, 'next/dist/next-server/lib/router/utils')));
             if (typeof getRouteRegex !== 'function') {
                 getRouteRegex = undefined;
             }
@@ -302,10 +303,10 @@ function localizeDynamicRoutes(dynamicRoutes, dynamicPrefix, entryDirectory, sta
         const { i18n } = routesManifest || {};
         if (i18n) {
             const { pathname } = url_1.default.parse(route.dest);
-            const pathnameNoPrefix = pathname === null || pathname === void 0 ? void 0 : pathname.replace(dynamicPrefix, '');
+            const pathnameNoPrefix = pathname?.replace(dynamicPrefix, '');
             const isFallback = prerenderManifest.fallbackRoutes[pathname];
             const isBlocking = prerenderManifest.blockingFallbackRoutes[pathname];
-            const isApiRoute = pathnameNoPrefix === '/api' || (pathnameNoPrefix === null || pathnameNoPrefix === void 0 ? void 0 : pathnameNoPrefix.startsWith('/api/'));
+            const isApiRoute = pathnameNoPrefix === '/api' || pathnameNoPrefix?.startsWith('/api/');
             const isAutoExport = staticPages[addLocaleOrDefault(pathname, routesManifest).substring(1)];
             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('|')})?`);
@@ -331,17 +332,14 @@ async function getImagesManifest(entryPath, outputDirectory) {
     if (!hasImagesManifest) {
         return undefined;
     }
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
-    const imagesManifest = require(pathImagesManifest);
-    return imagesManifest;
+    return fs_extra_1.default.readJson(pathImagesManifest);
 }
 exports.getImagesManifest = getImagesManifest;
 function filterStaticPages(staticPageFiles, dynamicPages, entryDirectory, htmlContentType, prerenderManifest, routesManifest) {
     const staticPages = {};
     Object.keys(staticPageFiles).forEach((page) => {
-        var _a;
         const pathname = page.replace(/\.html$/, '');
-        const routeName = normalizeLocalePath(normalizePage(pathname), (_a = routesManifest === null || routesManifest === void 0 ? void 0 : routesManifest.i18n) === null || _a === void 0 ? void 0 : _a.locales).pathname;
+        const routeName = normalizeLocalePath(normalizePage(pathname), routesManifest?.i18n?.locales).pathname;
         // Prerendered routes emit a `.html` file but should not be treated as a
         // static page.
         // Lazily prerendered routes have a fallback `.html` file on newer
@@ -377,11 +375,11 @@ function getFilesMapFromReasons(fileList, reasons, ignoreFn) {
                     parentFiles = new Set();
                     parentFilesMap.set(parent, parentFiles);
                 }
-                if (!(ignoreFn === null || ignoreFn === void 0 ? void 0 : ignoreFn(file, parent))) {
+                if (!ignoreFn?.(file, parent)) {
                     parentFiles.add(file);
                 }
                 const parentReason = reasons.get(parent);
-                if (parentReason === null || parentReason === void 0 ? void 0 : parentReason.parents) {
+                if (parentReason?.parents) {
                     propagateToParents(parentReason.parents, file, seen);
                 }
             }
@@ -389,7 +387,7 @@ function getFilesMapFromReasons(fileList, reasons, ignoreFn) {
     }
     for (const file of fileList) {
         const reason = reasons.get(file);
-        const isInitial = (reason === null || reason === void 0 ? void 0 : reason.type.length) === 1 && reason.type.includes('initial');
+        const isInitial = reason?.type.length === 1 && reason.type.includes('initial');
         if (!reason ||
             !reason.parents ||
             (isInitial && reason.parents.size === 0)) {
@@ -773,7 +771,7 @@ function normalizeLocalePath(pathname, locales) {
 }
 exports.normalizeLocalePath = normalizeLocalePath;
 function addLocaleOrDefault(pathname, routesManifest, locale) {
-    if (!(routesManifest === null || routesManifest === void 0 ? void 0 : routesManifest.i18n))
+    if (!routesManifest?.i18n)
         return pathname;
     if (!locale)
         locale = routesManifest.i18n.defaultLocale;
@@ -812,10 +810,9 @@ async function getPageLambdaGroups(entryPath, config, pages, prerenderRoutes, pa
                 let newTracedFilesUncompressedSize = group.pseudoLayerUncompressedBytes;
                 for (const newPage of newPages) {
                     Object.keys(pageTraces[newPage] || {}).map(file => {
-                        var _a;
                         if (!group.pseudoLayer[file]) {
                             const item = tracedPseudoLayer[file];
-                            newTracedFilesSize += ((_a = item.compBuffer) === null || _a === void 0 ? void 0 : _a.byteLength) || 0;
+                            newTracedFilesSize += item.compBuffer?.byteLength || 0;
                             newTracedFilesUncompressedSize += item.uncompressedSize || 0;
                         }
                     });
@@ -848,9 +845,8 @@ async function getPageLambdaGroups(entryPath, config, pages, prerenderRoutes, pa
         }
         for (const newPage of newPages) {
             Object.keys(pageTraces[newPage] || {}).map(file => {
-                var _a;
                 const pseudoItem = tracedPseudoLayer[file];
-                const compressedSize = ((_a = pseudoItem === null || pseudoItem === void 0 ? void 0 : pseudoItem.compBuffer) === null || _a === void 0 ? void 0 : _a.byteLength) || 0;
+                const compressedSize = pseudoItem?.compBuffer?.byteLength || 0;
                 if (!matchingGroup.pseudoLayer[file]) {
                     matchingGroup.pseudoLayer[file] = pseudoItem;
                     matchingGroup.pseudoLayerBytes += compressedSize;
@@ -993,7 +989,7 @@ const onPrerenderRouteInitial = (prerenderManifest, canUsePreviewMode, entryDire
     const pr = prerenderManifest.staticRoutes[routeKey];
     const { initialRevalidate, srcRoute } = pr;
     const route = srcRoute || routeKey;
-    const routeNoLocale = (routesManifest === null || routesManifest === void 0 ? void 0 : routesManifest.i18n)
+    const routeNoLocale = routesManifest?.i18n
         ? normalizeLocalePath(routeKey, routesManifest.i18n.locales).pathname
         : routeKey;
     // if the 404 page used getStaticProps we need to update static404Page
@@ -1008,7 +1004,7 @@ const onPrerenderRouteInitial = (prerenderManifest, canUsePreviewMode, entryDire
         (!canUsePreviewMode || (hasPages404 && routeNoLocale === '/404')) &&
         !prerenderManifest.fallbackRoutes[route] &&
         !prerenderManifest.blockingFallbackRoutes[route]) {
-        if ((routesManifest === null || routesManifest === void 0 ? void 0 : routesManifest.i18n) &&
+        if (routesManifest?.i18n &&
             Object.keys(prerenderManifest.staticRoutes).some(route => {
                 const staticRoute = prerenderManifest.staticRoutes[route];
                 return (staticRoute.srcRoute === srcRoute &&
@@ -1031,7 +1027,6 @@ const onPrerenderRouteInitial = (prerenderManifest, canUsePreviewMode, entryDire
 exports.onPrerenderRouteInitial = onPrerenderRouteInitial;
 let prerenderGroup = 1;
 const onPrerenderRoute = (prerenderRouteArgs) => (routeKey, { isBlocking, isFallback, isOmitted, locale, }) => {
-    var _a;
     const { pagesDir, hasPages404, static404Page, entryDirectory, prerenderManifest, isSharedLambdas, isServerMode, canUsePreviewMode, lambdas, prerenders, pageLambdaMap, routesManifest, isCorrectNotFoundRoutes, } = prerenderRouteArgs;
     if (isBlocking && isFallback) {
         throw new build_utils_1.NowBuildError({
@@ -1050,7 +1045,7 @@ const onPrerenderRoute = (prerenderRouteArgs) => (routeKey, { isBlocking, isFall
     let origRouteFileNoExt = routeFileNoExt;
     const { isLocalePrefixed } = prerenderManifest;
     if (!locale && isLocalePrefixed) {
-        const localePathResult = normalizeLocalePath(routeKey, ((_a = routesManifest === null || routesManifest === void 0 ? void 0 : routesManifest.i18n) === null || _a === void 0 ? void 0 : _a.locales) || []);
+        const localePathResult = normalizeLocalePath(routeKey, routesManifest?.i18n?.locales || []);
         locale = localePathResult.detectedLocale;
         origRouteFileNoExt =
             localePathResult.pathname === '/'
@@ -1173,8 +1168,8 @@ const onPrerenderRoute = (prerenderRouteArgs) => (routeKey, { isBlocking, isFall
         // detect this for prerender (ISR) pages by reading the routes manifest file.
         const pageKey = srcRoute || routeKey;
         const isDynamic = isDynamicRoute(pageKey);
-        const route = routesManifest === null || routesManifest === void 0 ? void 0 : routesManifest.dynamicRoutes.find((r) => r.page === pageKey && !('isMiddleware' in r));
-        const routeKeys = route === null || route === void 0 ? void 0 : route.routeKeys;
+        const route = routesManifest?.dynamicRoutes.find((r) => r.page === pageKey && !('isMiddleware' in r));
+        const routeKeys = route?.routeKeys;
         // by default allowQuery should be undefined and only set when
         // we have sufficient information to set it
         let allowQuery;
@@ -1205,7 +1200,7 @@ const onPrerenderRoute = (prerenderRouteArgs) => (routeKey, { isBlocking, isFall
             bypassToken: prerenderManifest.bypassToken,
         });
         ++prerenderGroup;
-        if ((routesManifest === null || routesManifest === void 0 ? void 0 : routesManifest.i18n) && isBlocking) {
+        if (routesManifest?.i18n && isBlocking) {
             for (const locale of routesManifest.i18n.locales) {
                 const localeRouteFileNoExt = addLocaleOrDefault(routeFileNoExt, routesManifest, locale);
                 const localeOutputPathPage = normalizeIndexOutput(path_1.default.posix.join(entryDirectory, localeRouteFileNoExt), isServerMode);
@@ -1228,7 +1223,7 @@ const onPrerenderRoute = (prerenderRouteArgs) => (routeKey, { isBlocking, isFall
         }
     }
     if (((nonDynamicSsg && !isLocalePrefixed) || isFallback || isOmitted) &&
-        (routesManifest === null || routesManifest === void 0 ? void 0 : routesManifest.i18n) &&
+        routesManifest?.i18n &&
         !locale) {
         // load each locale
         for (const locale of routesManifest.i18n.locales) {
@@ -1339,45 +1334,27 @@ async function getPrivateOutputs(dir, entries) {
     return { files, routes };
 }
 exports.getPrivateOutputs = getPrivateOutputs;
-async function getMiddlewareBundle({ entryPath, outputDirectory, routesManifest, }) {
-    var _a;
+async function getMiddlewareBundle({ entryPath, outputDirectory, routesManifest, isCorrectMiddlewareOrder, }) {
     const middlewareManifest = await getMiddlewareManifest(entryPath, outputDirectory);
-    const sortedFunctions = [
-        ...(!middlewareManifest
-            ? []
-            : middlewareManifest.sortedMiddleware.map(key => ({
-                key,
-                edgeFunction: middlewareManifest === null || middlewareManifest === void 0 ? void 0 : middlewareManifest.middleware[key],
-                type: 'middleware',
-            }))),
-        ...Object.entries((_a = middlewareManifest === null || middlewareManifest === void 0 ? void 0 : middlewareManifest.functions) !== null && _a !== void 0 ? _a : {}).map(([key, edgeFunction]) => {
-            return {
-                key,
-                edgeFunction,
-                type: 'function',
-            };
-        }),
-    ];
-    if (middlewareManifest && sortedFunctions.length > 0) {
-        const workerConfigs = await Promise.all(sortedFunctions.map(async ({ key, edgeFunction, type }) => {
+    if (middlewareManifest && middlewareManifest?.sortedMiddleware.length > 0) {
+        const workerConfigs = await Promise.all(middlewareManifest.sortedMiddleware.map(async (key) => {
+            const middleware = middlewareManifest.middleware[key];
             try {
-                const wrappedModuleSource = await (0, get_edge_function_source_1.getNextjsEdgeFunctionSource)(edgeFunction.files, {
-                    name: edgeFunction.name,
+                const wrappedModuleSource = await (0, get_edge_function_source_1.getNextjsEdgeFunctionSource)(middleware.files, {
+                    name: middleware.name,
                     staticRoutes: routesManifest.staticRoutes,
                     dynamicRoutes: routesManifest.dynamicRoutes.filter(r => !('isMiddleware' in r)),
                     nextConfig: {
                         basePath: routesManifest.basePath,
                         i18n: routesManifest.i18n,
                     },
-                }, path_1.default.resolve(entryPath, outputDirectory), edgeFunction.wasm);
+                }, path_1.default.resolve(entryPath, outputDirectory), middleware.wasm);
                 return {
-                    type,
-                    page: edgeFunction.page,
+                    page: middlewareManifest.middleware[key].page,
                     edgeFunction: (() => {
-                        var _a;
                         const { source, map } = wrappedModuleSource.sourceAndMap();
                         const transformedMap = (0, sourcemapped_1.stringifySourceMap)(transformSourceMap(map));
-                        const wasmFiles = ((_a = edgeFunction.wasm) !== null && _a !== void 0 ? _a : []).reduce((acc, { filePath, name }) => {
+                        const wasmFiles = (middleware.wasm ?? []).reduce((acc, { filePath, name }) => {
                             const fullFilePath = path_1.default.join(entryPath, outputDirectory, filePath);
                             acc[`wasm/${name}.wasm`] = new build_utils_1.FileFsRef({
                                 mode: 0o644,
@@ -1388,7 +1365,7 @@ async function getMiddlewareBundle({ entryPath, outputDirectory, routesManifest,
                         }, {});
                         return new build_utils_1.EdgeFunction({
                             deploymentTarget: 'v8-worker',
-                            name: edgeFunction.name,
+                            name: middleware.name,
                             files: {
                                 'index.js': new build_utils_1.FileBlob({
                                     data: source,
@@ -1405,10 +1382,10 @@ async function getMiddlewareBundle({ entryPath, outputDirectory, routesManifest,
                                 ...wasmFiles,
                             },
                             entrypoint: 'index.js',
-                            envVarsInUse: edgeFunction.env,
+                            envVarsInUse: middleware.env,
                         });
                     })(),
-                    routeSrc: getRouteSrc(edgeFunction, routesManifest),
+                    routeSrc: getRouteSrc(middlewareManifest.middleware[key], routesManifest),
                 };
             }
             catch (e) {
@@ -1423,21 +1400,16 @@ async function getMiddlewareBundle({ entryPath, outputDirectory, routesManifest,
         };
         for (const worker of workerConfigs.values()) {
             const edgeFile = worker.edgeFunction.name;
-            const shortPath = edgeFile.replace(/^pages\//, '');
-            worker.edgeFunction.name = shortPath;
-            source.edgeFunctions[shortPath] = worker.edgeFunction;
+            worker.edgeFunction.name = edgeFile.replace(/^pages\//, '');
+            source.edgeFunctions[edgeFile] = worker.edgeFunction;
             const route = {
                 continue: true,
+                middlewarePath: edgeFile,
                 src: worker.routeSrc,
-                ...(worker.type === 'middleware'
-                    ? {
-                        middlewarePath: shortPath,
-                        override: true,
-                    }
-                    : {
-                        dest: shortPath,
-                    }),
             };
+            if (isCorrectMiddlewareOrder) {
+                route.override = true;
+            }
             if (routesManifest.version > 3 && isDynamicRoute(worker.page)) {
                 source.dynamicRouteMap.set(worker.page, route);
             }
@@ -1468,10 +1440,8 @@ async function getMiddlewareManifest(entryPath, outputDirectory) {
     if (!hasManifest) {
         return;
     }
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
-    return require(middlewareManifestPath);
+    return fs_extra_1.default.readJSON(middlewareManifestPath);
 }
-exports.getMiddlewareManifest = getMiddlewareManifest;
 /**
  * For an object containing middleware info and a routes manifest this will
  * generate a string with the route that will activate the middleware on
@@ -1483,9 +1453,9 @@ exports.getMiddlewareManifest = getMiddlewareManifest;
  */
 function getRouteSrc({ regexp, page }, { basePath = '', i18n }) {
     if (page === '/') {
-        return regexp.replace('_next', `${(basePath === null || basePath === void 0 ? void 0 : basePath.substring(1)) ? `${basePath === null || basePath === void 0 ? void 0 : basePath.substring(1)}/` : ''}_next`);
+        return regexp.replace('_next', `${basePath?.substring(1) ? `${basePath?.substring(1)}/` : ''}_next`);
     }
-    const locale = (i18n === null || i18n === void 0 ? void 0 : i18n.locales.length)
+    const locale = i18n?.locales.length
         ? `(?:/(${i18n.locales
             .map(locale => (0, escape_string_regexp_1.default)(locale))
             .join('|')}))?`
@@ -1497,12 +1467,14 @@ function getRouteSrc({ regexp, page }, { basePath = '', i18n }) {
  * by removing webpack-specific prefixes
  */
 function transformSourceMap(sourcemap) {
-    var _a;
     if (!sourcemap)
         return;
-    const sources = (_a = sourcemap.sources) === null || _a === void 0 ? void 0 : _a.map(source => {
+    const sources = sourcemap.sources
+        ?.map(source => {
         return source.replace(/^webpack:\/\/?_N_E\/(?:\.\/)?/, '');
-    }).map(source => {
+    })
+        // Hide the Next.js entrypoint
+        .map(source => {
         return source.startsWith('?') ? '[native code]' : source;
     });
     return { ...sourcemap, sources };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/next",
-  "version": "2.9.0",
+  "version": "3.0.1-canary.0",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/next-js",
@@ -45,9 +45,9 @@
     "@types/semver": "6.0.0",
     "@types/text-table": "0.2.1",
     "@types/webpack-sources": "3.2.0",
-    "@vercel/build-utils": "3.1.1",
+    "@vercel/build-utils": "4.0.1-canary.0",
     "@vercel/nft": "0.19.1",
-    "@vercel/routing-utils": "1.13.3",
+    "@vercel/routing-utils": "1.13.4",
     "async-sema": "3.0.1",
     "buffer-crc32": "0.2.13",
     "cheerio": "1.0.0-rc.10",
@@ -70,5 +70,5 @@
     "typescript": "4.5.2",
     "webpack-sources": "3.2.3"
   },
-  "gitHead": "ad436313e155b0e07cb14475e11c5c12e1b36f75"
+  "gitHead": "39f758662131ec37c467ebba5d5b618cba0c753f"
 }