fix(pack): bundle @tsdown/exe and @tsdown/css into core

fengmk2 · fengmk2 · commit a4a537fccba6 · 2026-06-23T13:58:16.000+08:00
@tsdown/exe and @tsdown/css hard-peer-depend on tsdown and import tsdown/internal, but Vite+ bundles tsdown internally with no resolvable top-level tsdown package, so installing them failed with "Failed to import module @tsdown/exe". Bundle both into core (tsdown-exe.js, tsdown-css.js) so they resolve tsdown/internal at build time and work without any extra install. lightningcss (native) stays external as an optional peer, loaded lazily with an actionable error when it is missing. Closes #1586
diff --git a/docs/guide/pack.md b/docs/guide/pack.md
@@ -58,4 +58,20 @@ export default defineConfig({
 });
 ```
 
+Executable support is bundled into Vite+, so you do not need to install `@tsdown/exe` separately.
+
+Building executables uses Node's [Single Executable Applications](https://nodejs.org/api/single-executable-applications.html) support and requires Node.js 25.7.0 or later. Switch the active runtime with `vp env use 25` if `vp pack --exe` reports an unsupported version.
+
 See the official [tsdown executable docs](https://tsdown.dev/options/exe#executable) for details about configuring custom file names, embedded assets, and cross-platform targets.
+
+## CSS Bundling
+
+`vp pack` can transform and bundle CSS (including CSS Modules and Lightning CSS optimizations) for your entry points. This support is bundled into Vite+, so you do not need to install `@tsdown/css`.
+
+CSS transforms are powered by [Lightning CSS](https://lightningcss.dev/), which ships as a native module and is an optional peer dependency. Install it when you bundle CSS:
+
+```bash
+vp add -D lightningcss
+```
+
+If it is missing, `vp pack` prints an actionable error telling you to install it.
diff --git a/packages/cli/snap-tests/command-pack-css/package.json b/packages/cli/snap-tests/command-pack-css/package.json
@@ -0,0 +1,5 @@
+{
+  "name": "command-pack-css",
+  "version": "1.0.0",
+  "type": "module"
+}
diff --git a/packages/cli/snap-tests/command-pack-css/snap.txt b/packages/cli/snap-tests/command-pack-css/snap.txt
@@ -0,0 +1,16 @@
+> vp pack src/index.ts --minify # bundles CSS via the bundled @tsdown/css + lightningcss (issue #1586)
+ℹ entry: src/index.ts
+ℹ Build start
+ℹ dist/index.mjs  <variable> kB │ gzip: <variable> kB
+ℹ dist/style.css  <variable> kB │ gzip: <variable> kB
+ℹ 2 files, total: <variable> kB
+✔ Build complete in <variable>ms
+
+> cat dist/style.css # lightningcss-optimized output proves @tsdown/css ran
+.foo {
+  color: red;
+}
+
+.bar {
+  margin: 0;
+}
diff --git a/packages/cli/snap-tests/command-pack-css/src/index.ts b/packages/cli/snap-tests/command-pack-css/src/index.ts
@@ -0,0 +1,3 @@
+import './style.css';
+
+export const hello = 'world';
diff --git a/packages/cli/snap-tests/command-pack-css/src/style.css b/packages/cli/snap-tests/command-pack-css/src/style.css
@@ -0,0 +1,7 @@
+.foo {
+  color: #ff0000;
+}
+
+.bar {
+  margin: 0px 0px 0px 0px;
+}
diff --git a/packages/cli/snap-tests/command-pack-css/steps.json b/packages/cli/snap-tests/command-pack-css/steps.json
@@ -0,0 +1,7 @@
+{
+  "ignoredPlatforms": ["win32"],
+  "commands": [
+    "vp pack src/index.ts --minify # bundles CSS via the bundled @tsdown/css + lightningcss (issue #1586)",
+    "cat dist/style.css # lightningcss-optimized output proves @tsdown/css ran"
+  ]
+}
diff --git a/packages/cli/snap-tests/command-pack-tsdown-extensions/package.json b/packages/cli/snap-tests/command-pack-tsdown-extensions/package.json
@@ -0,0 +1,5 @@
+{
+  "name": "command-pack-tsdown-extensions",
+  "version": "1.0.0",
+  "type": "module"
+}
diff --git a/packages/cli/snap-tests/command-pack-tsdown-extensions/snap.txt b/packages/cli/snap-tests/command-pack-tsdown-extensions/snap.txt
@@ -0,0 +1,3 @@
+> node verify-extensions.mjs # bundled @tsdown/exe and @tsdown/css load without a top-level tsdown (issue #1586)
+tsdown-exe.js: getCacheDir, getCachedBinaryPath, getTargetSuffix, resolveNodeBinary
+tsdown-css.js: CssPlugin, resolveCssOptions
diff --git a/packages/cli/snap-tests/command-pack-tsdown-extensions/steps.json b/packages/cli/snap-tests/command-pack-tsdown-extensions/steps.json
@@ -0,0 +1,6 @@
+{
+  "ignoredPlatforms": ["win32"],
+  "commands": [
+    "node verify-extensions.mjs # bundled @tsdown/exe and @tsdown/css load without a top-level tsdown (issue #1586)"
+  ]
+}
diff --git a/packages/cli/snap-tests/command-pack-tsdown-extensions/verify-extensions.mjs b/packages/cli/snap-tests/command-pack-tsdown-extensions/verify-extensions.mjs
@@ -0,0 +1,22 @@
+// Issue #1586: `@tsdown/exe` and `@tsdown/css` have a hard peer dependency on
+// `tsdown` and import `tsdown/internal`, but Vite+ bundles tsdown internally and
+// does not expose a resolvable top-level `tsdown` package. Before the fix, the
+// bundled tsdown loaded them as external top-level packages, so `vp pack --exe`
+// (and CSS bundling) failed with `Failed to import module "@tsdown/exe"`.
+//
+// They are now bundled into core, so this loads the bundled extension chunks
+// directly to prove they resolve `tsdown/internal` against the bundled tsdown.
+// `vp pack --exe` itself needs Node >= 25.7 (SEA), so it cannot run end-to-end
+// in CI; this check is Node-version independent.
+import { createRequire } from 'node:module';
+import path from 'node:path';
+import { pathToFileURL } from 'node:url';
+
+const require = createRequire(import.meta.url);
+const packEntry = require.resolve('@voidzero-dev/vite-plus-core/pack');
+const tsdownDir = path.dirname(packEntry);
+
+for (const chunk of ['tsdown-exe.js', 'tsdown-css.js']) {
+  const mod = await import(pathToFileURL(path.join(tsdownDir, chunk)).href);
+  console.log(`${chunk}: ${Object.keys(mod).sort().join(', ')}`);
+}
diff --git a/packages/core/build.ts b/packages/core/build.ts
@@ -1,5 +1,6 @@
 import { existsSync } from 'node:fs';
 import { copyFile, cp, mkdir, readFile, stat, writeFile } from 'node:fs/promises';
+import { createRequire } from 'node:module';
 import path from 'node:path';
 import { dirname, join, parse, resolve, relative } from 'node:path';
 import { fileURLToPath } from 'node:url';
@@ -54,6 +55,7 @@ await bundleRolldown();
 await buildVite();
 await bundleTsdown();
 await brandTsdown();
+await wireBundledTsdownExtensions();
 await bundleVitepress();
 generateLicenseFile({
   title: 'Vite-Plus core license',
@@ -379,23 +381,47 @@ async function bundleRolldown() {
 async function bundleTsdown() {
   await mkdir(join(projectDir, 'dist/tsdown/dist'), { recursive: true });
 
-  const tsdownExternal = Object.keys(pkgJson.peerDependencies);
+  const require = createRequire(import.meta.url);
+
+  // `@tsdown/exe` and `@tsdown/css` are bundled directly into core instead of
+  // being externalized. They have a hard peer dependency on `tsdown` and import
+  // `tsdown/internal`, but Vite+ bundles tsdown inside core rather than exposing
+  // a resolvable top-level `tsdown` package. Bundling them here resolves
+  // `tsdown/internal` against the bundled tsdown at build time, so `vp pack
+  // --exe` and CSS bundling work without users installing anything extra.
+  // See https://github.com/voidzero-dev/vite-plus/issues/1586
+  const bundledTsdownPackages = new Set(['@tsdown/exe', '@tsdown/css']);
+
+  // Everything else in tsdown's peer dependencies stays external. `lightningcss`
+  // (a native module) and `postcss` also stay external: `@tsdown/css` pulls them
+  // in, and they cannot be bundled. `lightningcss` becomes an optional peer with
+  // a friendly loader injected by `wireBundledTsdownExtensions()`.
+  const tsdownExternal = [
+    ...Object.keys(pkgJson.peerDependencies).filter((name) => !bundledTsdownPackages.has(name)),
+    'lightningcss',
+    'postcss',
+  ];
+  const isExternal = (id: string) => tsdownExternal.some((e) => id === e || id.startsWith(`${e}/`));
 
   const thirdPartyCjsModules = new Set<string>();
 
-  // Re-build tsdown cli
+  // Re-build tsdown cli plus the bundled `@tsdown/exe` and `@tsdown/css`
+  // extensions as stable named entries (`tsdown-exe.js`, `tsdown-css.js`).
   await build({
     input: {
       run: join(tsdownSourceDir, 'dist/run.mjs'),
       index: join(tsdownSourceDir, 'dist/index.mjs'),
+      'tsdown-exe': require.resolve('@tsdown/exe'),
+      'tsdown-css': require.resolve('@tsdown/css'),
     },
     output: {
       format: 'esm',
       cleanDir: true,
       dir: join(projectDir, 'dist/tsdown'),
+      entryFileNames: '[name].js',
     },
     platform: 'node',
-    external: (id: string) => tsdownExternal.some((e) => id.startsWith(e)),
+    external: isExternal,
     plugins: [
       RewriteImportsPlugin,
       {
@@ -425,7 +451,7 @@ async function bundleTsdown() {
       format: 'esm',
       dir: join(projectDir, 'dist/tsdown'),
     },
-    external: (id: string) => tsdownExternal.some((e) => id.startsWith(e)),
+    external: isExternal,
     plugins: [
       RewriteImportsPlugin,
       dts({
@@ -448,13 +474,14 @@ async function bundleTsdown() {
 async function brandTsdown() {
   const tsdownDistDir = join(projectDir, 'dist/tsdown');
   const buildFiles = await glob(toPosixPath(join(tsdownDistDir, 'build-*.js')), { absolute: true });
-  const mainFiles = await glob(toPosixPath(join(tsdownDistDir, 'main-*.js')), { absolute: true });
+  // The logger code lives in a shared chunk whose name depends on rolldown's
+  // chunking (e.g. `main-*.js` or `debug-*.js`), so scan every chunk for it.
+  const loggerCandidateFiles = await glob(toPosixPath(join(tsdownDistDir, '*.js')), {
+    absolute: true,
+  });
   if (buildFiles.length === 0) {
     throw new Error('brandTsdown: no build chunk found in dist/tsdown/');
   }
-  if (mainFiles.length === 0) {
-    throw new Error('brandTsdown: no main chunk found in dist/tsdown/');
-  }
 
   const search = '"tsdown <your-file>"';
   const replacement = '"vp pack <your-file>"';
@@ -534,8 +561,8 @@ async function brandTsdown() {
   ];
   let loggerPatched = false;
 
-  for (const mainFile of mainFiles) {
-    let content = await readFile(mainFile, 'utf-8');
+  for (const candidateFile of loggerCandidateFiles) {
+    let content = await readFile(candidateFile, 'utf-8');
     let changed = false;
     for (const { search, replacement } of loggerPatches) {
       if (content.includes(search)) {
@@ -546,13 +573,91 @@ async function brandTsdown() {
     if (!changed) {
       continue;
     }
-    await writeFile(mainFile, content, 'utf-8');
-    console.log(`Branded tsdown logger prefixes in ${mainFile}`);
+    await writeFile(candidateFile, content, 'utf-8');
+    console.log(`Branded tsdown logger prefixes in ${candidateFile}`);
     loggerPatched = true;
   }
 
   if (!loggerPatched) {
-    throw new Error('brandTsdown: logger prefix patterns not found in any main chunk');
+    throw new Error('brandTsdown: logger prefix patterns not found in any chunk');
+  }
+}
+
+// Wire the bundled `@tsdown/exe` and `@tsdown/css` extensions into the bundled
+// tsdown so they load from the local chunks instead of resolving external
+// top-level packages, and make `lightningcss` an optional peer with a friendly
+// loader. See https://github.com/voidzero-dev/vite-plus/issues/1586
+async function wireBundledTsdownExtensions() {
+  const tsdownDistDir = join(projectDir, 'dist/tsdown');
+  const buildFiles = await glob(toPosixPath(join(tsdownDistDir, 'build-*.js')), { absolute: true });
+  if (buildFiles.length === 0) {
+    throw new Error('wireBundledTsdownExtensions: no build chunk found in dist/tsdown/');
+  }
+
+  // 1) Route `@tsdown/exe` and `@tsdown/css` to the bundled entries.
+  //    - `importWithError("@tsdown/exe")` dynamically imports a runtime string,
+  //      which rolldown cannot follow, so rewrite the call site to the chunk.
+  //    - `pkgExists("@tsdown/css")` resolves the top-level package at runtime;
+  //      since it is bundled now, force it on and point the import at the chunk.
+  let exeWired = false;
+  let cssWired = false;
+  for (const buildFile of buildFiles) {
+    let content = await readFile(buildFile, 'utf-8');
+    let changed = false;
+    if (content.includes('importWithError("@tsdown/exe")')) {
+      content = content.replaceAll('importWithError("@tsdown/exe")', 'import("./tsdown-exe.js")');
+      exeWired = true;
+      changed = true;
+    }
+    if (content.includes('pkgExists("@tsdown/css")')) {
+      content = content.replaceAll('pkgExists("@tsdown/css")', 'true');
+      cssWired = true;
+      changed = true;
+    }
+    if (content.includes('import("@tsdown/css")')) {
+      content = content.replaceAll('import("@tsdown/css")', 'import("./tsdown-css.js")');
+      changed = true;
+    }
+    if (changed) {
+      await writeFile(buildFile, content);
+    }
+  }
+  if (!exeWired) {
+    throw new Error('wireBundledTsdownExtensions: `importWithError("@tsdown/exe")` not found');
+  }
+  if (!cssWired) {
+    throw new Error('wireBundledTsdownExtensions: `pkgExists("@tsdown/css")` not found');
+  }
+
+  // 2) `lightningcss` is a native module and an optional peer. Wrap its dynamic
+  //    import so a missing install produces an actionable error instead of a raw
+  //    `Cannot find package 'lightningcss'`.
+  const helper =
+    'async function __vpImportLightningcss() {\n' +
+    '  try {\n' +
+    '    return await import("lightningcss");\n' +
+    '  } catch (cause) {\n' +
+    '    throw new Error(' +
+    '"Cannot find package \\"lightningcss\\". CSS bundling with `vp pack` requires it. ' +
+    'Install it with `vp add -D lightningcss`.", { cause });\n' +
+    '  }\n' +
+    '}\n';
+  const allChunks = await glob(toPosixPath(join(tsdownDistDir, '*.js')), { absolute: true });
+  let lightningcssWired = false;
+  for (const chunk of allChunks) {
+    let content = await readFile(chunk, 'utf-8');
+    if (!content.includes('import("lightningcss")')) {
+      continue;
+    }
+    // Rewrite the call sites first, then prepend the helper (whose own
+    // `import("lightningcss")` must not be rewritten).
+    content = content.replaceAll('import("lightningcss")', '__vpImportLightningcss()');
+    content = helper + content;
+    await writeFile(chunk, content);
+    lightningcssWired = true;
+  }
+  if (!lightningcssWired) {
+    throw new Error('wireBundledTsdownExtensions: `import("lightningcss")` not found');
   }
 }
 
@@ -650,6 +755,14 @@ async function mergePackageJson() {
   const vitePkg = JSON.parse(await readFile(vitePkgPath, 'utf-8'));
   const destPkg = JSON.parse(await readFile(destPkgPath, 'utf-8'));
 
+  // Track the bundled `@tsdown/css` lightningcss dependency so the optional peer
+  // range stays in lockstep with what the bundled CSS code expects.
+  const require = createRequire(import.meta.url);
+  const tsdownCssPkg = JSON.parse(
+    await readFile(require.resolve('@tsdown/css/package.json'), 'utf-8'),
+  );
+  const lightningcssPeerRange: string = tsdownCssPkg.dependencies?.lightningcss ?? '^1.30.2';
+
   // Merge peerDependencies from tsdown and vite
   destPkg.peerDependencies = {
     ...tsdownPkg.peerDependencies,
@@ -662,6 +775,18 @@ async function mergePackageJson() {
     ...vitePkg.peerDependenciesMeta,
   };
 
+  // `@tsdown/exe` and `@tsdown/css` are bundled into core (see bundleTsdown),
+  // so they must not be advertised as peers anymore. `lightningcss` is a native
+  // module pulled in by the bundled `@tsdown/css` (and Vite's lightningcss
+  // transformer); keep it external as an optional peer so users only install it
+  // when they actually bundle CSS.
+  for (const bundled of ['@tsdown/exe', '@tsdown/css']) {
+    delete destPkg.peerDependencies[bundled];
+    delete destPkg.peerDependenciesMeta[bundled];
+  }
+  destPkg.peerDependencies['lightningcss'] = lightningcssPeerRange;
+  destPkg.peerDependenciesMeta['lightningcss'] = { optional: true };
+
   destPkg.bundledVersions = {
     ...destPkg.bundledVersions,
     vite: vitePkg.version,
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -102,7 +102,6 @@
   "dependencies": {
     "@oxc-project/runtime": "catalog:",
     "@oxc-project/types": "catalog:",
-    "lightningcss": "^1.30.2",
     "postcss": "^8.5.6"
   },
   "devDependencies": {
@@ -112,9 +111,12 @@
     "@babel/types": "^7.28.5",
     "@oxc-node/cli": "catalog:",
     "@oxc-node/core": "catalog:",
+    "@tsdown/css": "catalog:",
+    "@tsdown/exe": "catalog:",
     "@vitejs/devtools": "^0.3.3",
     "es-module-lexer": "^1.7.0",
     "hookable": "^6.0.1",
+    "lightningcss": "^1.32.0",
     "magic-string": "^0.30.21",
     "oxc-parser": "catalog:",
     "oxfmt": "catalog:",
@@ -133,13 +135,12 @@
   },
   "peerDependencies": {
     "@arethetypeswrong/core": "^0.18.1",
-    "@tsdown/css": "0.22.3",
-    "@tsdown/exe": "0.22.3",
     "@types/node": "^20.19.0 || >=22.12.0",
     "@vitejs/devtools": "^0.1.18",
     "esbuild": "^0.27.0 || ^0.28.0",
     "jiti": ">=1.21.0",
     "less": "^4.0.0",
+    "lightningcss": "^1.32.0",
     "publint": "^0.3.8",
     "sass": "^1.70.0",
     "sass-embedded": "^1.70.0",
@@ -156,12 +157,6 @@
     "@arethetypeswrong/core": {
       "optional": true
     },
-    "@tsdown/css": {
-      "optional": true
-    },
-    "@tsdown/exe": {
-      "optional": true
-    },
     "@vitejs/devtools": {
       "optional": true
     },
@@ -209,6 +204,9 @@
     },
     "yaml": {
       "optional": true
+    },
+    "lightningcss": {
+      "optional": true
     }
   },
   "optionalDependencies": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
diff --git a/rfcs/pack-command.md b/rfcs/pack-command.md

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+import './style.css';`
	`2`	`+`
	`3`	`+export const hello = 'world';`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,7 @@ @@
 +.foo {
 +  color: #ff0000;
 +}
++
 +.bar {
 +  margin: 0px 0px 0px 0px;
 +}
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+> node verify-extensions.mjs # bundled @tsdown/exe and @tsdown/css load without a top-level tsdown (issue #1586)`
	`2`	`+tsdown-exe.js: getCacheDir, getCachedBinaryPath, getTargetSuffix, resolveNodeBinary`
	`3`	`+tsdown-css.js: CssPlugin, resolveCssOptions`