@vercel/next 3.1.20 → 3.1.23

package/dist/utils.js

@@ -22,7 +22,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMiddlewareManifest = exports.getMiddlewareBundle = exports.getSourceFilePathFromPage = exports.isDynamicRoute = exports.normalizePage = exports.getNextConfig = exports.normalizePackageJson = exports.validateEntrypoint = exports.excludeFiles = exports.getPrivateOutputs = exports.updateRouteSrc = exports.getNextServerPath = exports.normalizeIndexOutput = exports.getStaticFiles = exports.onPrerenderRoute = exports.onPrerenderRouteInitial = exports.detectLambdaLimitExceeding = exports.outputFunctionFileSizeInfo = exports.getPageLambdaGroups = exports.MAX_UNCOMPRESSED_LAMBDA_SIZE = exports.addLocaleOrDefault = exports.normalizeLocalePath = exports.getPrerenderManifest = exports.getRequiredServerFilesManifest = exports.getExportStatus = exports.getExportIntent = exports.createLambdaFromPseudoLayers = exports.createPseudoLayer = exports.ExperimentalTraceVersion = exports.collectTracedFiles = exports.getFilesMapFromReasons = exports.filterStaticPages = exports.getImagesManifest = exports.localizeDynamicRoutes = exports.getDynamicRoutes = exports.getRoutesManifest = void 0;
+exports.upgradeMiddlewareManifest = exports.getMiddlewareManifest = exports.getMiddlewareBundle = exports.getSourceFilePathFromPage = exports.isDynamicRoute = exports.normalizePage = exports.getNextConfig = exports.normalizePackageJson = exports.validateEntrypoint = exports.excludeFiles = exports.getPrivateOutputs = exports.updateRouteSrc = exports.getNextServerPath = exports.normalizeIndexOutput = exports.getStaticFiles = exports.onPrerenderRoute = exports.onPrerenderRouteInitial = exports.detectLambdaLimitExceeding = exports.outputFunctionFileSizeInfo = exports.getPageLambdaGroups = exports.MAX_UNCOMPRESSED_LAMBDA_SIZE = exports.addLocaleOrDefault = exports.normalizeLocalePath = exports.getPrerenderManifest = exports.getRequiredServerFilesManifest = exports.getExportStatus = exports.getExportIntent = exports.createLambdaFromPseudoLayers = exports.createPseudoLayer = exports.ExperimentalTraceVersion = exports.collectTracedFiles = exports.getFilesMapFromReasons = exports.filterStaticPages = exports.getImagesManifest = exports.localizeDynamicRoutes = exports.getDynamicRoutes = exports.getRoutesManifest = void 0;
 const build_utils_1 = require("@vercel/build-utils");
 const async_sema_1 = require("async-sema");
 const buffer_crc32_1 = __importDefault(require("buffer-crc32"));
@@ -1439,7 +1439,7 @@ async function getMiddlewareBundle({ entryPath, outputDirectory, routesManifest,
                             }),
                         });
                     })(),
-                    routeSrc: getRouteSrc(edgeFunction, routesManifest),
+                    routeMatchers: getRouteMatchers(edgeFunction, routesManifest),
                 };
             }
             catch (e) {
@@ -1462,26 +1462,29 @@ async function getMiddlewareBundle({ entryPath, outputDirectory, routesManifest,
             if (worker.type === 'function') {
                 continue;
             }
-            const route = {
-                continue: true,
-                src: worker.routeSrc,
-                missing: [
-                    {
-                        type: 'header',
-                        key: 'x-prerender-revalidate',
-                        value: prerenderBypassToken,
-                    },
-                ],
-            };
-            route.middlewarePath = shortPath;
-            if (isCorrectMiddlewareOrder) {
-                route.override = true;
-            }
-            if (routesManifest.version > 3 && isDynamicRoute(worker.page)) {
-                source.dynamicRouteMap.set(worker.page, route);
-            }
-            else {
-                source.staticRoutes.push(route);
+            for (const matcher of worker.routeMatchers) {
+                const route = {
+                    continue: true,
+                    src: matcher.regexp,
+                    has: matcher.has,
+                    missing: [
+                        {
+                            type: 'header',
+                            key: 'x-prerender-revalidate',
+                            value: prerenderBypassToken,
+                        },
+                    ],
+                };
+                route.middlewarePath = shortPath;
+                if (isCorrectMiddlewareOrder) {
+                    route.override = true;
+                }
+                if (routesManifest.version > 3 && isDynamicRoute(worker.page)) {
+                    source.dynamicRouteMap.set(worker.page, route);
+                }
+                else {
+                    source.staticRoutes.push(route);
+                }
             }
         }
         return source;
@@ -1507,28 +1510,70 @@ async function getMiddlewareManifest(entryPath, outputDirectory) {
     if (!hasManifest) {
         return;
     }
-    return fs_extra_1.default.readJSON(middlewareManifestPath);
+    const manifest = (await fs_extra_1.default.readJSON(middlewareManifestPath));
+    return manifest.version === 1
+        ? upgradeMiddlewareManifest(manifest)
+        : manifest;
 }
 exports.getMiddlewareManifest = getMiddlewareManifest;
+function upgradeMiddlewareManifest(v1) {
+    function updateInfo(v1Info) {
+        const { regexp, ...rest } = v1Info;
+        return {
+            ...rest,
+            matchers: [{ regexp }],
+        };
+    }
+    const middleware = Object.fromEntries(Object.entries(v1.middleware).map(([p, info]) => [p, updateInfo(info)]));
+    const functions = v1.functions
+        ? Object.fromEntries(Object.entries(v1.functions).map(([p, info]) => [p, updateInfo(info)]))
+        : undefined;
+    return {
+        ...v1,
+        version: 2,
+        middleware,
+        functions,
+    };
+}
+exports.upgradeMiddlewareManifest = upgradeMiddlewareManifest;
 /**
  * For an object containing middleware info and a routes manifest this will
  * generate a string with the route that will activate the middleware on
  * Vercel Proxy.
  *
- * @param param0 The middleware info including regexp and page.
+ * @param param0 The middleware info including matchers and page.
  * @param param1 The routes manifest
- * @returns A regexp string for the middleware route.
+ * @returns matchers for the middleware route.
  */
-function getRouteSrc({ regexp, page }, { basePath = '', i18n }) {
-    if (page === '/') {
-        return regexp.replace('_next', `${basePath?.substring(1) ? `${basePath?.substring(1)}/` : ''}_next`);
-    }
-    const locale = i18n?.locales.length
-        ? `(?:/(${i18n.locales
-            .map(locale => (0, escape_string_regexp_1.default)(locale))
-            .join('|')}))?`
-        : '';
-    return `(?:^${basePath}${locale}${regexp.substring(1)})`;
+function getRouteMatchers(info, { basePath = '', i18n }) {
+    function getRegexp(regexp) {
+        if (info.page === '/') {
+            return regexp;
+        }
+        const locale = i18n?.locales.length
+            ? `(?:/(${i18n.locales
+                .map(locale => (0, escape_string_regexp_1.default)(locale))
+                .join('|')}))?`
+            : '';
+        return `(?:^${basePath}${locale}${regexp.substring(1)})`;
+    }
+    function normalizeHas(has) {
+        return has.map(v => v.type === 'header'
+            ? {
+                ...v,
+                key: v.key.toLowerCase(),
+            }
+            : v);
+    }
+    return info.matchers.map(matcher => {
+        const m = {
+            regexp: getRegexp(matcher.regexp),
+        };
+        if (matcher.has) {
+            m.has = normalizeHas(matcher.has);
+        }
+        return m;
+    });
 }
 /**
  * Makes the sources more human-readable in the source map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/next",
-  "version": "3.1.20",
+  "version": "3.1.23",
   "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.4.1",
     "@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": "ebb5e2b208b14c6dbef325f47643d99008d50700"
+  "gitHead": "2906d83eaeddc72f9d874981dbe6698e812f3ca3"
 }