@nx/angular 23.0.0-beta.2 → 23.0.0-beta.20

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

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addLintingGenerator = addLintingGenerator;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const string_utils_1 = require("@nx/devkit/src/utils/string-utils");
 const eslint_1 = require("@nx/eslint");
-const global_eslint_config_1 = require("@nx/eslint/src/generators/init/global-eslint-config");
-const eslint_file_1 = require("@nx/eslint/src/generators/utils/eslint-file");
+const assert_supported_angular_version_1 = require("../../utils/assert-supported-angular-version");
+const internal_2 = require("@nx/eslint/internal");
 const add_angular_eslint_dependencies_1 = require("./lib/add-angular-eslint-dependencies");
 const buildable_project_1 = require("./lib/buildable-project");
-const flat_config_1 = require("@nx/eslint/src/utils/flat-config");
 async function addLintingGenerator(tree, options) {
+    (0, assert_supported_angular_version_1.assertSupportedAngularVersion)(tree);
     const tasks = [];
     const rootProject = options.projectRoot === '.' || options.projectRoot === '';
     const lintTask = await (0, eslint_1.lintProjectGenerator)(tree, {
@@ -27,23 +27,23 @@ async function addLintingGenerator(tree, options) {
         skipPackageJson: options.skipPackageJson,
     });
     tasks.push(lintTask);
-    if ((0, eslint_file_1.isEslintConfigSupported)(tree)) {
-        const eslintFile = (0, eslint_file_1.findEslintFile)(tree, options.projectRoot);
+    if ((0, internal_2.isEslintConfigSupported)(tree)) {
+        const eslintFile = (0, internal_2.findEslintFile)(tree, options.projectRoot);
         // keep parser options if they exist
         const hasParserOptions = tree
             .read((0, devkit_1.joinPathFragments)(options.projectRoot, eslintFile), 'utf8')
             .includes(`${options.projectRoot}/tsconfig.*?.json`);
-        if ((0, flat_config_1.useFlatConfig)(tree)) {
-            (0, eslint_file_1.addPredefinedConfigToFlatLintConfig)(tree, options.projectRoot, 'flat/angular', { checkBaseConfig: true });
-            (0, eslint_file_1.addPredefinedConfigToFlatLintConfig)(tree, options.projectRoot, 'flat/angular-template', { checkBaseConfig: true });
-            (0, eslint_file_1.addOverrideToLintConfig)(tree, options.projectRoot, {
+        if ((0, internal_2.useFlatConfig)(tree)) {
+            (0, internal_2.addPredefinedConfigToFlatLintConfig)(tree, options.projectRoot, 'flat/angular', { checkBaseConfig: true });
+            (0, internal_2.addPredefinedConfigToFlatLintConfig)(tree, options.projectRoot, 'flat/angular-template', { checkBaseConfig: true });
+            (0, internal_2.addOverrideToLintConfig)(tree, options.projectRoot, {
                 files: ['*.ts'],
                 rules: {
                     '@angular-eslint/directive-selector': [
                         'error',
                         {
                             type: 'attribute',
-                            prefix: (0, string_utils_1.camelize)(options.prefix),
+                            prefix: (0, internal_1.camelize)(options.prefix),
                             style: 'camelCase',
                         },
                     ],
@@ -51,20 +51,20 @@ async function addLintingGenerator(tree, options) {
                         'error',
                         {
                             type: 'element',
-                            prefix: (0, string_utils_1.dasherize)(options.prefix),
+                            prefix: (0, internal_1.dasherize)(options.prefix),
                             style: 'kebab-case',
                         },
                     ],
                 },
             });
-            (0, eslint_file_1.addOverrideToLintConfig)(tree, options.projectRoot, {
+            (0, internal_2.addOverrideToLintConfig)(tree, options.projectRoot, {
                 files: ['*.html'],
                 rules: {},
             });
         }
         else {
-            (0, eslint_file_1.replaceOverridesInLintConfig)(tree, options.projectRoot, [
-                ...(rootProject ? [global_eslint_config_1.typeScriptOverride, global_eslint_config_1.javaScriptOverride] : []),
+            (0, internal_2.replaceOverridesInLintConfig)(tree, options.projectRoot, [
+                ...(rootProject ? [internal_2.typeScriptOverride, internal_2.javaScriptOverride] : []),
                 {
                     files: ['*.ts'],
                     ...(hasParserOptions
@@ -83,7 +83,7 @@ async function addLintingGenerator(tree, options) {
                             'error',
                             {
                                 type: 'attribute',
-                                prefix: (0, string_utils_1.camelize)(options.prefix),
+                                prefix: (0, internal_1.camelize)(options.prefix),
                                 style: 'camelCase',
                             },
                         ],
@@ -91,7 +91,7 @@ async function addLintingGenerator(tree, options) {
                             'error',
                             {
                                 type: 'element',
-                                prefix: (0, string_utils_1.dasherize)(options.prefix),
+                                prefix: (0, internal_1.dasherize)(options.prefix),
                                 style: 'kebab-case',
                             },
                         ],

package/src/generators/add-linting/lib/add-angular-eslint-dependencies.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-angular-eslint-dependencies.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/add-linting/lib/add-angular-eslint-dependencies.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,iBAAiB,EACtB,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAMpB,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,GAClB,iBAAiB,CA2BnB"}
+{"version":3,"file":"add-angular-eslint-dependencies.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/add-linting/lib/add-angular-eslint-dependencies.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,iBAAiB,EACtB,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAQpB,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,GAClB,iBAAiB,CAiCnB"}

package/src/generators/add-linting/lib/add-angular-eslint-dependencies.js

@@ -2,14 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addAngularEsLintDependencies = addAngularEsLintDependencies;
 const devkit_1 = require("@nx/devkit");
-const flat_config_1 = require("@nx/eslint/src/utils/flat-config");
-const versions_1 = require("@nx/eslint/src/utils/versions");
+const internal_1 = require("@nx/eslint/internal");
 const version_utils_1 = require("../../utils/version-utils");
 const buildable_project_1 = require("./buildable-project");
 function addAngularEsLintDependencies(tree, projectName) {
     const compatVersions = (0, version_utils_1.versions)(tree);
     const angularEslintVersionToInstall = compatVersions.angularEslintVersion;
-    const usesEslintFlatConfig = (0, flat_config_1.useFlatConfig)(tree);
+    const usesEslintFlatConfig = (0, internal_1.useFlatConfig)(tree);
     const devDependencies = usesEslintFlatConfig
         ? {
             'angular-eslint': angularEslintVersionToInstall,
@@ -21,12 +20,12 @@ function addAngularEsLintDependencies(tree, projectName) {
         };
     if ('typescriptEslintVersion' in compatVersions) {
         devDependencies['@typescript-eslint/utils'] = usesEslintFlatConfig
-            ? versions_1.eslint9__typescriptESLintVersion
+            ? internal_1.eslint9__typescriptESLintVersion
             : compatVersions.typescriptEslintVersion;
     }
     if ((0, buildable_project_1.isBuildableLibraryProject)(tree, projectName)) {
         const jsoncEslintParserVersionToInstall = (0, version_utils_1.versions)(tree).jsoncEslintParserVersion;
         devDependencies['jsonc-eslint-parser'] = jsoncEslintParserVersionToInstall;
     }
-    return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, devDependencies);
+    return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, devDependencies, undefined, true);
 }

package/src/generators/application/application.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"application.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/application/application.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,iBAAiB,EAKjB,IAAI,EAEL,MAAM,YAAY,CAAC;AA0BpB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAEvC,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,iBAAiB,CAAC,CA8H5B;AAED,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"application.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/application/application.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,iBAAiB,EAKjB,IAAI,EAEL,MAAM,YAAY,CAAC;AA0BpB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAEvC,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,iBAAiB,CAAC,CAgI5B;AAED,eAAe,oBAAoB,CAAC"}

package/src/generators/application/application.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.applicationGenerator = applicationGenerator;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
 const js_1 = require("@nx/js");
+const assert_supported_angular_version_1 = require("../../utils/assert-supported-angular-version");
 const convert_to_rspack_1 = require("../convert-to-rspack/convert-to-rspack");
 const init_1 = require("../init/init");
 const setup_ssr_1 = require("../setup-ssr/setup-ssr");
@@ -12,6 +13,7 @@ const validations_1 = require("../utils/validations");
 const version_utils_1 = require("../utils/version-utils");
 const lib_1 = require("./lib");
 async function applicationGenerator(tree, schema) {
+    (0, assert_supported_angular_version_1.assertSupportedAngularVersion)(tree);
     (0, validations_1.assertNotUsingTsSolutionSetup)(tree, 'application');
     (0, lib_1.validateOptions)(tree, schema);
     const isRspack = schema.bundler === 'rspack';
@@ -37,7 +39,7 @@ async function applicationGenerator(tree, schema) {
     (0, lib_1.createProject)(tree, options);
     await (0, lib_1.createFiles)(tree, options, rootOffset);
     await (0, lib_1.addLinting)(tree, options);
-    await (0, lib_1.addUnitTestRunner)(tree, options);
+    const unitTestRunnerTask = await (0, lib_1.addUnitTestRunner)(tree, options);
     const e2ePort = await (0, lib_1.addE2e)(tree, options);
     (0, lib_1.addServeStaticTarget)(tree, options, options.e2eTestRunner !== 'none' ? e2ePort : options.port);
     (0, lib_1.updateTsconfigFiles)(tree, options);
@@ -103,9 +105,10 @@ async function applicationGenerator(tree, schema) {
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
-    return () => {
+    return async () => {
+        await unitTestRunnerTask();
         (0, devkit_1.installPackagesTask)(tree);
-        (0, log_show_project_command_1.logShowProjectCommand)(options.name);
+        (0, internal_1.logShowProjectCommand)(options.name);
     };
 }
 exports.default = applicationGenerator;

package/src/generators/application/lib/add-e2e.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-e2e.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/add-e2e.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AASlC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAG5D,wBAAsB,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,mBAsEjE"}
+{"version":3,"file":"add-e2e.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/add-e2e.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAalC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAE5D,wBAAsB,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,mBAsEjE"}

package/src/generators/application/lib/add-e2e.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addE2e = addE2e;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../../utils/versions");
 async function addE2e(tree, options) {
@@ -65,16 +66,13 @@ async function addE2e(tree, options) {
 function getAngularE2EWebServerInfo(tree, projectName, portOverride) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
     let e2ePort = portOverride ?? 4200;
-    if (nxJson.targetDefaults?.['serve'] &&
-        (nxJson.targetDefaults?.['serve'].options?.port ||
-            nxJson.targetDefaults?.['serve'].options?.env?.PORT)) {
-        e2ePort =
-            nxJson.targetDefaults?.['serve'].options?.port ||
-                nxJson.targetDefaults?.['serve'].options?.env?.PORT;
+    const serveTargetOptions = (0, internal_1.readTargetDefaultsForTarget)('serve', nxJson.targetDefaults)?.options;
+    if (serveTargetOptions?.port || serveTargetOptions?.env?.PORT) {
+        e2ePort = serveTargetOptions.port || serveTargetOptions.env.PORT;
     }
     const pm = (0, devkit_1.getPackageManagerCommand)();
     return {
-        e2eCiBaseUrl: 'http://localhost:4200',
+        e2eCiBaseUrl: `http://localhost:${e2ePort}`,
         e2eCiWebServerCommand: `${pm.exec} nx run ${projectName}:serve-static`,
         e2eWebServerCommand: `${pm.exec} nx run ${projectName}:serve`,
         e2eWebServerAddress: `http://localhost:${e2ePort}`,

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

@@ -1,4 +1,4 @@
-import type { Tree } from '@nx/devkit';
+import type { GeneratorCallback, Tree } from '@nx/devkit';
 import type { NormalizedSchema } from './normalized-schema';
-export declare function addUnitTestRunner(host: Tree, options: NormalizedSchema): Promise<void>;
+export declare function addUnitTestRunner(host: Tree, options: NormalizedSchema): Promise<GeneratorCallback>;
 //# sourceMappingURL=add-unit-test-runner.d.ts.map

package/src/generators/application/lib/add-unit-test-runner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-unit-test-runner.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/add-unit-test-runner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAIvC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAE5D,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,iBAgC5E"}
+{"version":3,"file":"add-unit-test-runner.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/add-unit-test-runner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAI1D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAE5D,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,iBAAiB,CAAC,CAgC5B"}

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

@@ -16,16 +16,15 @@ async function addUnitTestRunner(host, options) {
                 runtimeTsconfigFileName: 'tsconfig.app.json',
                 zoneless: options.zoneless,
             });
-            break;
+            return () => { };
         case test_runners_1.UnitTestRunner.VitestAngular:
-            await (0, add_vitest_1.addVitestAngular)(host, {
+            return (0, add_vitest_1.addVitestAngular)(host, {
                 name: options.name,
                 projectRoot: options.appProjectRoot,
                 skipPackageJson: options.skipPackageJson,
             });
-            break;
         case test_runners_1.UnitTestRunner.VitestAnalog:
-            await (0, add_vitest_1.addVitestAnalog)(host, {
+            return (0, add_vitest_1.addVitestAnalog)(host, {
                 name: options.name,
                 projectRoot: options.appProjectRoot,
                 skipFormat: options.skipFormat,
@@ -34,6 +33,7 @@ async function addUnitTestRunner(host, options) {
                 addPlugin: options.addPlugin,
                 zoneless: options.zoneless,
             });
-            break;
+        default:
+            return () => { };
     }
 }

package/src/generators/application/lib/create-project.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-project.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/create-project.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAIpB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAE5D,wBAAgB,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,QAUlE"}
+{"version":3,"file":"create-project.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/create-project.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAGpB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAE5D,wBAAgB,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,QAUlE"}

package/src/generators/application/lib/create-project.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createProject = createProject;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
 const version_utils_1 = require("../../utils/version-utils");
 function createProject(tree, options) {
     let project;
@@ -19,7 +19,7 @@ function createProjectForEsbuild(tree, options) {
     const buildExecutor = angularMajorVersion >= 20
         ? '@angular/build:application'
         : '@angular-devkit/build-angular:application';
-    (0, target_defaults_utils_1.addBuildTargetDefaults)(tree, buildExecutor);
+    (0, internal_1.addBuildTargetDefaults)(tree, buildExecutor);
     let budgets = undefined;
     if (options.strict) {
         budgets = [
@@ -115,7 +115,7 @@ function createProjectForEsbuild(tree, options) {
 }
 function createProjectForWebpack(tree, options) {
     const buildExecutor = '@angular-devkit/build-angular:browser';
-    (0, target_defaults_utils_1.addBuildTargetDefaults)(tree, buildExecutor);
+    (0, internal_1.addBuildTargetDefaults)(tree, buildExecutor);
     let budgets = undefined;
     if (options.strict) {
         budgets = [

package/src/generators/application/lib/normalize-options.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
 const devkit_1 = require("@nx/devkit");
-const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
+const internal_1 = require("@nx/devkit/internal");
 const test_runners_1 = require("../../../utils/test-runners");
 const version_utils_1 = require("../../utils/version-utils");
 function arePluginsExplicitlyDisabled(host) {
@@ -17,8 +17,8 @@ function validateBundler(bundler) {
     throw new Error(`Invalid bundler: ${bundler}. Please use one of the following: 'esbuild', 'webpack', 'rspack'.`);
 }
 async function normalizeOptions(host, options, isRspack) {
-    await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'application');
-    const { projectName: appProjectName, projectRoot: appProjectRoot } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+    await (0, internal_1.ensureRootProjectName)(options, 'application');
+    const { projectName: appProjectName, projectRoot: appProjectRoot } = await (0, internal_1.determineProjectNameAndRootOptions)(host, {
         name: options.name,
         projectType: 'application',
         directory: options.directory,

package/src/generators/application/lib/update-tsconfig-files.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateTsconfigFiles = updateTsconfigFiles;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
-const configuration_1 = require("@nx/js/src/utils/typescript/configuration");
+const internal_1 = require("@nx/js/internal");
 const semver_1 = require("semver");
 const tsconfig_utils_1 = require("../../utils/tsconfig-utils");
 const update_app_editor_tsconfig_excluded_files_1 = require("../../utils/update-app-editor-tsconfig-excluded-files");
@@ -51,7 +51,7 @@ function updateTsconfigFiles(tree, options) {
         // file. Calling getNeededCompilerOptionOverrides would compare the file
         // against itself and strip options like skipLibCheck that are already set.
         if (tsconfigPath !== rootTsConfigPath) {
-            json.compilerOptions = (0, configuration_1.getNeededCompilerOptionOverrides)(tree, json.compilerOptions, rootTsConfigPath);
+            json.compilerOptions = (0, internal_1.getNeededCompilerOptionOverrides)(tree, json.compilerOptions, rootTsConfigPath);
         }
         return json;
     });
@@ -63,7 +63,7 @@ function updateTsconfigFiles(tree, options) {
                 module: 'commonjs',
                 moduleResolution: 'node10',
             };
-            json.compilerOptions = (0, configuration_1.getNeededCompilerOptionOverrides)(tree, json.compilerOptions, tsconfigPath);
+            json.compilerOptions = (0, internal_1.getNeededCompilerOptionOverrides)(tree, json.compilerOptions, tsconfigPath);
             return json;
         });
     }

package/src/generators/component/component.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"component.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/component/component.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAgBvC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAEvC,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,iBA6FtE;AAED,eAAe,kBAAkB,CAAC"}
+{"version":3,"file":"component.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/component/component.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAiBvC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAEvC,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,iBA8FtE;AAED,eAAe,kBAAkB,CAAC"}

package/src/generators/component/component.js

@@ -2,11 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.componentGenerator = componentGenerator;
 const devkit_1 = require("@nx/devkit");
+const assert_supported_angular_version_1 = require("../../utils/assert-supported-angular-version");
 const zoneless_1 = require("../../utils/zoneless");
 const utils_1 = require("../utils");
 const version_utils_1 = require("../utils/version-utils");
 const lib_1 = require("./lib");
 async function componentGenerator(tree, rawOptions) {
+    (0, assert_supported_angular_version_1.assertSupportedAngularVersion)(tree);
     const options = await (0, lib_1.normalizeOptions)(tree, rawOptions);
     const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
     const project = (0, devkit_1.readProjectConfiguration)(tree, options.projectName);

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.exportComponentInEntryPoint = exportComponentInEntryPoint;
 const devkit_1 = require("@nx/devkit");
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
+const internal_1 = require("@nx/js/internal");
 const entry_point_1 = require("../../utils/entry-point");
 const path_1 = require("../../utils/path");
 const module_1 = require("./module");
@@ -45,7 +45,7 @@ function shouldExportInEntryPoint(tree, entryPoint, modulePath) {
     if (!modulePath) {
         return false;
     }
-    (0, ensure_typescript_1.ensureTypescript)();
+    (0, internal_1.ensureTypescript)();
     const { ast, query } = require('@phenomnomnominal/tsquery');
     const moduleImportPath = (0, path_1.getRelativeImportToFile)(entryPoint, modulePath);
     const entryPointContent = tree.read(entryPoint, 'utf-8');

package/src/generators/component/lib/normalize-options.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
 const devkit_1 = require("@nx/devkit");
-const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
+const internal_1 = require("@nx/devkit/internal");
 const selector_1 = require("../../utils/selector");
 const validations_1 = require("../../utils/validations");
 const version_utils_1 = require("../../utils/version-utils");
@@ -11,7 +11,7 @@ async function normalizeOptions(tree, options) {
     if (angularMajorVersion < 20) {
         options.type ??= 'component';
     }
-    const { artifactName: name, directory, fileName, filePath, project: projectName, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
+    const { artifactName: name, directory, fileName, filePath, project: projectName, } = await (0, internal_1.determineArtifactNameAndDirectoryOptions)(tree, {
         name: options.name,
         path: options.path,
         suffix: options.type,

package/src/generators/component-story/component-story.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"component-story.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/component-story/component-story.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAGvC,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,UAAU,CAAC;AAE/D,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,8BAA8B,GACtC,OAAO,CAAC,IAAI,CAAC,CAgCf;AAED,eAAe,uBAAuB,CAAC"}
+{"version":3,"file":"component-story.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/component-story/component-story.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAIvC,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,UAAU,CAAC;AAE/D,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,8BAA8B,GACtC,OAAO,CAAC,IAAI,CAAC,CAiCf;AAED,eAAe,uBAAuB,CAAC"}

package/src/generators/component-story/component-story.js

@@ -2,8 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.componentStoryGenerator = componentStoryGenerator;
 const devkit_1 = require("@nx/devkit");
+const assert_supported_angular_version_1 = require("../../utils/assert-supported-angular-version");
 const storybook_inputs_1 = require("../utils/storybook-ast/storybook-inputs");
 async function componentStoryGenerator(tree, options) {
+    (0, assert_supported_angular_version_1.assertSupportedAngularVersion)(tree);
     const { componentFileName, componentName, componentPath, projectPath } = options;
     const templatesDir = (0, devkit_1.joinPathFragments)(__dirname, 'files');
     const destinationDir = (0, devkit_1.joinPathFragments)(projectPath, componentPath);

package/src/generators/component-test/component-test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"component-test.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/component-test/component-test.ts"],"names":[],"mappings":"AAAA,OAAO,EAQL,KAAK,iBAAiB,EACtB,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAOpB,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAEpD,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,mBAAmB,8BAyD7B;AAED,eAAe,sBAAsB,CAAC"}
+{"version":3,"file":"component-test.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/component-test/component-test.ts"],"names":[],"mappings":"AAAA,OAAO,EAQL,KAAK,iBAAiB,EACtB,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAQpB,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAEpD,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,mBAAmB,8BA0D7B;AAED,eAAe,sBAAsB,CAAC"}

package/src/generators/component-test/component-test.js

@@ -2,10 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.componentTestGenerator = componentTestGenerator;
 const devkit_1 = require("@nx/devkit");
+const assert_supported_angular_version_1 = require("../../utils/assert-supported-angular-version");
 const versions_1 = require("../../utils/versions");
 const storybook_inputs_1 = require("../utils/storybook-ast/storybook-inputs");
 const version_utils_1 = require("../utils/version-utils");
 async function componentTestGenerator(tree, options) {
+    (0, assert_supported_angular_version_1.assertSupportedAngularVersion)(tree);
     (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
     const { root } = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     const componentDirPath = (0, devkit_1.joinPathFragments)(root, options.componentDir);

package/src/generators/convert-to-application-executor/convert-to-application-executor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"convert-to-application-executor.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/convert-to-application-executor/convert-to-application-executor.ts"],"names":[],"mappings":"AAAA,OAAO,EAUL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAMpB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAoBjD,wBAAsB,4BAA4B,CAChD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,uBA6B1B;AA6QD,eAAe,4BAA4B,CAAC"}
+{"version":3,"file":"convert-to-application-executor.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/convert-to-application-executor/convert-to-application-executor.ts"],"names":[],"mappings":"AAAA,OAAO,EAUL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAOpB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAoBjD,wBAAsB,4BAA4B,CAChD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,uBA8B1B;AA6QD,eAAe,4BAA4B,CAAC"}

package/src/generators/convert-to-application-executor/convert-to-application-executor.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertToApplicationExecutor = convertToApplicationExecutor;
 const devkit_1 = require("@nx/devkit");
 const posix_1 = require("node:path/posix");
+const assert_supported_angular_version_1 = require("../../utils/assert-supported-angular-version");
 const targets_1 = require("../../utils/targets");
 const setup_ssr_1 = require("../setup-ssr/setup-ssr");
 const validations_1 = require("../utils/validations");
@@ -25,6 +26,7 @@ const redundantExecutors = new Set([
     '@nx/angular:webpack-server',
 ]);
 async function convertToApplicationExecutor(tree, options) {
+    (0, assert_supported_angular_version_1.assertSupportedAngularVersion)(tree);
     let didAnySucceed = false;
     if (options.project) {
         (0, validations_1.validateProject)(tree, options.project);

package/src/generators/convert-to-rspack/convert-to-rspack.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"convert-to-rspack.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/convert-to-rspack/convert-to-rspack.ts"],"names":[],"mappings":"AAAA,OAAO,EAcL,KAAK,iBAAiB,EAEtB,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAapB,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AA6StD,wBAAsB,eAAe,CACnC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,qBAAqB,8BAiZ9B;AAED,eAAe,eAAe,CAAC"}
+{"version":3,"file":"convert-to-rspack.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/convert-to-rspack/convert-to-rspack.ts"],"names":[],"mappings":"AACA,OAAO,EAcL,KAAK,iBAAiB,EAEtB,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAYpB,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AA6StD,wBAAsB,eAAe,CACnC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,qBAAqB,8BAkZ9B;AAED,eAAe,eAAe,CAAC"}

package/src/generators/convert-to-rspack/convert-to-rspack.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertToRspack = convertToRspack;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
-const get_named_inputs_1 = require("@nx/devkit/src/utils/get-named-inputs");
 const enquirer_1 = require("enquirer");
 const path_1 = require("path");
 const posix_1 = require("path/posix");
+const assert_supported_angular_version_1 = require("../../utils/assert-supported-angular-version");
 const versions_1 = require("../../utils/versions");
 const version_utils_1 = require("../utils/version-utils");
 const create_config_1 = require("./lib/create-config");
@@ -222,7 +222,7 @@ function handleDevServerTargetOptions(tree, options, newConfigurationOptions, ro
 async function getProjectToConvert(tree) {
     const projects = new Set();
     for (const executor of SUPPORTED_EXECUTORS) {
-        (0, executor_options_utils_1.forEachExecutorOptions)(tree, executor, (_, project) => {
+        (0, internal_1.forEachExecutorOptions)(tree, executor, (_, project) => {
             projects.add(project);
         });
     }
@@ -235,6 +235,7 @@ async function getProjectToConvert(tree) {
     return project;
 }
 async function convertToRspack(tree, schema) {
+    (0, assert_supported_angular_version_1.assertSupportedAngularVersion)(tree);
     let { project: projectName } = schema;
     if (!projectName) {
         projectName = await getProjectToConvert(tree);
@@ -363,7 +364,7 @@ async function convertToRspack(tree, schema) {
                 // check whether the existing inputs would match the inferred task
                 // inputs with the exception of the @rspack/cli external dependency
                 // which webpack tasks wouldn't have
-                const namedInputs = (0, get_named_inputs_1.getNamedInputs)(project.root, {
+                const namedInputs = (0, internal_1.getNamedInputs)(project.root, {
                     nxJsonConfiguration: nxJson,
                     workspaceRoot: devkit_1.workspaceRoot,
                 });

package/src/generators/convert-to-rspack/lib/create-config.js

@@ -17,7 +17,7 @@ function createConfig(tree, opts, configurationOptions = {}, existingWebpackConf
         })
             .join(',\n')
         : '';
-    const createConfigContents = `createConfig({ 
+    const createConfigContents = `createConfig({
     options: {
       root: __dirname,
       ${JSON.stringify(createConfigOptions, undefined, 2).slice(1, -1)}

package/src/generators/convert-to-rspack/lib/get-custom-webpack-config.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCustomWebpackConfig = getCustomWebpackConfig;
 exports.convertWebpackConfigToUseNxModuleFederationPlugin = convertWebpackConfigToUseNxModuleFederationPlugin;
 const devkit_1 = require("@nx/devkit");
-const config_utils_1 = require("@nx/devkit/src/utils/config-utils");
+const internal_1 = require("@nx/devkit/internal");
 const path_1 = require("path");
 const tsquery_1 = require("@phenomnomnominal/tsquery");
 const FILE_EXTENSION_REGEX = /\.[^.]+$/;
@@ -17,7 +17,7 @@ async function getCustomWebpackConfig(tree, projectRoot, pathToCustomWebpackConf
             normalizedPathToCustomWebpackConfig: `./${(0, path_1.relative)(projectRoot, pathToCustomWebpackConfig).replace(FILE_EXTENSION_REGEX, '')}`,
         };
     }
-    const configFile = await (0, config_utils_1.loadConfigFile)((0, path_1.join)(tree.root, pathToCustomWebpackConfig));
+    const configFile = await (0, internal_1.loadConfigFile)((0, path_1.join)(tree.root, pathToCustomWebpackConfig));
     const webpackConfig = 'default' in configFile ? configFile.default : configFile;
     return {
         isWebpackConfigFunction: typeof webpackConfig === 'function',

package/src/generators/convert-to-with-mf/convert-to-with-mf.d.ts

@@ -1,5 +1,5 @@
 import { Tree } from '@nx/devkit';
 import type { Schema } from './schema';
-export declare function convertToWithMF(tree: Tree, schema: Schema): Promise<void>;
+export declare function convertToWithMF(tree: Tree, schema: Schema): Promise<import("@nx/devkit").GeneratorCallback>;
 export default convertToWithMF;
 //# sourceMappingURL=convert-to-with-mf.d.ts.map

package/src/generators/convert-to-with-mf/convert-to-with-mf.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"convert-to-with-mf.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/convert-to-with-mf/convert-to-with-mf.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,IAAI,EACL,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAWvC,wBAAsB,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,iBA6C/D;AAED,eAAe,eAAe,CAAC"}
+{"version":3,"file":"convert-to-with-mf.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/convert-to-with-mf/convert-to-with-mf.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,IAAI,EACL,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAavC,wBAAsB,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,mDAsD/D;AAED,eAAe,eAAe,CAAC"}

package/src/generators/convert-to-with-mf/convert-to-with-mf.js

@@ -2,9 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertToWithMF = convertToWithMF;
 const devkit_1 = require("@nx/devkit");
+const assert_supported_angular_version_1 = require("../../utils/assert-supported-angular-version");
 const get_mf_projects_1 = require("../../utils/get-mf-projects");
+const versions_1 = require("../../utils/versions");
 const lib_1 = require("./lib");
 async function convertToWithMF(tree, schema) {
+    (0, assert_supported_angular_version_1.assertSupportedAngularVersion)(tree);
     const projects = new Set((0, get_mf_projects_1.getMFProjects)(tree, { legacy: true }));
     if (!projects.has(schema.project)) {
         throw new Error(`Could not find project "${schema.project}" with a Micro Frontend configuration in your workspace. Please check the name of the project you're wishing to convert exists.`);
@@ -24,8 +27,10 @@ async function convertToWithMF(tree, schema) {
     const [updatedWebpackConfig, mfConfig] = (0, lib_1.writeNewWebpackConfig)(webpackAst, (0, lib_1.isHostRemoteConfig)(webpackAst), schema.project);
     tree.write(pathToWebpackConfig, updatedWebpackConfig);
     tree.write((0, devkit_1.joinPathFragments)(project.root, 'module-federation.config.js'), mfConfig);
+    const installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@nx/module-federation': versions_1.nxVersion });
     if (!schema.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
+    return installTask;
 }
 exports.default = convertToWithMF;

package/src/generators/convert-to-with-mf/lib/check-name-matches.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkOutputNameMatchesProjectName = checkOutputNameMatchesProjectName;
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
+const internal_1 = require("@nx/js/internal");
 function checkOutputNameMatchesProjectName(sourceFile, projectName) {
-    (0, ensure_typescript_1.ensureTypescript)();
+    (0, internal_1.ensureTypescript)();
     const { query } = require('@phenomnomnominal/tsquery');
     const OUTPUT_SELECTOR = 'PropertyAssignment:has(Identifier[name=output]) > ObjectLiteralExpression:has(PropertyAssignment:has(Identifier[name=uniqueName]))';
     const UNIQUENAME_SELECTOR = 'ObjectLiteralExpression > PropertyAssignment:has(Identifier[name=uniqueName]) > StringLiteral';

package/src/generators/convert-to-with-mf/lib/check-shared-npm-packages.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkSharedNpmPackagesMatchExpected = checkSharedNpmPackagesMatchExpected;
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
+const internal_1 = require("@nx/js/internal");
 function checkSharedNpmPackagesMatchExpected(sourceFile) {
-    (0, ensure_typescript_1.ensureTypescript)();
+    (0, internal_1.ensureTypescript)();
     const { query } = require('@phenomnomnominal/tsquery');
     const SHARE_HELPER_SELECTOR = 'PropertyAssignment:has(Identifier[name=shared]) > CallExpression:has(Identifier[name=share])';
     const SHARED_PACKAGE_CONFIG_SELECTOR = 'ObjectLiteralExpression > PropertyAssignment > ObjectLiteralExpression';