@vercel/next 3.4.6 → 3.5.0

package/dist/index.js

@@ -40896,10 +40896,7 @@ const build = async ({ files, workPath, repoRootPath, entrypoint, config = {}, m
             outputDirectory,
             appPathRoutesManifest,
         });
-        const isApiPage = (page) => page
-            .replace(/\\/g, '/')
-            .match(/(serverless|server)\/pages\/api(\/|\.js$)/);
-        const canUsePreviewMode = Object.keys(pages).some(page => isApiPage(pages[page].fsPath));
+        const canUsePreviewMode = Object.keys(pages).some(page => (0, utils_1.isApiPage)(pages[page].fsPath));
         staticPages = await (0, utils_1.filterStaticPages)(await (0, build_utils_1.glob)('**/*.html', pagesDir), dynamicPages, entryDirectory, exports.htmlContentType, prerenderManifest, routesManifest);
         hasStatic500 = !!staticPages[path_1.default.posix.join(entryDirectory, '500')];
         // this can be either 404.html in latest versions
@@ -41109,7 +41106,7 @@ const build = async ({ files, workPath, repoRootPath, entrypoint, config = {}, m
             const route = `/${page.replace(/\.js$/, '')}`;
             if (route === '/_error' && static404Page)
                 continue;
-            if (isApiPage(pagePath)) {
+            if ((0, utils_1.isApiPage)(pagePath)) {
                 apiPages.push(page);
             }
             else if (!nonLambdaSsgPages.has(route)) {
@@ -41214,6 +41211,9 @@ const build = async ({ files, workPath, repoRootPath, entrypoint, config = {}, m
                 lambdaCompressedByteLimit,
                 internalPages: [],
             });
+            for (const group of initialApiLambdaGroups) {
+                group.isApiLambda = true;
+            }
             (0, build_utils_1.debug)(JSON.stringify({
                 apiLambdaGroups: initialApiLambdaGroups.map(group => ({
                     pages: group.pages,
@@ -41250,7 +41250,7 @@ const build = async ({ files, workPath, repoRootPath, entrypoint, config = {}, m
                     const pageFileName = path_1.default.normalize(path_1.default.relative(workPath, pages[page].fsPath));
                     const pathname = page.replace(/\.js$/, '');
                     const routeIsDynamic = (0, utils_1.isDynamicRoute)(pathname);
-                    routeIsApi = isApiPage(pageFileName);
+                    routeIsApi = (0, utils_1.isApiPage)(pageFileName);
                     if (routeIsDynamic) {
                         dynamicPages.push((0, utils_1.normalizePage)(pathname));
                     }
@@ -41366,6 +41366,10 @@ const build = async ({ files, workPath, repoRootPath, entrypoint, config = {}, m
                             },
                         ],
                         handler: path_1.default.join(path_1.default.relative(baseDir, entryPath), '___next_launcher.cjs'),
+                        operationType: (0, utils_1.getOperationType)({
+                            prerenderManifest,
+                            pageFileName,
+                        }),
                         runtime: nodeVersion.runtime,
                         nextVersion,
                         ...lambdaOptions,
@@ -41383,6 +41387,7 @@ const build = async ({ files, workPath, repoRootPath, entrypoint, config = {}, m
                             },
                         ],
                         handler: path_1.default.join(path_1.default.relative(baseDir, entryPath), '___next_launcher.cjs'),
+                        operationType: (0, utils_1.getOperationType)({ pageFileName }),
                         runtime: nodeVersion.runtime,
                         nextVersion,
                         ...lambdaOptions,
@@ -41521,6 +41526,10 @@ const build = async ({ files, workPath, repoRootPath, entrypoint, config = {}, m
                 for (const page of groupPageKeys) {
                     pageLambdaMap[page] = group.lambdaIdentifier;
                 }
+                const operationType = (0, utils_1.getOperationType)({
+                    group,
+                    prerenderManifest,
+                });
                 lambdas[group.lambdaIdentifier] =
                     await (0, utils_1.createLambdaFromPseudoLayers)({
                         files: {
@@ -41529,6 +41538,7 @@ const build = async ({ files, workPath, repoRootPath, entrypoint, config = {}, m
                         },
                         layers: [group.pseudoLayer],
                         handler: path_1.default.join(path_1.default.relative(baseDir, entryPath), '___next_launcher.cjs'),
+                        operationType,
                         runtime: nodeVersion.runtime,
                         nextVersion,
                     });
@@ -42788,6 +42798,9 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
             lambdaCompressedByteLimit,
             internalPages,
         });
+        for (const group of apiLambdaGroups) {
+            group.isApiLambda = true;
+        }
         (0, build_utils_1.debug)(JSON.stringify({
             apiLambdaGroups: apiLambdaGroups.map(group => ({
                 pages: group.pages,
@@ -42871,6 +42884,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                     });
                 }
             }
+            const operationType = (0, utils_1.getOperationType)({ group, prerenderManifest });
             const lambda = await (0, utils_1.createLambdaFromPseudoLayers)({
                 files: {
                     ...launcherFiles,
@@ -42878,11 +42892,11 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                 },
                 layers: [group.pseudoLayer, groupPageFiles],
                 handler: path_1.default.join(path_1.default.relative(baseDir, requiredServerFilesManifest.appDir || entryPath), '___next_launcher.cjs'),
+                operationType,
                 memory: group.memory,
                 runtime: nodeVersion.runtime,
                 maxDuration: group.maxDuration,
                 isStreaming: group.isStreaming,
-                cron: group.cron,
                 nextVersion,
             });
             for (const page of group.pages) {
@@ -43636,7 +43650,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.upgradeMiddlewareManifest = exports.getMiddlewareManifest = 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.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;
 const build_utils_1 = __webpack_require__(3445);
 const async_sema_1 = __webpack_require__(7905);
 const buffer_crc32_1 = __importDefault(__webpack_require__(2227));
@@ -44442,8 +44456,7 @@ async function getPageLambdaGroups({ entryPath, config, pages, prerenderRoutes,
         let matchingGroup = groups.find(group => {
             const matches = group.maxDuration === opts.maxDuration &&
                 group.memory === opts.memory &&
-                group.isPrerenders === isPrerenderRoute &&
-                !opts.cron; // Functions with a cronjob must be on their own
+                group.isPrerenders === isPrerenderRoute;
             if (matches) {
                 let newTracedFilesSize = group.pseudoLayerBytes;
                 let newTracedFilesUncompressedSize = group.pseudoLayerUncompressedBytes;
@@ -44475,6 +44488,7 @@ async function getPageLambdaGroups({ entryPath, config, pages, prerenderRoutes,
                 pages: [page],
                 ...opts,
                 isPrerenders: isPrerenderRoute,
+                isApiLambda: !!isApiPage(page),
                 pseudoLayerBytes: initialPseudoLayer.pseudoLayerBytes,
                 pseudoLayerUncompressedBytes: initialPseudoLayerUncompressed,
                 pseudoLayer: Object.assign({}, initialPseudoLayer.pseudoLayer),
@@ -45051,7 +45065,7 @@ async function getPrivateOutputs(dir, entries) {
     return { files, routes };
 }
 exports.getPrivateOutputs = getPrivateOutputs;
-async function getMiddlewareBundle({ config = {}, entryPath, outputDirectory, routesManifest, isCorrectMiddlewareOrder, prerenderBypassToken, nextVersion, }) {
+async function getMiddlewareBundle({ entryPath, outputDirectory, routesManifest, isCorrectMiddlewareOrder, prerenderBypassToken, nextVersion, }) {
     const middlewareManifest = await getMiddlewareManifest(entryPath, outputDirectory);
     const sortedFunctions = [
         ...(!middlewareManifest
@@ -45081,18 +45095,6 @@ async function getMiddlewareBundle({ config = {}, entryPath, outputDirectory, ro
                         i18n: routesManifest.i18n,
                     },
                 }, path_1.default.resolve(entryPath, outputDirectory), edgeFunction.wasm);
-                const edgeFunctionOptions = {};
-                if (config.functions) {
-                    const sourceFile = await getSourceFilePathFromPage({
-                        workPath: entryPath,
-                        page: `${edgeFunction.page}.js`,
-                    });
-                    const opts = await (0, build_utils_1.getLambdaOptionsFromFunction)({
-                        sourceFile,
-                        config,
-                    });
-                    edgeFunctionOptions.cron = opts.cron;
-                }
                 return {
                     type,
                     page: edgeFunction.page,
@@ -45118,7 +45120,6 @@ async function getMiddlewareBundle({ config = {}, entryPath, outputDirectory, ro
                             return acc;
                         }, {});
                         return new build_utils_1.EdgeFunction({
-                            ...edgeFunctionOptions,
                             deploymentTarget: 'v8-worker',
                             name: edgeFunction.name,
                             files: {
@@ -45329,6 +45330,32 @@ function transformSourceMap(sourcemap) {
     });
     return { ...sourcemap, sources };
 }
+function getOperationType({ group, prerenderManifest, pageFileName, }) {
+    if (group?.isApiLambda || isApiPage(pageFileName)) {
+        return 'API';
+    }
+    if (group?.isPrerenders) {
+        return 'ISR';
+    }
+    if (pageFileName && prerenderManifest) {
+        const { blockingFallbackRoutes = {}, fallbackRoutes = {} } = prerenderManifest;
+        if (pageFileName in blockingFallbackRoutes ||
+            pageFileName in fallbackRoutes) {
+            return 'ISR';
+        }
+    }
+    return 'SSR';
+}
+exports.getOperationType = getOperationType;
+function isApiPage(page) {
+    if (!page) {
+        return false;
+    }
+    return page
+        .replace(/\\/g, '/')
+        .match(/(serverless|server)\/pages\/api(\/|\.js$)/);
+}
+exports.isApiPage = isApiPage;
 
 
 /***/ }),

package/dist/server-build.js

@@ -412,6 +412,9 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
             lambdaCompressedByteLimit,
             internalPages,
         });
+        for (const group of apiLambdaGroups) {
+            group.isApiLambda = true;
+        }
         (0, build_utils_1.debug)(JSON.stringify({
             apiLambdaGroups: apiLambdaGroups.map(group => ({
                 pages: group.pages,
@@ -495,6 +498,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                     });
                 }
             }
+            const operationType = (0, utils_1.getOperationType)({ group, prerenderManifest });
             const lambda = await (0, utils_1.createLambdaFromPseudoLayers)({
                 files: {
                     ...launcherFiles,
@@ -502,11 +506,11 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                 },
                 layers: [group.pseudoLayer, groupPageFiles],
                 handler: path_1.default.join(path_1.default.relative(baseDir, requiredServerFilesManifest.appDir || entryPath), '___next_launcher.cjs'),
+                operationType,
                 memory: group.memory,
                 runtime: nodeVersion.runtime,
                 maxDuration: group.maxDuration,
                 isStreaming: group.isStreaming,
-                cron: group.cron,
                 nextVersion,
             });
             for (const page of group.pages) {

package/dist/utils.js

@@ -22,7 +22,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.upgradeMiddlewareManifest = exports.getMiddlewareManifest = 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.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;
 const build_utils_1 = require("@vercel/build-utils");
 const async_sema_1 = require("async-sema");
 const buffer_crc32_1 = __importDefault(require("buffer-crc32"));
@@ -828,8 +828,7 @@ async function getPageLambdaGroups({ entryPath, config, pages, prerenderRoutes,
         let matchingGroup = groups.find(group => {
             const matches = group.maxDuration === opts.maxDuration &&
                 group.memory === opts.memory &&
-                group.isPrerenders === isPrerenderRoute &&
-                !opts.cron; // Functions with a cronjob must be on their own
+                group.isPrerenders === isPrerenderRoute;
             if (matches) {
                 let newTracedFilesSize = group.pseudoLayerBytes;
                 let newTracedFilesUncompressedSize = group.pseudoLayerUncompressedBytes;
@@ -861,6 +860,7 @@ async function getPageLambdaGroups({ entryPath, config, pages, prerenderRoutes,
                 pages: [page],
                 ...opts,
                 isPrerenders: isPrerenderRoute,
+                isApiLambda: !!isApiPage(page),
                 pseudoLayerBytes: initialPseudoLayer.pseudoLayerBytes,
                 pseudoLayerUncompressedBytes: initialPseudoLayerUncompressed,
                 pseudoLayer: Object.assign({}, initialPseudoLayer.pseudoLayer),
@@ -1437,7 +1437,7 @@ async function getPrivateOutputs(dir, entries) {
     return { files, routes };
 }
 exports.getPrivateOutputs = getPrivateOutputs;
-async function getMiddlewareBundle({ config = {}, entryPath, outputDirectory, routesManifest, isCorrectMiddlewareOrder, prerenderBypassToken, nextVersion, }) {
+async function getMiddlewareBundle({ entryPath, outputDirectory, routesManifest, isCorrectMiddlewareOrder, prerenderBypassToken, nextVersion, }) {
     const middlewareManifest = await getMiddlewareManifest(entryPath, outputDirectory);
     const sortedFunctions = [
         ...(!middlewareManifest
@@ -1467,18 +1467,6 @@ async function getMiddlewareBundle({ config = {}, entryPath, outputDirectory, ro
                         i18n: routesManifest.i18n,
                     },
                 }, path_1.default.resolve(entryPath, outputDirectory), edgeFunction.wasm);
-                const edgeFunctionOptions = {};
-                if (config.functions) {
-                    const sourceFile = await getSourceFilePathFromPage({
-                        workPath: entryPath,
-                        page: `${edgeFunction.page}.js`,
-                    });
-                    const opts = await (0, build_utils_1.getLambdaOptionsFromFunction)({
-                        sourceFile,
-                        config,
-                    });
-                    edgeFunctionOptions.cron = opts.cron;
-                }
                 return {
                     type,
                     page: edgeFunction.page,
@@ -1504,7 +1492,6 @@ async function getMiddlewareBundle({ config = {}, entryPath, outputDirectory, ro
                             return acc;
                         }, {});
                         return new build_utils_1.EdgeFunction({
-                            ...edgeFunctionOptions,
                             deploymentTarget: 'v8-worker',
                             name: edgeFunction.name,
                             files: {
@@ -1715,3 +1702,29 @@ function transformSourceMap(sourcemap) {
     });
     return { ...sourcemap, sources };
 }
+function getOperationType({ group, prerenderManifest, pageFileName, }) {
+    if (group?.isApiLambda || isApiPage(pageFileName)) {
+        return 'API';
+    }
+    if (group?.isPrerenders) {
+        return 'ISR';
+    }
+    if (pageFileName && prerenderManifest) {
+        const { blockingFallbackRoutes = {}, fallbackRoutes = {} } = prerenderManifest;
+        if (pageFileName in blockingFallbackRoutes ||
+            pageFileName in fallbackRoutes) {
+            return 'ISR';
+        }
+    }
+    return 'SSR';
+}
+exports.getOperationType = getOperationType;
+function isApiPage(page) {
+    if (!page) {
+        return false;
+    }
+    return page
+        .replace(/\\/g, '/')
+        .match(/(serverless|server)\/pages\/api(\/|\.js$)/);
+}
+exports.isApiPage = isApiPage;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/next",
-  "version": "3.4.6",
+  "version": "3.5.0",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/next-js",
@@ -45,7 +45,7 @@
     "@types/semver": "6.0.0",
     "@types/text-table": "0.2.1",
     "@types/webpack-sources": "3.2.0",
-    "@vercel/build-utils": "6.2.4",
+    "@vercel/build-utils": "6.3.0",
     "@vercel/nft": "0.22.5",
     "@vercel/routing-utils": "2.1.9",
     "async-sema": "3.0.1",
@@ -71,5 +71,5 @@
     "typescript": "4.5.2",
     "webpack-sources": "3.2.3"
   },
-  "gitHead": "1bb7b37e0ce3ea25fad81f9a328de466de67a14e"
+  "gitHead": "70a53515bd12202f895c369504e2d5be6c9469f4"
 }