@vercel/next 4.0.1 → 4.0.3

package/dist/server-build.js

@@ -39,14 +39,21 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, functionsConfi
             inversedAppPathManifest[appPathRoutesManifest[ogRoute]] = ogRoute;
         }
     }
-    const APP_PREFETCH_SUFFIX = '.prefetch.rsc';
     let appRscPrefetches = {};
     let appBuildTraces = {};
     let appDir = null;
     if (appPathRoutesManifest) {
         appDir = path_1.default.join(pagesDir, '../app');
         appBuildTraces = await (0, build_utils_1.glob)('**/*.js.nft.json', appDir);
-        appRscPrefetches = await (0, build_utils_1.glob)(`**/*${APP_PREFETCH_SUFFIX}`, appDir);
+        appRscPrefetches = await (0, build_utils_1.glob)(`**/*${utils_1.RSC_PREFETCH_SUFFIX}`, appDir);
+        const rscContentTypeHeader = routesManifest?.rsc?.contentTypeHeader || utils_1.RSC_CONTENT_TYPE;
+        // ensure all appRscPrefetches have a contentType since this is used by Next.js
+        // to determine if it's a valid response
+        for (const value of Object.values(appRscPrefetches)) {
+            if (!value.contentType) {
+                value.contentType = rscContentTypeHeader;
+            }
+        }
     }
     const isCorrectNotFoundRoutes = semver_1.default.gte(nextVersion, CORRECT_NOT_FOUND_ROUTES_VERSION);
     const isCorrectMiddlewareOrder = semver_1.default.gte(nextVersion, CORRECT_MIDDLEWARE_ORDER_VERSION);
@@ -206,10 +213,17 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, functionsConfi
             // for notFound GS(S)P support
             if (i18n) {
                 for (const locale of i18n.locales) {
-                    const static404File = staticPages[path_1.default.posix.join(entryDirectory, locale, '/404')] ||
-                        new build_utils_1.FileFsRef({
+                    let static404File = staticPages[path_1.default.posix.join(entryDirectory, locale, '/404')];
+                    if (!static404File) {
+                        static404File = new build_utils_1.FileFsRef({
                             fsPath: path_1.default.join(pagesDir, locale, '/404.html'),
                         });
+                        if (!fs_extra_1.default.existsSync(static404File.fsPath)) {
+                            static404File = new build_utils_1.FileFsRef({
+                                fsPath: path_1.default.join(pagesDir, '/404.html'),
+                            });
+                        }
+                    }
                     requiredFiles[path_1.default.relative(baseDir, static404File.fsPath)] =
                         static404File;
                 }
@@ -622,7 +636,25 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, functionsConfi
     });
     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, inversedAppPathManifest).then(arr => (0, utils_1.localizeDynamicRoutes)(arr, dynamicPrefix, entryDirectory, staticPages, prerenderManifest, routesManifest, true, isCorrectLocaleAPIRoutes, inversedAppPathManifest));
+    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, inversedAppPathManifest));
+    const pagesPlaceholderRscEntries = {};
+    if (appDir) {
+        // since we attempt to rewrite all paths to an .rsc variant,
+        // we need to create dummy rsc outputs for all pages entries
+        // this is so that an RSC request to a `pages` entry will match
+        // rather than falling back to a catchall `app` entry
+        // on the nextjs side, invalid RSC response payloads will correctly trigger an mpa navigation
+        const pagesManifest = path_1.default.join(entryPath, outputDirectory, `server/pages-manifest.json`);
+        const pagesData = await fs_extra_1.default.readJSON(pagesManifest);
+        const pagesEntries = Object.keys(pagesData);
+        for (const page of pagesEntries) {
+            const pathName = page.startsWith('/') ? page.slice(1) : page;
+            pagesPlaceholderRscEntries[`${pathName}.rsc`] = new build_utils_1.FileBlob({
+                data: '{}',
+                contentType: 'application/json',
+            });
+        }
+    }
     const { staticFiles, publicDirectoryFiles, staticDirectoryFiles } = await (0, utils_1.getStaticFiles)(entryPath, entryDirectory, outputDirectory);
     const normalizeNextDataRoute = (isOverride = false) => {
         return isNextDataServerResolving
@@ -708,7 +740,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, functionsConfi
             if (ogRoute.endsWith('/route')) {
                 continue;
             }
-            route = path_1.default.posix.join('./', entryDirectory, route === '/' ? '/index' : route);
+            route = (0, utils_1.normalizeIndexOutput)(path_1.default.posix.join('./', entryDirectory, route === '/' ? '/index' : route), true);
             if (lambdas[route]) {
                 lambdas[`${route}.rsc`] = lambdas[route];
             }
@@ -729,6 +761,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, functionsConfi
             ...publicDirectoryFiles,
             ...lambdas,
             ...appRscPrefetches,
+            ...pagesPlaceholderRscEntries,
             // Prerenders may override Lambdas -- this is an intentional behavior.
             ...prerenders,
             ...staticPages,
@@ -920,7 +953,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, functionsConfi
                                         key: rscPrefetchHeader,
                                     },
                                 ],
-                                dest: path_1.default.posix.join('/', entryDirectory, '/index.prefetch.rsc'),
+                                dest: path_1.default.posix.join('/', entryDirectory, `/index${utils_1.RSC_PREFETCH_SUFFIX}`),
                                 headers: { vary: rscVaryHeader },
                                 continue: true,
                                 override: true,
@@ -933,7 +966,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, functionsConfi
                                         key: rscPrefetchHeader,
                                     },
                                 ],
-                                dest: path_1.default.posix.join('/', entryDirectory, `/$1${APP_PREFETCH_SUFFIX}`),
+                                dest: path_1.default.posix.join('/', entryDirectory, `/$1${utils_1.RSC_PREFETCH_SUFFIX}`),
                                 headers: { vary: rscVaryHeader },
                                 continue: true,
                                 override: true,
@@ -998,7 +1031,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, functionsConfi
             ...(rscPrefetchHeader
                 ? [
                     {
-                        src: path_1.default.posix.join('/', entryDirectory, `/index${APP_PREFETCH_SUFFIX}`),
+                        src: path_1.default.posix.join('/', entryDirectory, `/index${utils_1.RSC_PREFETCH_SUFFIX}`),
                         dest: path_1.default.posix.join('/', entryDirectory, '/index.rsc'),
                         has: [
                             {
@@ -1010,7 +1043,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, functionsConfi
                         override: true,
                     },
                     {
-                        src: `^${path_1.default.posix.join('/', entryDirectory, `/(.+?)${APP_PREFETCH_SUFFIX}(?:/)?$`)}`,
+                        src: `^${path_1.default.posix.join('/', entryDirectory, `/(.+?)${utils_1.RSC_PREFETCH_SUFFIX}(?:/)?$`)}`,
                         dest: path_1.default.posix.join('/', entryDirectory, '/$1.rsc'),
                         has: [
                             {
@@ -1023,62 +1056,17 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, functionsConfi
                     },
                 ]
                 : []),
-            ...(appDir
-                ? [
-                    // check routes that end in `.rsc` to see if a page with the resulting name (sans-.rsc) exists in the filesystem
-                    // if so, we want to match that page instead. (This matters when prefetching a pages route while on an appdir route)
-                    {
-                        src: `^${path_1.default.posix.join('/', entryDirectory, '/(.*)\\.rsc$')}`,
-                        dest: path_1.default.posix.join('/', entryDirectory, '/$1'),
-                        has: [
-                            {
-                                type: 'header',
-                                key: rscHeader,
-                            },
-                        ],
-                        ...(rscPrefetchHeader
-                            ? {
-                                missing: [
-                                    {
-                                        type: 'header',
-                                        key: rscPrefetchHeader,
-                                    },
-                                ],
-                            }
-                            : {}),
-                        check: true,
-                    },
-                ]
-                : []),
             // These need to come before handle: miss or else they are grouped
             // with that routing section
             ...afterFilesRewrites,
-            ...(appDir
-                ? [
-                    // rewrite route back to `.rsc`, but skip checking fs
-                    {
-                        src: `^${path_1.default.posix.join('/', entryDirectory, '/((?!.+\\.rsc).+?)(?:/)?$')}`,
-                        has: [
-                            {
-                                type: 'header',
-                                key: rscHeader,
-                            },
-                        ],
-                        dest: path_1.default.posix.join('/', entryDirectory, '/$1.rsc'),
-                        headers: { vary: rscVaryHeader },
-                        continue: true,
-                        override: true,
-                    },
-                ]
-                : []),
-            // make sure 404 page is used when a directory is matched without
-            // an index page
             { handle: 'resource' },
             ...fallbackRewrites,
+            // make sure 404 page is used when a directory is matched without
+            // an index page
             { src: path_1.default.posix.join('/', entryDirectory, '.*'), status: 404 },
+            { handle: 'miss' },
             // We need to make sure to 404 for /_next after handle: miss since
             // handle: miss is called before rewrites and to prevent rewriting /_next
-            { handle: 'miss' },
             {
                 src: path_1.default.posix.join('/', entryDirectory, '_next/static/(?:[^/]+/pages|pages|chunks|runtime|css|image|media)/.+'),
                 status: 404,

package/dist/utils.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isApiPage = exports.getOperationType = exports.upgradeMiddlewareManifest = exports.getMiddlewareManifest = exports.getFunctionsConfigManifest = exports.getMiddlewareBundle = exports.getSourceFilePathFromPage = exports.isDynamicRoute = exports.normalizePage = exports.getImagesConfig = 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 = exports.prettyBytes = exports.MIB = exports.KIB = void 0;
+exports.isApiPage = exports.getOperationType = exports.upgradeMiddlewareManifest = exports.getMiddlewareManifest = exports.getFunctionsConfigManifest = exports.getMiddlewareBundle = exports.normalizeEdgeFunctionPath = exports.getSourceFilePathFromPage = exports.isDynamicRoute = exports.normalizePage = exports.getImagesConfig = 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 = exports.RSC_PREFETCH_SUFFIX = exports.RSC_CONTENT_TYPE = exports.prettyBytes = exports.MIB = exports.KIB = 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"));
@@ -46,6 +46,8 @@ exports.KIB = 1024;
 exports.MIB = 1024 * exports.KIB;
 const prettyBytes = (n) => (0, bytes_1.default)(n, { unitSeparator: ' ' });
 exports.prettyBytes = prettyBytes;
+exports.RSC_CONTENT_TYPE = 'x-component';
+exports.RSC_PREFETCH_SUFFIX = '.prefetch.rsc';
 // Identify /[param]/ in route string
 // eslint-disable-next-line no-useless-escape
 const TEST_DYNAMIC_ROUTE = /\/\[[^\/]+?\](?=\/|$)/;
@@ -194,7 +196,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, appPathRoutesManifest) {
+async function getDynamicRoutes(entryPath, entryDirectory, dynamicPages, isDev, routesManifest, omittedRoutes, canUsePreviewMode, bypassToken, isServerMode, dynamicMiddlewareRouteMap) {
     if (routesManifest) {
         switch (routesManifest.version) {
             case 1:
@@ -253,13 +255,11 @@ async function getDynamicRoutes(entryPath, entryDirectory, dynamicPages, isDev,
                             },
                         ];
                     }
-                    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,
+                        src: route.src.replace(new RegExp((0, escape_string_regexp_1.default)('(?:/)?$')), '(?:\\.rsc)(?:/)?$'),
+                        dest: route.dest?.replace(/($|\?)/, '.rsc$1'),
+                    });
                     routes.push(route);
                     continue;
                 }
@@ -1363,7 +1363,7 @@ const onPrerenderRoute = (prerenderRouteArgs) => (routeKey, { isBlocking, isFall
         const rscEnabled = !!routesManifest?.rsc;
         const rscVaryHeader = routesManifest?.rsc?.varyHeader ||
             'RSC, Next-Router-State-Tree, Next-Router-Prefetch';
-        const rscContentTypeHeader = routesManifest?.rsc?.contentTypeHeader || 'text/x-component';
+        const rscContentTypeHeader = routesManifest?.rsc?.contentTypeHeader || exports.RSC_CONTENT_TYPE;
         let sourcePath;
         if (`/${outputPathPage}` !== srcRoute && srcRoute) {
             sourcePath = srcRoute;
@@ -1503,7 +1503,7 @@ async function getStaticFiles(entryPath, entryDirectory, outputDirectory) {
 }
 exports.getStaticFiles = getStaticFiles;
 function normalizeIndexOutput(outputName, isServerMode) {
-    if (outputName !== '/index' && isServerMode) {
+    if (outputName !== 'index' && outputName !== '/index' && isServerMode) {
         return outputName.replace(/\/index$/, '');
     }
     return outputName;
@@ -1597,6 +1597,21 @@ function normalizeRegions(regions) {
     }
     return newRegions;
 }
+function normalizeEdgeFunctionPath(shortPath, appPathRoutesManifest) {
+    if (shortPath.startsWith('app/') &&
+        (shortPath.endsWith('/page') ||
+            shortPath.endsWith('/route') ||
+            shortPath === 'app/_not-found')) {
+        const ogRoute = shortPath.replace(/^app\//, '/');
+        shortPath = (appPathRoutesManifest[ogRoute] ||
+            shortPath.replace(/(^|\/)(page|route)$/, '')).replace(/^\//, '');
+        if (!shortPath || shortPath === '/') {
+            shortPath = 'index';
+        }
+    }
+    return shortPath;
+}
+exports.normalizeEdgeFunctionPath = normalizeEdgeFunctionPath;
 async function getMiddlewareBundle({ entryPath, outputDirectory, routesManifest, isCorrectMiddlewareOrder, prerenderBypassToken, nextVersion, appPathRoutesManifest, }) {
     const middlewareManifest = await getMiddlewareManifest(entryPath, outputDirectory);
     const sortedFunctions = [
@@ -1713,21 +1728,11 @@ async function getMiddlewareBundle({ entryPath, outputDirectory, routesManifest,
             if (shortPath.startsWith('pages/')) {
                 shortPath = shortPath.replace(/^pages\//, '');
             }
-            else if (shortPath.startsWith('app/') &&
-                (shortPath.endsWith('/page') ||
-                    shortPath.endsWith('/route') ||
-                    shortPath === 'app/_not-found')) {
-                const ogRoute = shortPath.replace(/^app\//, '/');
-                shortPath = (appPathRoutesManifest[ogRoute] ||
-                    shortPath.replace(/(^|\/)(page|route)$/, '')).replace(/^\//, '');
-                if (!shortPath || shortPath === '/') {
-                    shortPath = 'index';
-                }
+            else {
+                shortPath = normalizeEdgeFunctionPath(shortPath, appPathRoutesManifest);
             }
             if (routesManifest?.basePath) {
-                shortPath = path_1.default.posix
-                    .join(routesManifest.basePath, shortPath)
-                    .replace(/^\//, '');
+                shortPath = normalizeIndexOutput(path_1.default.posix.join('./', routesManifest?.basePath, shortPath.replace(/^\//, '')), true);
             }
             worker.edgeFunction.name = shortPath;
             source.edgeFunctions[shortPath] = worker.edgeFunction;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/next",
-  "version": "4.0.1",
+  "version": "4.0.3",
   "license": "Apache-2.0",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/next-js",
@@ -26,7 +26,7 @@
     "@types/semver": "6.0.0",
     "@types/text-table": "0.2.1",
     "@types/webpack-sources": "3.2.0",
-    "@vercel/build-utils": "7.0.0",
+    "@vercel/build-utils": "7.2.0",
     "@vercel/nft": "0.22.5",
     "@vercel/routing-utils": "3.0.0",
     "async-sema": "3.0.1",
@@ -45,7 +45,7 @@
     "ndjson": "2.0.0",
     "pretty-bytes": "5.3.0",
     "resolve-from": "5.0.0",
-    "semver": "6.1.1",
+    "semver": "6.3.1",
     "set-cookie-parser": "2.4.6",
     "source-map": "0.7.3",
     "test-listen": "1.1.0",