@ngtools/webpack 15.0.4 → 15.0.5

package/package.json

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

package/src/transformers/replace_resources.js

@@ -34,8 +34,6 @@ exports.getResourceUrl = exports.replaceResources = exports.NG_COMPONENT_RESOURC
 const ts = __importStar(require("typescript"));
 const inline_resource_1 = require("../loaders/inline-resource");
 exports.NG_COMPONENT_RESOURCE_QUERY = 'ngResource';
-/** Whether the current version of TypeScript is after 4.8. */
-const IS_TS_48 = isAfterVersion(4, 8);
 function replaceResources(shouldTransform, getTypeChecker, inlineStyleFileExtension) {
     return (context) => {
         const typeChecker = getTypeChecker();
@@ -43,8 +41,16 @@ function replaceResources(shouldTransform, getTypeChecker, inlineStyleFileExtens
         const moduleKind = context.getCompilerOptions().module;
         const nodeFactory = context.factory;
         const visitNode = (node) => {
+            var _a;
             if (ts.isClassDeclaration(node)) {
-                return visitClassDeclaration(nodeFactory, typeChecker, node, resourceImportDeclarations, moduleKind, inlineStyleFileExtension);
+                const decorators = ts.getDecorators(node);
+                if (!decorators || decorators.length === 0) {
+                    return node;
+                }
+                return nodeFactory.updateClassDeclaration(node, [
+                    ...decorators.map((current) => visitDecorator(nodeFactory, current, typeChecker, resourceImportDeclarations, moduleKind, inlineStyleFileExtension)),
+                    ...((_a = ts.getModifiers(node)) !== null && _a !== void 0 ? _a : []),
+                ], node.name, node.typeParameters, node.heritageClauses, node.members);
             }
             return ts.visitEachChild(node, visitNode, context);
         };
@@ -65,42 +71,6 @@ function replaceResources(shouldTransform, getTypeChecker, inlineStyleFileExtens
     };
 }
 exports.replaceResources = replaceResources;
-/**
- * Replaces the resources inside of a `ClassDeclaration`. This is a backwards-compatibility layer
- * to support TypeScript versions older than 4.8 where the decorators of a node were in a separate
- * array, rather than being part of its `modifiers` array.
- *
- * TODO: remove this function and use the `NodeFactory` directly once support for TypeScript
- * 4.6 and 4.7 has been dropped.
- */
-function visitClassDeclaration(nodeFactory, typeChecker, node, resourceImportDeclarations, moduleKind, inlineStyleFileExtension) {
-    var _a;
-    let decorators;
-    let modifiers;
-    if (IS_TS_48) {
-        (_a = node.modifiers) === null || _a === void 0 ? void 0 : _a.forEach((modifier) => {
-            if (ts.isDecorator(modifier)) {
-                decorators !== null && decorators !== void 0 ? decorators : (decorators = []);
-                decorators.push(modifier);
-            }
-            else {
-                modifiers = modifiers !== null && modifiers !== void 0 ? modifiers : (modifiers = []);
-                modifiers.push(modifier);
-            }
-        });
-    }
-    else {
-        decorators = node.decorators;
-        modifiers = node.modifiers;
-    }
-    if (!decorators || decorators.length === 0) {
-        return node;
-    }
-    decorators = decorators.map((current) => visitDecorator(nodeFactory, current, typeChecker, resourceImportDeclarations, moduleKind, inlineStyleFileExtension));
-    return IS_TS_48
-        ? nodeFactory.updateClassDeclaration(node, [...decorators, ...(modifiers !== null && modifiers !== void 0 ? modifiers : [])], node.name, node.typeParameters, node.heritageClauses, node.members)
-        : nodeFactory.updateClassDeclaration(node, decorators, modifiers, node.name, node.typeParameters, node.heritageClauses, node.members);
-}
 function visitDecorator(nodeFactory, node, typeChecker, resourceImportDeclarations, moduleKind, inlineStyleFileExtension) {
     if (!isComponentDecorator(node, typeChecker)) {
         return node;
@@ -258,16 +228,3 @@ function getDecoratorOrigin(decorator, typeChecker) {
     }
     return null;
 }
-/** Checks if the current version of TypeScript is after the specified major/minor versions. */
-function isAfterVersion(targetMajor, targetMinor) {
-    const [major, minor] = ts.versionMajorMinor.split('.').map((part) => parseInt(part));
-    if (major < targetMajor) {
-        return false;
-    }
-    else if (major > targetMajor) {
-        return true;
-    }
-    else {
-        return minor >= targetMinor;
-    }
-}