@vercel/cervel 0.0.5 → 0.0.7

package/dist/cli.mjs

@@ -2,11 +2,107 @@ import { parseArgs } from "node:util";
 import { createRequire } from "module";
 import { existsSync } from "fs";
 import { readFile, rm, writeFile } from "fs/promises";
-import { extname, join, relative } from "path";
+import { extname, join } from "path";
 import { build } from "rolldown";
 import { spawn } from "child_process";
 import execa from "execa";
 
+//#region src/rolldown.ts
+/**
+* Escapes special regex characters in a string to treat it as a literal pattern.
+*/
+function escapeRegExp(string) {
+	return string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+const rolldown = async (args) => {
+	const baseDir = args.repoRootPath || args.workPath;
+	const entrypointPath = join(args.workPath, args.entrypoint);
+	const shouldAddSourcemapSupport = false;
+	const extension = extname(args.entrypoint);
+	const extensionMap = {
+		".ts": {
+			format: "auto",
+			extension: "js"
+		},
+		".mts": {
+			format: "esm",
+			extension: "mjs"
+		},
+		".cts": {
+			format: "cjs",
+			extension: "cjs"
+		},
+		".cjs": {
+			format: "cjs",
+			extension: "cjs"
+		},
+		".js": {
+			format: "auto",
+			extension: "js"
+		},
+		".mjs": {
+			format: "esm",
+			extension: "mjs"
+		}
+	};
+	const extensionInfo = extensionMap[extension] || extensionMap[".js"];
+	let resolvedFormat = extensionInfo.format === "auto" ? void 0 : extensionInfo.format;
+	const packageJsonPath = join(args.workPath, "package.json");
+	const external = [];
+	let pkg = {};
+	if (existsSync(packageJsonPath)) {
+		const source = await readFile(packageJsonPath, "utf8");
+		try {
+			pkg = JSON.parse(source.toString());
+		} catch (_e) {
+			pkg = {};
+		}
+		if (extensionInfo.format === "auto") if (pkg.type === "module") resolvedFormat = "esm";
+		else resolvedFormat = "cjs";
+		for (const dependency of Object.keys(pkg.dependencies || {})) external.push(dependency);
+		for (const dependency of Object.keys(pkg.devDependencies || {})) external.push(dependency);
+		for (const dependency of Object.keys(pkg.peerDependencies || {})) external.push(dependency);
+		for (const dependency of Object.keys(pkg.optionalDependencies || {})) external.push(dependency);
+	}
+	const relativeOutputDir = args.out;
+	const outputDir = join(baseDir, relativeOutputDir);
+	const out = await build({
+		input: entrypointPath,
+		cwd: baseDir,
+		platform: "node",
+		tsconfig: true,
+		external: external.map((pkg$1) => /* @__PURE__ */ new RegExp(`^${escapeRegExp(pkg$1)}`)),
+		output: {
+			cleanDir: true,
+			dir: outputDir,
+			format: resolvedFormat,
+			preserveModules: true,
+			sourcemap: false
+		}
+	});
+	let handler = null;
+	for (const entry of out.output) if (entry.type === "chunk") {
+		if (entry.isEntry) handler = entry.fileName;
+	}
+	if (typeof handler !== "string") throw new Error(`Unable to resolve module for ${args.entrypoint}`);
+	const cleanup = async () => {
+		await rm(outputDir, {
+			recursive: true,
+			force: true
+		});
+	};
+	return {
+		result: {
+			pkg,
+			shouldAddSourcemapSupport,
+			handler,
+			outputDir
+		},
+		cleanup
+	};
+};
+
+//#endregion
 //#region src/utils.ts
 const noColor = globalThis.process?.env?.NO_COLOR === "1" || globalThis.process?.env?.TERM === "dumb";
 const resets = {
@@ -38,7 +134,7 @@ const Colors = {
 //#endregion
 //#region src/typescript.ts
 const require_ = createRequire(import.meta.url);
-const typescript = async (args) => {
+const typescript = (args) => {
 	const extension = extname(args.entrypoint);
 	if (![
 		".ts",
@@ -48,7 +144,7 @@ const typescript = async (args) => {
 	const tscPath = resolveTscPath(args);
 	if (!tscPath) {
 		console.log(Colors.gray(`${Colors.bold(Colors.cyan("✓"))} Typecheck skipped ${Colors.gray("(TypeScript not found)")}`));
-		return Promise.resolve();
+		return null;
 	}
 	return doTypeCheck(args, tscPath);
 };
@@ -119,115 +215,6 @@ const findNearestTsconfig = async (workPath) => {
 	return findNearestTsconfig(join(workPath, ".."));
 };
 
-//#endregion
-//#region src/rolldown.ts
-const rolldown = async (args) => {
-	const baseDir = args.repoRootPath || args.workPath;
-	const entrypointPath = join(args.workPath, args.entrypoint);
-	const shouldAddSourcemapSupport = false;
-	const extension = extname(args.entrypoint);
-	const extensionMap = {
-		".ts": {
-			format: "auto",
-			extension: "js"
-		},
-		".mts": {
-			format: "esm",
-			extension: "mjs"
-		},
-		".cts": {
-			format: "cjs",
-			extension: "cjs"
-		},
-		".cjs": {
-			format: "cjs",
-			extension: "cjs"
-		},
-		".js": {
-			format: "auto",
-			extension: "js"
-		},
-		".mjs": {
-			format: "esm",
-			extension: "mjs"
-		}
-	};
-	let format = (extensionMap[extension] || extensionMap[".js"]).format;
-	const packageJsonPath = join(args.workPath, "package.json");
-	const external = [];
-	let pkg = {};
-	if (existsSync(packageJsonPath)) {
-		const source = await readFile(packageJsonPath, "utf8");
-		try {
-			pkg = JSON.parse(source.toString());
-		} catch (_e) {
-			pkg = {};
-		}
-		if (format === "auto") if (pkg.type === "module") format = "esm";
-		else format = "cjs";
-		for (const dependency of Object.keys(pkg.dependencies || {})) external.push(dependency);
-		for (const dependency of Object.keys(pkg.devDependencies || {})) external.push(dependency);
-		for (const dependency of Object.keys(pkg.peerDependencies || {})) external.push(dependency);
-		for (const dependency of Object.keys(pkg.optionalDependencies || {})) external.push(dependency);
-	}
-	const tsconfig = await findNearestTsconfig(baseDir);
-	const relativeOutputDir = args.out;
-	const outputDir = join(baseDir, relativeOutputDir);
-	let handler = null;
-	await build({
-		input: entrypointPath,
-		cwd: baseDir,
-		platform: "node",
-		external: (source) => {
-			if (source.startsWith(".") || source.startsWith("/")) return false;
-			return external.some((pkg$1) => {
-				return source === pkg$1 || source.startsWith(pkg$1 + "/");
-			});
-		},
-		tsconfig,
-		output: {
-			dir: outputDir,
-			entryFileNames: (info) => {
-				if (info.name === "rolldown_runtime") return "rolldown_runtime.js";
-				const facadeModuleId = info.facadeModuleId;
-				if (!facadeModuleId) throw new Error(`Unable to resolve module for ${info.name}`);
-				const relPath = relative(baseDir, facadeModuleId);
-				const extension$1 = extname(relPath);
-				const ext = {
-					".ts": ".js",
-					".mts": ".mjs",
-					".mjs": ".mjs",
-					".cts": ".cjs",
-					".cjs": ".cjs",
-					".js": ".js"
-				}[extension$1] || ".js";
-				const nameWithJS = relPath.slice(0, -extension$1.length) + ext;
-				if (info.isEntry) handler = nameWithJS;
-				return nameWithJS;
-			},
-			format,
-			preserveModules: true,
-			sourcemap: false
-		}
-	});
-	if (typeof handler !== "string") throw new Error(`Unable to resolve module for ${args.entrypoint}`);
-	const cleanup = async () => {
-		await rm(outputDir, {
-			recursive: true,
-			force: true
-		});
-	};
-	return {
-		result: {
-			pkg,
-			shouldAddSourcemapSupport,
-			handler,
-			outputDir
-		},
-		cleanup
-	};
-};
-
 //#endregion
 //#region src/find-entrypoint.ts
 const frameworks = [
@@ -305,7 +292,8 @@ const build$1 = async (args) => {
 	await writeFile(join(args.cwd, args.out, ".cervel.json"), JSON.stringify({ handler: rolldownResult.result.handler }, null, 2));
 	console.log(Colors.gray(`${Colors.bold(Colors.cyan("✓"))} Build complete`));
 	const typecheckComplete = true;
-	if (!await Promise.race([tsPromise.then(() => typecheckComplete), Promise.resolve(false)])) console.log(Colors.gray(`${Colors.bold(Colors.gray("*"))} Waiting for typecheck...`));
+	const result = tsPromise ? await Promise.race([tsPromise.then(() => typecheckComplete), Promise.resolve(false)]) : true;
+	if (tsPromise && !result) console.log(Colors.gray(`${Colors.bold(Colors.gray("*"))} Waiting for typecheck...`));
 	return {
 		rolldownResult: rolldownResult.result,
 		tsPromise

package/dist/index.d.mts

@@ -16,10 +16,10 @@ declare const build: (args: {
   rolldownResult: {
     pkg: Record<string, unknown>;
     shouldAddSourcemapSupport: boolean;
-    handler: never;
+    handler: string;
     outputDir: string;
   };
-  tsPromise: Promise<void>;
+  tsPromise: Promise<void> | null | undefined;
 }>;
 declare const serve: (args: {
   cwd: string;

package/dist/index.mjs

@@ -1,11 +1,107 @@
 import { createRequire } from "module";
 import { existsSync } from "fs";
 import { readFile, rm, writeFile } from "fs/promises";
-import { extname, join, relative } from "path";
+import { extname, join } from "path";
 import { build as build$1 } from "rolldown";
 import { spawn } from "child_process";
 import execa from "execa";
 
+//#region src/rolldown.ts
+/**
+* Escapes special regex characters in a string to treat it as a literal pattern.
+*/
+function escapeRegExp(string) {
+	return string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+const rolldown = async (args) => {
+	const baseDir = args.repoRootPath || args.workPath;
+	const entrypointPath = join(args.workPath, args.entrypoint);
+	const shouldAddSourcemapSupport = false;
+	const extension = extname(args.entrypoint);
+	const extensionMap = {
+		".ts": {
+			format: "auto",
+			extension: "js"
+		},
+		".mts": {
+			format: "esm",
+			extension: "mjs"
+		},
+		".cts": {
+			format: "cjs",
+			extension: "cjs"
+		},
+		".cjs": {
+			format: "cjs",
+			extension: "cjs"
+		},
+		".js": {
+			format: "auto",
+			extension: "js"
+		},
+		".mjs": {
+			format: "esm",
+			extension: "mjs"
+		}
+	};
+	const extensionInfo = extensionMap[extension] || extensionMap[".js"];
+	let resolvedFormat = extensionInfo.format === "auto" ? void 0 : extensionInfo.format;
+	const packageJsonPath = join(args.workPath, "package.json");
+	const external = [];
+	let pkg = {};
+	if (existsSync(packageJsonPath)) {
+		const source = await readFile(packageJsonPath, "utf8");
+		try {
+			pkg = JSON.parse(source.toString());
+		} catch (_e) {
+			pkg = {};
+		}
+		if (extensionInfo.format === "auto") if (pkg.type === "module") resolvedFormat = "esm";
+		else resolvedFormat = "cjs";
+		for (const dependency of Object.keys(pkg.dependencies || {})) external.push(dependency);
+		for (const dependency of Object.keys(pkg.devDependencies || {})) external.push(dependency);
+		for (const dependency of Object.keys(pkg.peerDependencies || {})) external.push(dependency);
+		for (const dependency of Object.keys(pkg.optionalDependencies || {})) external.push(dependency);
+	}
+	const relativeOutputDir = args.out;
+	const outputDir = join(baseDir, relativeOutputDir);
+	const out = await build$1({
+		input: entrypointPath,
+		cwd: baseDir,
+		platform: "node",
+		tsconfig: true,
+		external: external.map((pkg$1) => /* @__PURE__ */ new RegExp(`^${escapeRegExp(pkg$1)}`)),
+		output: {
+			cleanDir: true,
+			dir: outputDir,
+			format: resolvedFormat,
+			preserveModules: true,
+			sourcemap: false
+		}
+	});
+	let handler = null;
+	for (const entry of out.output) if (entry.type === "chunk") {
+		if (entry.isEntry) handler = entry.fileName;
+	}
+	if (typeof handler !== "string") throw new Error(`Unable to resolve module for ${args.entrypoint}`);
+	const cleanup = async () => {
+		await rm(outputDir, {
+			recursive: true,
+			force: true
+		});
+	};
+	return {
+		result: {
+			pkg,
+			shouldAddSourcemapSupport,
+			handler,
+			outputDir
+		},
+		cleanup
+	};
+};
+
+//#endregion
 //#region src/utils.ts
 const noColor = globalThis.process?.env?.NO_COLOR === "1" || globalThis.process?.env?.TERM === "dumb";
 const resets = {
@@ -37,7 +133,7 @@ const Colors = {
 //#endregion
 //#region src/typescript.ts
 const require_ = createRequire(import.meta.url);
-const typescript = async (args) => {
+const typescript = (args) => {
 	const extension = extname(args.entrypoint);
 	if (![
 		".ts",
@@ -47,7 +143,7 @@ const typescript = async (args) => {
 	const tscPath = resolveTscPath(args);
 	if (!tscPath) {
 		console.log(Colors.gray(`${Colors.bold(Colors.cyan("✓"))} Typecheck skipped ${Colors.gray("(TypeScript not found)")}`));
-		return Promise.resolve();
+		return null;
 	}
 	return doTypeCheck(args, tscPath);
 };
@@ -118,115 +214,6 @@ const findNearestTsconfig = async (workPath) => {
 	return findNearestTsconfig(join(workPath, ".."));
 };
 
-//#endregion
-//#region src/rolldown.ts
-const rolldown = async (args) => {
-	const baseDir = args.repoRootPath || args.workPath;
-	const entrypointPath = join(args.workPath, args.entrypoint);
-	const shouldAddSourcemapSupport = false;
-	const extension = extname(args.entrypoint);
-	const extensionMap = {
-		".ts": {
-			format: "auto",
-			extension: "js"
-		},
-		".mts": {
-			format: "esm",
-			extension: "mjs"
-		},
-		".cts": {
-			format: "cjs",
-			extension: "cjs"
-		},
-		".cjs": {
-			format: "cjs",
-			extension: "cjs"
-		},
-		".js": {
-			format: "auto",
-			extension: "js"
-		},
-		".mjs": {
-			format: "esm",
-			extension: "mjs"
-		}
-	};
-	let format = (extensionMap[extension] || extensionMap[".js"]).format;
-	const packageJsonPath = join(args.workPath, "package.json");
-	const external = [];
-	let pkg = {};
-	if (existsSync(packageJsonPath)) {
-		const source = await readFile(packageJsonPath, "utf8");
-		try {
-			pkg = JSON.parse(source.toString());
-		} catch (_e) {
-			pkg = {};
-		}
-		if (format === "auto") if (pkg.type === "module") format = "esm";
-		else format = "cjs";
-		for (const dependency of Object.keys(pkg.dependencies || {})) external.push(dependency);
-		for (const dependency of Object.keys(pkg.devDependencies || {})) external.push(dependency);
-		for (const dependency of Object.keys(pkg.peerDependencies || {})) external.push(dependency);
-		for (const dependency of Object.keys(pkg.optionalDependencies || {})) external.push(dependency);
-	}
-	const tsconfig = await findNearestTsconfig(baseDir);
-	const relativeOutputDir = args.out;
-	const outputDir = join(baseDir, relativeOutputDir);
-	let handler = null;
-	await build$1({
-		input: entrypointPath,
-		cwd: baseDir,
-		platform: "node",
-		external: (source) => {
-			if (source.startsWith(".") || source.startsWith("/")) return false;
-			return external.some((pkg$1) => {
-				return source === pkg$1 || source.startsWith(pkg$1 + "/");
-			});
-		},
-		tsconfig,
-		output: {
-			dir: outputDir,
-			entryFileNames: (info) => {
-				if (info.name === "rolldown_runtime") return "rolldown_runtime.js";
-				const facadeModuleId = info.facadeModuleId;
-				if (!facadeModuleId) throw new Error(`Unable to resolve module for ${info.name}`);
-				const relPath = relative(baseDir, facadeModuleId);
-				const extension$1 = extname(relPath);
-				const ext = {
-					".ts": ".js",
-					".mts": ".mjs",
-					".mjs": ".mjs",
-					".cts": ".cjs",
-					".cjs": ".cjs",
-					".js": ".js"
-				}[extension$1] || ".js";
-				const nameWithJS = relPath.slice(0, -extension$1.length) + ext;
-				if (info.isEntry) handler = nameWithJS;
-				return nameWithJS;
-			},
-			format,
-			preserveModules: true,
-			sourcemap: false
-		}
-	});
-	if (typeof handler !== "string") throw new Error(`Unable to resolve module for ${args.entrypoint}`);
-	const cleanup = async () => {
-		await rm(outputDir, {
-			recursive: true,
-			force: true
-		});
-	};
-	return {
-		result: {
-			pkg,
-			shouldAddSourcemapSupport,
-			handler,
-			outputDir
-		},
-		cleanup
-	};
-};
-
 //#endregion
 //#region src/find-entrypoint.ts
 const frameworks = [
@@ -308,7 +295,8 @@ const build = async (args) => {
 	await writeFile(join(args.cwd, args.out, ".cervel.json"), JSON.stringify({ handler: rolldownResult.result.handler }, null, 2));
 	console.log(Colors.gray(`${Colors.bold(Colors.cyan("✓"))} Build complete`));
 	const typecheckComplete = true;
-	if (!await Promise.race([tsPromise.then(() => typecheckComplete), Promise.resolve(false)])) console.log(Colors.gray(`${Colors.bold(Colors.gray("*"))} Waiting for typecheck...`));
+	const result = tsPromise ? await Promise.race([tsPromise.then(() => typecheckComplete), Promise.resolve(false)]) : true;
+	if (tsPromise && !result) console.log(Colors.gray(`${Colors.bold(Colors.gray("*"))} Waiting for typecheck...`));
 	return {
 		rolldownResult: rolldownResult.result,
 		tsPromise

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/cervel",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "license": "Apache-2.0",
   "homepage": "https://vercel.com/docs",
   "publishConfig": {
@@ -29,7 +29,7 @@
   ],
   "dependencies": {
     "execa": "3.2.0",
-    "rolldown": "1.0.0-beta.35",
+    "rolldown": "1.0.0-beta.52",
     "srvx": "0.8.9",
     "tsx": "4.19.2"
   },