@vercel/next 3.1.5 → 3.1.8

package/dist/index.js

@@ -44633,14 +44633,18 @@ const pretty_bytes_1 = __importDefault(__webpack_require__(539));
 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 = {};
     const lambdaPageKeys = Object.keys(lambdaPages);
     const internalPages = ['_app.js', '_error.js', '_document.js'];
     const pageBuildTraces = await (0, build_utils_1.glob)('**/*.js.nft.json', pagesDir);
+    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({
@@ -44819,7 +44823,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({
@@ -44975,16 +44979,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,
@@ -45030,6 +45085,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
         static404Page,
         hasPages404: routesManifest.pages404,
         isCorrectNotFoundRoutes,
+        isEmptyAllowQueryForPrendered,
     });
     Object.keys(prerenderManifest.staticRoutes).forEach(route => prerenderRoute(route, {}));
     Object.keys(prerenderManifest.fallbackRoutes).forEach(route => prerenderRoute(route, { isFallback: true }));
@@ -46679,7 +46735,7 @@ const onPrerenderRouteInitial = (prerenderManifest, canUsePreviewMode, entryDire
 exports.onPrerenderRouteInitial = onPrerenderRouteInitial;
 let prerenderGroup = 1;
 const onPrerenderRoute = (prerenderRouteArgs) => (routeKey, { isBlocking, isFallback, isOmitted, locale, }) => {
-    const { pagesDir, hasPages404, static404Page, entryDirectory, prerenderManifest, isSharedLambdas, isServerMode, canUsePreviewMode, lambdas, prerenders, pageLambdaMap, routesManifest, isCorrectNotFoundRoutes, } = prerenderRouteArgs;
+    const { pagesDir, hasPages404, static404Page, entryDirectory, prerenderManifest, isSharedLambdas, isServerMode, canUsePreviewMode, lambdas, prerenders, pageLambdaMap, routesManifest, isCorrectNotFoundRoutes, isEmptyAllowQueryForPrendered, } = prerenderRouteArgs;
     if (isBlocking && isFallback) {
         throw new build_utils_1.NowBuildError({
             code: 'NEXT_ISBLOCKING_ISFALLBACK',
@@ -46819,21 +46875,39 @@ const onPrerenderRoute = (prerenderRouteArgs) => (routeKey, { isBlocking, isFall
         // a given path. All other query keys will be striped. We can automatically
         // detect this for prerender (ISR) pages by reading the routes manifest file.
         const pageKey = srcRoute || routeKey;
-        const isDynamic = isDynamicRoute(pageKey);
         const route = routesManifest?.dynamicRoutes.find((r) => r.page === pageKey && !('isMiddleware' in r));
         const routeKeys = route?.routeKeys;
         // by default allowQuery should be undefined and only set when
         // we have sufficient information to set it
         let allowQuery;
-        if (routeKeys) {
-            // if we have routeKeys in the routes-manifest we use those
-            // for allowQuery for dynamic routes
-            allowQuery = Object.values(routeKeys);
-        }
-        else if (!isDynamic) {
-            // for non-dynamic routes we use an empty array since
-            // no query values bust the cache for non-dynamic prerenders
-            allowQuery = [];
+        if (isEmptyAllowQueryForPrendered) {
+            const isDynamic = isDynamicRoute(routeKey);
+            if (!isDynamic) {
+                // for non-dynamic routes we use an empty array since
+                // no query values bust the cache for non-dynamic prerenders
+                // prerendered paths also do not pass allowQuery as they match
+                // during handle: 'filesystem' so should not cache differently
+                // by query values
+                allowQuery = [];
+            }
+            else if (routeKeys) {
+                // if we have routeKeys in the routes-manifest we use those
+                // for allowQuery for dynamic routes
+                allowQuery = Object.values(routeKeys);
+            }
+        }
+        else {
+            const isDynamic = isDynamicRoute(pageKey);
+            if (routeKeys) {
+                // if we have routeKeys in the routes-manifest we use those
+                // for allowQuery for dynamic routes
+                allowQuery = Object.values(routeKeys);
+            }
+            else if (!isDynamic) {
+                // for non-dynamic routes we use an empty array since
+                // no query values bust the cache for non-dynamic prerenders
+                allowQuery = [];
+            }
         }
         prerenders[outputPathPage] = new build_utils_1.Prerender({
             expiration: initialRevalidate,

package/dist/server-build.js

@@ -19,14 +19,18 @@ const pretty_bytes_1 = __importDefault(require("pretty-bytes"));
 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 = {};
     const lambdaPageKeys = Object.keys(lambdaPages);
     const internalPages = ['_app.js', '_error.js', '_document.js'];
     const pageBuildTraces = await (0, build_utils_1.glob)('**/*.js.nft.json', pagesDir);
+    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({
@@ -205,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({
@@ -361,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,
@@ -416,6 +471,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
         static404Page,
         hasPages404: routesManifest.pages404,
         isCorrectNotFoundRoutes,
+        isEmptyAllowQueryForPrendered,
     });
     Object.keys(prerenderManifest.staticRoutes).forEach(route => prerenderRoute(route, {}));
     Object.keys(prerenderManifest.fallbackRoutes).forEach(route => prerenderRoute(route, { isFallback: true }));

package/dist/utils.js

@@ -1027,7 +1027,7 @@ const onPrerenderRouteInitial = (prerenderManifest, canUsePreviewMode, entryDire
 exports.onPrerenderRouteInitial = onPrerenderRouteInitial;
 let prerenderGroup = 1;
 const onPrerenderRoute = (prerenderRouteArgs) => (routeKey, { isBlocking, isFallback, isOmitted, locale, }) => {
-    const { pagesDir, hasPages404, static404Page, entryDirectory, prerenderManifest, isSharedLambdas, isServerMode, canUsePreviewMode, lambdas, prerenders, pageLambdaMap, routesManifest, isCorrectNotFoundRoutes, } = prerenderRouteArgs;
+    const { pagesDir, hasPages404, static404Page, entryDirectory, prerenderManifest, isSharedLambdas, isServerMode, canUsePreviewMode, lambdas, prerenders, pageLambdaMap, routesManifest, isCorrectNotFoundRoutes, isEmptyAllowQueryForPrendered, } = prerenderRouteArgs;
     if (isBlocking && isFallback) {
         throw new build_utils_1.NowBuildError({
             code: 'NEXT_ISBLOCKING_ISFALLBACK',
@@ -1167,21 +1167,39 @@ const onPrerenderRoute = (prerenderRouteArgs) => (routeKey, { isBlocking, isFall
         // a given path. All other query keys will be striped. We can automatically
         // detect this for prerender (ISR) pages by reading the routes manifest file.
         const pageKey = srcRoute || routeKey;
-        const isDynamic = isDynamicRoute(pageKey);
         const route = routesManifest?.dynamicRoutes.find((r) => r.page === pageKey && !('isMiddleware' in r));
         const routeKeys = route?.routeKeys;
         // by default allowQuery should be undefined and only set when
         // we have sufficient information to set it
         let allowQuery;
-        if (routeKeys) {
-            // if we have routeKeys in the routes-manifest we use those
-            // for allowQuery for dynamic routes
-            allowQuery = Object.values(routeKeys);
+        if (isEmptyAllowQueryForPrendered) {
+            const isDynamic = isDynamicRoute(routeKey);
+            if (!isDynamic) {
+                // for non-dynamic routes we use an empty array since
+                // no query values bust the cache for non-dynamic prerenders
+                // prerendered paths also do not pass allowQuery as they match
+                // during handle: 'filesystem' so should not cache differently
+                // by query values
+                allowQuery = [];
+            }
+            else if (routeKeys) {
+                // if we have routeKeys in the routes-manifest we use those
+                // for allowQuery for dynamic routes
+                allowQuery = Object.values(routeKeys);
+            }
         }
-        else if (!isDynamic) {
-            // for non-dynamic routes we use an empty array since
-            // no query values bust the cache for non-dynamic prerenders
-            allowQuery = [];
+        else {
+            const isDynamic = isDynamicRoute(pageKey);
+            if (routeKeys) {
+                // if we have routeKeys in the routes-manifest we use those
+                // for allowQuery for dynamic routes
+                allowQuery = Object.values(routeKeys);
+            }
+            else if (!isDynamic) {
+                // for non-dynamic routes we use an empty array since
+                // no query values bust the cache for non-dynamic prerenders
+                allowQuery = [];
+            }
         }
         prerenders[outputPathPage] = new build_utils_1.Prerender({
             expiration: initialRevalidate,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/next",
-  "version": "3.1.5",
+  "version": "3.1.8",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/next-js",
@@ -45,9 +45,9 @@
     "@types/semver": "6.0.0",
     "@types/text-table": "0.2.1",
     "@types/webpack-sources": "3.2.0",
-    "@vercel/build-utils": "5.0.2",
+    "@vercel/build-utils": "5.0.4",
     "@vercel/nft": "0.20.1",
-    "@vercel/routing-utils": "1.13.5",
+    "@vercel/routing-utils": "2.0.0",
     "async-sema": "3.0.1",
     "buffer-crc32": "0.2.13",
     "cheerio": "1.0.0-rc.10",
@@ -70,5 +70,5 @@
     "typescript": "4.5.2",
     "webpack-sources": "3.2.3"
   },
-  "gitHead": "d2f8d178f77e15cb490cce73f5766537d892f763"
+  "gitHead": "3d3774ee7e3d344b3292d2166d485bdf41a68d4c"
 }