fix(typescript)!: incorrect declarations directory

BREAKING CHANGES: This fix changes the output directory for types with single-file builds
rollup · Nov 27, 2022 · a5c90d1 · a5c90d1
1 parent b734673
commit a5c90d1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/packages/typescript/src/index.ts b/packages/typescript/src/index.ts
@@ -157,6 +157,15 @@ export default function typescript(options: RollupTypescriptOptions = {}): Plugi
             (parsedOptions.options.declaration
               ? parsedOptions.options.declarationDir || parsedOptions.options.outDir
               : null);
+          const cwd = normalizePath(process.cwd());
+          if (
+            parsedOptions.options.declaration &&
+            parsedOptions.options.declarationDir &&
+            baseDir?.startsWith(cwd)
+          ) {
+            const declarationDir = baseDir.slice(cwd.length + 1);
+            baseDir = baseDir.slice(0, -1 * declarationDir.length);
+          }
           if (!baseDir && tsconfig) {
             baseDir = tsconfig.substring(0, tsconfig.lastIndexOf('/'));
           }

diff --git a/packages/typescript/test/test.js b/packages/typescript/test/test.js
@@ -153,7 +153,7 @@ test.serial('supports emitting types also for single file output', async (t) =>
 
   t.deepEqual(
     output.map((out) => out.fileName),
-    ['main.js', 'main.d.ts']
+    ['main.js', 'dist/main.d.ts']
   );
   t.is(warnings.length, 0);
 });