@nx/angular 20.2.0-canary.20241205-15060e3 → 20.2.0

package/migrations.json

@@ -314,6 +314,24 @@
       },
       "description": "Disable the Angular ESLint prefer-standalone rule if not set.",
       "factory": "./src/migrations/update-20-2-0/disable-angular-eslint-prefer-standalone"
+    },
+    "remove-angular-eslint-rules": {
+      "cli": "nx",
+      "version": "20.2.0-beta.8",
+      "requires": {
+        "@angular/core": ">=19.0.0"
+      },
+      "description": "Remove Angular ESLint rules that were removed in v19.0.0.",
+      "factory": "./src/migrations/update-20-2-0/remove-angular-eslint-rules"
+    },
+    "remove-tailwind-config-from-ng-packagr-executors": {
+      "cli": "nx",
+      "version": "20.2.0-beta.8",
+      "requires": {
+        "@angular/core": ">=19.0.0"
+      },
+      "description": "Remove the deprecated 'tailwindConfig' option from ng-packagr executors. Tailwind CSS configurations located at the project or workspace root will be picked up automatically.",
+      "factory": "./src/migrations/update-20-2-0/remove-tailwind-config-from-ng-packagr-executors"
     }
   },
   "packageJsonUpdates": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "20.2.0-canary.20241205-15060e3",
+  "version": "20.2.0",
   "private": false,
   "description": "The Nx Plugin for Angular contains executors, generators, and utilities for managing Angular applications and libraries within an Nx workspace. It provides: \n\n- Integration with libraries such as Storybook, Jest, ESLint, Tailwind CSS, Playwright and Cypress. \n\n- Generators to help scaffold code quickly (like: Micro Frontends, Libraries, both internal to your codebase and publishable to npm) \n\n- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -71,13 +71,13 @@
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
     "webpack-merge": "^5.8.0",
-    "@nx/devkit": "20.2.0-canary.20241205-15060e3",
-    "@nx/js": "20.2.0-canary.20241205-15060e3",
-    "@nx/eslint": "20.2.0-canary.20241205-15060e3",
-    "@nx/webpack": "20.2.0-canary.20241205-15060e3",
-    "@nx/module-federation": "20.2.0-canary.20241205-15060e3",
-    "@nx/web": "20.2.0-canary.20241205-15060e3",
-    "@nx/workspace": "20.2.0-canary.20241205-15060e3",
+    "@nx/devkit": "20.2.0",
+    "@nx/js": "20.2.0",
+    "@nx/eslint": "20.2.0",
+    "@nx/webpack": "20.2.0",
+    "@nx/module-federation": "20.2.0",
+    "@nx/web": "20.2.0",
+    "@nx/workspace": "20.2.0",
     "piscina": "^4.4.0"
   },
   "peerDependencies": {

package/src/migrations/update-20-2-0/remove-angular-eslint-rules.d.ts

@@ -0,0 +1,2 @@
+import { type Tree } from '@nx/devkit';
+export default function (tree: Tree): Promise<void>;

package/src/migrations/update-20-2-0/remove-angular-eslint-rules.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = default_1;
+const devkit_1 = require("@nx/devkit");
+const eslint_file_1 = require("@nx/eslint/src/generators/utils/eslint-file");
+const projects_1 = require("../utils/projects");
+async function default_1(tree) {
+    const projects = await (0, projects_1.getProjectsFilteredByDependencies)(tree, [
+        'npm:@angular/core',
+    ]);
+    for (const { project: { root }, } of projects) {
+        if (!(0, eslint_file_1.isEslintConfigSupported)(tree, root)) {
+            // ESLint config is not supported, skip
+            continue;
+        }
+        removeRule(tree, root, '@angular-eslint/no-host-metadata-property');
+        removeRule(tree, root, '@angular-eslint/sort-ngmodule-metadata-arrays');
+        removeRule(tree, root, '@angular-eslint/prefer-standalone-component');
+    }
+    await (0, devkit_1.formatFiles)(tree);
+}
+function removeRule(tree, root, rule) {
+    const lookup = (o) => !!o.rules?.[rule];
+    if (!(0, eslint_file_1.lintConfigHasOverride)(tree, root, lookup, true)) {
+        // it's not using the rule, skip
+        return;
+    }
+    // there is an override containing the rule, remove the rule
+    (0, eslint_file_1.updateOverrideInLintConfig)(tree, root, lookup, (o) => {
+        delete o.rules[rule];
+        return o;
+    });
+}

package/src/migrations/update-20-2-0/remove-tailwind-config-from-ng-packagr-executors.d.ts

@@ -0,0 +1,3 @@
+import { type Tree } from '@nx/devkit';
+export declare const executors: string[];
+export default function (tree: Tree): Promise<void>;

package/src/migrations/update-20-2-0/remove-tailwind-config-from-ng-packagr-executors.js

@@ -0,0 +1,73 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.executors = void 0;
+exports.default = default_1;
+const devkit_1 = require("@nx/devkit");
+const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
+exports.executors = ['@nx/angular:ng-packagr-lite', '@nx/angular:package'];
+async function default_1(tree) {
+    // update options from project configs
+    exports.executors.forEach((executor) => {
+        (0, executor_options_utils_1.forEachExecutorOptions)(tree, executor, (options, project, target, configuration) => {
+            if (options.tailwindConfig === undefined) {
+                return;
+            }
+            const projectConfiguration = (0, devkit_1.readProjectConfiguration)(tree, project);
+            if (configuration) {
+                const config = projectConfiguration.targets[target].configurations[configuration];
+                delete config.tailwindConfig;
+                if (!Object.keys(config).length) {
+                    delete projectConfiguration.targets[target].configurations[configuration];
+                }
+                if (!Object.keys(projectConfiguration.targets[target].configurations)
+                    .length) {
+                    delete projectConfiguration.targets[target].configurations;
+                }
+            }
+            else {
+                const config = projectConfiguration.targets[target].options;
+                delete config.tailwindConfig;
+                if (!Object.keys(config).length) {
+                    delete projectConfiguration.targets[target].options;
+                }
+            }
+            (0, devkit_1.updateProjectConfiguration)(tree, project, projectConfiguration);
+        });
+    });
+    // update options from nx.json target defaults
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    if (!nxJson.targetDefaults) {
+        return;
+    }
+    for (const [targetOrExecutor, targetConfig] of Object.entries(nxJson.targetDefaults)) {
+        if (!exports.executors.includes(targetOrExecutor) &&
+            !exports.executors.includes(targetConfig.executor)) {
+            continue;
+        }
+        if (targetConfig.options) {
+            delete targetConfig.options.tailwindConfig;
+            if (!Object.keys(targetConfig.options).length) {
+                delete targetConfig.options;
+            }
+        }
+        Object.entries(targetConfig.configurations ?? {}).forEach(([name, config]) => {
+            delete config.tailwindConfig;
+            if (!Object.keys(config).length) {
+                delete targetConfig.configurations[name];
+            }
+        });
+        if (!Object.keys(targetConfig.configurations ?? {}).length) {
+            delete targetConfig.configurations;
+        }
+        if (!Object.keys(targetConfig).length ||
+            (Object.keys(targetConfig).length === 1 &&
+                Object.keys(targetConfig)[0] === 'executor')) {
+            delete nxJson.targetDefaults[targetOrExecutor];
+        }
+        if (!Object.keys(nxJson.targetDefaults).length) {
+            delete nxJson.targetDefaults;
+        }
+    }
+    (0, devkit_1.updateNxJson)(tree, nxJson);
+    await (0, devkit_1.formatFiles)(tree);
+}