@vercel/backends 0.0.29 → 0.0.31

package/dist/index.mjs

@@ -1,8 +1,8 @@
 import { builtinModules, createRequire } from "node:module";
 import { delimiter, dirname, extname, join } from "path";
-import { FileBlob, FileFsRef, NodejsLambda, Span, debug, defaultCachePathGlob, download, execCommand, getEnvForPackageManager, getNodeBinPaths, getNodeVersion, glob, isBackendFramework, isExperimentalBackendsWithoutIntrospectionEnabled, runNpmInstall, runPackageJsonScript, scanParentDirs } from "@vercel/build-utils";
+import { FileBlob, FileFsRef, NodejsLambda, Span, debug, defaultCachePathGlob, download, execCommand, getEnvForPackageManager, getNodeBinPaths, getNodeVersion, glob, isBackendFramework, isBunVersion, isExperimentalBackendsWithoutIntrospectionEnabled, runNpmInstall, runPackageJsonScript, scanParentDirs } from "@vercel/build-utils";
 import { createWriteStream, existsSync, mkdirSync, mkdtempSync, readFileSync, rmSync, unlinkSync, writeFileSync } from "node:fs";
-import { lstat, readFile, rm } from "node:fs/promises";
+import { lstat, readFile, rm, stat } from "node:fs/promises";
 import { dirname as dirname$1, extname as extname$1, isAbsolute, join as join$1, relative } from "node:path";
 import { build as build$2 } from "rolldown";
 import { exports } from "resolve.exports";
@@ -678,12 +678,14 @@ const resolveEntrypointAndFormat = async (args) => {
 const nft = async (args) => {
 	const nftSpan = args.span.child("vc.builder.backends.nft");
 	const runNft = async () => {
+		const ignorePatterns = [...args.ignoreNodeModules ? ["**/node_modules/**"] : [], ...args.ignore ? Array.isArray(args.ignore) ? args.ignore : [args.ignore] : []];
 		const nftResult = await nodeFileTrace$1(Array.from(args.localBuildFiles), {
 			base: args.repoRootPath,
 			processCwd: args.workPath,
 			ts: true,
 			mixedModules: true,
-			ignore: args.ignoreNodeModules ? (path) => path.includes("node_modules") : void 0,
+			conditions: args.conditions,
+			ignore: ignorePatterns.length > 0 ? ignorePatterns : void 0,
 			async readFile(fsPath) {
 				try {
 					let source = await readFile(fsPath);
@@ -701,11 +703,13 @@ const nft = async (args) => {
 			const outputPath = file;
 			if (args.localBuildFiles.has(join$1(args.repoRootPath, outputPath))) continue;
 			if (stats.isSymbolicLink() || stats.isFile()) if (args.ignoreNodeModules) {
-				const content = await readFile(absolutePath, "utf-8");
-				args.files[outputPath] = new FileBlob({
-					data: content,
-					mode: stats.mode
-				});
+				if ((stats.isSymbolicLink() ? await stat(absolutePath) : stats).isFile()) {
+					const content = await readFile(absolutePath, "utf-8");
+					args.files[outputPath] = new FileBlob({
+						data: content,
+						mode: stats.mode
+					});
+				}
 			} else args.files[outputPath] = new FileFsRef({
 				fsPath: absolutePath,
 				mode: stats.mode
@@ -783,6 +787,9 @@ const rolldown = async (args) => {
 		const normalizedId = id.includes(":") ? id.split(":")[1] : id;
 		return builtinModules.includes(normalizedId);
 	};
+	const isBunBuiltin = (id) => {
+		return id === "bun" || id.startsWith("bun:");
+	};
 	const isLocalImport = (id) => {
 		return !id.startsWith("node:") && !id.includes("node_modules");
 	};
@@ -801,6 +808,10 @@ const rolldown = async (args) => {
 						id: id.startsWith("node:") ? id : `node:${id}`,
 						external: true
 					};
+					if (isBunBuiltin(id)) return {
+						id,
+						external: true
+					};
 					if (resolved?.id && isLocalImport(resolved.id)) localBuildFiles.add(resolved.id);
 					else if (!resolved) localBuildFiles.add(join$1(args.workPath, id));
 					if (importer?.startsWith(CJS_SHIM_PREFIX) && isBareImport(id)) return {
@@ -900,9 +911,11 @@ module.exports = requireFromContext('${pkgName}');
 		localBuildFiles,
 		files,
 		span: rolldownSpan ?? new Span({ name: "vc.builder.backends.nft" }),
-		ignoreNodeModules: true
+		ignoreNodeModules: true,
+		ignore: args.config.excludeFiles
 	});
 	if (!handler) throw new Error(`Unable to resolve build handler for entrypoint: ${args.entrypoint}`);
+	console.log(Colors.gray(`${Colors.bold(Colors.cyan("✓"))} Build complete`));
 	return {
 		files,
 		handler,
@@ -1408,7 +1421,8 @@ const getFramework = (args) => {
 const version = 2;
 const build = async (args) => {
 	const downloadResult = await downloadInstallAndBundle(args);
-	const nodeVersion = await getNodeVersion(args.workPath);
+	const nodeVersion = await getNodeVersion(args.workPath, void 0, args.config, args.meta);
+	const isBun = isBunVersion(nodeVersion);
 	const builderName = "@vercel/backends";
 	const span = args.span ?? new Span({ name: builderName });
 	span.setAttributes({ "builder.name": builderName });
@@ -1418,6 +1432,11 @@ const build = async (args) => {
 		debug("Entrypoint", entrypoint);
 		args.entrypoint = entrypoint;
 		const userBuildResult = await maybeDoBuildCommand(args, downloadResult);
+		const functionConfig = args.config.functions?.[entrypoint];
+		if (functionConfig) {
+			args.config.includeFiles = [...normalizeArray(args.config.includeFiles), ...normalizeArray(functionConfig.includeFiles)];
+			args.config.excludeFiles = [...normalizeArray(args.config.excludeFiles), ...normalizeArray(functionConfig.excludeFiles)];
+		}
 		const rolldownResult = await rolldown({
 			...args,
 			span: buildSpan
@@ -1443,8 +1462,13 @@ const build = async (args) => {
 			localBuildFiles,
 			files,
 			ignoreNodeModules: false,
+			ignore: args.config.excludeFiles,
+			conditions: isBun ? ["bun"] : void 0,
 			span: buildSpan
 		});
+		const baseDir = args.repoRootPath || args.workPath;
+		const includeResults = await Promise.all(normalizeArray(args.config.includeFiles).map((pattern) => glob(pattern, baseDir)));
+		for (const matched of includeResults) for (const [relPath, entry] of Object.entries(matched)) files[relPath] = entry;
 		const introspectionResult = await introspectionPromise;
 		await typescriptPromise;
 		const lambda = new NodejsLambda({
@@ -1479,6 +1503,7 @@ const build = async (args) => {
 const prepareCache = ({ repoRootPath, workPath }) => {
 	return glob(defaultCachePathGlob, repoRootPath || workPath);
 };
+const normalizeArray = (value) => Array.isArray(value) ? value : value ? [value] : [];
 
 //#endregion
 export { build, build$1 as cervelBuild, serve as cervelServe, findEntrypoint, findEntrypointOrThrow, getBuildSummary, introspectApp, nodeFileTrace, prepareCache, srvxOptions, version };

package/dist/rolldown/index.d.mts

@@ -1,7 +1,7 @@
 import { BuildOptions, Files, Span } from "@vercel/build-utils";
 
 //#region src/rolldown/index.d.ts
-declare const rolldown: (args: Pick<BuildOptions, 'entrypoint' | 'workPath' | 'repoRootPath'> & {
+declare const rolldown: (args: Pick<BuildOptions, 'entrypoint' | 'workPath' | 'repoRootPath' | 'config'> & {
   span?: Span;
 }) => Promise<{
   files: Files;

package/dist/rolldown/index.mjs

@@ -2,13 +2,42 @@ import { builtinModules } from "node:module";
 import { FileBlob, FileFsRef, Span, isBackendFramework } from "@vercel/build-utils";
 import { dirname, extname, join, relative } from "node:path";
 import { existsSync } from "node:fs";
-import { lstat, readFile } from "node:fs/promises";
+import { lstat, readFile, stat } from "node:fs/promises";
 import { build } from "rolldown";
 import { nodeFileTrace } from "@vercel/nft";
 import { isNativeError } from "node:util/types";
 import { transform } from "oxc-transform";
 import { exports } from "resolve.exports";
 
+//#region src/cervel/utils.ts
+const noColor = globalThis.process?.env?.NO_COLOR === "1" || globalThis.process?.env?.TERM === "dumb";
+const resets = {
+	1: 22,
+	31: 39,
+	32: 39,
+	33: 39,
+	34: 39,
+	35: 39,
+	36: 39,
+	90: 39
+};
+const _c = (c) => (text) => {
+	if (noColor) return text;
+	return `\u001B[${c}m${text}\u001B[${resets[c] ?? 0}m`;
+};
+const Colors = {
+	bold: _c(1),
+	red: _c(31),
+	green: _c(32),
+	yellow: _c(33),
+	blue: _c(34),
+	magenta: _c(35),
+	cyan: _c(36),
+	gray: _c(90),
+	url: (title, url) => noColor ? `[${title}](${url})` : `\u001B]8;;${url}\u001B\\${title}\u001B]8;;\u001B\\`
+};
+
+//#endregion
 //#region src/rolldown/resolve-format.ts
 const resolveEntrypointAndFormat = async (args) => {
 	const extension = extname(args.entrypoint);
@@ -64,12 +93,14 @@ const resolveEntrypointAndFormat = async (args) => {
 const nft = async (args) => {
 	const nftSpan = args.span.child("vc.builder.backends.nft");
 	const runNft = async () => {
+		const ignorePatterns = [...args.ignoreNodeModules ? ["**/node_modules/**"] : [], ...args.ignore ? Array.isArray(args.ignore) ? args.ignore : [args.ignore] : []];
 		const nftResult = await nodeFileTrace(Array.from(args.localBuildFiles), {
 			base: args.repoRootPath,
 			processCwd: args.workPath,
 			ts: true,
 			mixedModules: true,
-			ignore: args.ignoreNodeModules ? (path) => path.includes("node_modules") : void 0,
+			conditions: args.conditions,
+			ignore: ignorePatterns.length > 0 ? ignorePatterns : void 0,
 			async readFile(fsPath) {
 				try {
 					let source = await readFile(fsPath);
@@ -87,11 +118,13 @@ const nft = async (args) => {
 			const outputPath = file;
 			if (args.localBuildFiles.has(join(args.repoRootPath, outputPath))) continue;
 			if (stats.isSymbolicLink() || stats.isFile()) if (args.ignoreNodeModules) {
-				const content = await readFile(absolutePath, "utf-8");
-				args.files[outputPath] = new FileBlob({
-					data: content,
-					mode: stats.mode
-				});
+				if ((stats.isSymbolicLink() ? await stat(absolutePath) : stats).isFile()) {
+					const content = await readFile(absolutePath, "utf-8");
+					args.files[outputPath] = new FileBlob({
+						data: content,
+						mode: stats.mode
+					});
+				}
 			} else args.files[outputPath] = new FileFsRef({
 				fsPath: absolutePath,
 				mode: stats.mode
@@ -169,6 +202,9 @@ const rolldown = async (args) => {
 		const normalizedId = id.includes(":") ? id.split(":")[1] : id;
 		return builtinModules.includes(normalizedId);
 	};
+	const isBunBuiltin = (id) => {
+		return id === "bun" || id.startsWith("bun:");
+	};
 	const isLocalImport = (id) => {
 		return !id.startsWith("node:") && !id.includes("node_modules");
 	};
@@ -187,6 +223,10 @@ const rolldown = async (args) => {
 						id: id.startsWith("node:") ? id : `node:${id}`,
 						external: true
 					};
+					if (isBunBuiltin(id)) return {
+						id,
+						external: true
+					};
 					if (resolved?.id && isLocalImport(resolved.id)) localBuildFiles.add(resolved.id);
 					else if (!resolved) localBuildFiles.add(join(args.workPath, id));
 					if (importer?.startsWith(CJS_SHIM_PREFIX) && isBareImport(id)) return {
@@ -286,9 +326,11 @@ module.exports = requireFromContext('${pkgName}');
 		localBuildFiles,
 		files,
 		span: rolldownSpan ?? new Span({ name: "vc.builder.backends.nft" }),
-		ignoreNodeModules: true
+		ignoreNodeModules: true,
+		ignore: args.config.excludeFiles
 	});
 	if (!handler) throw new Error(`Unable to resolve build handler for entrypoint: ${args.entrypoint}`);
+	console.log(Colors.gray(`${Colors.bold(Colors.cyan("✓"))} Build complete`));
 	return {
 		files,
 		handler,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/backends",
-  "version": "0.0.29",
+  "version": "0.0.31",
   "license": "Apache-2.0",
   "main": "./dist/index.mjs",
   "homepage": "https://vercel.com/docs",
@@ -34,7 +34,7 @@
     "srvx": "0.8.9",
     "tsx": "4.21.0",
     "zod": "3.22.4",
-    "@vercel/build-utils": "13.3.2"
+    "@vercel/build-utils": "13.3.4"
   },
   "peerDependencies": {
     "typescript": "^4.0.0 || ^5.0.0"