diff --git a/src/service/emit/declaration/emit-declarations.ts b/src/service/emit/declaration/emit-declarations.ts index 38e7ee3b..db0a495e 100644 --- a/src/service/emit/declaration/emit-declarations.ts +++ b/src/service/emit/declaration/emit-declarations.ts @@ -93,6 +93,7 @@ export function emitDeclarations(options: EmitDeclarationsOptions): void { declarationDir: options.originalCompilerOptions.declarationDir, outFile: setExtension(virtualOutFile.relative, JS_EXTENSION), module: typescript.ModuleKind.System, + noEmit: false, emitDeclarationOnly: true, // This can cause TS2612 errors that wouldn't otherwise happen diff --git a/src/util/chunk/normalize-chunk.ts b/src/util/chunk/normalize-chunk.ts index 17ac70c0..3ea683bf 100644 --- a/src/util/chunk/normalize-chunk.ts +++ b/src/util/chunk/normalize-chunk.ts @@ -33,7 +33,11 @@ export function preNormalizeChunk(chunk: OutputChunk, otherChunks: OutputChunk[] // Make sure to remove any base modules that are also entry modules in other chunks for (const baseModule of baseModules) { - if (otherChunks.some(otherChunk => otherChunk.isEntry && otherChunk.facadeModuleId === baseModule)) { + if ( + otherChunks.some( + otherChunk => otherChunk.isEntry && otherChunk.facadeModuleId != null && normalizeChunkFilename(otherChunk.facadeModuleId) === normalizeChunkFilename(baseModule) + ) + ) { baseModules.delete(baseModule); } } @@ -41,7 +45,7 @@ export function preNormalizeChunk(chunk: OutputChunk, otherChunks: OutputChunk[] // Add the facadeModuleId to the base modules if it is an entry chunk and it wasn't already there. // Since Rollup v3.22.0, the facadeModuleId may no longer be included in the modules of the chunk if it only contains imports/exports, so we'll have to add it manually if (chunk.isEntry && chunk.facadeModuleId != null && !baseModules.has(chunk.facadeModuleId)) { - baseModules.add(chunk.facadeModuleId); + baseModules.add(normalizeChunkFilename(chunk.facadeModuleId)); } return { diff --git a/test/allow-importing-ts-extensions.test.ts b/test/allow-importing-ts-extensions.test.ts index c3df7a85..207b0f09 100644 --- a/test/allow-importing-ts-extensions.test.ts +++ b/test/allow-importing-ts-extensions.test.ts @@ -29,8 +29,7 @@ test.serial( typescript, rollup, tsconfig: { - allowImportingTsExtensions: true, - noEmit: true + allowImportingTsExtensions: true } } );