- Passing tsconfig info to honor declaration Dir

Author: lmartorella

packages/ngtools/webpack/src/ivy/loader.ts

@@ -74,8 +74,16 @@ export function angularWebpackLoader(
       }
 
       // Write the declaration file in the target dir
-      if (result.declaration) {
-        fs.writeFileSync(this.resourcePath.replace('.ts', '.d.ts'), result.declaration);
+      if (result.declaration && fileEmitter.compilerOptions.declaration) {
+        let target = this.resourcePath.replace('.ts', '.d.ts');
+        if (fileEmitter.compilerOptions.declarationDir) {
+          if (!fileEmitter.compilerOptions.baseUrl) {
+            throw new Error('When declarationDir is specified, baseUrl is required as well');
+          }
+          const relDir = path.relative(fileEmitter.compilerOptions.baseUrl, target);
+          target = path.join(fileEmitter.compilerOptions.declarationDir, relDir);
+        }
+        fs.writeFileSync(target, result.declaration);
       }
       callback(undefined, resultContent, resultMap);
     })

packages/ngtools/webpack/src/ivy/plugin.ts

@@ -85,6 +85,7 @@ export class AngularWebpackPlugin {
   private readonly requiredFilesToEmit = new Set<string>();
   private readonly requiredFilesToEmitCache = new Map<string, EmitFileResult | undefined>();
   private readonly fileEmitHistory = new Map<string, FileEmitHistoryItem>();
+  private compilerOptions!: CompilerOptions;
 
   constructor(options: Partial<AngularWebpackPluginOptions> = {}) {
     this.pluginOptions = {
@@ -186,6 +187,7 @@ export class AngularWebpackPlugin {
 
     // Setup and read TypeScript and Angular compiler configuration
     const { compilerOptions, rootNames, errors } = this.loadConfiguration();
+    this.compilerOptions = compilerOptions;
 
     // Create diagnostics reporter and report configuration file errors
     const diagnosticsReporter = createDiagnosticsReporter(compilation, (diagnostic) =>
@@ -320,7 +322,7 @@ export class AngularWebpackPlugin {
   private registerWithCompilation(compilation: Compilation) {
     let fileEmitters = compilationFileEmitters.get(compilation);
     if (!fileEmitters) {
-      fileEmitters = new FileEmitterCollection();
+      fileEmitters = new FileEmitterCollection(this.compilerOptions);
       compilationFileEmitters.set(compilation, fileEmitters);
       compilation.compiler.webpack.NormalModule.getCompilationHooks(compilation).loader.tap(
         PLUGIN_NAME,

packages/ngtools/webpack/src/ivy/symbol.ts

@@ -6,6 +6,8 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
+import { CompilerOptions } from 'typescript';
+
 export const AngularPluginSymbol: unique symbol = Symbol.for('@ngtools/webpack[angular-compiler]');
 
 export interface EmitFileResult {
@@ -37,6 +39,8 @@ export class FileEmitterRegistration {
 export class FileEmitterCollection {
   #registrations: FileEmitterRegistration[] = [];
 
+  constructor(public readonly compilerOptions: CompilerOptions) {}
+
   register(): FileEmitterRegistration {
     const registration = new FileEmitterRegistration();
     this.#registrations.push(registration);