@nx/angular 23.0.0-pr.35465.2bc2643 → 23.0.0-rc.1

package/dist/src/migrations/update-20-2-0/disable-angular-eslint-prefer-standalone.js

@@ -0,0 +1,56 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = default_1;
+const devkit_1 = require("@nx/devkit");
+const internal_1 = require("@nx/eslint/internal");
+const projects_1 = require("../utils/projects");
+const preferStandaloneRule = '@angular-eslint/prefer-standalone';
+async function default_1(tree) {
+    const projects = await (0, projects_1.getProjectsFilteredByDependencies)([
+        'npm:@angular/core',
+    ]);
+    for (const graphNode of projects) {
+        const root = graphNode.data.root;
+        if (!(0, internal_1.isEslintConfigSupported)(tree, root)) {
+            // ESLint config is not supported, skip
+            continue;
+        }
+        if ((0, internal_1.lintConfigHasOverride)(tree, root, (o) => !!o.rules?.[preferStandaloneRule], true)) {
+            // the @angular-eslint/prefer-standalone rule is set in an override, skip
+            continue;
+        }
+        const ngEslintOverrideLookup = (o) => o.files?.includes('*.ts') &&
+            Object.keys(o.rules ?? {}).some((r) => r.startsWith('@angular-eslint/'));
+        const tsFilesOverrideLookup = (o) => o.files?.length === 1 && o.files[0] === '*.ts';
+        if ((0, internal_1.lintConfigHasOverride)(tree, root, ngEslintOverrideLookup, false)) {
+            // there is an override containing an Angular ESLint rule
+            (0, internal_1.updateOverrideInLintConfig)(tree, root, ngEslintOverrideLookup, (o) => {
+                o.rules = {
+                    ...o.rules,
+                    [preferStandaloneRule]: 'off',
+                };
+                return o;
+            });
+        }
+        else if ((0, internal_1.lintConfigHasOverride)(tree, root, tsFilesOverrideLookup, false)) {
+            // there is an override for just *.ts files
+            (0, internal_1.updateOverrideInLintConfig)(tree, root, tsFilesOverrideLookup, (o) => {
+                o.rules = {
+                    ...o.rules,
+                    [preferStandaloneRule]: 'off',
+                };
+                return o;
+            });
+        }
+        else {
+            // there are no overrides for any Angular ESLint rule or just *.ts files, add a new override
+            (0, internal_1.addOverrideToLintConfig)(tree, root, {
+                files: ['*.ts'],
+                rules: {
+                    [preferStandaloneRule]: 'off',
+                },
+            });
+        }
+    }
+    await (0, devkit_1.formatFiles)(tree);
+}

package/dist/src/migrations/update-20-2-0/disable-angular-eslint-prefer-standalone.md

@@ -0,0 +1,475 @@
+#### Disable Angular ESLint Prefer Standalone
+
+Disable the Angular ESLint prefer-standalone rule if not set.
+
+#### Sample Code Changes
+
+Update import paths for `withModuleFederation` and `withModuleFederationForSSR`.
+
+##### Before
+
+```json title="apps/app1/.eslintrc.json"
+{
+  "overrides": [
+    {
+      "files": ["*.html"],
+      "rules": {
+        "some-rule-for-html": "error"
+      }
+    }
+  ]
+}
+```
+
+##### After
+
+```json title="apps/app1/.eslintrc.json"
+{
+  "overrides": [
+    {
+      "files": ["*.html"],
+      "rules": {
+        "some-rule-for-html": "error"
+      }
+    },
+    {
+      "files": ["*.ts"],
+      "rules": {
+        "@angular-eslint/prefer-standalone": "off"
+      }
+    }
+  ]
+}
+```
+
+import {
+addProjectConfiguration,
+writeJson,
+type ProjectConfiguration,
+type ProjectGraph,
+type Tree,
+} from '@nx/devkit';
+import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
+import migration from './disable-angular-eslint-prefer-standalone';
+
+let projectGraph: ProjectGraph;
+jest.mock('@nx/devkit', () => ({
+...jest.requireActual('@nx/devkit'),
+createProjectGraphAsync: () => Promise.resolve(projectGraph),
+}));
+
+describe('disable-angular-eslint-prefer-standalone', () => {
+let tree: Tree;
+
+beforeEach(() => {
+tree = createTreeWithEmptyWorkspace();
+
+    const projectConfig: ProjectConfiguration = {
+      name: 'app1',
+      root: 'apps/app1',
+    };
+    projectGraph = {
+      dependencies: {
+        app1: [
+          {
+            source: 'app1',
+            target: 'npm:@angular/core',
+            type: 'static',
+          },
+        ],
+      },
+      nodes: {
+        app1: {
+          data: projectConfig,
+          name: 'app1',
+          type: 'app',
+        },
+      },
+    };
+    addProjectConfiguration(tree, projectConfig.name, projectConfig);
+
+});
+
+describe('.eslintrc.json', () => {
+it('should not disable @angular-eslint/prefer-standalone when it is set', async () => {
+writeJson(tree, 'apps/app1/.eslintrc.json', {
+overrides: [
+{
+files: ['*.ts'],
+rules: { '@angular-eslint/prefer-standalone': ['error'] },
+},
+],
+});
+
+      await migration(tree);
+
+      expect(tree.read('apps/app1/.eslintrc.json', 'utf8'))
+        .toMatchInlineSnapshot(`
+        "{
+          "overrides": [
+            {
+              "files": ["*.ts"],
+              "rules": {
+                "@angular-eslint/prefer-standalone": ["error"]
+              }
+            }
+          ]
+        }
+        "
+      `);
+    });
+
+    it('should not disable @angular-eslint/prefer-standalone when there are multiple overrides for angular eslint and the rule is set in one of them', async () => {
+      writeJson(tree, 'apps/app1/.eslintrc.json', {
+        overrides: [
+          {
+            files: ['*.ts'],
+            rules: {
+              '@angular-eslint/directive-selector': [
+                'error',
+                { type: 'attribute', prefix: 'app', style: 'camelCase' },
+              ],
+            },
+          },
+          {
+            files: ['*.ts'],
+            rules: { '@angular-eslint/prefer-standalone': ['error'] },
+          },
+        ],
+      });
+
+      await migration(tree);
+
+      expect(tree.read('apps/app1/.eslintrc.json', 'utf8'))
+        .toMatchInlineSnapshot(`
+        "{
+          "overrides": [
+            {
+              "files": ["*.ts"],
+              "rules": {
+                "@angular-eslint/directive-selector": [
+                  "error",
+                  {
+                    "type": "attribute",
+                    "prefix": "app",
+                    "style": "camelCase"
+                  }
+                ]
+              }
+            },
+            {
+              "files": ["*.ts"],
+              "rules": {
+                "@angular-eslint/prefer-standalone": ["error"]
+              }
+            }
+          ]
+        }
+        "
+      `);
+    });
+
+    it('should disable @angular-eslint/prefer-standalone in an existing override for angular eslint', async () => {
+      writeJson(tree, 'apps/app1/.eslintrc.json', {
+        overrides: [
+          {
+            files: ['*.ts'],
+            rules: { 'no-unused-vars': 'error' },
+          },
+          {
+            files: ['*.ts'],
+            rules: {
+              '@angular-eslint/directive-selector': [
+                'error',
+                { type: 'attribute', prefix: 'app', style: 'camelCase' },
+              ],
+            },
+          },
+        ],
+      });
+
+      await migration(tree);
+
+      expect(tree.read('apps/app1/.eslintrc.json', 'utf8'))
+        .toMatchInlineSnapshot(`
+        "{
+          "overrides": [
+            {
+              "files": ["*.ts"],
+              "rules": {
+                "no-unused-vars": "error"
+              }
+            },
+            {
+              "files": ["*.ts"],
+              "rules": {
+                "@angular-eslint/directive-selector": [
+                  "error",
+                  {
+                    "type": "attribute",
+                    "prefix": "app",
+                    "style": "camelCase"
+                  }
+                ],
+                "@angular-eslint/prefer-standalone": "off"
+              }
+            }
+          ]
+        }
+        "
+      `);
+    });
+
+    it('should disable @angular-eslint/prefer-standalone in an existing override for ts files', async () => {
+      writeJson(tree, 'apps/app1/.eslintrc.json', {
+        overrides: [
+          {
+            files: ['*.ts'],
+            rules: { 'no-unused-vars': 'error' },
+          },
+        ],
+      });
+
+      await migration(tree);
+
+      expect(tree.read('apps/app1/.eslintrc.json', 'utf8'))
+        .toMatchInlineSnapshot(`
+        "{
+          "overrides": [
+            {
+              "files": ["*.ts"],
+              "rules": {
+                "no-unused-vars": "error",
+                "@angular-eslint/prefer-standalone": "off"
+              }
+            }
+          ]
+        }
+        "
+      `);
+    });
+
+    it('should disable @angular-eslint/prefer-standalone in a new override', async () => {
+      writeJson(tree, 'apps/app1/.eslintrc.json', {
+        overrides: [
+          {
+            files: ['*.html'],
+            rules: { 'some-rule-for-html': 'error' },
+          },
+        ],
+      });
+
+      await migration(tree);
+
+      expect(tree.read('apps/app1/.eslintrc.json', 'utf8'))
+        .toMatchInlineSnapshot(`
+        "{
+          "overrides": [
+            {
+              "files": ["*.html"],
+              "rules": {
+                "some-rule-for-html": "error"
+              }
+            },
+            {
+              "files": ["*.ts"],
+              "rules": {
+                "@angular-eslint/prefer-standalone": "off"
+              }
+            }
+          ]
+        }
+        "
+      `);
+    });
+
+});
+
+describe('flat config', () => {
+it('should not disable @angular-eslint/prefer-standalone when it is set', async () => {
+tree.write('eslint.config.js', 'module.exports = [];');
+tree.write(
+'apps/app1/eslint.config.js',
+`module.exports = [
+          {
+            files: ['*.ts'],
+            rules: { '@angular-eslint/prefer-standalone': ['error'] },
+          },
+        ];
+        `
+);
+
+      await migration(tree);
+
+      expect(tree.read('apps/app1/eslint.config.js', 'utf8'))
+        .toMatchInlineSnapshot(`
+        "module.exports = [
+          {
+            files: ['*.ts'],
+            rules: { '@angular-eslint/prefer-standalone': ['error'] },
+          },
+        ];
+        "
+      `);
+    });
+
+    it('should not disable @angular-eslint/prefer-standalone when there are multiple overrides for angular eslint and the rule is set in one of them', async () => {
+      tree.write('eslint.config.js', 'module.exports = [];');
+      tree.write(
+        'apps/app1/eslint.config.js',
+        `module.exports = [
+          {
+            files: ['*.ts'],
+            rules: {
+              '@angular-eslint/directive-selector': [
+                'error',
+                { type: 'attribute', prefix: 'app', style: 'camelCase' },
+              ],
+            },
+          },
+          {
+            files: ['*.ts'],
+            rules: { '@angular-eslint/prefer-standalone': ['error'] },
+          },
+        ];
+        `
+      );
+
+      await migration(tree);
+
+      expect(tree.read('apps/app1/eslint.config.js', 'utf8'))
+        .toMatchInlineSnapshot(`
+        "module.exports = [
+          {
+            files: ['*.ts'],
+            rules: {
+              '@angular-eslint/directive-selector': [
+                'error',
+                { type: 'attribute', prefix: 'app', style: 'camelCase' },
+              ],
+            },
+          },
+          {
+            files: ['*.ts'],
+            rules: { '@angular-eslint/prefer-standalone': ['error'] },
+          },
+        ];
+        "
+      `);
+    });
+
+    it('should disable @angular-eslint/prefer-standalone in an existing override for angular eslint', async () => {
+      tree.write('eslint.config.js', 'module.exports = [];');
+      tree.write(
+        'apps/app1/eslint.config.js',
+        `module.exports = [
+          {
+            files: ['*.ts'],
+            rules: { 'no-unused-vars': 'error' },
+          },
+          {
+            files: ['*.ts'],
+            rules: {
+              '@angular-eslint/directive-selector': [
+                'error',
+                { type: 'attribute', prefix: 'app', style: 'camelCase' },
+              ],
+            },
+          },
+        ];
+        `
+      );
+
+      await migration(tree);
+
+      expect(tree.read('apps/app1/eslint.config.js', 'utf8'))
+        .toMatchInlineSnapshot(`
+        "module.exports = [
+          {
+            files: ['*.ts'],
+            rules: { 'no-unused-vars': 'error' },
+          },
+          {
+            files: ['**/*.ts'],
+            rules: {
+              '@angular-eslint/directive-selector': [
+                'error',
+                {
+                  type: 'attribute',
+                  prefix: 'app',
+                  style: 'camelCase',
+                },
+              ],
+              '@angular-eslint/prefer-standalone': 'off',
+            },
+          },
+        ];
+        "
+      `);
+    });
+
+    it('should disable @angular-eslint/prefer-standalone in an existing override for ts files', async () => {
+      tree.write('eslint.config.js', 'module.exports = [];');
+      tree.write(
+        'apps/app1/eslint.config.js',
+        `module.exports = [
+          {
+            files: ['*.ts'],
+            rules: { 'no-unused-vars': 'error' },
+          },
+        ];
+        `
+      );
+
+      await migration(tree);
+
+      expect(tree.read('apps/app1/eslint.config.js', 'utf8'))
+        .toMatchInlineSnapshot(`
+        "module.exports = [
+          {
+            files: ['**/*.ts'],
+            rules: {
+              'no-unused-vars': 'error',
+              '@angular-eslint/prefer-standalone': 'off',
+            },
+          },
+        ];
+        "
+      `);
+    });
+
+    it('should disable @angular-eslint/prefer-standalone in a new override', async () => {
+      tree.write('eslint.config.js', 'module.exports = [];');
+      tree.write(
+        'apps/app1/eslint.config.js',
+        `module.exports = [
+          {
+            files: ['*.html'],
+            rules: { 'some-rule-for-html': 'error' },
+          },
+        ];
+        `
+      );
+
+      await migration(tree);
+
+      expect(tree.read('apps/app1/eslint.config.js', 'utf8'))
+        .toMatchInlineSnapshot(`
+        "module.exports = [
+          {
+            files: ['*.html'],
+            rules: { 'some-rule-for-html': 'error' },
+          },
+          {
+            files: ['**/*.ts'],
+            rules: {
+              '@angular-eslint/prefer-standalone': 'off',
+            },
+          },
+        ];
+        "
+      `);
+    });
+
+});
+});

package/dist/src/migrations/update-20-2-0/migrate-mf-imports-to-new-package.d.ts

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

package/dist/src/migrations/update-20-2-0/migrate-mf-imports-to-new-package.md

@@ -0,0 +1,19 @@
+#### Migrate Module Federation Imports to New Package
+
+Update the ModuleFederationConfig imports to use @nx/module-federation.
+
+#### Sample Code Changes
+
+Update import paths for ModuleFederationConfig.
+
+##### Before
+
+```js title="apps/shell/webpack.config.js"
+import { ModuleFederationConfig } from '@nx/webpack';
+```
+
+##### After
+
+```js title="apps/shell/webpack.config.js"
+import { ModuleFederationConfig } from '@nx/module-federation';
+```

package/dist/src/migrations/update-20-2-0/migrate-with-mf-import-to-new-package.d.ts

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

package/dist/src/migrations/update-20-2-0/migrate-with-mf-import-to-new-package.js

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = migrateWithMfImport;
+const internal_1 = require("@nx/devkit/internal");
+const devkit_1 = require("@nx/devkit");
+const tsquery_1 = require("@phenomnomnominal/tsquery");
+const versions_1 = require("../../utils/versions");
+const NX_ANGULAR_MODULE_FEDERATION_IMPORT_SELECTOR = 'ImportDeclaration > StringLiteral[value=@nx/angular/module-federation], VariableStatement CallExpression:has(Identifier[name=require]) > StringLiteral[value=@nx/angular/module-federation]';
+const NEW_IMPORT_PATH = `'@nx/module-federation/angular'`;
+async function migrateWithMfImport(tree) {
+    const projects = new Set();
+    (0, internal_1.forEachExecutorOptions)(tree, '@nx/angular:webpack-browser', (options, project, target) => {
+        const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, project);
+        projects.add(projectConfig.root);
+    });
+    for (const projectRoot of projects) {
+        (0, devkit_1.visitNotIgnoredFiles)(tree, projectRoot, (filePath) => {
+            if (!filePath.endsWith('.ts') && !filePath.endsWith('.js')) {
+                return;
+            }
+            let contents = tree.read(filePath, 'utf-8');
+            if (!contents.includes('@nx/angular/module-federation')) {
+                return;
+            }
+            const sourceFile = (0, tsquery_1.ast)(contents);
+            const importNodes = (0, tsquery_1.query)(sourceFile, NX_ANGULAR_MODULE_FEDERATION_IMPORT_SELECTOR);
+            if (importNodes.length === 0) {
+                return;
+            }
+            const importPathNode = importNodes[0];
+            contents = `${contents.slice(0, importPathNode.getStart())}${NEW_IMPORT_PATH}${contents.slice(importPathNode.getEnd())}`;
+            tree.write(filePath, contents);
+        });
+    }
+    if (projects.size !== 0) {
+        (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
+            '@nx/module-federation': versions_1.nxVersion,
+        });
+    }
+    await (0, devkit_1.formatFiles)(tree);
+}

package/dist/src/migrations/update-20-2-0/migrate-with-mf-import-to-new-package.md

@@ -0,0 +1,25 @@
+#### Migrate withModuleFederation Import to New Package
+
+Update the withModuleFederation import to use @nx/module-federation/webpack.
+
+#### Sample Code Changes
+
+Update import paths for `withModuleFederation` and `withModuleFederationForSSR`.
+
+##### Before
+
+```ts title="apps/shell/webpack.config.ts"
+import {
+  withModuleFederation,
+  withModuleFederationForSSR,
+} from '@nx/angular/module-federation';
+```
+
+##### After
+
+```ts title="apps/shell/webpack.config.ts"
+import {
+  withModuleFederation,
+  withModuleFederationForSSR,
+} from '@nx/module-federation/angular';
+```

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

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

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

@@ -0,0 +1,63 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.rulesToRemove = void 0;
+exports.default = default_1;
+const devkit_1 = require("@nx/devkit");
+const internal_1 = require("@nx/eslint/internal");
+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)([
+        'npm:@angular/core',
+    ]);
+    let hasRootProject = false;
+    for (const graphNode of projects) {
+        const root = graphNode.data.root;
+        if (!(0, internal_1.isEslintConfigSupported)(tree, root)) {
+            // ESLint config is not supported, skip
+            continue;
+        }
+        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, internal_1.isEslintConfigSupported)(tree, '')) {
+            removeRules(tree, '');
+        }
+    }
+    // handle root base config, not providing a root will prioritize a base config
+    const baseEslintConfig = (0, internal_1.findEslintFile)(tree);
+    if (baseEslintConfig && baseEslintConfig.includes('.base.')) {
+        removeRules(tree, baseEslintConfig);
+    }
+    await (0, devkit_1.formatFiles)(tree);
+}
+function removeRules(tree, root) {
+    for (const rule of exports.rulesToRemove) {
+        const lookup = (o) => !!o.rules?.[rule];
+        if (!(0, internal_1.lintConfigHasOverride)(tree, root, lookup)) {
+            // it's not using the rule, skip
+            continue;
+        }
+        // there is an override containing the rule, remove the rule
+        (0, internal_1.updateOverrideInLintConfig)(tree, root, lookup, (o) => {
+            delete o.rules[rule];
+            return o;
+        });
+    }
+}