@vercel/next 3.1.7 → 3.1.10

package/dist/server-build.js

@@ -20,6 +20,7 @@ const CORRECT_NOT_FOUND_ROUTES_VERSION = 'v12.0.1';
 const CORRECT_MIDDLEWARE_ORDER_VERSION = 'v12.1.7-canary.29';
 const NEXT_DATA_MIDDLEWARE_RESOLVING_VERSION = 'v12.1.7-canary.33';
 const EMPTY_ALLOW_QUERY_FOR_PRERENDERED_VERSION = 'v12.2.0';
+const CORRECTED_MANIFESTS_VERSION = 'v12.2.0';
 async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs, baseDir, workPath, entryPath, nodeVersion, buildId, escapedBuildId, dynamicPrefix, entryDirectory, outputDirectory, redirects, beforeFilesRewrites, afterFilesRewrites, fallbackRewrites, headers, dataRoutes, hasIsr404Page, imagesManifest, wildcardConfig, routesManifest, staticPages, lambdaPages, nextVersion, canUsePreviewMode, trailingSlash, prerenderManifest, omittedPrerenderRoutes, trailingSlashRedirects, isCorrectLocaleAPIRoutes, lambdaCompressedByteLimit, requiredServerFilesManifest, }) {
     const lambdas = {};
     const prerenders = {};
@@ -29,6 +30,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
     const isEmptyAllowQueryForPrendered = semver_1.default.gte(nextVersion, EMPTY_ALLOW_QUERY_FOR_PRERENDERED_VERSION);
     const isCorrectNotFoundRoutes = semver_1.default.gte(nextVersion, CORRECT_NOT_FOUND_ROUTES_VERSION);
     const isCorrectMiddlewareOrder = semver_1.default.gte(nextVersion, CORRECT_MIDDLEWARE_ORDER_VERSION);
+    const isCorrectManifests = semver_1.default.gte(nextVersion, CORRECTED_MANIFESTS_VERSION);
     let hasStatic500 = !!staticPages[path_1.default.join(entryDirectory, '500')];
     if (lambdaPageKeys.length === 0) {
         throw new build_utils_1.NowBuildError({
@@ -207,7 +209,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
             if (requiredServerFilesManifest.appDir) {
                 fsPath = path_1.default.join(requiredServerFilesManifest.appDir, file);
             }
-            const relativePath = path_1.default.join(path_1.default.relative(baseDir, fsPath));
+            const relativePath = path_1.default.relative(baseDir, fsPath);
             const { mode } = await fs_extra_1.default.lstat(fsPath);
             lstatSema.release();
             requiredFiles[relativePath] = new build_utils_1.FileFsRef({
@@ -363,16 +365,67 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
         const combinedGroups = [...pageLambdaGroups, ...apiLambdaGroups];
         await (0, utils_1.detectLambdaLimitExceeding)(combinedGroups, lambdaCompressedByteLimit, compressedPages);
         for (const group of combinedGroups) {
+            const groupPageFiles = {};
+            for (const page of [...group.pages, ...internalPages]) {
+                const pageFileName = path_1.default.normalize(path_1.default.relative(baseDir, lambdaPages[page].fsPath));
+                groupPageFiles[pageFileName] = compressedPages[page];
+            }
+            const updatedManifestFiles = {};
+            if (isCorrectManifests) {
+                // filter dynamic routes to only the included dynamic routes
+                // in this specific serverless function so that we don't
+                // accidentally match a dynamic route while resolving that
+                // is not actually in this specific serverless function
+                for (const manifest of [
+                    'routes-manifest.json',
+                    'server/pages-manifest.json',
+                ]) {
+                    const fsPath = path_1.default.join(entryPath, outputDirectory, manifest);
+                    const relativePath = path_1.default.relative(baseDir, fsPath);
+                    delete group.pseudoLayer[relativePath];
+                    const manifestData = await fs_extra_1.default.readJSON(fsPath);
+                    const normalizedPages = new Set(group.pages.map(page => {
+                        page = `/${page.replace(/\.js$/, '')}`;
+                        if (page === '/index')
+                            page = '/';
+                        return page;
+                    }));
+                    switch (manifest) {
+                        case 'routes-manifest.json': {
+                            const filterItem = (item) => normalizedPages.has(item.page);
+                            manifestData.dynamicRoutes =
+                                manifestData.dynamicRoutes?.filter(filterItem);
+                            manifestData.staticRoutes =
+                                manifestData.staticRoutes?.filter(filterItem);
+                            break;
+                        }
+                        case 'server/pages-manifest.json': {
+                            for (const key of Object.keys(manifestData)) {
+                                if ((0, utils_1.isDynamicRoute)(key) && !normalizedPages.has(key)) {
+                                    delete manifestData[key];
+                                }
+                            }
+                            break;
+                        }
+                        default: {
+                            throw new build_utils_1.NowBuildError({
+                                message: `Unexpected manifest value ${manifest}, please contact support if this continues`,
+                                code: 'NEXT_MANIFEST_INVARIANT',
+                            });
+                        }
+                    }
+                    updatedManifestFiles[relativePath] = new build_utils_1.FileBlob({
+                        contentType: 'application/json',
+                        data: JSON.stringify(manifestData),
+                    });
+                }
+            }
             const lambda = await (0, utils_1.createLambdaFromPseudoLayers)({
-                files: launcherFiles,
-                layers: [
-                    group.pseudoLayer,
-                    [...group.pages, ...internalPages].reduce((prev, page) => {
-                        const pageFileName = path_1.default.normalize(path_1.default.relative(baseDir, lambdaPages[page].fsPath));
-                        prev[pageFileName] = compressedPages[page];
-                        return prev;
-                    }, {}),
-                ],
+                files: {
+                    ...launcherFiles,
+                    ...updatedManifestFiles,
+                },
+                layers: [group.pseudoLayer, groupPageFiles],
                 handler: path_1.default.join(path_1.default.relative(baseDir, requiredServerFilesManifest.appDir || entryPath), '___next_launcher.cjs'),
                 memory: group.memory,
                 runtime: nodeVersion.runtime,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/next",
-  "version": "3.1.7",
+  "version": "3.1.10",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/next-js",
@@ -45,8 +45,8 @@
     "@types/semver": "6.0.0",
     "@types/text-table": "0.2.1",
     "@types/webpack-sources": "3.2.0",
-    "@vercel/build-utils": "5.0.3",
-    "@vercel/nft": "0.20.1",
+    "@vercel/build-utils": "5.0.6",
+    "@vercel/nft": "0.21.0",
     "@vercel/routing-utils": "2.0.0",
     "async-sema": "3.0.1",
     "buffer-crc32": "0.2.13",
@@ -70,5 +70,5 @@
     "typescript": "4.5.2",
     "webpack-sources": "3.2.3"
   },
-  "gitHead": "bef1aec76609ae661f084dcc391edd66f891f0b4"
+  "gitHead": "90c18959498cfa852bc56adffcdd16a8bbcbcce6"
 }