@vercel/next 3.1.4 → 3.1.7

package/dist/index.js

@@ -42668,6 +42668,7 @@ const build = async ({ files, workPath, repoRootPath, entrypoint, config = {}, m
     const env = { ...spawnOpts.env };
     const memoryToConsume = Math.floor(os_1.default.totalmem() / 1024 ** 2) - 128;
     env.NODE_OPTIONS = `--max_old_space_size=${memoryToConsume}`;
+    env.NEXT_EDGE_RUNTIME_PROVIDER = 'vercel';
     if (target) {
         // Since version v10.0.8-canary.15 of Next.js the NEXT_PRIVATE_TARGET env
         // value can be used to override the target set in next.config.js
@@ -44632,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')];
@@ -45029,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 }));
@@ -46678,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',
@@ -46818,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);
+        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,
@@ -47030,6 +47052,15 @@ async function getMiddlewareBundle({ entryPath, outputDirectory, routesManifest,
                             });
                             return acc;
                         }, {});
+                        const assetFiles = (edgeFunction.assets ?? []).reduce((acc, { filePath, name }) => {
+                            const fullFilePath = path_1.default.join(entryPath, outputDirectory, filePath);
+                            acc[`assets/${name}`] = new build_utils_1.FileFsRef({
+                                mode: 0o644,
+                                contentType: 'application/octet-stream',
+                                fsPath: fullFilePath,
+                            });
+                            return acc;
+                        }, {});
                         return new build_utils_1.EdgeFunction({
                             deploymentTarget: 'v8-worker',
                             name: edgeFunction.name,
@@ -47047,9 +47078,16 @@ async function getMiddlewareBundle({ entryPath, outputDirectory, routesManifest,
                                     }),
                                 }),
                                 ...wasmFiles,
+                                ...assetFiles,
                             },
                             entrypoint: 'index.js',
                             envVarsInUse: edgeFunction.env,
+                            assets: (edgeFunction.assets ?? []).map(({ name }) => {
+                                return {
+                                    name,
+                                    path: `assets/${name}`,
+                                };
+                            }),
                         });
                     })(),
                     routeSrc: getRouteSrc(edgeFunction, routesManifest),

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,
@@ -1379,6 +1397,15 @@ async function getMiddlewareBundle({ entryPath, outputDirectory, routesManifest,
                             });
                             return acc;
                         }, {});
+                        const assetFiles = (edgeFunction.assets ?? []).reduce((acc, { filePath, name }) => {
+                            const fullFilePath = path_1.default.join(entryPath, outputDirectory, filePath);
+                            acc[`assets/${name}`] = new build_utils_1.FileFsRef({
+                                mode: 0o644,
+                                contentType: 'application/octet-stream',
+                                fsPath: fullFilePath,
+                            });
+                            return acc;
+                        }, {});
                         return new build_utils_1.EdgeFunction({
                             deploymentTarget: 'v8-worker',
                             name: edgeFunction.name,
@@ -1396,9 +1423,16 @@ async function getMiddlewareBundle({ entryPath, outputDirectory, routesManifest,
                                     }),
                                 }),
                                 ...wasmFiles,
+                                ...assetFiles,
                             },
                             entrypoint: 'index.js',
                             envVarsInUse: edgeFunction.env,
+                            assets: (edgeFunction.assets ?? []).map(({ name }) => {
+                                return {
+                                    name,
+                                    path: `assets/${name}`,
+                                };
+                            }),
                         });
                     })(),
                     routeSrc: getRouteSrc(edgeFunction, routesManifest),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/next",
-  "version": "3.1.4",
+  "version": "3.1.7",
   "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.1",
+    "@vercel/build-utils": "5.0.3",
     "@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": "0a2af4fb94d71a7a23ffc72fb68748be1177f345"
+  "gitHead": "bef1aec76609ae661f084dcc391edd66f891f0b4"
 }