@nx/angular 17.3.0-beta.3 → 17.3.0-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "17.3.0-beta.3",
+  "version": "17.3.0-beta.4",
   "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, 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- Upgrading AngularJS applications \n\n- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -78,15 +78,15 @@
     "tslib": "^2.3.0",
     "webpack": "^5.80.0",
     "webpack-merge": "^5.8.0",
-    "@nx/devkit": "17.3.0-beta.3",
-    "@nx/cypress": "17.3.0-beta.3",
-    "@nx/jest": "17.3.0-beta.3",
-    "@nx/js": "17.3.0-beta.3",
-    "@nx/eslint": "17.3.0-beta.3",
-    "@nx/webpack": "17.3.0-beta.3",
-    "@nx/web": "17.3.0-beta.3",
-    "@nx/workspace": "17.3.0-beta.3",
-    "@nrwl/angular": "17.3.0-beta.3"
+    "@nx/devkit": "17.3.0-beta.4",
+    "@nx/cypress": "17.3.0-beta.4",
+    "@nx/jest": "17.3.0-beta.4",
+    "@nx/js": "17.3.0-beta.4",
+    "@nx/eslint": "17.3.0-beta.4",
+    "@nx/webpack": "17.3.0-beta.4",
+    "@nx/web": "17.3.0-beta.4",
+    "@nx/workspace": "17.3.0-beta.4",
+    "@nrwl/angular": "17.3.0-beta.4"
   },
   "peerDependencies": {
     "@angular-devkit/build-angular": ">= 15.0.0 < 18.0.0",

package/src/generators/application/application.js

@@ -2,9 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.applicationGeneratorInternal = exports.applicationGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
+const js_1 = require("@nx/js");
 const init_1 = require("../init/init");
 const setup_ssr_1 = require("../setup-ssr/setup-ssr");
 const setup_tailwind_1 = require("../setup-tailwind/setup-tailwind");
+const ensure_angular_dependencies_1 = require("../utils/ensure-angular-dependencies");
 const lib_1 = require("./lib");
 async function applicationGenerator(tree, schema) {
     return await applicationGeneratorInternal(tree, {
@@ -16,10 +18,17 @@ exports.applicationGenerator = applicationGenerator;
 async function applicationGeneratorInternal(tree, schema) {
     const options = await (0, lib_1.normalizeOptions)(tree, schema);
     const rootOffset = (0, devkit_1.offsetFromRoot)(options.appProjectRoot);
+    await (0, js_1.initGenerator)(tree, {
+        ...options,
+        tsConfigName: options.rootProject ? 'tsconfig.json' : 'tsconfig.base.json',
+        js: false,
+        skipFormat: true,
+    });
     await (0, init_1.angularInitGenerator)(tree, {
         ...options,
         skipFormat: true,
     });
+    (0, ensure_angular_dependencies_1.ensureAngularDependencies)(tree);
     (0, lib_1.createProject)(tree, options);
     await (0, lib_1.createFiles)(tree, options, rootOffset);
     if (options.addTailwind) {
@@ -33,6 +42,7 @@ async function applicationGeneratorInternal(tree, schema) {
     await (0, lib_1.addUnitTestRunner)(tree, options);
     await (0, lib_1.addE2e)(tree, options);
     (0, lib_1.updateEditorTsConfig)(tree, options);
+    (0, lib_1.setGeneratorDefaults)(tree, options);
     if (options.rootProject) {
         const nxJson = (0, devkit_1.readNxJson)(tree);
         nxJson.defaultProject = options.name;

package/src/generators/application/lib/add-unit-test-runner.js

@@ -1,32 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addUnitTestRunner = void 0;
-const devkit_1 = require("@nx/devkit");
-const jest_1 = require("@nx/jest");
 const test_runners_1 = require("../../../utils/test-runners");
+const add_jest_1 = require("../../utils/add-jest");
 async function addUnitTestRunner(host, options) {
     if (options.unitTestRunner === test_runners_1.UnitTestRunner.Jest) {
-        await (0, jest_1.configurationGenerator)(host, {
-            ...options,
-            project: options.name,
-            setupFile: 'angular',
-            supportTsx: false,
-            skipSerializers: false,
+        await (0, add_jest_1.addJest)(host, {
+            name: options.name,
+            projectRoot: options.appProjectRoot,
             skipPackageJson: options.skipPackageJson,
-            skipFormat: true,
+            strict: options.strict,
         });
-        const setupFile = (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'src', 'test-setup.ts');
-        if (options.strict && host.exists(setupFile)) {
-            const contents = host.read(setupFile, 'utf-8');
-            host.write(setupFile, `// @ts-expect-error https://thymikee.github.io/jest-preset-angular/docs/getting-started/test-environment
-globalThis.ngJest = {
-  testEnvironmentOptions: {
-    errorOnUnknownElements: true,
-    errorOnUnknownProperties: true,
-  },
-};
-${contents}`);
-        }
     }
 }
 exports.addUnitTestRunner = addUnitTestRunner;

package/src/generators/application/lib/index.d.ts

@@ -8,4 +8,5 @@ export * from './enable-strict-type-checking';
 export * from './normalize-options';
 export * from './normalized-schema';
 export * from './set-app-strict-default';
+export * from './set-generator-defaults';
 export * from './update-editor-tsconfig';

package/src/generators/application/lib/index.js

@@ -11,4 +11,5 @@ tslib_1.__exportStar(require("./enable-strict-type-checking"), exports);
 tslib_1.__exportStar(require("./normalize-options"), exports);
 tslib_1.__exportStar(require("./normalized-schema"), exports);
 tslib_1.__exportStar(require("./set-app-strict-default"), exports);
+tslib_1.__exportStar(require("./set-generator-defaults"), exports);
 tslib_1.__exportStar(require("./update-editor-tsconfig"), exports);

package/src/generators/application/lib/set-generator-defaults.d.ts

@@ -0,0 +1,3 @@
+import { type Tree } from '@nx/devkit';
+import type { NormalizedSchema } from './normalized-schema';
+export declare function setGeneratorDefaults(tree: Tree, options: NormalizedSchema): void;

package/src/generators/application/lib/set-generator-defaults.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setGeneratorDefaults = void 0;
+const devkit_1 = require("@nx/devkit");
+function setGeneratorDefaults(tree, options) {
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    nxJson.generators = nxJson.generators ?? {};
+    nxJson.generators['@nx/angular:application'] = {
+        e2eTestRunner: options.e2eTestRunner,
+        linter: options.linter,
+        style: options.style,
+        unitTestRunner: options.unitTestRunner,
+        ...(nxJson.generators['@nx/angular:application'] || {}),
+    };
+    (0, devkit_1.updateNxJson)(tree, nxJson);
+}
+exports.setGeneratorDefaults = setGeneratorDefaults;

package/src/generators/component/component.js

@@ -48,6 +48,7 @@ async function componentGeneratorInternal(tree, rawOptions) {
         (0, utils_1.addToNgModule)(tree, options.directory, modulePath, options.name, options.symbolName, options.fileName, 'declarations', true, options.export);
     }
     (0, lib_1.exportComponentInEntryPoint)(tree, options);
+    (0, lib_1.setGeneratorDefaults)(tree, options);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }

package/src/generators/component/lib/index.d.ts

@@ -1,3 +1,4 @@
 export * from './component';
 export * from './module';
 export * from './normalize-options';
+export * from './set-generator-defaults';

package/src/generators/component/lib/index.js

@@ -4,3 +4,4 @@ const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./component"), exports);
 tslib_1.__exportStar(require("./module"), exports);
 tslib_1.__exportStar(require("./normalize-options"), exports);
+tslib_1.__exportStar(require("./set-generator-defaults"), exports);

package/src/generators/component/lib/set-generator-defaults.d.ts

@@ -0,0 +1,3 @@
+import { type Tree } from '@nx/devkit';
+import type { NormalizedSchema } from '../schema';
+export declare function setGeneratorDefaults(tree: Tree, options: NormalizedSchema): void;

package/src/generators/component/lib/set-generator-defaults.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setGeneratorDefaults = void 0;
+const devkit_1 = require("@nx/devkit");
+function setGeneratorDefaults(tree, options) {
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    nxJson.generators = nxJson.generators ?? {};
+    nxJson.generators['@nx/angular:component'] = {
+        style: options.style,
+        ...(nxJson.generators['@nx/angular:component'] || {}),
+    };
+    (0, devkit_1.updateNxJson)(tree, nxJson);
+}
+exports.setGeneratorDefaults = setGeneratorDefaults;

package/src/generators/init/init.d.ts

@@ -1,4 +1,4 @@
-import { GeneratorCallback, Tree } from '@nx/devkit';
+import { type GeneratorCallback, type Tree } from '@nx/devkit';
 import { Schema } from './schema';
-export declare function angularInitGenerator(tree: Tree, rawOptions: Schema): Promise<GeneratorCallback>;
+export declare function angularInitGenerator(tree: Tree, options: Schema): Promise<GeneratorCallback>;
 export default angularInitGenerator;

package/src/generators/init/init.js

@@ -2,151 +2,33 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.angularInitGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
-const jest_1 = require("@nx/jest");
-const eslint_1 = require("@nx/eslint");
-const js_1 = require("@nx/js");
-const test_runners_1 = require("../../utils/test-runners");
 const version_utils_1 = require("../utils/version-utils");
-const versions_1 = require("../../utils/versions");
-async function angularInitGenerator(tree, rawOptions) {
-    const tasks = [];
-    const options = normalizeOptions(rawOptions);
-    const pkgVersions = (0, version_utils_1.versions)(tree);
-    const peerDepsToInstall = ['@angular-devkit/core'];
-    let devkitVersion;
-    peerDepsToInstall.forEach((pkg) => {
-        const packageVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, pkg);
-        if (!packageVersion) {
-            devkitVersion ??=
-                (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular-devkit/build-angular') ??
-                    pkgVersions.angularDevkitVersion;
-            try {
-                (0, devkit_1.ensurePackage)(pkg, devkitVersion);
-            }
-            catch {
-                // @schematics/angular cannot be required so this fails but this will still allow wrapping the schematic later on
-            }
-            if (!options.skipPackageJson) {
-                tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, { [pkg]: devkitVersion }));
-            }
-        }
-    });
-    setDefaults(tree, options);
-    const jsTask = await (0, js_1.initGenerator)(tree, {
-        ...options,
-        tsConfigName: options.rootProject ? 'tsconfig.json' : 'tsconfig.base.json',
-        js: false,
-        skipFormat: true,
-    });
-    tasks.push(jsTask);
-    if (!options.skipPackageJson) {
-        tasks.push(updateDependencies(tree, pkgVersions));
-    }
-    const unitTestTask = await addUnitTestRunner(tree, options, pkgVersions.jestPresetAngularVersion);
-    tasks.push(unitTestTask);
-    const e2eTask = await addE2ETestRunner(tree, options);
-    tasks.push(e2eTask);
+async function angularInitGenerator(tree, options) {
     ignoreAngularCacheDirectory(tree);
+    const installTask = installAngularDevkitCoreIfMissing(tree, options);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
-    return (0, devkit_1.runTasksInSerial)(...tasks);
+    return installTask;
 }
 exports.angularInitGenerator = angularInitGenerator;
-function normalizeOptions(options) {
-    return {
-        e2eTestRunner: options.e2eTestRunner ?? test_runners_1.E2eTestRunner.Cypress,
-        linter: options.linter ?? eslint_1.Linter.EsLint,
-        skipFormat: options.skipFormat ?? false,
-        skipInstall: options.skipInstall ?? false,
-        skipPackageJson: options.skipPackageJson ?? false,
-        style: options.style ?? 'css',
-        unitTestRunner: options.unitTestRunner ?? test_runners_1.UnitTestRunner.Jest,
-        rootProject: options.rootProject,
-    };
-}
-function setDefaults(host, options) {
-    const nxJson = (0, devkit_1.readNxJson)(host);
-    nxJson.generators = nxJson.generators || {};
-    nxJson.generators['@nx/angular:application'] = {
-        style: options.style,
-        linter: options.linter,
-        unitTestRunner: options.unitTestRunner,
-        e2eTestRunner: options.e2eTestRunner,
-        ...(nxJson.generators['@nx/angular:application'] || {}),
-    };
-    nxJson.generators['@nx/angular:library'] = {
-        linter: options.linter,
-        unitTestRunner: options.unitTestRunner,
-        ...(nxJson.generators['@nx/angular:library'] || {}),
-    };
-    nxJson.generators['@nx/angular:component'] = {
-        style: options.style,
-        ...(nxJson.generators['@nx/angular:component'] || {}),
-    };
-    (0, devkit_1.updateNxJson)(host, nxJson);
-}
-function updateDependencies(tree, versions) {
-    const angularVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular/core') ??
-        versions.angularVersion;
-    const angularDevkitVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular-devkit/build-angular') ??
-        versions.angularDevkitVersion;
-    const rxjsVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, 'rxjs') ?? versions.rxjsVersion;
-    const tsLibVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, 'tslib') ?? versions.tsLibVersion;
-    const zoneJsVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, 'zone.js') ?? versions.zoneJsVersion;
-    return (0, version_utils_1.addDependenciesToPackageJsonIfDontExist)(tree, {
-        '@angular/animations': angularVersion,
-        '@angular/common': angularVersion,
-        '@angular/compiler': angularVersion,
-        '@angular/core': angularVersion,
-        '@angular/forms': angularVersion,
-        '@angular/platform-browser': angularVersion,
-        '@angular/platform-browser-dynamic': angularVersion,
-        '@angular/router': angularVersion,
-        rxjs: rxjsVersion,
-        tslib: tsLibVersion,
-        'zone.js': zoneJsVersion,
-    }, {
-        '@angular/cli': angularDevkitVersion,
-        '@angular/compiler-cli': angularVersion,
-        '@angular/language-service': angularVersion,
-        '@angular-devkit/build-angular': angularDevkitVersion,
-        '@angular-devkit/schematics': angularDevkitVersion,
-        '@schematics/angular': angularDevkitVersion,
-    });
-}
-async function addUnitTestRunner(tree, options, jestPresetAngularVersion) {
-    switch (options.unitTestRunner) {
-        case test_runners_1.UnitTestRunner.Jest:
-            if (!options.skipPackageJson) {
-                process.env.npm_config_legacy_peer_deps ??= 'true';
-                (0, version_utils_1.addDependenciesToPackageJsonIfDontExist)(tree, {}, {
-                    'jest-preset-angular': jestPresetAngularVersion,
-                });
-            }
-            return (0, jest_1.jestInitGenerator)(tree, {
-                skipPackageJson: options.skipPackageJson,
-            });
-        default:
-            return () => { };
-    }
-}
-async function addE2ETestRunner(tree, options) {
-    switch (options.e2eTestRunner) {
-        case test_runners_1.E2eTestRunner.Cypress:
-            const { cypressInitGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
-            return cypressInitGenerator(tree, {
-                skipPackageJson: options.skipPackageJson,
-            });
-        case test_runners_1.E2eTestRunner.Playwright:
-            const { initGenerator: playwrightInitGenerator } = (0, devkit_1.ensurePackage)('@nx/playwright', versions_1.nxVersion);
-            return playwrightInitGenerator(tree, {
-                skipFormat: true,
-                skipPackageJson: options.skipPackageJson,
-            });
-        default:
-            return () => { };
+function installAngularDevkitCoreIfMissing(tree, options) {
+    const packageVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular-devkit/core');
+    if (!packageVersion) {
+        const pkgVersions = (0, version_utils_1.versions)(tree);
+        const devkitVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular-devkit/build-angular') ??
+            pkgVersions.angularDevkitVersion;
+        try {
+            (0, devkit_1.ensurePackage)('@angular-devkit/core', devkitVersion);
+        }
+        catch {
+            // @schematics/angular cannot be required so this fails but this will still allow wrapping the schematic later on
+        }
+        if (!options.skipPackageJson) {
+            return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { ['@angular-devkit/core']: devkitVersion });
+        }
     }
+    return () => { };
 }
 function ignoreAngularCacheDirectory(tree) {
     const { cli } = (0, devkit_1.readNxJson)(tree);

package/src/generators/init/schema.d.ts

@@ -1,14 +1,5 @@
-import { Linter } from '@nx/eslint';
-import { E2eTestRunner, UnitTestRunner } from '../../utils/test-runners';
-import type { Styles } from '../utils/types';
-
 export interface Schema {
-  unitTestRunner?: UnitTestRunner;
-  e2eTestRunner?: E2eTestRunner;
   skipFormat?: boolean;
   skipInstall?: boolean;
-  style?: Styles;
-  linter?: Linter;
   skipPackageJson?: boolean;
-  rootProject?: boolean;
 }

package/src/generators/init/schema.json

@@ -5,28 +5,7 @@
   "title": "Init Angular Plugin",
   "description": "Initializes the `@nx/angular` plugin. NOTE: Does not work in the `--dry-run` mode.",
   "type": "object",
-  "examples": [
-    {
-      "command": "nx g @nx/angular:init --style=scss",
-      "description": "Installs angular dependencies and initializes the `@nx/angular` plugin with the `scss` stylesheet format."
-    }
-  ],
   "properties": {
-    "unitTestRunner": {
-      "type": "string",
-      "enum": ["jest", "none"],
-      "description": "Test runner to use for unit tests.",
-      "default": "jest",
-      "x-priority": "important"
-    },
-    "e2eTestRunner": {
-      "type": "string",
-      "enum": ["cypress", "playwright", "none"],
-      "x-prompt": "Which E2E test runner would you like to use?",
-      "description": "Test runner to use for end to end (e2e) tests.",
-      "default": "cypress",
-      "x-priority": "important"
-    },
     "skipInstall": {
       "type": "boolean",
       "description": "Skip installing after adding `@nx/workspace`.",
@@ -39,41 +18,6 @@
       "default": false,
       "x-priority": "internal"
     },
-    "linter": {
-      "description": "The tool to use for running lint checks.",
-      "type": "string",
-      "enum": ["eslint", "none"],
-      "default": "eslint",
-      "x-priority": "important"
-    },
-    "style": {
-      "description": "The file extension to be used for style files.",
-      "type": "string",
-      "default": "css",
-      "enum": ["css", "scss", "sass", "less"],
-      "x-prompt": {
-        "message": "Which stylesheet format would you like to use?",
-        "type": "list",
-        "items": [
-          {
-            "value": "css",
-            "label": "CSS"
-          },
-          {
-            "value": "scss",
-            "label": "SASS(.scss)  [ http://sass-lang.com   ]"
-          },
-          {
-            "value": "sass",
-            "label": "SASS(.sass)  [ http://sass-lang.com   ]"
-          },
-          {
-            "value": "less",
-            "label": "LESS         [ http://lesscss.org     ]"
-          }
-        ]
-      }
-    },
     "skipPackageJson": {
       "type": "boolean",
       "default": false,

package/src/generators/library/lib/set-generator-defaults.d.ts

@@ -0,0 +1,3 @@
+import { type Tree } from '@nx/devkit';
+import type { NormalizedSchema } from './normalized-schema';
+export declare function setGeneratorDefaults(tree: Tree, options: NormalizedSchema): void;

package/src/generators/library/lib/set-generator-defaults.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setGeneratorDefaults = void 0;
+const devkit_1 = require("@nx/devkit");
+function setGeneratorDefaults(tree, options) {
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    nxJson.generators = nxJson.generators ?? {};
+    nxJson.generators['@nx/angular:library'] = {
+        linter: options.libraryOptions.linter,
+        unitTestRunner: options.libraryOptions.unitTestRunner,
+        ...(nxJson.generators['@nx/angular:library'] || {}),
+    };
+    (0, devkit_1.updateNxJson)(tree, nxJson);
+}
+exports.setGeneratorDefaults = setGeneratorDefaults;

package/src/generators/library/library.js

@@ -2,11 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.libraryGeneratorInternal = exports.libraryGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
-const jest_1 = require("@nx/jest");
 const eslint_1 = require("@nx/eslint");
 const js_1 = require("@nx/js");
 const init_1 = require("../../generators/init/init");
-const test_runners_1 = require("../../utils/test-runners");
 const add_linting_1 = require("../add-linting/add-linting");
 const setup_tailwind_1 = require("../setup-tailwind/setup-tailwind");
 const version_utils_1 = require("../utils/version-utils");
@@ -19,6 +17,9 @@ const update_lib_package_npm_scope_1 = require("./lib/update-lib-package-npm-sco
 const update_tsconfig_1 = require("./lib/update-tsconfig");
 const create_files_1 = require("./lib/create-files");
 const add_project_1 = require("./lib/add-project");
+const add_jest_1 = require("../utils/add-jest");
+const set_generator_defaults_1 = require("./lib/set-generator-defaults");
+const ensure_angular_dependencies_1 = require("../utils/ensure-angular-dependencies");
 async function libraryGenerator(tree, schema) {
     return await libraryGeneratorInternal(tree, {
         // provide a default projectNameAndRootFormat to avoid breaking changes
@@ -42,16 +43,15 @@ async function libraryGeneratorInternal(tree, schema) {
     const options = await (0, normalize_options_1.normalizeOptions)(tree, schema);
     const { libraryOptions } = options;
     const pkgVersions = (0, version_utils_1.versions)(tree);
-    await (0, init_1.default)(tree, {
-        ...libraryOptions,
-        skipFormat: true,
-        e2eTestRunner: test_runners_1.E2eTestRunner.None,
-    });
+    await (0, js_1.initGenerator)(tree, { ...options, js: false, skipFormat: true });
+    await (0, init_1.default)(tree, { ...libraryOptions, skipFormat: true });
+    (0, ensure_angular_dependencies_1.ensureAngularDependencies)(tree);
     const project = (0, add_project_1.addProject)(tree, libraryOptions);
     (0, create_files_1.createFiles)(tree, options, project);
     (0, update_tsconfig_1.updateTsConfig)(tree, libraryOptions);
     await addUnitTestRunner(tree, libraryOptions);
     updateNpmScopeIfBuildableOrPublishable(tree, libraryOptions);
+    (0, set_generator_defaults_1.setGeneratorDefaults)(tree, options);
     if (!libraryOptions.standalone) {
         (0, add_module_1.addModule)(tree, libraryOptions);
     }
@@ -85,26 +85,12 @@ async function libraryGeneratorInternal(tree, schema) {
 exports.libraryGeneratorInternal = libraryGeneratorInternal;
 async function addUnitTestRunner(host, options) {
     if (options.unitTestRunner === 'jest') {
-        await (0, jest_1.configurationGenerator)(host, {
-            project: options.name,
-            setupFile: 'angular',
-            supportTsx: false,
-            skipSerializers: false,
-            skipFormat: true,
+        await (0, add_jest_1.addJest)(host, {
+            name: options.name,
+            projectRoot: options.projectRoot,
             skipPackageJson: options.skipPackageJson,
+            strict: options.strict,
         });
-        const setupFile = (0, devkit_1.joinPathFragments)(options.projectRoot, 'src', 'test-setup.ts');
-        if (options.strict && host.exists(setupFile)) {
-            const contents = host.read(setupFile, 'utf-8');
-            host.write(setupFile, `// @ts-expect-error https://thymikee.github.io/jest-preset-angular/docs/getting-started/test-environment
-globalThis.ngJest = {
-  testEnvironmentOptions: {
-    errorOnUnknownElements: true,
-    errorOnUnknownProperties: true,
-  },
-};
-${contents}`);
-        }
     }
 }
 function updateNpmScopeIfBuildableOrPublishable(host, options) {

package/src/generators/ng-add/ng-add.js

@@ -1,16 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ngAddGenerator = void 0;
-const init_1 = require("../init/init");
 const migrate_from_angular_cli_1 = require("./migrate-from-angular-cli");
-function getWorkspaceType(tree) {
-    return tree.exists('nx.json') ? 'nx' : 'angular';
-}
 async function ngAddGenerator(tree, options) {
-    if (getWorkspaceType(tree) === 'angular') {
-        return await (0, migrate_from_angular_cli_1.migrateFromAngularCli)(tree, options);
-    }
-    return await (0, init_1.angularInitGenerator)(tree, options);
+    return await (0, migrate_from_angular_cli_1.migrateFromAngularCli)(tree, options);
 }
 exports.ngAddGenerator = ngAddGenerator;
 exports.default = ngAddGenerator;

package/src/generators/ng-add/utilities/workspace.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.deleteGitKeepFilesIfNotNeeded = exports.deleteAngularJson = exports.updateVsCodeRecommendedExtensions = exports.getWorkspaceRootFileTypesInfo = exports.createRootKarmaConfig = exports.createWorkspaceFiles = exports.cleanupEsLintPackages = exports.updateRootEsLintConfig = exports.updatePackageJson = exports.updateRootTsConfig = exports.updateWorkspaceConfigDefaults = exports.createNxJson = exports.validateWorkspace = void 0;
 const devkit_1 = require("@nx/devkit");
 const eslint_1 = require("@nx/eslint");
+const setup_root_eslint_1 = require("@nx/eslint/src/generators/lint-project/setup-root-eslint");
 const js_1 = require("@nx/js");
 const default_base_1 = require("nx/src/utils/default-base");
 const versions_1 = require("@nx/js/src/utils/versions");
@@ -149,22 +150,14 @@ function updatePackageJson(tree) {
 }
 exports.updatePackageJson = updatePackageJson;
 function updateRootEsLintConfig(tree, existingEsLintConfig, unitTestRunner) {
-    if (tree.exists('.eslintrc.json')) {
-        /**
-         * If it still exists it means that there was no project at the root of the
-         * workspace, so it was not moved. In that case, we remove the file so the
-         * init generator do its work. We still receive the content of the file,
-         * so we update it after the init generator has run.
-         */
-        tree.delete('.eslintrc.json');
-    }
-    (0, eslint_1.lintInitGenerator)(tree, { linter: eslint_1.Linter.EsLint, unitTestRunner });
+    (0, eslint_1.lintInitGenerator)(tree, {});
     if (!existingEsLintConfig) {
-        // There was no eslint config in the root, so we keep the generated one as-is.
+        // There was no eslint config in the root, so we set it up and use it as-is
+        (0, setup_root_eslint_1.setupRootEsLint)(tree, { unitTestRunner });
         return;
     }
     existingEsLintConfig.ignorePatterns = ['**/*'];
-    if (!(existingEsLintConfig.plugins ?? []).includes('@nrwl/nx')) {
+    if (!(existingEsLintConfig.plugins ?? []).includes('@nx')) {
         existingEsLintConfig.plugins = Array.from(new Set([...(existingEsLintConfig.plugins ?? []), '@nx']));
     }
     existingEsLintConfig.overrides?.forEach((override) => {

package/src/generators/storybook-configuration/storybook-configuration.js

@@ -25,9 +25,7 @@ async function storybookConfigurationGenerator(tree, options) {
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
-    return () => {
-        storybookGeneratorInstallTask();
-    };
+    return storybookGeneratorInstallTask;
 }
 exports.storybookConfigurationGenerator = storybookConfigurationGenerator;
 exports.default = storybookConfigurationGenerator;

package/src/generators/utils/add-jest.d.ts

@@ -0,0 +1,8 @@
+import { type Tree } from '@nx/devkit';
+export type AddJestOptions = {
+    name: string;
+    projectRoot: string;
+    skipPackageJson: boolean;
+    strict: boolean;
+};
+export declare function addJest(tree: Tree, options: AddJestOptions): Promise<void>;

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

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addJest = void 0;
+const devkit_1 = require("@nx/devkit");
+const jest_1 = require("@nx/jest");
+const versions_1 = require("../../utils/versions");
+const version_utils_1 = require("./version-utils");
+async function addJest(tree, options) {
+    if (!options.skipPackageJson) {
+        process.env.npm_config_legacy_peer_deps ??= 'true';
+        (0, version_utils_1.addDependenciesToPackageJsonIfDontExist)(tree, {}, { 'jest-preset-angular': versions_1.jestPresetAngularVersion });
+    }
+    await (0, jest_1.configurationGenerator)(tree, {
+        project: options.name,
+        setupFile: 'angular',
+        supportTsx: false,
+        skipSerializers: false,
+        skipPackageJson: options.skipPackageJson,
+        skipFormat: true,
+    });
+    const setupFile = (0, devkit_1.joinPathFragments)(options.projectRoot, 'src', 'test-setup.ts');
+    if (options.strict && tree.exists(setupFile)) {
+        const contents = tree.read(setupFile, 'utf-8');
+        tree.write(setupFile, `// @ts-expect-error https://thymikee.github.io/jest-preset-angular/docs/getting-started/test-environment
+globalThis.ngJest = {
+testEnvironmentOptions: {
+  errorOnUnknownElements: true,
+  errorOnUnknownProperties: true,
+},
+};
+${contents}`);
+    }
+}
+exports.addJest = addJest;

package/src/generators/utils/ensure-angular-dependencies.d.ts

@@ -0,0 +1,2 @@
+import type { GeneratorCallback, Tree } from '@nx/devkit';
+export declare function ensureAngularDependencies(tree: Tree): GeneratorCallback;

package/src/generators/utils/ensure-angular-dependencies.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ensureAngularDependencies = void 0;
+const version_utils_1 = require("./version-utils");
+function ensureAngularDependencies(tree) {
+    const pkgVersions = (0, version_utils_1.versions)(tree);
+    const angularVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular/core') ??
+        pkgVersions.angularVersion;
+    const angularDevkitVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular-devkit/build-angular') ??
+        pkgVersions.angularDevkitVersion;
+    const rxjsVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, 'rxjs') ?? pkgVersions.rxjsVersion;
+    const tsLibVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, 'tslib') ?? pkgVersions.tsLibVersion;
+    const zoneJsVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, 'zone.js') ?? pkgVersions.zoneJsVersion;
+    return (0, version_utils_1.addDependenciesToPackageJsonIfDontExist)(tree, {
+        '@angular/animations': angularVersion,
+        '@angular/common': angularVersion,
+        '@angular/compiler': angularVersion,
+        '@angular/core': angularVersion,
+        '@angular/forms': angularVersion,
+        '@angular/platform-browser': angularVersion,
+        '@angular/platform-browser-dynamic': angularVersion,
+        '@angular/router': angularVersion,
+        rxjs: rxjsVersion,
+        tslib: tsLibVersion,
+        'zone.js': zoneJsVersion,
+    }, {
+        '@angular/cli': angularDevkitVersion,
+        '@angular/compiler-cli': angularVersion,
+        '@angular/language-service': angularVersion,
+        '@angular-devkit/build-angular': angularDevkitVersion,
+        '@angular-devkit/schematics': angularDevkitVersion,
+        '@schematics/angular': angularDevkitVersion,
+    });
+}
+exports.ensureAngularDependencies = ensureAngularDependencies;