fix: declaration option

unjs · Sep 14, 2023 · 3811611 · 3811611
1 parent 511cd75
commit 3811611
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 10 deletions.
diff --git a/src/auto.ts b/src/auto.ts
@@ -30,8 +30,10 @@ export const autoPreset = definePreset(() => {
         if (res.cjs) {
           ctx.options.rollup.emitCJS = true;
         }
-        if (res.dts) {
-          ctx.options.declaration = res.dts;
+        if (ctx.options.declaration === undefined) {
+          // Enable auto detect based on "package.json"
+          // If "package.json" has "types" field, it will be "compatible", otherwise false.
+          ctx.options.declaration = res.dts ? "compatible" : false;
         }
         consola.info(
           "Automatically detected entries:",

diff --git a/src/build.ts b/src/build.ts
@@ -74,7 +74,7 @@ async function _build(
       rootDir,
       entries: [],
       clean: true,
-      declaration: false,
+      declaration: undefined,
       outDir: "dist",
       stub,
       stubOptions: {

diff --git a/src/builder/rollup.ts b/src/builder/rollup.ts
@@ -113,17 +113,26 @@ export async function rollupBuild(ctx: BuildContext) {
       );
 
       // DTS Stub
-      await writeFile(
-        output + ".d.ts",
-        [
+      if (ctx.options.declaration) {
+        const dtsContent = [
           `export * from ${JSON.stringify(resolvedEntryWithoutExt)};`,
           hasDefaultExport
             ? `export { default } from ${JSON.stringify(
                 resolvedEntryWithoutExt,
               )};`
             : "",
-        ].join("\n"),
-      );
+        ].join("\n");
+
+        await writeFile(output + ".d.cts", dtsContent);
+        await writeFile(output + ".d.mts", dtsContent);
+        // .d.ts for node10 compatibility (TypeScript version < 4.7)
+        if (
+          ctx.options.declaration === "compatible" ||
+          ctx.options.declaration === true
+        ) {
+          await writeFile(output + ".d.ts", dtsContent);
+        }
+      }
 
       if (shebang) {
         await makeExecutable(output + ".cjs");

diff --git a/test/fixture/build.config.ts b/test/fixture/build.config.ts
@@ -22,7 +22,7 @@ export default defineBuildConfig([
     entries: ["src/index"],
     outDir: "dist/min",
     sourcemap: true,
-    declaration: true,
+    declaration: "compatible",
     rollup: {
       esbuild: {
         minify: true,

diff --git a/test/fixture/build.preset.ts b/test/fixture/build.preset.ts
@@ -1,7 +1,7 @@
 import { definePreset } from "../../src";
 
 export default definePreset({
-  declaration: true,
+  declaration: "compatible",
   rollup: {
     cjsBridge: true,
   },