@ngtools/webpack 19.0.0-next.0 → 19.0.0-next.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ngtools/webpack",
-  "version": "19.0.0-next.0",
+  "version": "19.0.0-next.2",
   "description": "Webpack plugin that AoT compiles your Angular components and modules.",
   "main": "./src/index.js",
   "typings": "src/index.d.ts",

package/src/ivy/plugin.d.ts

@@ -23,6 +23,7 @@ export interface AngularWebpackPluginOptions {
 export declare class AngularWebpackPlugin {
     private readonly pluginOptions;
     private compilerCliModule?;
+    private compilerCliToolingModule?;
     private watchMode?;
     private ngtscNextProgram?;
     private builder?;
@@ -35,6 +36,7 @@ export declare class AngularWebpackPlugin {
     private readonly fileEmitHistory;
     constructor(options?: Partial<AngularWebpackPluginOptions>);
     private get compilerCli();
+    private get compilerCliTooling();
     get options(): AngularWebpackPluginOptions;
     apply(compiler: Compiler): void;
     private setupCompilation;

package/src/ivy/plugin.js

@@ -54,6 +54,7 @@ const compilationFileEmitters = new WeakMap();
 class AngularWebpackPlugin {
     pluginOptions;
     compilerCliModule;
+    compilerCliToolingModule;
     watchMode;
     ngtscNextProgram;
     builder;
@@ -83,6 +84,13 @@ class AngularWebpackPlugin {
         assert_1.strict.ok(this.compilerCliModule, `'@angular/compiler-cli' used prior to Webpack compilation.`);
         return this.compilerCliModule;
     }
+    get compilerCliTooling() {
+        // The compilerCliToolingModule field is guaranteed to be defined during a compilation
+        // due to the `beforeCompile` hook. Usage of this property accessor prior to the
+        // hook execution is an implementation error.
+        assert_1.strict.ok(this.compilerCliToolingModule, `'@angular/compiler-cli' used prior to Webpack compilation.`);
+        return this.compilerCliToolingModule;
+    }
     get options() {
         return this.pluginOptions;
     }
@@ -230,7 +238,8 @@ class AngularWebpackPlugin {
         if (!fileEmitters) {
             fileEmitters = new symbol_1.FileEmitterCollection();
             compilationFileEmitters.set(compilation, fileEmitters);
-            compilation.compiler.webpack.NormalModule.getCompilationHooks(compilation).loader.tap(PLUGIN_NAME, (loaderContext) => {
+            compilation.compiler.webpack.NormalModule.getCompilationHooks(compilation).loader.tap(PLUGIN_NAME, (context) => {
+                const loaderContext = context;
                 loaderContext[symbol_1.AngularPluginSymbol] = fileEmitters;
             });
         }
@@ -497,9 +506,6 @@ class AngularWebpackPlugin {
         };
     }
     async initializeCompilerCli() {
-        if (this.compilerCliModule) {
-            return;
-        }
         // This uses a dynamic import to load `@angular/compiler-cli` which may be ESM.
         // CommonJS code can load ESM code via a dynamic import. Unfortunately, TypeScript
         // will currently, unconditionally downlevel dynamic import into a require call.
@@ -507,7 +513,8 @@ class AngularWebpackPlugin {
         // this, a Function constructor is used to prevent TypeScript from changing the dynamic import.
         // Once TypeScript provides support for keeping the dynamic import this workaround can
         // be dropped.
-        this.compilerCliModule = await new Function(`return import('@angular/compiler-cli');`)();
+        this.compilerCliModule ??= await new Function(`return import('@angular/compiler-cli');`)();
+        this.compilerCliToolingModule ??= await new Function(`return import('@angular/compiler-cli/private/tooling');`)();
     }
     async addFileEmitHistory(filePath, content) {
         assert_1.strict.ok(this.webpackCreateHash, 'File emitter is used prior to Webpack compilation');

package/src/ivy/transformation.d.ts

@@ -11,7 +11,7 @@ export declare function createAotTransformers(builder: ts.BuilderProgram, option
     emitNgModuleScope?: boolean;
     emitSetClassDebugInfo?: boolean;
 }, imageDomains: Set<string>): ts.CustomTransformers;
-export declare function createJitTransformers(builder: ts.BuilderProgram, compilerCli: typeof import('@angular/compiler-cli'), options: {
+export declare function createJitTransformers(builder: ts.BuilderProgram, compilerCli: typeof import('@angular/compiler-cli/private/tooling'), options: {
     inlineStyleFileExtension?: string;
 }): ts.CustomTransformers;
 export declare function mergeTransformers(first: ts.CustomTransformers, second: ts.CustomTransformers): ts.CustomTransformers;