@ngtools/webpack 17.0.0-rc.2 → 17.0.0-rc.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ngtools/webpack",
-  "version": "17.0.0-rc.2",
+  "version": "17.0.0-rc.4",
   "description": "Webpack plugin that AoT compiles your Angular components and modules.",
   "main": "./src/index.js",
   "typings": "src/index.d.ts",
@@ -31,7 +31,7 @@
     "webpack": "^5.54.0"
   },
   "engines": {
-    "node": ">=18.13.0",
+    "node": "^18.13.0 || >=20.9.0",
     "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
     "yarn": ">= 1.13.0"
   }

package/src/ivy/plugin.d.ts

@@ -16,6 +16,7 @@ export interface AngularWebpackPluginOptions {
     directTemplateLoading: boolean;
     emitClassMetadata: boolean;
     emitNgModuleScope: boolean;
+    emitSetClassDebugInfo?: boolean;
     jitMode: boolean;
     inlineStyleFileExtension?: string;
 }

package/src/ivy/transformation.d.ts

@@ -9,6 +9,7 @@ import * as ts from 'typescript';
 export declare function createAotTransformers(builder: ts.BuilderProgram, options: {
     emitClassMetadata?: boolean;
     emitNgModuleScope?: boolean;
+    emitSetClassDebugInfo?: boolean;
 }, imageDomains: Set<string>): ts.CustomTransformers;
 export declare function createJitTransformers(builder: ts.BuilderProgram, compilerCli: typeof import('@angular/compiler-cli'), options: {
     inlineStyleFileExtension?: string;

package/src/ivy/transformation.js

@@ -44,9 +44,10 @@ function createAotTransformers(builder, options, imageDomains) {
     };
     const removeClassMetadata = !options.emitClassMetadata;
     const removeNgModuleScope = !options.emitNgModuleScope;
-    if (removeClassMetadata || removeNgModuleScope) {
+    const removeSetClassDebugInfo = !options.emitSetClassDebugInfo;
+    if (removeClassMetadata || removeNgModuleScope || removeSetClassDebugInfo) {
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        transformers.before.push((0, remove_ivy_jit_support_calls_1.removeIvyJitSupportCalls)(removeClassMetadata, removeNgModuleScope, getTypeChecker));
+        transformers.before.push((0, remove_ivy_jit_support_calls_1.removeIvyJitSupportCalls)(removeClassMetadata, removeNgModuleScope, removeSetClassDebugInfo, getTypeChecker));
     }
     return transformers;
 }

package/src/transformers/find_image_domains.js

@@ -93,7 +93,7 @@ function findImageDomains(imageDomains) {
                 }
                 return node;
             }
-            function findPropertyAssignment(node) {
+            function findProvidersAssignment(node) {
                 if (ts.isPropertyAssignment(node)) {
                     if (ts.isIdentifier(node.name) && node.name.escapedText === 'providers') {
                         ts.visitEachChild(node.initializer, findImageLoaders, context);
@@ -101,18 +101,44 @@ function findImageDomains(imageDomains) {
                 }
                 return node;
             }
+            function findFeaturesAssignment(node) {
+                if (ts.isPropertyAssignment(node)) {
+                    if (ts.isIdentifier(node.name) &&
+                        node.name.escapedText === 'features' &&
+                        ts.isArrayLiteralExpression(node.initializer)) {
+                        const providerElement = node.initializer.elements.find(isProvidersFeatureElement);
+                        if (providerElement &&
+                            ts.isCallExpression(providerElement) &&
+                            providerElement.arguments[0]) {
+                            ts.visitEachChild(providerElement.arguments[0], findImageLoaders, context);
+                        }
+                    }
+                }
+                return node;
+            }
+            function isProvidersFeatureElement(node) {
+                return (ts.isCallExpression(node) &&
+                    ts.isPropertyAccessExpression(node.expression) &&
+                    ts.isIdentifier(node.expression.expression) &&
+                    node.expression.expression.escapedText === 'i0' &&
+                    ts.isIdentifier(node.expression.name) &&
+                    node.expression.name.escapedText === 'ɵɵProvidersFeature');
+            }
             function findPropertyDeclaration(node) {
                 if (ts.isPropertyDeclaration(node) &&
                     ts.isIdentifier(node.name) &&
-                    node.name.escapedText === 'ɵinj' &&
                     node.initializer &&
                     ts.isCallExpression(node.initializer) &&
                     node.initializer.arguments[0]) {
-                    ts.visitEachChild(node.initializer.arguments[0], findPropertyAssignment, context);
+                    if (node.name.escapedText === 'ɵinj') {
+                        ts.visitEachChild(node.initializer.arguments[0], findProvidersAssignment, context);
+                    }
+                    else if (node.name.escapedText === 'ɵcmp') {
+                        ts.visitEachChild(node.initializer.arguments[0], findFeaturesAssignment, context);
+                    }
                 }
                 return node;
             }
-            // Continue traversal if node is ClassDeclaration and has name "AppModule"
             function findClassDeclaration(node) {
                 if (ts.isClassDeclaration(node)) {
                     ts.visitEachChild(node, findPropertyDeclaration, context);

package/src/transformers/remove-ivy-jit-support-calls.d.ts

@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import * as ts from 'typescript';
-export declare function removeIvyJitSupportCalls(classMetadata: boolean, ngModuleScope: boolean, getTypeChecker: () => ts.TypeChecker): ts.TransformerFactory<ts.SourceFile>;
+export declare function removeIvyJitSupportCalls(classMetadata: boolean, ngModuleScope: boolean, debugInfo: boolean, getTypeChecker: () => ts.TypeChecker): ts.TransformerFactory<ts.SourceFile>;

package/src/transformers/remove-ivy-jit-support-calls.js

@@ -33,7 +33,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.removeIvyJitSupportCalls = void 0;
 const ts = __importStar(require("typescript"));
 const elide_imports_1 = require("./elide_imports");
-function removeIvyJitSupportCalls(classMetadata, ngModuleScope, getTypeChecker) {
+function removeIvyJitSupportCalls(classMetadata, ngModuleScope, debugInfo, getTypeChecker) {
     return (context) => {
         const removedNodes = [];
         const visitNode = (node) => {
@@ -55,6 +55,12 @@ function removeIvyJitSupportCalls(classMetadata, ngModuleScope, getTypeChecker)
                         return undefined;
                     }
                 }
+                if (debugInfo &&
+                    ts.isBinaryExpression(innerExpression) &&
+                    isIvyPrivateCallExpression(innerExpression.right, 'ɵsetClassDebugInfo')) {
+                    removedNodes.push(innerExpression);
+                    return undefined;
+                }
             }
             return ts.visitEachChild(node, visitNode, context);
         };

package/src/transformers/replace_resources.js

@@ -146,6 +146,10 @@ function transformInlineStyleLiteral(node, nodeFactory, isInlineStyle, inlineSty
     if (!ts.isStringLiteralLike(node)) {
         return node;
     }
+    // Don't transform empty strings as PostCSS will choke on them. No work to do anyways.
+    if (node.text === '') {
+        return node;
+    }
     if (!isInlineStyle) {
         const url = getResourceUrl(node);
         return url