@vercel/next 3.6.3 → 3.6.6

package/dist/index.js

@@ -42420,6 +42420,13 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
     const projectDir = requiredServerFilesManifest.relativeAppDir
         ? path_1.default.join(baseDir, requiredServerFilesManifest.relativeAppDir)
         : requiredServerFilesManifest.appDir || entryPath;
+    // allow looking up original route from normalized route
+    const inversedAppPathManifest = {};
+    if (appPathRoutesManifest) {
+        for (const ogRoute of Object.keys(appPathRoutesManifest)) {
+            inversedAppPathManifest[appPathRoutesManifest[ogRoute]] = ogRoute;
+        }
+    }
     let appBuildTraces = {};
     let appDir = null;
     if (appPathRoutesManifest) {
@@ -42438,7 +42445,8 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
         });
     }
     const pageMatchesApi = (page) => {
-        return (!appPathRoutesManifest?.[page] &&
+        const normalizedPage = `/${page.replace(/\.js$/, '')}`;
+        return (!inversedAppPathManifest[normalizedPage] &&
             (page.startsWith('api/') || page === 'api.js'));
     };
     const { i18n } = routesManifest;
@@ -43068,13 +43076,8 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
         // to match prerenders so we can route the same when the
         // __rsc__ header is present
         const edgeFunctions = middleware.edgeFunctions;
-        // allow looking up original route from normalized route
-        const inverseAppPathManifest = {};
-        for (const ogRoute of Object.keys(appPathRoutesManifest)) {
-            inverseAppPathManifest[appPathRoutesManifest[ogRoute]] = ogRoute;
-        }
         for (let route of Object.values(appPathRoutesManifest)) {
-            const ogRoute = inverseAppPathManifest[route];
+            const ogRoute = inversedAppPathManifest[route];
             if (ogRoute.endsWith('/route')) {
                 continue;
             }
@@ -43370,7 +43373,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                     {
                         src: `^${path_1.default.posix.join('/', entryDirectory)}/?(?:${i18n.locales
                             .map(locale => (0, escape_string_regexp_1.default)(locale))
-                            .join('|')})/?(.*)`,
+                            .join('|')})/(.*)`,
                         dest: `${path_1.default.posix.join('/', entryDirectory, '/')}$1`,
                         check: true,
                     },
@@ -45290,6 +45293,9 @@ async function getMiddlewareBundle({ entryPath, outputDirectory, routesManifest,
                     ],
                 };
                 route.middlewarePath = shortPath;
+                route.middlewareRawSrc = matcher.originalSource
+                    ? [matcher.originalSource]
+                    : [];
                 if (isCorrectMiddlewareOrder) {
                     route.override = true;
                 }
@@ -45382,6 +45388,7 @@ function getRouteMatchers(info, { basePath = '', i18n }) {
     return info.matchers.map(matcher => {
         const m = {
             regexp: getRegexp(matcher.regexp),
+            originalSource: matcher.originalSource,
         };
         if (matcher.has) {
             m.has = normalizeHas(matcher.has);

package/dist/server-build.js

@@ -32,6 +32,13 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
     const projectDir = requiredServerFilesManifest.relativeAppDir
         ? path_1.default.join(baseDir, requiredServerFilesManifest.relativeAppDir)
         : requiredServerFilesManifest.appDir || entryPath;
+    // allow looking up original route from normalized route
+    const inversedAppPathManifest = {};
+    if (appPathRoutesManifest) {
+        for (const ogRoute of Object.keys(appPathRoutesManifest)) {
+            inversedAppPathManifest[appPathRoutesManifest[ogRoute]] = ogRoute;
+        }
+    }
     let appBuildTraces = {};
     let appDir = null;
     if (appPathRoutesManifest) {
@@ -50,7 +57,8 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
         });
     }
     const pageMatchesApi = (page) => {
-        return (!appPathRoutesManifest?.[page] &&
+        const normalizedPage = `/${page.replace(/\.js$/, '')}`;
+        return (!inversedAppPathManifest[normalizedPage] &&
             (page.startsWith('api/') || page === 'api.js'));
     };
     const { i18n } = routesManifest;
@@ -680,13 +688,8 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
         // to match prerenders so we can route the same when the
         // __rsc__ header is present
         const edgeFunctions = middleware.edgeFunctions;
-        // allow looking up original route from normalized route
-        const inverseAppPathManifest = {};
-        for (const ogRoute of Object.keys(appPathRoutesManifest)) {
-            inverseAppPathManifest[appPathRoutesManifest[ogRoute]] = ogRoute;
-        }
         for (let route of Object.values(appPathRoutesManifest)) {
-            const ogRoute = inverseAppPathManifest[route];
+            const ogRoute = inversedAppPathManifest[route];
             if (ogRoute.endsWith('/route')) {
                 continue;
             }
@@ -982,7 +985,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                     {
                         src: `^${path_1.default.posix.join('/', entryDirectory)}/?(?:${i18n.locales
                             .map(locale => (0, escape_string_regexp_1.default)(locale))
-                            .join('|')})/?(.*)`,
+                            .join('|')})/(.*)`,
                         dest: `${path_1.default.posix.join('/', entryDirectory, '/')}$1`,
                         check: true,
                     },

package/dist/utils.js

@@ -1628,6 +1628,9 @@ async function getMiddlewareBundle({ entryPath, outputDirectory, routesManifest,
                     ],
                 };
                 route.middlewarePath = shortPath;
+                route.middlewareRawSrc = matcher.originalSource
+                    ? [matcher.originalSource]
+                    : [];
                 if (isCorrectMiddlewareOrder) {
                     route.override = true;
                 }
@@ -1720,6 +1723,7 @@ function getRouteMatchers(info, { basePath = '', i18n }) {
     return info.matchers.map(matcher => {
         const m = {
             regexp: getRegexp(matcher.regexp),
+            originalSource: matcher.originalSource,
         };
         if (matcher.has) {
             m.has = normalizeHas(matcher.has);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/next",
-  "version": "3.6.3",
+  "version": "3.6.6",
   "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": "6.3.2",
+    "@vercel/build-utils": "6.3.4",
     "@vercel/nft": "0.22.5",
     "@vercel/routing-utils": "2.1.10",
     "async-sema": "3.0.1",
@@ -71,5 +71,5 @@
     "typescript": "4.5.2",
     "webpack-sources": "3.2.3"
   },
-  "gitHead": "cfc1c9e818ebb55d440479cf0edf18536b772b28"
+  "gitHead": "21a440b83262760ccae70f5c58dc73b3718182a5"
 }