unjs · pi0 · Feb 26, 2025 · Feb 24, 2025 · Feb 24, 2025 · Feb 26, 2025
diff --git a/package.json b/package.json
@@ -39,6 +39,7 @@
     "consola": "^3.4.0",
     "defu": "^6.1.4",
     "esbuild": "^0.25.0",
+    "fix-dts-default-cjs-exports": "^1.0.0",
     "hookable": "^5.5.3",
     "jiti": "^2.4.2",
     "magic-string": "^0.30.17",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/builders/rollup/build.ts b/src/builders/rollup/build.ts
@@ -82,7 +82,7 @@ export async function rollupBuild(ctx: BuildContext): Promise<void> {
       ...rollupOptions.plugins,
       dts(ctx.options.rollup.dts),
       removeShebangPlugin(),
-      ctx.options.rollup.emitCJS && fixCJSExportTypePlugin(),
+      ctx.options.rollup.emitCJS && fixCJSExportTypePlugin(ctx),
     ].filter(
       (plugin) =>
         /**

diff --git a/src/builders/rollup/plugins/cjs.ts b/src/builders/rollup/plugins/cjs.ts
@@ -1,6 +1,8 @@
 import type { Plugin } from "rollup";
 import { findStaticImports } from "mlly";
 import MagicString from "magic-string";
+import type { BuildContext } from "../../../types.ts";
+import { FixDtsDefaultCjsExportsPlugin } from "fix-dts-default-cjs-exports/rollup";
 
 export function cjsPlugin(_opts?: any): Plugin {
   return {
@@ -14,27 +16,23 @@ export function cjsPlugin(_opts?: any): Plugin {
   } as Plugin;
 }
 
-// Ported from https://github.com/egoist/tsup/blob/cd03e1e00ec2bd6676ae1837cbc7e618ab6a2362/src/rollup.ts#L92-L109
-export function fixCJSExportTypePlugin(): Plugin {
-  return {
-    name: "unbuild-fix-cjs-export-type",
-    renderChunk(code, info, opts) {
-      if (
-        info.type !== "chunk" ||
-        !info.fileName.endsWith(".d.cts") ||
-        !info.isEntry ||
-        info.exports?.length !== 1 ||
-        info.exports[0] !== "default"
-      ) {
-        return;
-      }
-
-      return code.replace(
-        /(?<=(?<=[;}]|^)\s*export\s*){\s*([\w$]+)\s*as\s+default\s*}/,
-        `= $1`,
+export function fixCJSExportTypePlugin(ctx: BuildContext): Plugin {
+  const regexp =
+    ctx.options.declaration === "node16"
+      ? /\.d\.cts$/ // d.cts only
+      : /\.d\.c?ts$/; // d.ts and d.cts
+  return FixDtsDefaultCjsExportsPlugin({
+    warn: (msg) => ctx.warnings.add(msg),
+    matcher: (info) => {
+      return (
+        info.type === "chunk" &&
+        info.exports?.length > 0 &&
+        info.exports.includes("default") &&
+        regexp.test(info.fileName) &&
+        info.isEntry
       );
     },
-  } as Plugin;
+  }) as Plugin;
 }
 
 const CJSyntaxRe = /__filename|__dirname|require\(|require\.resolve\(/;