@vercel/build-utils 2.12.3-canary.17 → 2.12.3-canary.18

package/dist/convert-runtime-to-plugin.d.ts

@@ -10,3 +10,14 @@ export declare function convertRuntimeToPlugin(buildRuntime: (options: BuildOpti
 }>, ext: string): ({ workPath }: {
     workPath: string;
 }) => Promise<void>;
+/**
+ * If `.output/functions-manifest.json` exists, append to the pages
+ * property. Otherwise write a new file. This will also read `vercel.json`
+ * and apply relevant `functions` property config.
+ */
+export declare function updateFunctionsManifest({ workPath, pages, }: {
+    workPath: string;
+    pages: {
+        [key: string]: any;
+    };
+}): Promise<void>;

package/dist/convert-runtime-to-plugin.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertRuntimeToPlugin = void 0;
+exports.updateFunctionsManifest = exports.convertRuntimeToPlugin = void 0;
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = require("path");
 const glob_1 = __importDefault(require("./fs/glob"));
@@ -21,8 +21,8 @@ function convertRuntimeToPlugin(buildRuntime, ext) {
         const files = await glob_1.default('**', opts);
         delete files['vercel.json']; // Builders/Runtimes didn't have vercel.json
         const entrypoints = await glob_1.default(`api/**/*${ext}`, opts);
-        const functionsManifest = {};
-        const functions = await readVercelConfigFunctions(workPath);
+        const pages = {};
+        const { functions = {} } = await readVercelConfig(workPath);
         const traceDir = path_1.join(workPath, '.output', 'runtime-traced-files');
         await fs_extra_1.default.ensureDir(traceDir);
         for (const entrypoint of Object.keys(entrypoints)) {
@@ -38,11 +38,11 @@ function convertRuntimeToPlugin(buildRuntime, ext) {
                     excludeFiles: config.excludeFiles,
                 },
             });
-            functionsManifest[entrypoint] = {
+            pages[entrypoint] = {
                 handler: output.handler,
                 runtime: output.runtime,
-                memory: config.memory || output.memory,
-                maxDuration: config.maxDuration || output.maxDuration,
+                memory: output.memory,
+                maxDuration: output.maxDuration,
                 environment: output.environment,
                 allowQuery: output.allowQuery,
                 regions: output.regions,
@@ -78,7 +78,7 @@ function convertRuntimeToPlugin(buildRuntime, ext) {
             await fs_extra_1.default.ensureDir(path_1.dirname(nft));
             await fs_extra_1.default.writeFile(nft, json);
         }
-        await fs_extra_1.default.writeFile(path_1.join(workPath, '.output', 'functions-manifest.json'), JSON.stringify(functionsManifest));
+        await updateFunctionsManifest({ workPath, pages });
     };
 }
 exports.convertRuntimeToPlugin = convertRuntimeToPlugin;
@@ -92,12 +92,10 @@ async function linkOrCopy(existingPath, newPath) {
         }
     }
 }
-async function readVercelConfigFunctions(workPath) {
-    const vercelJsonPath = path_1.join(workPath, 'vercel.json');
+async function readJson(filePath) {
     try {
-        const str = await fs_extra_1.default.readFile(vercelJsonPath, 'utf8');
-        const obj = JSON.parse(str);
-        return obj.functions || {};
+        const str = await fs_extra_1.default.readFile(filePath, 'utf8');
+        return JSON.parse(str);
     }
     catch (err) {
         if (err.code === 'ENOENT') {
@@ -106,3 +104,35 @@ async function readVercelConfigFunctions(workPath) {
         throw err;
     }
 }
+async function readVercelConfig(workPath) {
+    const vercelJsonPath = path_1.join(workPath, 'vercel.json');
+    return readJson(vercelJsonPath);
+}
+/**
+ * If `.output/functions-manifest.json` exists, append to the pages
+ * property. Otherwise write a new file. This will also read `vercel.json`
+ * and apply relevant `functions` property config.
+ */
+async function updateFunctionsManifest({ workPath, pages, }) {
+    const functionsManifestPath = path_1.join(workPath, '.output', 'functions-manifest.json');
+    const vercelConfig = await readVercelConfig(workPath);
+    const functionsManifest = await readJson(functionsManifestPath);
+    if (!functionsManifest.version)
+        functionsManifest.version = 1;
+    if (!functionsManifest.pages)
+        functionsManifest.pages = {};
+    for (const [pageKey, pageConfig] of Object.entries(pages)) {
+        const fnConfig = await lambda_1.getLambdaOptionsFromFunction({
+            sourceFile: pageKey,
+            config: vercelConfig,
+        });
+        functionsManifest.pages[pageKey] = {
+            ...pageConfig,
+            memory: fnConfig.memory || pageConfig.memory,
+            maxDuration: fnConfig.maxDuration || pageConfig.maxDuration,
+            regions: vercelConfig.regions || pageConfig.regions,
+        };
+    }
+    await fs_extra_1.default.writeFile(functionsManifestPath, JSON.stringify(functionsManifest));
+}
+exports.updateFunctionsManifest = updateFunctionsManifest;

package/dist/index.d.ts

@@ -18,7 +18,7 @@ export { detectFramework } from './detect-framework';
 export { DetectorFilesystem } from './detectors/filesystem';
 export { readConfigFile } from './fs/read-config-file';
 export { normalizePath } from './fs/normalize-path';
-export { convertRuntimeToPlugin } from './convert-runtime-to-plugin';
+export { convertRuntimeToPlugin, updateFunctionsManifest, } from './convert-runtime-to-plugin';
 export * from './schemas';
 export * from './types';
 export * from './errors';

package/dist/index.js

@@ -32246,7 +32246,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.convertRuntimeToPlugin = void 0;
+exports.updateFunctionsManifest = exports.convertRuntimeToPlugin = void 0;
 const fs_extra_1 = __importDefault(__webpack_require__(5392));
 const path_1 = __webpack_require__(5622);
 const glob_1 = __importDefault(__webpack_require__(4240));
@@ -32264,8 +32264,8 @@ function convertRuntimeToPlugin(buildRuntime, ext) {
         const files = await glob_1.default('**', opts);
         delete files['vercel.json']; // Builders/Runtimes didn't have vercel.json
         const entrypoints = await glob_1.default(`api/**/*${ext}`, opts);
-        const functionsManifest = {};
-        const functions = await readVercelConfigFunctions(workPath);
+        const pages = {};
+        const { functions = {} } = await readVercelConfig(workPath);
         const traceDir = path_1.join(workPath, '.output', 'runtime-traced-files');
         await fs_extra_1.default.ensureDir(traceDir);
         for (const entrypoint of Object.keys(entrypoints)) {
@@ -32281,11 +32281,11 @@ function convertRuntimeToPlugin(buildRuntime, ext) {
                     excludeFiles: config.excludeFiles,
                 },
             });
-            functionsManifest[entrypoint] = {
+            pages[entrypoint] = {
                 handler: output.handler,
                 runtime: output.runtime,
-                memory: config.memory || output.memory,
-                maxDuration: config.maxDuration || output.maxDuration,
+                memory: output.memory,
+                maxDuration: output.maxDuration,
                 environment: output.environment,
                 allowQuery: output.allowQuery,
                 regions: output.regions,
@@ -32321,7 +32321,7 @@ function convertRuntimeToPlugin(buildRuntime, ext) {
             await fs_extra_1.default.ensureDir(path_1.dirname(nft));
             await fs_extra_1.default.writeFile(nft, json);
         }
-        await fs_extra_1.default.writeFile(path_1.join(workPath, '.output', 'functions-manifest.json'), JSON.stringify(functionsManifest));
+        await updateFunctionsManifest({ workPath, pages });
     };
 }
 exports.convertRuntimeToPlugin = convertRuntimeToPlugin;
@@ -32335,12 +32335,10 @@ async function linkOrCopy(existingPath, newPath) {
         }
     }
 }
-async function readVercelConfigFunctions(workPath) {
-    const vercelJsonPath = path_1.join(workPath, 'vercel.json');
+async function readJson(filePath) {
     try {
-        const str = await fs_extra_1.default.readFile(vercelJsonPath, 'utf8');
-        const obj = JSON.parse(str);
-        return obj.functions || {};
+        const str = await fs_extra_1.default.readFile(filePath, 'utf8');
+        return JSON.parse(str);
     }
     catch (err) {
         if (err.code === 'ENOENT') {
@@ -32349,6 +32347,38 @@ async function readVercelConfigFunctions(workPath) {
         throw err;
     }
 }
+async function readVercelConfig(workPath) {
+    const vercelJsonPath = path_1.join(workPath, 'vercel.json');
+    return readJson(vercelJsonPath);
+}
+/**
+ * If `.output/functions-manifest.json` exists, append to the pages
+ * property. Otherwise write a new file. This will also read `vercel.json`
+ * and apply relevant `functions` property config.
+ */
+async function updateFunctionsManifest({ workPath, pages, }) {
+    const functionsManifestPath = path_1.join(workPath, '.output', 'functions-manifest.json');
+    const vercelConfig = await readVercelConfig(workPath);
+    const functionsManifest = await readJson(functionsManifestPath);
+    if (!functionsManifest.version)
+        functionsManifest.version = 1;
+    if (!functionsManifest.pages)
+        functionsManifest.pages = {};
+    for (const [pageKey, pageConfig] of Object.entries(pages)) {
+        const fnConfig = await lambda_1.getLambdaOptionsFromFunction({
+            sourceFile: pageKey,
+            config: vercelConfig,
+        });
+        functionsManifest.pages[pageKey] = {
+            ...pageConfig,
+            memory: fnConfig.memory || pageConfig.memory,
+            maxDuration: fnConfig.maxDuration || pageConfig.maxDuration,
+            regions: vercelConfig.regions || pageConfig.regions,
+        };
+    }
+    await fs_extra_1.default.writeFile(functionsManifestPath, JSON.stringify(functionsManifest));
+}
+exports.updateFunctionsManifest = updateFunctionsManifest;
 
 
 /***/ }),
@@ -34321,7 +34351,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.getPlatformEnv = exports.isStaticRuntime = exports.isOfficialRuntime = exports.convertRuntimeToPlugin = exports.normalizePath = exports.readConfigFile = exports.DetectorFilesystem = exports.detectFramework = exports.detectApiExtensions = exports.detectApiDirectory = exports.detectOutputDirectory = exports.detectBuilders = exports.scanParentDirs = exports.getLambdaOptionsFromFunction = exports.isSymbolicLink = exports.debug = exports.shouldServe = exports.streamToBuffer = exports.getSpawnOptions = exports.getDiscontinuedNodeVersions = exports.getLatestNodeVersion = exports.getNodeVersion = exports.runShellScript = exports.runPipInstall = exports.runBundleInstall = exports.runNpmInstall = exports.getNodeBinPath = exports.walkParentDirs = exports.spawnCommand = exports.execCommand = exports.runPackageJsonScript = exports.installDependencies = exports.getScriptName = exports.spawnAsync = exports.execAsync = exports.rename = exports.glob = exports.getWriteableDirectory = exports.download = exports.Prerender = exports.createLambda = exports.Lambda = exports.FileRef = exports.FileFsRef = exports.FileBlob = void 0;
+exports.getPlatformEnv = exports.isStaticRuntime = exports.isOfficialRuntime = exports.updateFunctionsManifest = exports.convertRuntimeToPlugin = exports.normalizePath = exports.readConfigFile = exports.DetectorFilesystem = exports.detectFramework = exports.detectApiExtensions = exports.detectApiDirectory = exports.detectOutputDirectory = exports.detectBuilders = exports.scanParentDirs = exports.getLambdaOptionsFromFunction = exports.isSymbolicLink = exports.debug = exports.shouldServe = exports.streamToBuffer = exports.getSpawnOptions = exports.getDiscontinuedNodeVersions = exports.getLatestNodeVersion = exports.getNodeVersion = exports.runShellScript = exports.runPipInstall = exports.runBundleInstall = exports.runNpmInstall = exports.getNodeBinPath = exports.walkParentDirs = exports.spawnCommand = exports.execCommand = exports.runPackageJsonScript = exports.installDependencies = exports.getScriptName = exports.spawnAsync = exports.execAsync = exports.rename = exports.glob = exports.getWriteableDirectory = exports.download = exports.Prerender = exports.createLambda = exports.Lambda = exports.FileRef = exports.FileFsRef = exports.FileBlob = void 0;
 const file_blob_1 = __importDefault(__webpack_require__(2397));
 exports.FileBlob = file_blob_1.default;
 const file_fs_ref_1 = __importDefault(__webpack_require__(9331));
@@ -34385,6 +34415,7 @@ var normalize_path_1 = __webpack_require__(6261);
 Object.defineProperty(exports, "normalizePath", ({ enumerable: true, get: function () { return normalize_path_1.normalizePath; } }));
 var convert_runtime_to_plugin_1 = __webpack_require__(7276);
 Object.defineProperty(exports, "convertRuntimeToPlugin", ({ enumerable: true, get: function () { return convert_runtime_to_plugin_1.convertRuntimeToPlugin; } }));
+Object.defineProperty(exports, "updateFunctionsManifest", ({ enumerable: true, get: function () { return convert_runtime_to_plugin_1.updateFunctionsManifest; } }));
 __exportStar(__webpack_require__(2416), exports);
 __exportStar(__webpack_require__(5748), exports);
 __exportStar(__webpack_require__(3983), exports);

package/dist/lambda.d.ts

@@ -25,7 +25,7 @@ interface CreateLambdaOptions {
 }
 interface GetLambdaOptionsFromFunctionOptions {
     sourceFile: string;
-    config?: Config;
+    config?: Pick<Config, 'functions'>;
 }
 export declare const FILES_SYMBOL: unique symbol;
 export declare class Lambda {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/build-utils",
-  "version": "2.12.3-canary.17",
+  "version": "2.12.3-canary.18",
   "license": "MIT",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",
@@ -49,5 +49,5 @@
     "typescript": "4.3.4",
     "yazl": "2.4.3"
   },
-  "gitHead": "ed1dacd27698f3bb181f32b516af6953655b37e9"
+  "gitHead": "c3abf73f581c23c1c39f91249a21fd9f261f7519"
 }