@vercel/next 3.1.5 → 3.1.6

package/dist/index.js

@@ -44633,12 +44633,14 @@ 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';
 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);
     let hasStatic500 = !!staticPages[path_1.default.join(entryDirectory, '500')];
@@ -45030,6 +45032,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 +46682,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 +46822,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,12 +19,14 @@ 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';
 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);
     let hasStatic500 = !!staticPages[path_1.default.join(entryDirectory, '500')];
@@ -416,6 +418,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.6",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/next-js",
@@ -70,5 +70,5 @@
     "typescript": "4.5.2",
     "webpack-sources": "3.2.3"
   },
-  "gitHead": "d2f8d178f77e15cb490cce73f5766537d892f763"
+  "gitHead": "1be7a80bb8688cd3567fd1f2dacf9ab4b8c4149e"
 }