@vercel/next 3.5.1 → 3.6.0

package/dist/index.js

@@ -42435,7 +42435,8 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
         });
     }
     const pageMatchesApi = (page) => {
-        return page.startsWith('api/') || page === 'api.js';
+        return (!appPathRoutesManifest?.[page] &&
+            (page.startsWith('api/') || page === 'api.js'));
     };
     const { i18n } = routesManifest;
     const hasPages404 = routesManifest.pages404;
@@ -43051,7 +43052,16 @@ 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];
+            if (ogRoute.endsWith('/route')) {
+                continue;
+            }
             route = path_1.default.posix.join('./', route === '/' ? '/index' : route);
             if (lambdas[route]) {
                 lambdas[`${route}.rsc`] = lambdas[route];
@@ -43777,6 +43787,7 @@ function getImagesConfig(imagesManifest) {
             formats: imagesManifest.images.formats,
             dangerouslyAllowSVG: imagesManifest.images.dangerouslyAllowSVG,
             contentSecurityPolicy: imagesManifest.images.contentSecurityPolicy,
+            contentDispositionType: imagesManifest.images.contentDispositionType,
         }
         : undefined;
 }
@@ -44928,7 +44939,8 @@ const onPrerenderRoute = (prerenderRouteArgs) => (routeKey, { isBlocking, isFall
             }
         }
         const rscEnabled = !!routesManifest?.rsc;
-        const rscVaryHeader = routesManifest?.rsc?.varyHeader || 'RSC, Next-Router-State-Tree, Next-Router-Prefetch';
+        const rscVaryHeader = routesManifest?.rsc?.varyHeader ||
+            'RSC, Next-Router-State-Tree, Next-Router-Prefetch';
         const rscContentTypeHeader = routesManifest?.rsc?.contentTypeHeader || 'text/x-component';
         prerenders[outputPathPage] = new build_utils_1.Prerender({
             expiration: initialRevalidate,

package/dist/server-build.js

@@ -47,7 +47,8 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
         });
     }
     const pageMatchesApi = (page) => {
-        return page.startsWith('api/') || page === 'api.js';
+        return (!appPathRoutesManifest?.[page] &&
+            (page.startsWith('api/') || page === 'api.js'));
     };
     const { i18n } = routesManifest;
     const hasPages404 = routesManifest.pages404;
@@ -663,7 +664,16 @@ 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];
+            if (ogRoute.endsWith('/route')) {
+                continue;
+            }
             route = path_1.default.posix.join('./', route === '/' ? '/index' : route);
             if (lambdas[route]) {
                 lambdas[`${route}.rsc`] = lambdas[route];

package/dist/utils.js

@@ -141,6 +141,7 @@ function getImagesConfig(imagesManifest) {
             formats: imagesManifest.images.formats,
             dangerouslyAllowSVG: imagesManifest.images.dangerouslyAllowSVG,
             contentSecurityPolicy: imagesManifest.images.contentSecurityPolicy,
+            contentDispositionType: imagesManifest.images.contentDispositionType,
         }
         : undefined;
 }
@@ -1292,7 +1293,8 @@ const onPrerenderRoute = (prerenderRouteArgs) => (routeKey, { isBlocking, isFall
             }
         }
         const rscEnabled = !!routesManifest?.rsc;
-        const rscVaryHeader = routesManifest?.rsc?.varyHeader || 'RSC, Next-Router-State-Tree, Next-Router-Prefetch';
+        const rscVaryHeader = routesManifest?.rsc?.varyHeader ||
+            'RSC, Next-Router-State-Tree, Next-Router-Prefetch';
         const rscContentTypeHeader = routesManifest?.rsc?.contentTypeHeader || 'text/x-component';
         prerenders[outputPathPage] = new build_utils_1.Prerender({
             expiration: initialRevalidate,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/next",
-  "version": "3.5.1",
+  "version": "3.6.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": "6.3.0",
+    "@vercel/build-utils": "6.3.1",
     "@vercel/nft": "0.22.5",
     "@vercel/routing-utils": "2.1.9",
     "async-sema": "3.0.1",
@@ -71,5 +71,5 @@
     "typescript": "4.5.2",
     "webpack-sources": "3.2.3"
   },
-  "gitHead": "2fd33152219e7a2485b85b698e339c9c5cee23cf"
+  "gitHead": "34d199bd4925fab1fb32b8dae507e2383d38493a"
 }