@nx/angular 20.3.0-canary.20241210-ecba861 → 20.3.0-canary.20241212-0d1c960

package/migrations.json

@@ -1368,6 +1368,35 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "20.2.2-angular-eslint": {
+      "version": "20.2.2-beta.0",
+      "requires": {
+        "eslint": "^8.57.0 || ^9.0.0",
+        "@angular/core": ">= 19.0.0 < 20.0.0"
+      },
+      "packages": {
+        "angular-eslint": {
+          "version": "^19.0.2",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-eslint/eslint-plugin": {
+          "version": "^19.0.2",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-eslint/eslint-plugin-template": {
+          "version": "^19.0.2",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-eslint/template-parser": {
+          "version": "^19.0.2",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-eslint/utils": {
+          "version": "^19.0.2",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "20.3.0-canary.20241210-ecba861",
+  "version": "20.3.0-canary.20241212-0d1c960",
   "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.3.0-canary.20241210-ecba861",
-    "@nx/js": "20.3.0-canary.20241210-ecba861",
-    "@nx/eslint": "20.3.0-canary.20241210-ecba861",
-    "@nx/webpack": "20.3.0-canary.20241210-ecba861",
-    "@nx/module-federation": "20.3.0-canary.20241210-ecba861",
-    "@nx/web": "20.3.0-canary.20241210-ecba861",
-    "@nx/workspace": "20.3.0-canary.20241210-ecba861",
+    "@nx/devkit": "20.3.0-canary.20241212-0d1c960",
+    "@nx/js": "20.3.0-canary.20241212-0d1c960",
+    "@nx/eslint": "20.3.0-canary.20241212-0d1c960",
+    "@nx/webpack": "20.3.0-canary.20241212-0d1c960",
+    "@nx/module-federation": "20.3.0-canary.20241212-0d1c960",
+    "@nx/web": "20.3.0-canary.20241212-0d1c960",
+    "@nx/workspace": "20.3.0-canary.20241212-0d1c960",
     "piscina": "^4.4.0"
   },
   "peerDependencies": {

package/src/executors/application/utils/normalize-options.js

@@ -24,10 +24,11 @@ function normalizeOptions(options) {
             }
         }
     }
-    return {
-        ...options,
-        appShell: angularMajorVersion < 19 ? options.appShell ?? false : undefined,
-        prerender: angularMajorVersion < 19 ? options.prerender ?? false : undefined,
-        security,
-    };
+    let appShell = options.appShell;
+    let prerender = options.prerender;
+    if (angularMajorVersion < 19) {
+        appShell ??= false;
+        prerender ??= false;
+    }
+    return { ...options, appShell, prerender, security };
 }

package/src/generators/utils/add-vitest.js

@@ -4,46 +4,12 @@ exports.addVitest = addVitest;
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../utils/versions");
 async function addVitest(tree, options) {
-    if (!options.skipPackageJson) {
-        (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
-            '@analogjs/vitest-angular': versions_1.analogVitestAngular,
-            '@analogjs/vite-plugin-angular': versions_1.analogVitestAngular,
-        }, undefined, true);
-    }
-    const { createOrEditViteConfig, vitestGenerator } = (0, devkit_1.ensurePackage)('@nx/vite', versions_1.nxVersion);
-    const relativeTestSetupPath = (0, devkit_1.joinPathFragments)('src', 'test-setup.ts');
-    const setupFile = (0, devkit_1.joinPathFragments)(options.projectRoot, relativeTestSetupPath);
-    if (!tree.exists(setupFile)) {
-        tree.write(setupFile, `import '@analogjs/vitest-angular/setup-zone';
-
-import {
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting,
-} from '@angular/platform-browser-dynamic/testing';
-import { getTestBed } from '@angular/core/testing';
-
-getTestBed().initTestEnvironment(
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting()
-);
-`);
-        await vitestGenerator(tree, {
-            project: options.name,
-            uiFramework: 'none',
-            skipViteConfig: true,
-            testEnvironment: 'jsdom',
-            coverageProvider: 'v8',
-            addPlugin: false,
-        });
-        createOrEditViteConfig(tree, {
-            project: options.name,
-            includeLib: false,
-            includeVitest: true,
-            inSourceTests: false,
-            imports: [`import angular from '@analogjs/vite-plugin-angular'`],
-            plugins: ['angular()'],
-            setupFile: relativeTestSetupPath,
-            useEsmExtension: true,
-        }, true);
-    }
+    const { vitestGenerator } = (0, devkit_1.ensurePackage)('@nx/vite', versions_1.nxVersion);
+    await vitestGenerator(tree, {
+        project: options.name,
+        uiFramework: 'angular',
+        testEnvironment: 'jsdom',
+        coverageProvider: 'v8',
+        addPlugin: false,
+    });
 }

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

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

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

@@ -1,33 +1,62 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.rulesToRemove = void 0;
 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");
+exports.rulesToRemove = [
+    '@angular-eslint/no-host-metadata-property',
+    '@angular-eslint/sort-ngmodule-metadata-arrays',
+    '@angular-eslint/prefer-standalone-component',
+];
 async function default_1(tree) {
     const projects = await (0, projects_1.getProjectsFilteredByDependencies)(tree, [
         'npm:@angular/core',
     ]);
+    let hasRootProject = false;
     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');
+        if (root === '.') {
+            hasRootProject = true;
+        }
+        removeRules(tree, root);
+    }
+    /**
+     * We need to handle both a root config file (e.g. eslint.config.js) and a
+     * potential base config file (e.g. eslint.base.config.js). We can't use
+     * `findEslintFile` because it would return only one or the other depending
+     * on whether a root is provided and the existence of the files. So, we
+     * handle each of them separately.
+     */
+    // check root config, provide a root so it doesn't try to lookup a base config
+    if (!hasRootProject) {
+        // if there is no root project the root eslint config has not been processed
+        if ((0, eslint_file_1.isEslintConfigSupported)(tree, '')) {
+            removeRules(tree, '');
+        }
+    }
+    // handle root base config, not providing a root will prioritize a base config
+    const baseEslintConfig = (0, eslint_file_1.findEslintFile)(tree);
+    if (baseEslintConfig && baseEslintConfig.includes('.base.')) {
+        removeRules(tree, baseEslintConfig);
     }
     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;
+function removeRules(tree, root) {
+    for (const rule of exports.rulesToRemove) {
+        const lookup = (o) => !!o.rules?.[rule];
+        if (!(0, eslint_file_1.lintConfigHasOverride)(tree, root, lookup)) {
+            // it's not using the rule, skip
+            continue;
+        }
+        // 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;
+        });
     }
-    // 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/utils/backward-compatible-versions.d.ts

@@ -4,7 +4,7 @@ type LatestPackageVersionNames = Exclude<keyof typeof latestVersions, 'nxVersion
 type CompatPackageVersionNames = LatestPackageVersionNames;
 export type PackageVersionNames = LatestPackageVersionNames | CompatPackageVersionNames;
 export type VersionMap = {
-    angularV17: Record<Exclude<CompatPackageVersionNames, 'analogVitestAngular' | 'typescriptEslintVersion'>, string>;
+    angularV17: Record<Exclude<CompatPackageVersionNames, 'typescriptEslintVersion'>, string>;
     angularV18: Record<CompatPackageVersionNames, string>;
 };
 export type PackageLatestVersions = Record<LatestPackageVersionNames, string>;

package/src/utils/backward-compatible-versions.js

@@ -55,7 +55,6 @@ exports.backwardCompatibleVersions = {
         jestPresetAngularVersion: '~14.1.0',
         typesNodeVersion: '18.16.9',
         jasmineMarblesVersion: '^0.9.2',
-        analogVitestAngular: '~1.9.1',
         jsoncEslintParserVersion: '^2.1.0',
     },
 };

package/src/utils/versions.d.ts

@@ -14,7 +14,7 @@ export declare const typesExpressVersion = "4.17.14";
 export declare const browserSyncVersion = "^3.0.0";
 export declare const moduleFederationNodeVersion = "~2.6.11";
 export declare const moduleFederationEnhancedVersion = "0.7.6";
-export declare const angularEslintVersion = "^19.0.0";
+export declare const angularEslintVersion = "^19.0.2";
 export declare const typescriptEslintVersion = "^7.16.0";
 export declare const tailwindVersion = "^3.0.2";
 export declare const postcssVersion = "^8.4.5";
@@ -24,5 +24,4 @@ export declare const tsNodeVersion = "10.9.1";
 export declare const jestPresetAngularVersion = "~14.4.0";
 export declare const typesNodeVersion = "18.16.9";
 export declare const jasmineMarblesVersion = "^0.9.2";
-export declare const analogVitestAngular = "~1.10.0";
 export declare const jsoncEslintParserVersion = "^2.1.0";

package/src/utils/versions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.jsoncEslintParserVersion = exports.analogVitestAngular = exports.jasmineMarblesVersion = exports.typesNodeVersion = exports.jestPresetAngularVersion = exports.tsNodeVersion = exports.autoprefixerVersion = exports.postcssUrlVersion = exports.postcssVersion = exports.tailwindVersion = exports.typescriptEslintVersion = exports.angularEslintVersion = exports.moduleFederationEnhancedVersion = exports.moduleFederationNodeVersion = exports.browserSyncVersion = exports.typesExpressVersion = exports.expressVersion = exports.typesCorsVersion = exports.corsVersion = exports.tsLibVersion = exports.angularJsVersion = exports.zoneJsVersion = exports.rxjsVersion = exports.ngrxVersion = exports.ngPackagrVersion = exports.angularDevkitVersion = exports.angularVersion = exports.nxVersion = void 0;
+exports.jsoncEslintParserVersion = exports.jasmineMarblesVersion = exports.typesNodeVersion = exports.jestPresetAngularVersion = exports.tsNodeVersion = exports.autoprefixerVersion = exports.postcssUrlVersion = exports.postcssVersion = exports.tailwindVersion = exports.typescriptEslintVersion = exports.angularEslintVersion = exports.moduleFederationEnhancedVersion = exports.moduleFederationNodeVersion = exports.browserSyncVersion = exports.typesExpressVersion = exports.expressVersion = exports.typesCorsVersion = exports.corsVersion = exports.tsLibVersion = exports.angularJsVersion = exports.zoneJsVersion = exports.rxjsVersion = exports.ngrxVersion = exports.ngPackagrVersion = exports.angularDevkitVersion = exports.angularVersion = exports.nxVersion = void 0;
 exports.nxVersion = require('../../package.json').version;
 exports.angularVersion = '~19.0.0';
 exports.angularDevkitVersion = '~19.0.0';
@@ -17,7 +17,7 @@ exports.typesExpressVersion = '4.17.14';
 exports.browserSyncVersion = '^3.0.0';
 exports.moduleFederationNodeVersion = '~2.6.11';
 exports.moduleFederationEnhancedVersion = '0.7.6';
-exports.angularEslintVersion = '^19.0.0';
+exports.angularEslintVersion = '^19.0.2';
 exports.typescriptEslintVersion = '^7.16.0';
 exports.tailwindVersion = '^3.0.2';
 exports.postcssVersion = '^8.4.5';
@@ -27,5 +27,4 @@ exports.tsNodeVersion = '10.9.1';
 exports.jestPresetAngularVersion = '~14.4.0';
 exports.typesNodeVersion = '18.16.9';
 exports.jasmineMarblesVersion = '^0.9.2';
-exports.analogVitestAngular = '~1.10.0';
 exports.jsoncEslintParserVersion = '^2.1.0';