tsdown 0.6.4 → 0.6.6

package/README.md

@@ -27,6 +27,14 @@ export default defineConfig({
 })
 ```
 
+## Migrate from tsup
+
+```bash
+npx tsdown migrate
+```
+
+Please make sure to commit your changes before migrating.
+
 ## Credits
 
 This project also partially contains code derived or copied from [tsup](https://github.com/egoist/tsup).

package/dist/config.d.ts

@@ -1,6 +1,7 @@
-import { U as UserConfig } from './options.d-B6hAHDaA.js';
+import { U as UserConfig } from './options.d-D2X9ak47.js';
 import 'publint';
 import 'rolldown';
+import 'typescript';
 import 'unplugin-isolated-decl';
 import 'unplugin-unused';
 

package/dist/dts-DuyYOCuS.js

@@ -0,0 +1,175 @@
+import path, { dirname, normalize, sep } from "node:path";
+import process from "node:process";
+import { access, rm } from "node:fs/promises";
+import Debug from "debug";
+import { ResolverFactory } from "oxc-resolver";
+import { rollup } from "rollup";
+import DtsPlugin from "rollup-plugin-dts";
+
+//#region src/utils/fs.ts
+function fsExists(path$1) {
+	return access(path$1).then(() => true, () => false);
+}
+function fsRemove(path$1) {
+	return rm(path$1, {
+		force: true,
+		recursive: true
+	}).catch(() => {});
+}
+function lowestCommonAncestor(...filepaths) {
+	if (filepaths.length === 0) return "";
+	if (filepaths.length === 1) return dirname(filepaths[0]);
+	filepaths = filepaths.map(normalize);
+	const [first, ...rest] = filepaths;
+	let ancestor = first.split(sep);
+	for (const filepath of rest) {
+		const directories = filepath.split(sep, ancestor.length);
+		let index = 0;
+		for (const directory of directories) if (directory === ancestor[index]) index += 1;
+		else {
+			ancestor = ancestor.slice(0, index);
+			break;
+		}
+		ancestor = ancestor.slice(0, index);
+	}
+	return ancestor.length <= 1 && ancestor[0] === "" ? sep + ancestor[0] : ancestor.join(sep);
+}
+
+//#endregion
+//#region src/utils/general.ts
+function toArray(val, defaultValue) {
+	if (Array.isArray(val)) return val;
+	else if (val == null) {
+		if (defaultValue) return [defaultValue];
+		return [];
+	} else return [val];
+}
+function debounce(fn, wait) {
+	let timeout;
+	return function(...args) {
+		if (timeout) clearTimeout(timeout);
+		timeout = setTimeout(() => {
+			timeout = void 0;
+			fn.apply(this, args);
+		}, wait);
+	};
+}
+
+//#endregion
+//#region src/features/external.ts
+const debug$1 = Debug("tsdown:external");
+function ExternalPlugin(options, pkg) {
+	const deps = pkg && Array.from(getProductionDeps(pkg));
+	return {
+		name: "tsdown:external",
+		async resolveId(id, importer, { isEntry }) {
+			if (isEntry) return;
+			const { noExternal } = options;
+			if (typeof noExternal === "function" && noExternal(id, importer)) return;
+			if (noExternal) {
+				const noExternalPatterns = toArray(noExternal);
+				if (noExternalPatterns.some((pattern) => {
+					return pattern instanceof RegExp ? pattern.test(id) : id === pattern;
+				})) return;
+			}
+			let shouldExternal = false;
+			if (options.skipNodeModulesBundle) {
+				const resolved = await this.resolve(id);
+				if (!resolved) return;
+				shouldExternal = resolved.external || /[\\/]node_modules[\\/]/.test(resolved.id);
+			}
+			if (deps) shouldExternal ||= deps.some((dep) => id === dep || id.startsWith(`${dep}/`));
+			if (shouldExternal) {
+				debug$1("External dependency:", id);
+				return {
+					id,
+					external: true
+				};
+			}
+		}
+	};
+}
+function getProductionDeps(pkg) {
+	return new Set([...Object.keys(pkg.dependencies || {}), ...Object.keys(pkg.peerDependencies || {})]);
+}
+
+//#endregion
+//#region src/features/dts.ts
+const debug = Debug("tsdown:dts");
+const TEMP_DTS_DIR = ".tsdown-types";
+function getTempDtsDir(format) {
+	return `${TEMP_DTS_DIR}-${format}`;
+}
+async function bundleDts(options, jsExtension, format, pkg) {
+	const ext = jsExtension.replace("j", "t");
+	const dtsOutDir = path.resolve(options.outDir, getTempDtsDir(format));
+	const dtsEntry = Object.fromEntries(Object.keys(options.entry).map((key) => [key, path.resolve(dtsOutDir, `${key}.d.${ext}`)]));
+	const build = await rollup({
+		input: dtsEntry,
+		external: options.external,
+		onLog(level, log, defaultHandler) {
+			if (log.code !== "EMPTY_BUNDLE" && log.code !== "UNRESOLVED_IMPORT") defaultHandler(level, log);
+		},
+		plugins: [
+			ExternalPlugin(options, pkg),
+			options.bundleDts.resolve && ResolveDtsPlugin(),
+			DtsPlugin({ compilerOptions: {
+				...options.bundleDts.compilerOptions,
+				declaration: true,
+				noEmit: false,
+				emitDeclarationOnly: true,
+				noEmitOnError: true,
+				checkJs: false,
+				declarationMap: false,
+				skipLibCheck: true,
+				preserveSymlinks: false,
+				target: 99
+			} })
+		]
+	});
+	let outDir = options.outDir;
+	const extraOutdir = options.dts.extraOutdir;
+	if (extraOutdir) outDir = path.resolve(outDir, extraOutdir);
+	await build.write({
+		dir: outDir,
+		format: "es",
+		entryFileNames: `[name].d.${ext}`
+	});
+	await fsRemove(dtsOutDir);
+}
+let resolver;
+function ResolveDtsPlugin() {
+	return {
+		name: "resolve-dts",
+		buildStart() {
+			resolver ||= new ResolverFactory({
+				mainFields: ["types"],
+				conditionNames: [
+					"types",
+					"typings",
+					"import",
+					"require"
+				],
+				extensions: [".d.ts", ".ts"],
+				modules: ["node_modules", "node_modules/@types"]
+			});
+		},
+		async resolveId(id, importer) {
+			if (id[0] === "." || path.isAbsolute(id)) return;
+			if (/\0/.test(id)) return;
+			const directory = importer ? path.dirname(importer) : process.cwd();
+			debug("Resolving:", id, "from:", directory);
+			const { path: resolved } = await resolver.async(directory, id);
+			if (!resolved) return;
+			debug("Resolved:", resolved);
+			if (/[cm]?jsx?$/.test(resolved)) {
+				const dts = resolved.replace(/\.([cm]?)jsx?$/, ".d.$1ts");
+				return await fsExists(dts) ? dts : void 0;
+			}
+			return resolved;
+		}
+	};
+}
+
+//#endregion
+export { ExternalPlugin, ResolveDtsPlugin, bundleDts, debounce, fsExists, fsRemove, getTempDtsDir, lowestCommonAncestor, toArray };

package/dist/index.d.ts

@@ -1,9 +1,10 @@
-import { O as Options, R as ResolvedOptions } from './options.d-B6hAHDaA.js';
-export { U as UserConfig } from './options.d-B6hAHDaA.js';
+import { O as Options, R as ResolvedOptions } from './options.d-D2X9ak47.js';
+export { U as UserConfig } from './options.d-D2X9ak47.js';
 import { ConsolaInstance } from 'consola';
 export { defineConfig } from './config.js';
 import 'publint';
 import 'rolldown';
+import 'typescript';
 import 'unplugin-isolated-decl';
 import 'unplugin-unused';
 

package/dist/index.js

@@ -1,51 +1,19 @@
 import { defineConfig } from "./config-0LDjKwZ7.js";
-import { debug, logger, setSilent } from "./logger-4bmpqibt.js";
-import { ExternalPlugin, debounce, toArray } from "./external-CaGWwJ2H.js";
-import path, { dirname, normalize, sep } from "node:path";
+import { ExternalPlugin, bundleDts, debounce, fsExists, fsRemove, getTempDtsDir, lowestCommonAncestor, toArray } from "./dts-DuyYOCuS.js";
+import { debug, logger, setSilent } from "./logger-9p9U7Sx7.js";
+import path from "node:path";
 import process from "node:process";
 import { fileURLToPath } from "node:url";
 import { build as build$1 } from "rolldown";
 import { transformPlugin } from "rolldown/experimental";
-import { access, readdir, rm, stat } from "node:fs/promises";
+import { readdir, stat } from "node:fs/promises";
 import Debug from "debug";
 import { glob } from "tinyglobby";
-import { rollup } from "rollup";
-import DtsPlugin from "rollup-plugin-dts";
 import { readPackageJSON } from "pkg-types";
 import readline from "node:readline";
 import { blue, bold, dim, underline } from "ansis";
 import { loadConfig } from "unconfig";
 
-//#region src/utils/fs.ts
-function fsExists(path$1) {
-	return access(path$1).then(() => true, () => false);
-}
-function fsRemove(path$1) {
-	return rm(path$1, {
-		force: true,
-		recursive: true
-	}).catch(() => {});
-}
-function lowestCommonAncestor(...filepaths) {
-	if (filepaths.length === 0) return "";
-	if (filepaths.length === 1) return dirname(filepaths[0]);
-	filepaths = filepaths.map(normalize);
-	const [first, ...rest] = filepaths;
-	let ancestor = first.split(sep);
-	for (const filepath of rest) {
-		const directories = filepath.split(sep, ancestor.length);
-		let index = 0;
-		for (const directory of directories) if (directory === ancestor[index]) index += 1;
-		else {
-			ancestor = ancestor.slice(0, index);
-			break;
-		}
-		ancestor = ancestor.slice(0, index);
-	}
-	return ancestor.length <= 1 && ancestor[0] === "" ? sep + ancestor[0] : ancestor.join(sep);
-}
-
-//#endregion
 //#region src/features/clean.ts
 const debug$2 = Debug("tsdown:clean");
 async function cleanOutDir(cwd, patterns) {
@@ -62,34 +30,6 @@ async function cleanOutDir(cwd, patterns) {
 	}
 }
 
-//#endregion
-//#region src/features/dts.ts
-const TEMP_DTS_DIR = ".tsdown-types";
-function getTempDtsDir(format) {
-	return `${TEMP_DTS_DIR}-${format}`;
-}
-async function bundleDts(options, jsExtension, format) {
-	const ext = jsExtension.replace("j", "t");
-	const dtsOutDir = path.resolve(options.outDir, getTempDtsDir(format));
-	const dtsEntry = Object.fromEntries(Object.keys(options.entry).map((key) => [key, path.resolve(dtsOutDir, `${key}.d.${ext}`)]));
-	const build$2 = await rollup({
-		input: dtsEntry,
-		onLog(level, log, defaultHandler) {
-			if (log.code !== "EMPTY_BUNDLE" && log.code !== "UNRESOLVED_IMPORT") defaultHandler(level, log);
-		},
-		plugins: [DtsPlugin()]
-	});
-	let outDir = options.outDir;
-	const extraOutdir = options.dts.extraOutdir;
-	if (extraOutdir) outDir = path.resolve(outDir, extraOutdir);
-	await build$2.write({
-		dir: outDir,
-		format: "es",
-		entryFileNames: `[name].d.${ext}`
-	});
-	await fsRemove(dtsOutDir);
-}
-
 //#endregion
 //#region src/utils/package.ts
 async function readPackageJson(dir) {
@@ -134,9 +74,9 @@ function resolveOutputExtension(pkg, format, fixedExtension) {
 //#region src/features/publint.ts
 const debug$1 = Debug("tsdown:publint");
 async function publint(pkg) {
+	debug$1("Running publint");
 	const { publint: publint$1 } = await import("publint");
 	const { formatMessage } = await import("publint/utils");
-	debug$1("Running publint");
 	const { messages } = await publint$1();
 	debug$1("Found %d issues", messages.length);
 	if (!messages.length) logger.success("No publint issues found");
@@ -285,6 +225,7 @@ async function resolveOptions(options) {
 		entry = await resolveEntry(entry);
 		if (clean === true) clean = [];
 		if (publint$1 === true) publint$1 = {};
+		if (bundleDts$1 === true) bundleDts$1 = {};
 		if (fromVite) {
 			const viteUserConfig = await loadViteConfig(fromVite === true ? "vite" : fromVite, cwd);
 			if (viteUserConfig) {
@@ -454,9 +395,9 @@ async function buildSingle(config) {
 						...dts,
 						extraOutdir: config.bundleDts ? getTempDtsDir(format$1) : dts.extraOutdir
 					}),
-					target && transformPlugin({ target: target && (typeof target === "string" ? target : target.join(",")) }),
+					!!target && transformPlugin({ target: target && (typeof target === "string" ? target : target.join(",")) }),
 					userPlugins
-				].filter((plugin) => !!plugin),
+				],
 				inject: { ...shims && getShimsInject(format$1, platform) }
 			}, config.inputOptions, [format$1]);
 			const extension = resolveOutputExtension(pkg, format$1, fixedExtension);
@@ -473,12 +414,12 @@ async function buildSingle(config) {
 				...inputOptions,
 				output: outputOptions
 			});
-			if (config.dts && config.bundleDts) await bundleDts(config, extension, format$1);
+			if (config.dts && config.bundleDts) await bundleDts(config, extension, format$1, pkg);
 		}));
 		if (config.publint) if (pkg) await publint(pkg);
 		else logger.warn("publint is enabled but package.json is not found");
 		logger.success(`${first ? "Build" : "Rebuild"} complete in ${Math.round(performance.now() - startTime)}ms`);
-		await onSuccess?.();
+		await onSuccess?.(config);
 	}
 }
 

package/dist/{migrate-CbXRAJ1k.js → migrate-Y0DZZqeT.js}

@@ -1,4 +1,4 @@
-import { version } from "./package-VF4o7Lus.js";
+import { version } from "./package-Dga7uLAE.js";
 import process from "node:process";
 import { readFile, unlink, writeFile } from "node:fs/promises";
 import consola from "consola";

package/dist/{options.d-B6hAHDaA.d.ts → options.d-D2X9ak47.d.ts}

@@ -1,5 +1,6 @@
 import { Options as Options$3 } from 'publint';
 import { InputOptions, ExternalOption, ModuleFormat, OutputOptions, InternalModuleFormat } from 'rolldown';
+import { CompilerOptions } from 'typescript';
 import { Options as Options$1 } from 'unplugin-isolated-decl';
 import { Options as Options$2 } from 'unplugin-unused';
 
@@ -15,6 +16,10 @@ type MarkPartial<
 type Arrayable<T> = T | T[];
 
 type Sourcemap = boolean | "inline" | "hidden";
+interface BundleDtsOptions {
+	resolve?: boolean;
+	compilerOptions?: CompilerOptions;
+}
 /**
 * Options for tsdown.
 */
@@ -43,7 +48,7 @@ interface Options {
 	silent?: boolean;
 	config?: boolean | string;
 	watch?: boolean | string | string[];
-	onSuccess?: () => void | Promise<void>;
+	onSuccess?: (config: ResolvedOptions) => void | Promise<void>;
 	/**
 	* Skip bundling node_modules.
 	*/
@@ -65,7 +70,7 @@ interface Options {
 	*/
 	dts?: boolean | Options$1;
 	/** @default true */
-	bundleDts?: boolean;
+	bundleDts?: boolean | BundleDtsOptions;
 	/**
 	* Enable unused dependencies check with `unplugin-unused`
 	* Requires `unplugin-unused` to be installed.
@@ -86,6 +91,7 @@ type ResolvedOptions = Omit<Overwrite<MarkPartial<Options, "globalName" | "input
 	format: NormalizedFormat[]
 	clean: string[] | false
 	dts: false | Options$1
+	bundleDts: false | BundleDtsOptions
 }>, "config" | "fromVite">;
 
 export type { Options as O, ResolvedOptions as R, UserConfig as U };

package/dist/package-Dga7uLAE.js

@@ -0,0 +1,6 @@
+
+//#region package.json
+var version = "0.6.6";
+
+//#endregion
+export { version };

package/dist/plugins.d.ts

@@ -1,10 +1,14 @@
-import { R as ResolvedOptions } from './options.d-B6hAHDaA.js';
+import { R as ResolvedOptions } from './options.d-D2X9ak47.js';
 import { PackageJson } from 'pkg-types';
 import { Plugin } from 'rolldown';
+import { Plugin as Plugin$1 } from 'rollup';
 import 'publint';
+import 'typescript';
 import 'unplugin-isolated-decl';
 import 'unplugin-unused';
 
 declare function ExternalPlugin(options: ResolvedOptions, pkg?: PackageJson): Plugin;
 
-export { ExternalPlugin };
+declare function ResolveDtsPlugin(): Plugin$1;
+
+export { ExternalPlugin, ResolveDtsPlugin };

package/dist/plugins.js

@@ -1,3 +1,3 @@
-import { ExternalPlugin } from "./external-CaGWwJ2H.js";
+import { ExternalPlugin, ResolveDtsPlugin } from "./dts-DuyYOCuS.js";
 
-export { ExternalPlugin };
+export { ExternalPlugin, ResolveDtsPlugin };

package/dist/run.js

@@ -1,5 +1,5 @@
-import { logger, setSilent } from "./logger-4bmpqibt.js";
-import { version } from "./package-VF4o7Lus.js";
+import { logger, setSilent } from "./logger-9p9U7Sx7.js";
+import { version } from "./package-Dga7uLAE.js";
 import process from "node:process";
 import { VERSION } from "rolldown";
 import { dim } from "ansis";
@@ -16,7 +16,7 @@ cli.command("[...files]", "Bundle files", { ignoreOptionDefaultValue: true }).op
 	await build$1(flags);
 });
 cli.command("migrate", "Migrate from tsup to tsdown").option("-c, --cwd <dir>", "Working directory").option("-d, --dry-run", "Dry run").action(async (args) => {
-	const { migrate } = await import("./migrate-CbXRAJ1k.js");
+	const { migrate } = await import("./migrate-Y0DZZqeT.js");
 	await migrate(args);
 });
 async function runCLI() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tsdown",
-  "version": "0.6.4",
+  "version": "0.6.6",
   "description": "An even faster bundler powered by Rolldown.",
   "type": "module",
   "license": "MIT",
@@ -60,34 +60,35 @@
     "consola": "^3.4.0",
     "debug": "^4.4.0",
     "diff": "^7.0.0",
+    "oxc-resolver": "^5.0.0",
     "pkg-types": "^2.1.0",
-    "rolldown": "^1.0.0-beta.3",
-    "rollup": "^4.34.9",
+    "rolldown": "1.0.0-beta.3-commit.e170e6e",
+    "rollup": "^4.35.0",
     "rollup-plugin-dts": "^6.1.1",
     "tinyglobby": "^0.2.12",
-    "unconfig": "^7.3.0",
-    "unplugin-isolated-decl": "^0.13.0"
+    "unconfig": "^7.3.1",
+    "unplugin-isolated-decl": "^0.13.2"
   },
   "devDependencies": {
-    "@sxzz/eslint-config": "^5.2.0",
-    "@sxzz/prettier-config": "^2.2.0",
+    "@sxzz/eslint-config": "^6.0.1",
+    "@sxzz/prettier-config": "^2.2.1",
     "@sxzz/test-utils": "^0.5.1",
     "@types/debug": "^4.1.12",
     "@types/diff": "^7.0.1",
-    "@types/node": "^22.13.9",
+    "@types/node": "^22.13.10",
     "bumpp": "^10.0.3",
-    "eslint": "^9.21.0",
-    "oxc-transform": "^0.55.0",
+    "eslint": "^9.22.0",
+    "oxc-transform": "^0.56.5",
     "prettier": "^3.5.3",
-    "publint": "^0.3.8",
+    "publint": "^0.3.9",
     "tinyexec": "^0.3.2",
     "tsup": "^8.4.0",
     "tsx": "^4.19.3",
     "typescript": "~5.8.2",
-    "unplugin-ast": "^0.14.1",
+    "unplugin-ast": "^0.14.2",
     "unplugin-unused": "^0.4.3",
-    "vite": "^6.2.0",
-    "vitest": "^3.0.7"
+    "vite": "^6.2.1",
+    "vitest": "^3.0.8"
   },
   "engines": {
     "node": ">=18.0.0"

package/dist/external-CaGWwJ2H.js

@@ -1,61 +0,0 @@
-import Debug from "debug";
-
-//#region src/utils/general.ts
-function toArray(val, defaultValue) {
-	if (Array.isArray(val)) return val;
-	else if (val == null) {
-		if (defaultValue) return [defaultValue];
-		return [];
-	} else return [val];
-}
-function debounce(fn, wait) {
-	let timeout;
-	return function(...args) {
-		if (timeout) clearTimeout(timeout);
-		timeout = setTimeout(() => {
-			timeout = undefined;
-			fn.apply(this, args);
-		}, wait);
-	};
-}
-
-//#endregion
-//#region src/features/external.ts
-const debug = Debug("tsdown:external");
-function ExternalPlugin(options, pkg) {
-	const deps = pkg && Array.from(getProductionDeps(pkg));
-	return {
-		name: "tsdown:external",
-		async resolveId(id, importer, { isEntry }) {
-			if (isEntry) return;
-			const { noExternal } = options;
-			if (typeof noExternal === "function" && noExternal(id, importer)) return;
-			if (noExternal) {
-				const noExternalPatterns = toArray(noExternal);
-				if (noExternalPatterns.some((pattern) => {
-					return pattern instanceof RegExp ? pattern.test(id) : id === pattern;
-				})) return;
-			}
-			let shouldExternal = false;
-			if (options.skipNodeModulesBundle) {
-				const resolved = await this.resolve(id);
-				if (!resolved) return;
-				shouldExternal = resolved.external || /[\\/]node_modules[\\/]/.test(resolved.id);
-			}
-			if (deps) shouldExternal ||= deps.some((dep) => id === dep || id.startsWith(`${dep}/`));
-			if (shouldExternal) {
-				debug("External dependency:", id);
-				return {
-					id,
-					external: true
-				};
-			}
-		}
-	};
-}
-function getProductionDeps(pkg) {
-	return new Set([...Object.keys(pkg.dependencies || {}), ...Object.keys(pkg.peerDependencies || {})]);
-}
-
-//#endregion
-export { ExternalPlugin, debounce, toArray };

package/dist/package-VF4o7Lus.js

@@ -1,6 +0,0 @@
-
-//#region package.json
-var version = "0.6.4";
-
-//#endregion
-export { version };