@vercel/backends 0.8.12 → 0.8.14

package/dist/index.mjs

@@ -204,7 +204,7 @@ const resolveEntrypointAndFormat = async (args) => {
 		if (extensionInfo.format === "auto") if (pkg.type === "module") resolvedFormat = "esm";
 		else resolvedFormat = "cjs";
 	}
-	if (!resolvedFormat) throw new Error(`Unable to resolve format for ${args.entrypoint}`);
+	if (!resolvedFormat) resolvedFormat = "esm";
 	return {
 		format: resolvedFormat,
 		extension: resolvedFormat === "esm" ? "mjs" : "cjs"
@@ -978,8 +978,14 @@ const nft = async (args) => {
 			if (!isJsLikeExtension(relPath) || file.type !== "FileBlob") continue;
 			virtualFiles.set(join(args.repoRootPath, relPath), typeof file.data === "string" ? file.data : Buffer.from(new Uint8Array(file.data)));
 		}
-		const ignorePatterns = [...args.ignoreNodeModules ? ["**/node_modules/**"] : [], ...args.ignore ? Array.isArray(args.ignore) ? args.ignore : [args.ignore] : []];
 		const traceRoots = [...Array.from(args.localBuildFiles).filter((p) => existsSync(p) || virtualFiles.has(p)), ...virtualFiles.keys()];
+		const traceBase = getCommonBase(args.repoRootPath, traceRoots);
+		const ignorePatterns = getIgnorePatterns({
+			ignoreNodeModules: args.ignoreNodeModules,
+			ignore: args.ignore,
+			traceBase,
+			repoRootPath: args.repoRootPath
+		});
 		const statOverride = memoize(async (fsPath) => {
 			const virtual = virtualFiles.get(fsPath);
 			if (virtual !== void 0) return createVirtualFileStat(virtual);
@@ -1012,7 +1018,7 @@ const nft = async (args) => {
 			}
 		});
 		const nftResult = await nodeFileTrace$1(traceRoots, {
-			base: args.repoRootPath,
+			base: traceBase,
 			processCwd: args.workPath,
 			ts: true,
 			mixedModules: true,
@@ -1026,7 +1032,7 @@ const nft = async (args) => {
 			} : {}
 		});
 		for (const file of nftResult.fileList) {
-			const absolutePath = join(args.repoRootPath, file);
+			const absolutePath = join(traceBase, file);
 			if (virtualFiles.has(absolutePath)) continue;
 			let stats;
 			try {
@@ -1035,17 +1041,33 @@ const nft = async (args) => {
 				if (isNativeError(error) && "code" in error && error.code === "ENOENT") continue;
 				throw error;
 			}
-			const outputPath = file.split(sep).join("/");
-			if (args.localBuildFiles.has(join(args.repoRootPath, outputPath))) continue;
-			if (stats.isSymbolicLink() || stats.isFile()) if (args.ignoreNodeModules) {
-				if ((stats.isSymbolicLink() ? await stat(absolutePath) : stats).isFile()) args.files[outputPath] = new FileBlob({
-					data: await readFile(absolutePath),
+			const normalizedFile = normalizePath(relative(args.repoRootPath, absolutePath));
+			const outputPath = stripParentSegments(normalizedFile);
+			const escapesBase = outputPath !== normalizedFile;
+			if (args.localBuildFiles.has(join(args.repoRootPath, outputPath)) && !isNodeModulesPath(outputPath)) continue;
+			if (stats.isSymbolicLink() || stats.isFile()) {
+				if (stats.isSymbolicLink()) {
+					const symlinkTarget = await readlink(absolutePath);
+					const symlinkTargetPath = normalizePath(relative(args.repoRootPath, resolve(dirname(absolutePath), symlinkTarget)));
+					if (isParentPath(symlinkTargetPath)) {
+						const outputTargetPath = stripParentSegments(symlinkTargetPath);
+						args.files[outputPath] = new FileBlob({
+							data: posix.relative(posix.dirname(outputPath), outputTargetPath),
+							mode: stats.mode
+						});
+						continue;
+					}
+				}
+				if (args.ignoreNodeModules || escapesBase) {
+					if ((stats.isSymbolicLink() ? await stat(absolutePath) : stats).isFile()) args.files[outputPath] = new FileBlob({
+						data: await readFile(absolutePath),
+						mode: stats.mode
+					});
+				} else args.files[outputPath] = new FileFsRef({
+					fsPath: absolutePath,
 					mode: stats.mode
 				});
-			} else args.files[outputPath] = new FileFsRef({
-				fsPath: absolutePath,
-				mode: stats.mode
-			});
+			}
 		}
 	};
 	await nftSpan.trace(runNft);
@@ -1079,6 +1101,40 @@ const isJsLikeExtension = (path) => {
 	if (dot === -1) return false;
 	return JS_LIKE_EXTENSIONS.has(path.slice(dot).toLowerCase());
 };
+const getCommonBase = (base, paths) => {
+	let commonBase = base;
+	for (const path of paths) while (!isPathInside(commonBase, path)) {
+		const parent = dirname(commonBase);
+		if (parent === commonBase) break;
+		commonBase = parent;
+	}
+	return commonBase;
+};
+const isPathInside = (base, path) => {
+	const relPath = relative(base, path);
+	return relPath === "" || !isParentPath(normalizePath(relPath)) && !isAbsolute(relPath);
+};
+const normalizePath = (path) => path.split(sep).join("/");
+const isParentPath = (path) => path === ".." || path.startsWith("../");
+const isNodeModulesPath = (path) => path.split("/").includes("node_modules");
+const stripParentSegments = (path) => {
+	const segments = path.split("/");
+	let index = 0;
+	while (segments[index] === "..") index++;
+	return segments.slice(index).join("/");
+};
+const getIgnorePatterns = ({ ignoreNodeModules, ignore, traceBase, repoRootPath }) => {
+	const patterns = [...ignoreNodeModules ? ["**/node_modules/**"] : [], ...ignore ? Array.isArray(ignore) ? ignore : [ignore] : []];
+	const repoRootRelativeToTraceBase = normalizePath(relative(traceBase, repoRootPath));
+	if (!repoRootRelativeToTraceBase || isParentPath(repoRootRelativeToTraceBase)) return patterns;
+	const rebasedPatterns = patterns.map((pattern) => {
+		const isNegated = pattern.startsWith("!");
+		const patternBody = isNegated ? pattern.slice(1) : pattern;
+		const rebased = posix.join(repoRootRelativeToTraceBase, patternBody);
+		return isNegated ? `!${rebased}` : rebased;
+	});
+	return [...patterns, ...rebasedPatterns];
+};
 const createVirtualFileStat = (data) => {
 	const now = /* @__PURE__ */ new Date();
 	return {
@@ -1221,7 +1277,8 @@ const rolldown = async (args) => {
 							framework.slug = pkgJson.name;
 							framework.version = pkgJson.version;
 						} catch {}
-						if (resolved ? await isCommonJS(id, resolved.id, resolved) : false) {
+						if ((resolved ? await isCommonJS(id, resolved.id, resolved) : false) && resolved) {
+							localBuildFiles.add(resolved.id);
 							const importerPkgJsonPath = (await this.resolve(importer))?.packageJsonPath;
 							if (importerPkgJsonPath) {
 								const importerPkgDir = relative(args.repoRootPath, dirname(importerPkgJsonPath));

package/dist/rolldown/index.mjs

@@ -1,6 +1,6 @@
 import { builtinModules } from "node:module";
 import { FileBlob, FileFsRef, Span, isBackendFramework } from "@vercel/build-utils";
-import { dirname, extname, join, relative, sep } from "node:path";
+import { dirname, extname, isAbsolute, join, posix, relative, resolve, sep } from "node:path";
 import { existsSync } from "node:fs";
 import { lstat, readFile, readlink, stat } from "node:fs/promises";
 import { build } from "rolldown";
@@ -81,7 +81,7 @@ const resolveEntrypointAndFormat = async (args) => {
 		if (extensionInfo.format === "auto") if (pkg.type === "module") resolvedFormat = "esm";
 		else resolvedFormat = "cjs";
 	}
-	if (!resolvedFormat) throw new Error(`Unable to resolve format for ${args.entrypoint}`);
+	if (!resolvedFormat) resolvedFormat = "esm";
 	return {
 		format: resolvedFormat,
 		extension: resolvedFormat === "esm" ? "mjs" : "cjs"
@@ -98,8 +98,14 @@ const nft = async (args) => {
 			if (!isJsLikeExtension(relPath) || file.type !== "FileBlob") continue;
 			virtualFiles.set(join(args.repoRootPath, relPath), typeof file.data === "string" ? file.data : Buffer.from(new Uint8Array(file.data)));
 		}
-		const ignorePatterns = [...args.ignoreNodeModules ? ["**/node_modules/**"] : [], ...args.ignore ? Array.isArray(args.ignore) ? args.ignore : [args.ignore] : []];
 		const traceRoots = [...Array.from(args.localBuildFiles).filter((p) => existsSync(p) || virtualFiles.has(p)), ...virtualFiles.keys()];
+		const traceBase = getCommonBase(args.repoRootPath, traceRoots);
+		const ignorePatterns = getIgnorePatterns({
+			ignoreNodeModules: args.ignoreNodeModules,
+			ignore: args.ignore,
+			traceBase,
+			repoRootPath: args.repoRootPath
+		});
 		const statOverride = memoize(async (fsPath) => {
 			const virtual = virtualFiles.get(fsPath);
 			if (virtual !== void 0) return createVirtualFileStat(virtual);
@@ -132,7 +138,7 @@ const nft = async (args) => {
 			}
 		});
 		const nftResult = await nodeFileTrace(traceRoots, {
-			base: args.repoRootPath,
+			base: traceBase,
 			processCwd: args.workPath,
 			ts: true,
 			mixedModules: true,
@@ -146,7 +152,7 @@ const nft = async (args) => {
 			} : {}
 		});
 		for (const file of nftResult.fileList) {
-			const absolutePath = join(args.repoRootPath, file);
+			const absolutePath = join(traceBase, file);
 			if (virtualFiles.has(absolutePath)) continue;
 			let stats;
 			try {
@@ -155,17 +161,33 @@ const nft = async (args) => {
 				if (isNativeError(error) && "code" in error && error.code === "ENOENT") continue;
 				throw error;
 			}
-			const outputPath = file.split(sep).join("/");
-			if (args.localBuildFiles.has(join(args.repoRootPath, outputPath))) continue;
-			if (stats.isSymbolicLink() || stats.isFile()) if (args.ignoreNodeModules) {
-				if ((stats.isSymbolicLink() ? await stat(absolutePath) : stats).isFile()) args.files[outputPath] = new FileBlob({
-					data: await readFile(absolutePath),
+			const normalizedFile = normalizePath(relative(args.repoRootPath, absolutePath));
+			const outputPath = stripParentSegments(normalizedFile);
+			const escapesBase = outputPath !== normalizedFile;
+			if (args.localBuildFiles.has(join(args.repoRootPath, outputPath)) && !isNodeModulesPath(outputPath)) continue;
+			if (stats.isSymbolicLink() || stats.isFile()) {
+				if (stats.isSymbolicLink()) {
+					const symlinkTarget = await readlink(absolutePath);
+					const symlinkTargetPath = normalizePath(relative(args.repoRootPath, resolve(dirname(absolutePath), symlinkTarget)));
+					if (isParentPath(symlinkTargetPath)) {
+						const outputTargetPath = stripParentSegments(symlinkTargetPath);
+						args.files[outputPath] = new FileBlob({
+							data: posix.relative(posix.dirname(outputPath), outputTargetPath),
+							mode: stats.mode
+						});
+						continue;
+					}
+				}
+				if (args.ignoreNodeModules || escapesBase) {
+					if ((stats.isSymbolicLink() ? await stat(absolutePath) : stats).isFile()) args.files[outputPath] = new FileBlob({
+						data: await readFile(absolutePath),
+						mode: stats.mode
+					});
+				} else args.files[outputPath] = new FileFsRef({
+					fsPath: absolutePath,
 					mode: stats.mode
 				});
-			} else args.files[outputPath] = new FileFsRef({
-				fsPath: absolutePath,
-				mode: stats.mode
-			});
+			}
 		}
 	};
 	await nftSpan.trace(runNft);
@@ -199,6 +221,40 @@ const isJsLikeExtension = (path) => {
 	if (dot === -1) return false;
 	return JS_LIKE_EXTENSIONS.has(path.slice(dot).toLowerCase());
 };
+const getCommonBase = (base, paths) => {
+	let commonBase = base;
+	for (const path of paths) while (!isPathInside(commonBase, path)) {
+		const parent = dirname(commonBase);
+		if (parent === commonBase) break;
+		commonBase = parent;
+	}
+	return commonBase;
+};
+const isPathInside = (base, path) => {
+	const relPath = relative(base, path);
+	return relPath === "" || !isParentPath(normalizePath(relPath)) && !isAbsolute(relPath);
+};
+const normalizePath = (path) => path.split(sep).join("/");
+const isParentPath = (path) => path === ".." || path.startsWith("../");
+const isNodeModulesPath = (path) => path.split("/").includes("node_modules");
+const stripParentSegments = (path) => {
+	const segments = path.split("/");
+	let index = 0;
+	while (segments[index] === "..") index++;
+	return segments.slice(index).join("/");
+};
+const getIgnorePatterns = ({ ignoreNodeModules, ignore, traceBase, repoRootPath }) => {
+	const patterns = [...ignoreNodeModules ? ["**/node_modules/**"] : [], ...ignore ? Array.isArray(ignore) ? ignore : [ignore] : []];
+	const repoRootRelativeToTraceBase = normalizePath(relative(traceBase, repoRootPath));
+	if (!repoRootRelativeToTraceBase || isParentPath(repoRootRelativeToTraceBase)) return patterns;
+	const rebasedPatterns = patterns.map((pattern) => {
+		const isNegated = pattern.startsWith("!");
+		const patternBody = isNegated ? pattern.slice(1) : pattern;
+		const rebased = posix.join(repoRootRelativeToTraceBase, patternBody);
+		return isNegated ? `!${rebased}` : rebased;
+	});
+	return [...patterns, ...rebasedPatterns];
+};
 const createVirtualFileStat = (data) => {
 	const now = /* @__PURE__ */ new Date();
 	return {
@@ -341,7 +397,8 @@ const rolldown = async (args) => {
 							framework.slug = pkgJson.name;
 							framework.version = pkgJson.version;
 						} catch {}
-						if (resolved ? await isCommonJS(id, resolved.id, resolved) : false) {
+						if ((resolved ? await isCommonJS(id, resolved.id, resolved) : false) && resolved) {
+							localBuildFiles.add(resolved.id);
 							const importerPkgJsonPath = (await this.resolve(importer))?.packageJsonPath;
 							if (importerPkgJsonPath) {
 								const importerPkgDir = relative(args.repoRootPath, dirname(importerPkgJsonPath));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/backends",
-  "version": "0.8.12",
+  "version": "0.8.14",
   "license": "Apache-2.0",
   "main": "./dist/index.mjs",
   "homepage": "https://vercel.com/docs",