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

package/LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2017 Google, Inc.
+Copyright (c) 2010-2024 Google LLC. https://angular.dev/license
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -9,13 +9,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ngtools/webpack",
-  "version": "19.0.0-next.0",
+  "version": "19.0.0-next.10",
   "description": "Webpack plugin that AoT compiles your Angular components and modules.",
   "main": "./src/index.js",
   "typings": "src/index.d.ts",
@@ -26,10 +26,10 @@
   "homepage": "https://github.com/angular/angular-cli",
   "peerDependencies": {
     "@angular/compiler-cli": "^19.0.0-next.0",
-    "typescript": ">=5.4 <5.6",
+    "typescript": ">=5.5 <5.7",
     "webpack": "^5.54.0"
   },
-  "packageManager": "yarn@4.4.0",
+  "packageManager": "yarn@4.5.0",
   "engines": {
     "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
     "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",

package/src/ivy/loader.js

@@ -32,8 +32,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.angularWebpackLoader = angularWebpackLoader;
 exports.default = angularWebpackLoader;
-exports.angularWebpackLoader = angularWebpackLoader;
-exports.default = angularWebpackLoader;
 const path = __importStar(require("path"));
 const symbol_1 = require("./symbol");
 const JS_FILE_REGEXP = /\.[cm]?js$/;

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,11 +84,18 @@ 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;
     }
     apply(compiler) {
-        const { NormalModuleReplacementPlugin, WebpackError, util } = compiler.webpack;
+        const { NormalModuleReplacementPlugin, util } = compiler.webpack;
         this.webpackCreateHash = util.createHash;
         // Setup file replacements with webpack
         for (const [key, value] of Object.entries(this.pluginOptions.fileReplacements)) {
@@ -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;
             });
         }
@@ -459,7 +468,7 @@ class AngularWebpackPlugin {
             ...builder.getSemanticDiagnostics(),
         ];
         diagnosticsReporter(diagnostics);
-        const transformers = (0, transformation_1.createJitTransformers)(builder, this.compilerCli, this.pluginOptions);
+        const transformers = (0, transformation_1.createJitTransformers)(builder, this.compilerCliTooling, this.pluginOptions);
         return {
             fileEmitter: this.createFileEmitter(builder, transformers, () => []),
             builder,
@@ -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;

package/src/transformers/find_image_domains.d.ts

@@ -5,5 +5,5 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.dev/license
  */
-import * as ts from 'typescript';
+import ts from 'typescript';
 export declare function findImageDomains(imageDomains: Set<string>): ts.TransformerFactory<ts.SourceFile>;

package/src/transformers/find_image_domains.js

@@ -6,33 +6,12 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.dev/license
  */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findImageDomains = findImageDomains;
-const ts = __importStar(require("typescript"));
-const TARGET_TEXT = '@NgModule';
+const typescript_1 = __importDefault(require("typescript"));
 const BUILTIN_LOADERS = new Set([
     'provideCloudflareLoader',
     'provideCloudinaryLoader',
@@ -47,105 +26,105 @@ function findImageDomains(imageDomains) {
                 return BUILTIN_LOADERS.has(node.expression.getText());
             };
             const findDomainString = (node) => {
-                if (ts.isStringLiteral(node) ||
-                    ts.isTemplateHead(node) ||
-                    ts.isTemplateMiddle(node) ||
-                    ts.isTemplateTail(node)) {
+                if (typescript_1.default.isStringLiteral(node) ||
+                    typescript_1.default.isTemplateHead(node) ||
+                    typescript_1.default.isTemplateMiddle(node) ||
+                    typescript_1.default.isTemplateTail(node)) {
                     const domain = node.text.match(URL_REGEX);
                     if (domain && domain[0]) {
                         imageDomains.add(domain[0]);
                         return node;
                     }
                 }
-                ts.visitEachChild(node, findDomainString, context);
+                typescript_1.default.visitEachChild(node, findDomainString, context);
                 return node;
             };
             function isImageProviderKey(property) {
-                return (ts.isPropertyAssignment(property) &&
+                return (typescript_1.default.isPropertyAssignment(property) &&
                     property.name.getText() === 'provide' &&
                     property.initializer.getText() === 'IMAGE_LOADER');
             }
             function isImageProviderValue(property) {
-                return ts.isPropertyAssignment(property) && property.name.getText() === 'useValue';
+                return typescript_1.default.isPropertyAssignment(property) && property.name.getText() === 'useValue';
             }
             function checkForDomain(node) {
                 if (node.properties.find(isImageProviderKey)) {
                     const value = node.properties.find(isImageProviderValue);
-                    if (value && ts.isPropertyAssignment(value)) {
-                        if (ts.isArrowFunction(value.initializer) ||
-                            ts.isFunctionExpression(value.initializer)) {
-                            ts.visitEachChild(node, findDomainString, context);
+                    if (value && typescript_1.default.isPropertyAssignment(value)) {
+                        if (typescript_1.default.isArrowFunction(value.initializer) ||
+                            typescript_1.default.isFunctionExpression(value.initializer)) {
+                            typescript_1.default.visitEachChild(node, findDomainString, context);
                         }
                     }
                 }
             }
             function findImageLoaders(node) {
-                if (ts.isCallExpression(node)) {
+                if (typescript_1.default.isCallExpression(node)) {
                     if (isBuiltinImageLoader(node)) {
                         const firstArg = node.arguments[0];
-                        if (ts.isStringLiteralLike(firstArg)) {
+                        if (typescript_1.default.isStringLiteralLike(firstArg)) {
                             imageDomains.add(firstArg.text);
                         }
                     }
                 }
-                else if (ts.isObjectLiteralExpression(node)) {
+                else if (typescript_1.default.isObjectLiteralExpression(node)) {
                     checkForDomain(node);
                 }
                 return node;
             }
             function findProvidersAssignment(node) {
-                if (ts.isPropertyAssignment(node)) {
-                    if (ts.isIdentifier(node.name) && node.name.escapedText === 'providers') {
-                        ts.visitEachChild(node.initializer, findImageLoaders, context);
+                if (typescript_1.default.isPropertyAssignment(node)) {
+                    if (typescript_1.default.isIdentifier(node.name) && node.name.escapedText === 'providers') {
+                        typescript_1.default.visitEachChild(node.initializer, findImageLoaders, context);
                     }
                 }
                 return node;
             }
             function findFeaturesAssignment(node) {
-                if (ts.isPropertyAssignment(node)) {
-                    if (ts.isIdentifier(node.name) &&
+                if (typescript_1.default.isPropertyAssignment(node)) {
+                    if (typescript_1.default.isIdentifier(node.name) &&
                         node.name.escapedText === 'features' &&
-                        ts.isArrayLiteralExpression(node.initializer)) {
+                        typescript_1.default.isArrayLiteralExpression(node.initializer)) {
                         const providerElement = node.initializer.elements.find(isProvidersFeatureElement);
                         if (providerElement &&
-                            ts.isCallExpression(providerElement) &&
+                            typescript_1.default.isCallExpression(providerElement) &&
                             providerElement.arguments[0]) {
-                            ts.visitEachChild(providerElement.arguments[0], findImageLoaders, context);
+                            typescript_1.default.visitEachChild(providerElement.arguments[0], findImageLoaders, context);
                         }
                     }
                 }
                 return node;
             }
             function isProvidersFeatureElement(node) {
-                return (ts.isCallExpression(node) &&
-                    ts.isPropertyAccessExpression(node.expression) &&
-                    ts.isIdentifier(node.expression.expression) &&
+                return (typescript_1.default.isCallExpression(node) &&
+                    typescript_1.default.isPropertyAccessExpression(node.expression) &&
+                    typescript_1.default.isIdentifier(node.expression.expression) &&
                     node.expression.expression.escapedText === 'i0' &&
-                    ts.isIdentifier(node.expression.name) &&
+                    typescript_1.default.isIdentifier(node.expression.name) &&
                     node.expression.name.escapedText === 'ɵɵProvidersFeature');
             }
             function findPropertyDeclaration(node) {
-                if (ts.isPropertyDeclaration(node) &&
-                    ts.isIdentifier(node.name) &&
+                if (typescript_1.default.isPropertyDeclaration(node) &&
+                    typescript_1.default.isIdentifier(node.name) &&
                     node.initializer &&
-                    ts.isCallExpression(node.initializer) &&
+                    typescript_1.default.isCallExpression(node.initializer) &&
                     node.initializer.arguments[0]) {
                     if (node.name.escapedText === 'ɵinj') {
-                        ts.visitEachChild(node.initializer.arguments[0], findProvidersAssignment, context);
+                        typescript_1.default.visitEachChild(node.initializer.arguments[0], findProvidersAssignment, context);
                     }
                     else if (node.name.escapedText === 'ɵcmp') {
-                        ts.visitEachChild(node.initializer.arguments[0], findFeaturesAssignment, context);
+                        typescript_1.default.visitEachChild(node.initializer.arguments[0], findFeaturesAssignment, context);
                     }
                 }
                 return node;
             }
             function findClassDeclaration(node) {
-                if (ts.isClassDeclaration(node)) {
-                    ts.visitEachChild(node, findPropertyDeclaration, context);
+                if (typescript_1.default.isClassDeclaration(node)) {
+                    typescript_1.default.visitEachChild(node, findPropertyDeclaration, context);
                 }
                 return node;
             }
-            ts.visitEachChild(sourceFile, findClassDeclaration, context);
+            typescript_1.default.visitEachChild(sourceFile, findClassDeclaration, context);
             return sourceFile;
         };
     };