@vercel/next 3.8.2 → 3.8.3

package/dist/index.js

@@ -43682,7 +43682,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
     });
     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 dynamicRoutes = await (0, utils_1.getDynamicRoutes)(entryPath, entryDirectory, dynamicPages, false, routesManifest, omittedPrerenderRoutes, canUsePreviewMode, prerenderManifest.bypassToken || '', true, middleware.dynamicRouteMap, inversedAppPathManifest).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 normalizeNextDataRoute = (isOverride = false) => {
         return isNextDataServerResolving
@@ -43780,20 +43780,6 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
     const rscHeader = routesManifest.rsc?.header?.toLowerCase() || '__rsc__';
     const rscVaryHeader = routesManifest?.rsc?.varyHeader ||
         'RSC, Next-Router-State-Tree, Next-Router-Prefetch';
-    const completeDynamicRoutes = [];
-    if (appDir) {
-        for (const route of dynamicRoutes) {
-            completeDynamicRoutes.push({
-                ...route,
-                src: route.src.replace(new RegExp((0, escape_string_regexp_1.default)('(?:/)?$')), '(?:\\.rsc)(?:/)?$'),
-                dest: route.dest?.replace(/($|\?)/, '.rsc$1'),
-            });
-            completeDynamicRoutes.push(route);
-        }
-    }
-    else {
-        completeDynamicRoutes.push(...dynamicRoutes);
-    }
     return {
         wildcard: wildcardConfig,
         images: (0, utils_1.getImagesConfig)(imagesManifest),
@@ -44089,7 +44075,8 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                 ? // when resolving data routes for middleware we need to include
                     // all dynamic routes including non-SSG/SSP so that the priority
                     // is correct
-                    completeDynamicRoutes
+                    dynamicRoutes
+                        .filter(route => !route.src.includes('.rsc'))
                         .map(route => {
                         route = Object.assign({}, route);
                         let normalizedSrc = route.src;
@@ -44135,7 +44122,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                 : []),
             // Dynamic routes (must come after dataRoutes as dataRoutes are more
             // specific)
-            ...completeDynamicRoutes,
+            ...dynamicRoutes,
             ...(isNextDataServerResolving
                 ? [
                     {
@@ -44551,7 +44538,7 @@ async function getRoutesManifest(entryPath, outputDirectory, nextVersion) {
     return routesManifest;
 }
 exports.getRoutesManifest = getRoutesManifest;
-async function getDynamicRoutes(entryPath, entryDirectory, dynamicPages, isDev, routesManifest, omittedRoutes, canUsePreviewMode, bypassToken, isServerMode, dynamicMiddlewareRouteMap) {
+async function getDynamicRoutes(entryPath, entryDirectory, dynamicPages, isDev, routesManifest, omittedRoutes, canUsePreviewMode, bypassToken, isServerMode, dynamicMiddlewareRouteMap, appPathRoutesManifest) {
     if (routesManifest) {
         switch (routesManifest.version) {
             case 1:
@@ -44569,15 +44556,19 @@ async function getDynamicRoutes(entryPath, entryDirectory, dynamicPages, isDev,
             }
             case 3:
             case 4: {
-                return routesManifest.dynamicRoutes
-                    .filter(({ page }) => canUsePreviewMode || !omittedRoutes?.has(page))
-                    .map(params => {
+                const routes = [];
+                for (const dynamicRoute of routesManifest.dynamicRoutes) {
+                    if (!canUsePreviewMode && omittedRoutes?.has(dynamicRoute.page)) {
+                        continue;
+                    }
+                    const params = dynamicRoute;
                     if ('isMiddleware' in params) {
                         const route = dynamicMiddlewareRouteMap?.get(params.page);
                         if (!route) {
                             throw new Error(`Could not find dynamic middleware route for ${params.page}`);
                         }
-                        return route;
+                        routes.push(route);
+                        continue;
                     }
                     const { page, namedRegex, regex, routeKeys } = params;
                     const route = {
@@ -44606,8 +44597,17 @@ async function getDynamicRoutes(entryPath, entryDirectory, dynamicPages, isDev,
                             },
                         ];
                     }
-                    return route;
-                });
+                    if (appPathRoutesManifest?.[page]) {
+                        routes.push({
+                            ...route,
+                            src: route.src.replace(new RegExp((0, escape_string_regexp_1.default)('(?:/)?$')), '(?:\\.rsc)(?:/)?$'),
+                            dest: route.dest?.replace(/($|\?)/, '.rsc$1'),
+                        });
+                    }
+                    routes.push(route);
+                    continue;
+                }
+                return routes;
             }
             default: {
                 // update MIN_ROUTES_MANIFEST_VERSION

package/dist/server-build.js

@@ -608,7 +608,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
     });
     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 dynamicRoutes = await (0, utils_1.getDynamicRoutes)(entryPath, entryDirectory, dynamicPages, false, routesManifest, omittedPrerenderRoutes, canUsePreviewMode, prerenderManifest.bypassToken || '', true, middleware.dynamicRouteMap, inversedAppPathManifest).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 normalizeNextDataRoute = (isOverride = false) => {
         return isNextDataServerResolving
@@ -706,20 +706,6 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
     const rscHeader = routesManifest.rsc?.header?.toLowerCase() || '__rsc__';
     const rscVaryHeader = routesManifest?.rsc?.varyHeader ||
         'RSC, Next-Router-State-Tree, Next-Router-Prefetch';
-    const completeDynamicRoutes = [];
-    if (appDir) {
-        for (const route of dynamicRoutes) {
-            completeDynamicRoutes.push({
-                ...route,
-                src: route.src.replace(new RegExp((0, escape_string_regexp_1.default)('(?:/)?$')), '(?:\\.rsc)(?:/)?$'),
-                dest: route.dest?.replace(/($|\?)/, '.rsc$1'),
-            });
-            completeDynamicRoutes.push(route);
-        }
-    }
-    else {
-        completeDynamicRoutes.push(...dynamicRoutes);
-    }
     return {
         wildcard: wildcardConfig,
         images: (0, utils_1.getImagesConfig)(imagesManifest),
@@ -1015,7 +1001,8 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                 ? // when resolving data routes for middleware we need to include
                     // all dynamic routes including non-SSG/SSP so that the priority
                     // is correct
-                    completeDynamicRoutes
+                    dynamicRoutes
+                        .filter(route => !route.src.includes('.rsc'))
                         .map(route => {
                         route = Object.assign({}, route);
                         let normalizedSrc = route.src;
@@ -1061,7 +1048,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                 : []),
             // Dynamic routes (must come after dataRoutes as dataRoutes are more
             // specific)
-            ...completeDynamicRoutes,
+            ...dynamicRoutes,
             ...(isNextDataServerResolving
                 ? [
                     {

package/dist/utils.js

@@ -194,7 +194,7 @@ async function getRoutesManifest(entryPath, outputDirectory, nextVersion) {
     return routesManifest;
 }
 exports.getRoutesManifest = getRoutesManifest;
-async function getDynamicRoutes(entryPath, entryDirectory, dynamicPages, isDev, routesManifest, omittedRoutes, canUsePreviewMode, bypassToken, isServerMode, dynamicMiddlewareRouteMap) {
+async function getDynamicRoutes(entryPath, entryDirectory, dynamicPages, isDev, routesManifest, omittedRoutes, canUsePreviewMode, bypassToken, isServerMode, dynamicMiddlewareRouteMap, appPathRoutesManifest) {
     if (routesManifest) {
         switch (routesManifest.version) {
             case 1:
@@ -212,15 +212,19 @@ async function getDynamicRoutes(entryPath, entryDirectory, dynamicPages, isDev,
             }
             case 3:
             case 4: {
-                return routesManifest.dynamicRoutes
-                    .filter(({ page }) => canUsePreviewMode || !omittedRoutes?.has(page))
-                    .map(params => {
+                const routes = [];
+                for (const dynamicRoute of routesManifest.dynamicRoutes) {
+                    if (!canUsePreviewMode && omittedRoutes?.has(dynamicRoute.page)) {
+                        continue;
+                    }
+                    const params = dynamicRoute;
                     if ('isMiddleware' in params) {
                         const route = dynamicMiddlewareRouteMap?.get(params.page);
                         if (!route) {
                             throw new Error(`Could not find dynamic middleware route for ${params.page}`);
                         }
-                        return route;
+                        routes.push(route);
+                        continue;
                     }
                     const { page, namedRegex, regex, routeKeys } = params;
                     const route = {
@@ -249,8 +253,17 @@ async function getDynamicRoutes(entryPath, entryDirectory, dynamicPages, isDev,
                             },
                         ];
                     }
-                    return route;
-                });
+                    if (appPathRoutesManifest?.[page]) {
+                        routes.push({
+                            ...route,
+                            src: route.src.replace(new RegExp((0, escape_string_regexp_1.default)('(?:/)?$')), '(?:\\.rsc)(?:/)?$'),
+                            dest: route.dest?.replace(/($|\?)/, '.rsc$1'),
+                        });
+                    }
+                    routes.push(route);
+                    continue;
+                }
+                return routes;
             }
             default: {
                 // update MIN_ROUTES_MANIFEST_VERSION

package/package.json

@@ -1,18 +1,9 @@
 {
   "name": "@vercel/next",
-  "version": "3.8.2",
+  "version": "3.8.3",
   "license": "Apache-2.0",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/next-js",
-  "scripts": {
-    "build": "node build.js",
-    "build-dev": "node build.js --dev",
-    "test": "jest --env node --verbose --bail --runInBand --testTimeout=360000",
-    "test-unit": "pnpm test test/unit/",
-    "test-next-local": "pnpm test test/integration/*.test.js test/integration/*.test.ts",
-    "test-next-local:middleware": "pnpm test test/integration/middleware.test.ts",
-    "test-e2e": "rm -f test/builder-info.json; pnpm test test/fixtures/**/*.test.js"
-  },
   "repository": {
     "type": "git",
     "url": "https://github.com/vercel/vercel.git",
@@ -60,5 +51,13 @@
     "text-table": "0.2.0",
     "webpack-sources": "3.2.3"
   },
-  "gitHead": "f8749e1ff1d69fe25421a1f0f9309542ea50ad6e"
-}
+  "scripts": {
+    "build": "node build.js",
+    "build-dev": "node build.js --dev",
+    "test": "jest --env node --verbose --bail --runInBand --testTimeout=360000",
+    "test-unit": "pnpm test test/unit/",
+    "test-next-local": "pnpm test test/integration/*.test.js test/integration/*.test.ts",
+    "test-next-local:middleware": "pnpm test test/integration/middleware.test.ts",
+    "test-e2e": "rm -f test/builder-info.json; pnpm test test/fixtures/**/*.test.js"
+  }
+}