@vercel/next 2.8.67-canary.0 → 2.8.67-canary.3

package/dist/server-build.js

@@ -450,7 +450,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                     currentRouteSrc = starterRouteSrc;
                 }
                 // add to existing route src if src length limit isn't reached
-                currentRouteSrc = `${currentRouteSrc.substr(0, currentRouteSrc.length - 1)}${currentRouteSrc[currentRouteSrc.length - 2] === '(' ? '' : '|'}${route})`;
+                currentRouteSrc = `${currentRouteSrc.substring(0, currentRouteSrc.length - 1)}${currentRouteSrc[currentRouteSrc.length - 2] === '(' ? '' : '|'}${route})`;
                 if (isLastRoute) {
                     pushRoute(currentRouteSrc);
                 }
@@ -458,7 +458,6 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
         }
     }
     return {
-        middleware: middleware.middleware,
         wildcard: wildcardConfig,
         images: ((_d = imagesManifest === null || imagesManifest === void 0 ? void 0 : imagesManifest.images) === null || _d === void 0 ? void 0 : _d.loader) === 'default'
             ? {
@@ -786,8 +785,6 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                         },
                     ]),
         ],
-        watch: [],
-        childProcesses: [],
     };
 }
 exports.serverBuild = serverBuild;

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"));
@@ -306,7 +306,7 @@ function localizeDynamicRoutes(dynamicRoutes, dynamicPrefix, entryDirectory, sta
             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 isAutoExport = staticPages[addLocaleOrDefault(pathname, routesManifest).substr(1)];
+            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('|')})?`);
             if (isLocalePrefixed && !(isCorrectLocaleAPIRoutes && isApiRoute)) {
@@ -1340,27 +1340,44 @@ async function getPrivateOutputs(dir, entries) {
 }
 exports.getPrivateOutputs = getPrivateOutputs;
 async function getMiddlewareBundle({ entryPath, outputDirectory, routesManifest, }) {
+    var _a;
     const middlewareManifest = await getMiddlewareManifest(entryPath, outputDirectory);
-    if (middlewareManifest && (middlewareManifest === null || middlewareManifest === void 0 ? void 0 : 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 === 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 }) => {
             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: (() => {
                         var _a;
                         const { source, map } = wrappedModuleSource.sourceAndMap();
                         const transformedMap = (0, sourcemapped_1.stringifySourceMap)(transformSourceMap(map));
-                        const wasmFiles = ((_a = middleware.wasm) !== null && _a !== void 0 ? _a : []).reduce((acc, { filePath, name }) => {
+                        const wasmFiles = ((_a = edgeFunction.wasm) !== null && _a !== void 0 ? _a : []).reduce((acc, { filePath, name }) => {
                             const fullFilePath = path_1.default.join(entryPath, outputDirectory, filePath);
                             acc[`wasm/${name}.wasm`] = new build_utils_1.FileFsRef({
                                 mode: 0o644,
@@ -1371,7 +1388,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,
@@ -1388,10 +1405,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) {
@@ -1403,16 +1420,23 @@ async function getMiddlewareBundle({ entryPath, outputDirectory, routesManifest,
             staticRoutes: [],
             dynamicRouteMap: new Map(),
             edgeFunctions: {},
-            middleware: [],
         };
         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,
+                ...(worker.type === 'middleware'
+                    ? {
+                        middlewarePath: shortPath,
+                        override: true,
+                    }
+                    : {
+                        dest: shortPath,
+                    }),
             };
             if (routesManifest.version > 3 && isDynamicRoute(worker.page)) {
                 source.dynamicRouteMap.set(worker.page, route);
@@ -1427,7 +1451,6 @@ async function getMiddlewareBundle({ entryPath, outputDirectory, routesManifest,
         staticRoutes: [],
         dynamicRouteMap: new Map(),
         edgeFunctions: {},
-        middleware: [],
     };
 }
 exports.getMiddlewareBundle = getMiddlewareBundle;
@@ -1448,6 +1471,7 @@ async function getMiddlewareManifest(entryPath, outputDirectory) {
     // eslint-disable-next-line @typescript-eslint/no-var-requires
     return require(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": "2.8.67-canary.0",
+  "version": "2.8.67-canary.3",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/next-js",
@@ -45,8 +45,8 @@
     "@types/semver": "6.0.0",
     "@types/text-table": "0.2.1",
     "@types/webpack-sources": "3.2.0",
-    "@vercel/build-utils": "3.1.1-canary.0",
-    "@vercel/nft": "0.19.0",
+    "@vercel/build-utils": "3.1.1-canary.2",
+    "@vercel/nft": "0.19.1",
     "@vercel/routing-utils": "1.13.3",
     "async-sema": "3.0.1",
     "buffer-crc32": "0.2.13",
@@ -70,5 +70,5 @@
     "typescript": "4.5.2",
     "webpack-sources": "3.2.3"
   },
-  "gitHead": "e829ce47c356a06564551349e771b457ea95ac74"
+  "gitHead": "0a072ee8504ec6de9be9fe51b1659d67f56ec875"
 }