@vercel/next 3.0.1-canary.0 → 3.0.2-canary.0

package/dist/edge-function-source/constants.js

@@ -1,23 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EDGE_FUNCTION_USER_SCRIPT_SIZE_LIMIT = void 0;
+exports.EDGE_FUNCTION_SIZE_LIMIT = void 0;
 const KIB = 1024;
 const MIB = 1024 * KIB;
 /**
- * The limit after compression. it has to be kibibyte instead of kilobyte
- * See https://github.com/cloudflare/wrangler/blob/8907b12add3d70ee21ac597b69cd66f6807571f4/src/wranglerjs/output.rs#L44
+ * The maximum size of a *compressed* edge function.
  */
-const EDGE_FUNCTION_SCRIPT_SIZE_LIMIT = MIB;
-/**
- * This safety buffer must cover the size of our whole runtime layer compressed
- * plus some extra space to allow it to grow in the future. At the time of
- * writing this comment the compressed size size is ~7KiB so 20KiB should
- * be more than enough.
- */
-const EDGE_FUNCTION_SCRIPT_SIZE_BUFFER = 20 * KIB;
-/**
- * The max size we allow for compressed user code is the compressed script
- * limit minus the compressed safety buffer. We must check this limit after
- * compressing the user code.
- */
-exports.EDGE_FUNCTION_USER_SCRIPT_SIZE_LIMIT = EDGE_FUNCTION_SCRIPT_SIZE_LIMIT - EDGE_FUNCTION_SCRIPT_SIZE_BUFFER;
+exports.EDGE_FUNCTION_SIZE_LIMIT = MIB;

package/dist/edge-function-source/get-edge-function-source.js

@@ -66,7 +66,7 @@ function getWasmImportStatements(wasm = []) {
 }
 async function validateScript(content) {
     const gzipped = await gzip(content);
-    if (gzipped.length > constants_1.EDGE_FUNCTION_USER_SCRIPT_SIZE_LIMIT) {
-        throw new Error(`Exceeds maximum edge function script size: ${(0, pretty_bytes_1.default)(gzipped.length)} / ${(0, pretty_bytes_1.default)(constants_1.EDGE_FUNCTION_USER_SCRIPT_SIZE_LIMIT)}`);
+    if (gzipped.length > constants_1.EDGE_FUNCTION_SIZE_LIMIT) {
+        throw new Error(`Exceeds maximum edge function script size: ${(0, pretty_bytes_1.default)(gzipped.length)} / ${(0, pretty_bytes_1.default)(constants_1.EDGE_FUNCTION_SIZE_LIMIT)}`);
     }
 }

package/dist/index.js

@@ -44725,27 +44725,13 @@ exports.default = createServerlessConfig;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.EDGE_FUNCTION_USER_SCRIPT_SIZE_LIMIT = void 0;
+exports.EDGE_FUNCTION_SIZE_LIMIT = void 0;
 const KIB = 1024;
 const MIB = 1024 * KIB;
 /**
- * The limit after compression. it has to be kibibyte instead of kilobyte
- * See https://github.com/cloudflare/wrangler/blob/8907b12add3d70ee21ac597b69cd66f6807571f4/src/wranglerjs/output.rs#L44
+ * The maximum size of a *compressed* edge function.
  */
-const EDGE_FUNCTION_SCRIPT_SIZE_LIMIT = MIB;
-/**
- * This safety buffer must cover the size of our whole runtime layer compressed
- * plus some extra space to allow it to grow in the future. At the time of
- * writing this comment the compressed size size is ~7KiB so 20KiB should
- * be more than enough.
- */
-const EDGE_FUNCTION_SCRIPT_SIZE_BUFFER = 20 * KIB;
-/**
- * The max size we allow for compressed user code is the compressed script
- * limit minus the compressed safety buffer. We must check this limit after
- * compressing the user code.
- */
-exports.EDGE_FUNCTION_USER_SCRIPT_SIZE_LIMIT = EDGE_FUNCTION_SCRIPT_SIZE_LIMIT - EDGE_FUNCTION_SCRIPT_SIZE_BUFFER;
+exports.EDGE_FUNCTION_SIZE_LIMIT = MIB;
 
 
 /***/ }),
@@ -44822,8 +44808,8 @@ function getWasmImportStatements(wasm = []) {
 }
 async function validateScript(content) {
     const gzipped = await gzip(content);
-    if (gzipped.length > constants_1.EDGE_FUNCTION_USER_SCRIPT_SIZE_LIMIT) {
-        throw new Error(`Exceeds maximum edge function script size: ${(0, pretty_bytes_1.default)(gzipped.length)} / ${(0, pretty_bytes_1.default)(constants_1.EDGE_FUNCTION_USER_SCRIPT_SIZE_LIMIT)}`);
+    if (gzipped.length > constants_1.EDGE_FUNCTION_SIZE_LIMIT) {
+        throw new Error(`Exceeds maximum edge function script size: ${(0, pretty_bytes_1.default)(gzipped.length)} / ${(0, pretty_bytes_1.default)(constants_1.EDGE_FUNCTION_SIZE_LIMIT)}`);
     }
 }
 
@@ -44857,6 +44843,7 @@ const create_serverless_config_1 = __importDefault(__webpack_require__(9892));
 const legacy_versions_1 = __importDefault(__webpack_require__(1207));
 const server_build_1 = __webpack_require__(5840);
 const utils_1 = __webpack_require__(4411);
+const assert_1 = __importDefault(__webpack_require__(2357));
 exports.version = 2;
 exports.htmlContentType = 'text/html; charset=utf-8';
 const SERVER_BUILD_MINIMUM_NEXT_VERSION = 'v10.0.9-canary.4';
@@ -45532,7 +45519,11 @@ 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 (0, build_utils_1.glob)('**/!(_middleware).js', pagesDir);
+        const pages = await getServerlessPages({
+            pagesDir,
+            entryPath,
+            outputDirectory,
+        });
         const launcherPath = path_1.default.join(__dirname, 'legacy-launcher.js');
         const launcherData = await (0, fs_extra_1.readFile)(launcherPath, 'utf8');
         await Promise.all(Object.keys(pages).map(async (page) => {
@@ -45578,7 +45569,11 @@ 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 (0, build_utils_1.glob)('**/!(_middleware).js', pagesDir);
+        const pages = await getServerlessPages({
+            pagesDir,
+            entryPath,
+            outputDirectory,
+        });
         const isApiPage = (page) => page
             .replace(/\\/g, '/')
             .match(/(serverless|server)\/pages\/api(\/|\.js$)/);
@@ -45729,6 +45724,7 @@ const build = async ({ files, workPath, repoRootPath, entrypoint, config = {}, m
                 entryPath,
                 baseDir,
                 dataRoutes,
+                buildId,
                 escapedBuildId,
                 outputDirectory,
                 trailingSlashRedirects,
@@ -46637,6 +46633,23 @@ const prepareCache = async ({ workPath, repoRootPath, entrypoint, config = {}, }
     return cache;
 };
 exports.prepareCache = prepareCache;
+async function getServerlessPages(params) {
+    const [pages, middlewareManifest] = await Promise.all([
+        (0, build_utils_1.glob)('**/!(_middleware).js', params.pagesDir),
+        (0, utils_1.getMiddlewareManifest)(params.entryPath, params.outputDirectory),
+    ]);
+    // Edge Functions do not consider as Serverless Functions
+    for (const edgeFunctionFile of Object.keys(middlewareManifest?.functions ?? {})) {
+        // `getStaticProps` are expecting `Prerender` output which is a Serverless function
+        // and not an Edge Function. Therefore we only remove API endpoints for now, as they
+        // don't have `getStaticProps`.
+        //
+        // Context: https://github.com/vercel/vercel/pull/7905#discussion_r890213165
+        (0, assert_1.default)(edgeFunctionFile.startsWith('/api/'), `Only API endpoints are currently supported for Edge endpoints.`);
+        delete pages[edgeFunctionFile.slice(1) + '.js'];
+    }
+    return pages;
+}
 
 
 /***/ }),
@@ -47011,7 +47024,8 @@ const pretty_bytes_1 = __importDefault(__webpack_require__(539));
 // 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, }) {
+const NEXT_DATA_MIDDLEWARE_RESOLVING_VERSION = 'v12.1.7-canary.33';
+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, prerenderManifest, omittedPrerenderRoutes, trailingSlashRedirects, isCorrectLocaleAPIRoutes, lambdaCompressedByteLimit, requiredServerFilesManifest, }) {
     const lambdas = {};
     const prerenders = {};
     const lambdaPageKeys = Object.keys(lambdaPages);
@@ -47410,6 +47424,8 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
         routesManifest,
         isCorrectMiddlewareOrder,
     });
+    const isNextDataServerResolving = middleware.staticRoutes.length > 0 &&
+        semver_1.default.gte(nextVersion, NEXT_DATA_MIDDLEWARE_RESOLVING_VERSION);
     const dynamicRoutes = await (0, utils_1.getDynamicRoutes)(entryPath, entryDirectory, dynamicPages, false, routesManifest, omittedPrerenderRoutes, canUsePreviewMode, prerenderManifest.bypassToken || '', true, middleware.dynamicRouteMap).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 = [];
@@ -47452,6 +47468,39 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
             }
         }
     }
+    const normalizeNextDataRoute = isNextDataServerResolving
+        ? [
+            // strip _next/data prefix for resolving
+            {
+                src: `^${path_1.default.join('/', entryDirectory, '/_next/data/', escapedBuildId, '/(.*).json')}`,
+                dest: `${path_1.default.join('/', entryDirectory, '/$1')}`,
+                continue: true,
+                override: true,
+                has: [
+                    {
+                        type: 'header',
+                        key: 'x-nextjs-data',
+                    },
+                ],
+            },
+        ]
+        : [];
+    const denormalizeNextDataRoute = isNextDataServerResolving
+        ? [
+            {
+                src: '/(.*)',
+                has: [
+                    {
+                        type: 'header',
+                        key: 'x-nextjs-data',
+                    },
+                ],
+                dest: `${path_1.default.join('/', entryDirectory, '/_next/data/', buildId, '/$1.json')}`,
+                continue: true,
+                override: true,
+            },
+        ]
+        : [];
     return {
         wildcard: wildcardConfig,
         images: imagesManifest?.images?.loader === 'default'
@@ -47475,6 +47524,15 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
             ...staticDirectoryFiles,
             ...privateOutputs.files,
             ...middleware.edgeFunctions,
+            ...(isNextDataServerResolving
+                ? {
+                    __next_data_catchall: new build_utils_1.FileBlob({
+                        contentType: 'application/json',
+                        mode: 0o644,
+                        data: '{}',
+                    }),
+                }
+                : {}),
         },
         routes: [
             /*
@@ -47492,6 +47550,8 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
             // trailing slash
             ...trailingSlashRedirects,
             ...privateOutputs.routes,
+            // normalize _next/data URL before processing redirects
+            ...normalizeNextDataRoute,
             ...(i18n
                 ? [
                     // Handle auto-adding current default locale to path based on
@@ -47617,6 +47677,8 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                             continue: true,
                         },
                     ]),
+            // we need to undo _next/data normalize before checking filesystem
+            ...denormalizeNextDataRoute,
             // while middleware was in beta the order came right before
             // handle: 'filesystem' we maintain this for older versions
             // to prevent a local/deploy mismatch
@@ -47635,13 +47697,19 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                     },
                 ]
                 : []),
-            // No-op _next/data rewrite to trigger handle: 'rewrites' and then 404
-            // if no match to prevent rewriting _next/data unexpectedly
-            {
-                src: path_1.default.join('/', entryDirectory, '_next/data/(.*)'),
-                dest: path_1.default.join('/', entryDirectory, '_next/data/$1'),
-                check: true,
-            },
+            // normalize _next/data URL before processing rewrites
+            ...normalizeNextDataRoute,
+            ...(!isNextDataServerResolving
+                ? [
+                    // No-op _next/data rewrite to trigger handle: 'rewrites' and then 404
+                    // if no match to prevent rewriting _next/data unexpectedly
+                    {
+                        src: path_1.default.join('/', entryDirectory, '_next/data/(.*)'),
+                        dest: path_1.default.join('/', entryDirectory, '_next/data/$1'),
+                        check: true,
+                    },
+                ]
+                : []),
             // These need to come before handle: miss or else they are grouped
             // with that routing section
             ...afterFilesRewrites,
@@ -47687,18 +47755,34 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
             // routes that are called after each rewrite or after routes
             // if there no rewrites
             { handle: 'rewrite' },
+            // re-build /_next/data URL after resolving
+            ...denormalizeNextDataRoute,
             // /_next/data routes for getServerProps/getStaticProps pages
             ...dataRoutes,
-            // ensure we 404 for non-existent _next/data routes before
-            // trying page dynamic routes
-            {
-                src: path_1.default.join('/', entryDirectory, '_next/data/(.*)'),
-                dest: path_1.default.join('/', entryDirectory, '404'),
-                status: 404,
-            },
+            ...(!isNextDataServerResolving
+                ? [
+                    // ensure we 404 for non-existent _next/data routes before
+                    // trying page dynamic routes
+                    {
+                        src: path_1.default.join('/', entryDirectory, '_next/data/(.*)'),
+                        dest: path_1.default.join('/', entryDirectory, '404'),
+                        status: 404,
+                    },
+                ]
+                : []),
             // Dynamic routes (must come after dataRoutes as dataRoutes are more
             // specific)
             ...dynamicRoutes,
+            ...(isNextDataServerResolving
+                ? [
+                    // add a catch-all data route so we don't 404 when getting
+                    // middleware effects
+                    {
+                        src: `^${path_1.default.join('/', entryDirectory, '/_next/data/', escapedBuildId, '/(.*).json')}`,
+                        dest: '__next_data_catchall',
+                    },
+                ]
+                : []),
             // routes to call after a file has been matched
             { handle: 'hit' },
             // Before we handle static files we need to set proper caching headers
@@ -47920,7 +48004,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-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.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));
@@ -49234,25 +49318,41 @@ async function getPrivateOutputs(dir, entries) {
 exports.getPrivateOutputs = getPrivateOutputs;
 async function getMiddlewareBundle({ entryPath, outputDirectory, routesManifest, isCorrectMiddlewareOrder, }) {
     const middlewareManifest = await getMiddlewareManifest(entryPath, outputDirectory);
-    if (middlewareManifest && middlewareManifest?.sortedMiddleware.length > 0) {
-        const workerConfigs = await Promise.all(middlewareManifest.sortedMiddleware.map(async (key) => {
-            const middleware = middlewareManifest.middleware[key];
+    const sortedFunctions = [
+        ...(!middlewareManifest
+            ? []
+            : middlewareManifest.sortedMiddleware.map(key => ({
+                key,
+                edgeFunction: middlewareManifest?.middleware[key],
+                type: 'middleware',
+            }))),
+        ...Object.entries(middlewareManifest?.functions ?? {}).map(([key, edgeFunction]) => {
+            return {
+                key,
+                edgeFunction,
+                type: 'function',
+            };
+        }),
+    ];
+    if (middlewareManifest && sortedFunctions.length > 0) {
+        const workerConfigs = await Promise.all(sortedFunctions.map(async ({ key, edgeFunction, type }) => {
             try {
-                const wrappedModuleSource = await (0, get_edge_function_source_1.getNextjsEdgeFunctionSource)(middleware.files, {
-                    name: middleware.name,
+                const wrappedModuleSource = await (0, get_edge_function_source_1.getNextjsEdgeFunctionSource)(edgeFunction.files, {
+                    name: edgeFunction.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), middleware.wasm);
+                }, path_1.default.resolve(entryPath, outputDirectory), edgeFunction.wasm);
                 return {
-                    page: middlewareManifest.middleware[key].page,
+                    type,
+                    page: edgeFunction.page,
                     edgeFunction: (() => {
                         const { source, map } = wrappedModuleSource.sourceAndMap();
                         const transformedMap = (0, sourcemapped_1.stringifySourceMap)(transformSourceMap(map));
-                        const wasmFiles = (middleware.wasm ?? []).reduce((acc, { filePath, name }) => {
+                        const wasmFiles = (edgeFunction.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,
@@ -49263,7 +49363,7 @@ async function getMiddlewareBundle({ entryPath, outputDirectory, routesManifest,
                         }, {});
                         return new build_utils_1.EdgeFunction({
                             deploymentTarget: 'v8-worker',
-                            name: middleware.name,
+                            name: edgeFunction.name,
                             files: {
                                 'index.js': new build_utils_1.FileBlob({
                                     data: source,
@@ -49280,10 +49380,10 @@ async function getMiddlewareBundle({ entryPath, outputDirectory, routesManifest,
                                 ...wasmFiles,
                             },
                             entrypoint: 'index.js',
-                            envVarsInUse: middleware.env,
+                            envVarsInUse: edgeFunction.env,
                         });
                     })(),
-                    routeSrc: getRouteSrc(middlewareManifest.middleware[key], routesManifest),
+                    routeSrc: getRouteSrc(edgeFunction, routesManifest),
                 };
             }
             catch (e) {
@@ -49298,15 +49398,21 @@ async function getMiddlewareBundle({ entryPath, outputDirectory, routesManifest,
         };
         for (const worker of workerConfigs.values()) {
             const edgeFile = worker.edgeFunction.name;
-            worker.edgeFunction.name = edgeFile.replace(/^pages\//, '');
-            source.edgeFunctions[edgeFile] = worker.edgeFunction;
+            const shortPath = edgeFile.replace(/^pages\//, '');
+            worker.edgeFunction.name = shortPath;
+            source.edgeFunctions[shortPath] = worker.edgeFunction;
             const route = {
                 continue: true,
-                middlewarePath: edgeFile,
                 src: worker.routeSrc,
             };
-            if (isCorrectMiddlewareOrder) {
-                route.override = true;
+            if (worker.type === 'function') {
+                route.dest = shortPath;
+            }
+            else {
+                route.middlewarePath = shortPath;
+                if (isCorrectMiddlewareOrder) {
+                    route.override = true;
+                }
             }
             if (routesManifest.version > 3 && isDynamicRoute(worker.page)) {
                 source.dynamicRouteMap.set(worker.page, route);
@@ -49340,6 +49446,7 @@ async function getMiddlewareManifest(entryPath, outputDirectory) {
     }
     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

package/dist/server-build.js

@@ -18,7 +18,8 @@ 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, }) {
+const NEXT_DATA_MIDDLEWARE_RESOLVING_VERSION = 'v12.1.7-canary.33';
+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, prerenderManifest, omittedPrerenderRoutes, trailingSlashRedirects, isCorrectLocaleAPIRoutes, lambdaCompressedByteLimit, requiredServerFilesManifest, }) {
     const lambdas = {};
     const prerenders = {};
     const lambdaPageKeys = Object.keys(lambdaPages);
@@ -417,6 +418,8 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
         routesManifest,
         isCorrectMiddlewareOrder,
     });
+    const isNextDataServerResolving = middleware.staticRoutes.length > 0 &&
+        semver_1.default.gte(nextVersion, NEXT_DATA_MIDDLEWARE_RESOLVING_VERSION);
     const dynamicRoutes = await (0, utils_1.getDynamicRoutes)(entryPath, entryDirectory, dynamicPages, false, routesManifest, omittedPrerenderRoutes, canUsePreviewMode, prerenderManifest.bypassToken || '', true, middleware.dynamicRouteMap).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 = [];
@@ -459,6 +462,39 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
             }
         }
     }
+    const normalizeNextDataRoute = isNextDataServerResolving
+        ? [
+            // strip _next/data prefix for resolving
+            {
+                src: `^${path_1.default.join('/', entryDirectory, '/_next/data/', escapedBuildId, '/(.*).json')}`,
+                dest: `${path_1.default.join('/', entryDirectory, '/$1')}`,
+                continue: true,
+                override: true,
+                has: [
+                    {
+                        type: 'header',
+                        key: 'x-nextjs-data',
+                    },
+                ],
+            },
+        ]
+        : [];
+    const denormalizeNextDataRoute = isNextDataServerResolving
+        ? [
+            {
+                src: '/(.*)',
+                has: [
+                    {
+                        type: 'header',
+                        key: 'x-nextjs-data',
+                    },
+                ],
+                dest: `${path_1.default.join('/', entryDirectory, '/_next/data/', buildId, '/$1.json')}`,
+                continue: true,
+                override: true,
+            },
+        ]
+        : [];
     return {
         wildcard: wildcardConfig,
         images: imagesManifest?.images?.loader === 'default'
@@ -482,6 +518,15 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
             ...staticDirectoryFiles,
             ...privateOutputs.files,
             ...middleware.edgeFunctions,
+            ...(isNextDataServerResolving
+                ? {
+                    __next_data_catchall: new build_utils_1.FileBlob({
+                        contentType: 'application/json',
+                        mode: 0o644,
+                        data: '{}',
+                    }),
+                }
+                : {}),
         },
         routes: [
             /*
@@ -499,6 +544,8 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
             // trailing slash
             ...trailingSlashRedirects,
             ...privateOutputs.routes,
+            // normalize _next/data URL before processing redirects
+            ...normalizeNextDataRoute,
             ...(i18n
                 ? [
                     // Handle auto-adding current default locale to path based on
@@ -624,6 +671,8 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                             continue: true,
                         },
                     ]),
+            // we need to undo _next/data normalize before checking filesystem
+            ...denormalizeNextDataRoute,
             // while middleware was in beta the order came right before
             // handle: 'filesystem' we maintain this for older versions
             // to prevent a local/deploy mismatch
@@ -642,13 +691,19 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                     },
                 ]
                 : []),
-            // No-op _next/data rewrite to trigger handle: 'rewrites' and then 404
-            // if no match to prevent rewriting _next/data unexpectedly
-            {
-                src: path_1.default.join('/', entryDirectory, '_next/data/(.*)'),
-                dest: path_1.default.join('/', entryDirectory, '_next/data/$1'),
-                check: true,
-            },
+            // normalize _next/data URL before processing rewrites
+            ...normalizeNextDataRoute,
+            ...(!isNextDataServerResolving
+                ? [
+                    // No-op _next/data rewrite to trigger handle: 'rewrites' and then 404
+                    // if no match to prevent rewriting _next/data unexpectedly
+                    {
+                        src: path_1.default.join('/', entryDirectory, '_next/data/(.*)'),
+                        dest: path_1.default.join('/', entryDirectory, '_next/data/$1'),
+                        check: true,
+                    },
+                ]
+                : []),
             // These need to come before handle: miss or else they are grouped
             // with that routing section
             ...afterFilesRewrites,
@@ -694,18 +749,34 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
             // routes that are called after each rewrite or after routes
             // if there no rewrites
             { handle: 'rewrite' },
+            // re-build /_next/data URL after resolving
+            ...denormalizeNextDataRoute,
             // /_next/data routes for getServerProps/getStaticProps pages
             ...dataRoutes,
-            // ensure we 404 for non-existent _next/data routes before
-            // trying page dynamic routes
-            {
-                src: path_1.default.join('/', entryDirectory, '_next/data/(.*)'),
-                dest: path_1.default.join('/', entryDirectory, '404'),
-                status: 404,
-            },
+            ...(!isNextDataServerResolving
+                ? [
+                    // ensure we 404 for non-existent _next/data routes before
+                    // trying page dynamic routes
+                    {
+                        src: path_1.default.join('/', entryDirectory, '_next/data/(.*)'),
+                        dest: path_1.default.join('/', entryDirectory, '404'),
+                        status: 404,
+                    },
+                ]
+                : []),
             // Dynamic routes (must come after dataRoutes as dataRoutes are more
             // specific)
             ...dynamicRoutes,
+            ...(isNextDataServerResolving
+                ? [
+                    // add a catch-all data route so we don't 404 when getting
+                    // middleware effects
+                    {
+                        src: `^${path_1.default.join('/', entryDirectory, '/_next/data/', escapedBuildId, '/(.*).json')}`,
+                        dest: '__next_data_catchall',
+                    },
+                ]
+                : []),
             // routes to call after a file has been matched
             { handle: 'hit' },
             // Before we handle static files we need to set proper caching headers

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.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.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"));
@@ -1336,25 +1336,41 @@ async function getPrivateOutputs(dir, entries) {
 exports.getPrivateOutputs = getPrivateOutputs;
 async function getMiddlewareBundle({ entryPath, outputDirectory, routesManifest, isCorrectMiddlewareOrder, }) {
     const middlewareManifest = await getMiddlewareManifest(entryPath, outputDirectory);
-    if (middlewareManifest && middlewareManifest?.sortedMiddleware.length > 0) {
-        const workerConfigs = await Promise.all(middlewareManifest.sortedMiddleware.map(async (key) => {
-            const middleware = middlewareManifest.middleware[key];
+    const sortedFunctions = [
+        ...(!middlewareManifest
+            ? []
+            : middlewareManifest.sortedMiddleware.map(key => ({
+                key,
+                edgeFunction: middlewareManifest?.middleware[key],
+                type: 'middleware',
+            }))),
+        ...Object.entries(middlewareManifest?.functions ?? {}).map(([key, edgeFunction]) => {
+            return {
+                key,
+                edgeFunction,
+                type: 'function',
+            };
+        }),
+    ];
+    if (middlewareManifest && sortedFunctions.length > 0) {
+        const workerConfigs = await Promise.all(sortedFunctions.map(async ({ key, edgeFunction, type }) => {
             try {
-                const wrappedModuleSource = await (0, get_edge_function_source_1.getNextjsEdgeFunctionSource)(middleware.files, {
-                    name: middleware.name,
+                const wrappedModuleSource = await (0, get_edge_function_source_1.getNextjsEdgeFunctionSource)(edgeFunction.files, {
+                    name: edgeFunction.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), middleware.wasm);
+                }, path_1.default.resolve(entryPath, outputDirectory), edgeFunction.wasm);
                 return {
-                    page: middlewareManifest.middleware[key].page,
+                    type,
+                    page: edgeFunction.page,
                     edgeFunction: (() => {
                         const { source, map } = wrappedModuleSource.sourceAndMap();
                         const transformedMap = (0, sourcemapped_1.stringifySourceMap)(transformSourceMap(map));
-                        const wasmFiles = (middleware.wasm ?? []).reduce((acc, { filePath, name }) => {
+                        const wasmFiles = (edgeFunction.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,
@@ -1365,7 +1381,7 @@ async function getMiddlewareBundle({ entryPath, outputDirectory, routesManifest,
                         }, {});
                         return new build_utils_1.EdgeFunction({
                             deploymentTarget: 'v8-worker',
-                            name: middleware.name,
+                            name: edgeFunction.name,
                             files: {
                                 'index.js': new build_utils_1.FileBlob({
                                     data: source,
@@ -1382,10 +1398,10 @@ async function getMiddlewareBundle({ entryPath, outputDirectory, routesManifest,
                                 ...wasmFiles,
                             },
                             entrypoint: 'index.js',
-                            envVarsInUse: middleware.env,
+                            envVarsInUse: edgeFunction.env,
                         });
                     })(),
-                    routeSrc: getRouteSrc(middlewareManifest.middleware[key], routesManifest),
+                    routeSrc: getRouteSrc(edgeFunction, routesManifest),
                 };
             }
             catch (e) {
@@ -1400,15 +1416,21 @@ async function getMiddlewareBundle({ entryPath, outputDirectory, routesManifest,
         };
         for (const worker of workerConfigs.values()) {
             const edgeFile = worker.edgeFunction.name;
-            worker.edgeFunction.name = edgeFile.replace(/^pages\//, '');
-            source.edgeFunctions[edgeFile] = worker.edgeFunction;
+            const shortPath = edgeFile.replace(/^pages\//, '');
+            worker.edgeFunction.name = shortPath;
+            source.edgeFunctions[shortPath] = worker.edgeFunction;
             const route = {
                 continue: true,
-                middlewarePath: edgeFile,
                 src: worker.routeSrc,
             };
-            if (isCorrectMiddlewareOrder) {
-                route.override = true;
+            if (worker.type === 'function') {
+                route.dest = shortPath;
+            }
+            else {
+                route.middlewarePath = shortPath;
+                if (isCorrectMiddlewareOrder) {
+                    route.override = true;
+                }
             }
             if (routesManifest.version > 3 && isDynamicRoute(worker.page)) {
                 source.dynamicRouteMap.set(worker.page, route);
@@ -1442,6 +1464,7 @@ async function getMiddlewareManifest(entryPath, outputDirectory) {
     }
     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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/next",
-  "version": "3.0.1-canary.0",
+  "version": "3.0.2-canary.0",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/next-js",
@@ -45,7 +45,7 @@
     "@types/semver": "6.0.0",
     "@types/text-table": "0.2.1",
     "@types/webpack-sources": "3.2.0",
-    "@vercel/build-utils": "4.0.1-canary.0",
+    "@vercel/build-utils": "4.1.1-canary.0",
     "@vercel/nft": "0.19.1",
     "@vercel/routing-utils": "1.13.4",
     "async-sema": "3.0.1",
@@ -70,5 +70,5 @@
     "typescript": "4.5.2",
     "webpack-sources": "3.2.3"
   },
-  "gitHead": "39f758662131ec37c467ebba5d5b618cba0c753f"
+  "gitHead": "4bf6295d7a1d6544f195d76a2a4aedb476fa7dc1"
 }