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

package/src/generators/convert-to-with-mf/lib/is-host-remote-config.js

@@ -3,14 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.isHostRemoteConfig = isHostRemoteConfig;
 exports.getRemotesFromHost = getRemotesFromHost;
 exports.getExposedModulesFromRemote = getExposedModulesFromRemote;
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
+const internal_1 = require("@nx/js/internal");
 const REMOTES_EXPRESSION_SELECTOR = 'PropertyAssignment:has(Identifier[name=remotes]) > ObjectLiteralExpression';
 const EXPOSES_EXPRESSION_SELECTOR = 'PropertyAssignment:has(Identifier[name=exposes]) > ObjectLiteralExpression';
 const PROPERTY_SELECTOR = 'ObjectLiteralExpression > PropertyAssignment';
 function isHostRemoteConfig(sourceFile) {
     let isHost = false;
     let isRemote = false;
-    (0, ensure_typescript_1.ensureTypescript)();
+    (0, internal_1.ensureTypescript)();
     const { query } = require('@phenomnomnominal/tsquery');
     const remotesNodes = query(sourceFile, REMOTES_EXPRESSION_SELECTOR);
     if (remotesNodes.length > 0) {
@@ -24,7 +24,7 @@ function isHostRemoteConfig(sourceFile) {
     return result;
 }
 function getRemotesFromHost(sourceFile) {
-    (0, ensure_typescript_1.ensureTypescript)();
+    (0, internal_1.ensureTypescript)();
     const { query } = require('@phenomnomnominal/tsquery');
     const remotesObjectNodes = query(sourceFile, REMOTES_EXPRESSION_SELECTOR);
     if (remotesObjectNodes.length === 0) {
@@ -47,7 +47,7 @@ function getRemotesFromHost(sourceFile) {
     return remotes;
 }
 function getExposedModulesFromRemote(sourceFile) {
-    (0, ensure_typescript_1.ensureTypescript)();
+    (0, internal_1.ensureTypescript)();
     const { query } = require('@phenomnomnominal/tsquery');
     const exposesObjectNodes = query(sourceFile, EXPOSES_EXPRESSION_SELECTOR);
     if (exposesObjectNodes.length === 0) {

package/src/generators/convert-to-with-mf/lib/parse-ast-webpack-config.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseASTOfWebpackConfig = parseASTOfWebpackConfig;
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
+const internal_1 = require("@nx/js/internal");
 function parseASTOfWebpackConfig(tree, pathToWebpackConfig) {
     if (!tree.exists(pathToWebpackConfig)) {
         throw new Error(`Cannot migrate webpack config at \`${pathToWebpackConfig}\` as it does not exist. Please ensure this file exists and that the path to the file is correct.`);
     }
-    (0, ensure_typescript_1.ensureTypescript)();
+    (0, internal_1.ensureTypescript)();
     const { tsquery } = require('@phenomnomnominal/tsquery');
     const source = tree.read(pathToWebpackConfig, 'utf-8');
     return tsquery.ast(source);

package/src/generators/convert-to-with-mf/lib/write-new-webpack-config.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeNewWebpackConfig = writeNewWebpackConfig;
 const is_host_remote_config_1 = require("./is-host-remote-config");
 function writeNewWebpackConfig(ast, mfType, projectName) {
-    const webpackConfig = `const { withModuleFederation } = require('@nx/angular/module-federation');
+    const webpackConfig = `const { withModuleFederation } = require('@nx/module-federation/angular');
 const config = require('./module-federation.config');
 module.exports = withModuleFederation(config);
 `;

package/src/generators/cypress-component-configuration/cypress-component-configuration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cypress-component-configuration.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/cypress-component-configuration/cypress-component-configuration.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,iBAAiB,EAMjB,IAAI,EAEL,MAAM,YAAY,CAAC;AAYpB,OAAO,EAAE,4BAA4B,EAAE,MAAM,UAAU,CAAC;AAiBxD;;;GAGG;AACH,wBAAsB,6BAA6B,CACjD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,4BAA4B,GACpC,OAAO,CAAC,iBAAiB,CAAC,CAsD5B;AAoJD,eAAe,6BAA6B,CAAC"}
+{"version":3,"file":"cypress-component-configuration.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/cypress-component-configuration/cypress-component-configuration.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,iBAAiB,EAMjB,IAAI,EAEL,MAAM,YAAY,CAAC;AAapB,OAAO,EAAE,4BAA4B,EAAE,MAAM,UAAU,CAAC;AAiBxD;;;GAGG;AACH,wBAAsB,6BAA6B,CACjD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,4BAA4B,GACpC,OAAO,CAAC,iBAAiB,CAAC,CAqD5B;AAkJD,eAAe,6BAA6B,CAAC"}

package/src/generators/cypress-component-configuration/cypress-component-configuration.js

@@ -36,6 +36,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.cypressComponentConfiguration = cypressComponentConfiguration;
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
+const assert_supported_angular_version_1 = require("../../utils/assert-supported-angular-version");
 const zoneless_1 = require("../../utils/zoneless");
 const versions_1 = require("../../utils/versions");
 const component_test_1 = require("../component-test/component-test");
@@ -61,6 +62,7 @@ const esbuildExecutors = new Set([
  * storybook + cypress then use the componentCypressGenerator instead.
  */
 async function cypressComponentConfiguration(tree, options) {
+    (0, assert_supported_angular_version_1.assertSupportedAngularVersion)(tree);
     const { componentConfigurationGenerator: baseCyCTConfig } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     let isZoneless;
@@ -73,7 +75,7 @@ async function cypressComponentConfiguration(tree, options) {
         isZoneless = (0, devkit_1.getDependencyVersionFromPackageJson)(tree, 'zone.js') === null;
     }
     if (isZoneless) {
-        const { getInstalledCypressVersion } = await Promise.resolve().then(() => __importStar(require('@nx/cypress/src/utils/versions')));
+        const { getInstalledCypressVersion } = await Promise.resolve().then(() => __importStar(require('@nx/cypress/internal')));
         const installedCypressVersion = getInstalledCypressVersion(tree);
         // Zoneless support was introduced in Cypress 15.8.0
         // If Cypress is not yet installed, we'll install the latest version, which will have zoneless support
@@ -103,7 +105,7 @@ async function cypressComponentConfiguration(tree, options) {
 }
 async function addFiles(tree, projectConfig, options, isZoneless) {
     const componentFile = (0, devkit_1.joinPathFragments)(projectConfig.root, 'cypress', 'support', 'component.ts');
-    const { addMountDefinition } = require('@nx/cypress/src/utils/config');
+    const { addMountDefinition } = (require('@nx/cypress/internal'));
     const updatedCmpContents = await addMountDefinition(tree.read(componentFile, 'utf-8'));
     tree.write(componentFile, `import { mount } from '${isZoneless ? 'cypress/angular-zoneless' : 'cypress/angular'}';\n${updatedCmpContents}`);
     if (!options.generateTests) {
@@ -141,7 +143,7 @@ async function addFiles(tree, projectConfig, options, isZoneless) {
 async function configureCypressCT(tree, options) {
     let found = { target: options.buildTarget, config: undefined };
     if (!options.buildTarget) {
-        const { findBuildConfig } = require('@nx/cypress/src/utils/find-target-options');
+        const { findBuildConfig } = (require('@nx/cypress/internal'));
         found = await findBuildConfig(tree, {
             project: options.project,
             buildTarget: options.buildTarget,
@@ -179,9 +181,9 @@ async function configureCypressCT(tree, options) {
     else {
         ctConfigOptions.buildTarget = found.target;
     }
-    const { addDefaultCTConfig, getProjectCypressConfigPath } = require('@nx/cypress/src/utils/config');
+    const { addDefaultCTConfig, getProjectCypressConfigPath } = require('@nx/cypress/internal');
     const cypressConfigPath = getProjectCypressConfigPath(tree, projectConfig.root);
-    const updatedCyConfig = await addDefaultCTConfig(tree.read(cypressConfigPath, 'utf-8'), ctConfigOptions);
-    tree.write(cypressConfigPath, `import { nxComponentTestingPreset } from '@nx/angular/plugins/component-testing';\n${updatedCyConfig}`);
+    const updatedCyConfig = await addDefaultCTConfig(tree.read(cypressConfigPath, 'utf-8'), ctConfigOptions, '@nx/angular/plugins/component-testing');
+    tree.write(cypressConfigPath, updatedCyConfig);
 }
 exports.default = cypressComponentConfiguration;

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

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

package/src/generators/directive/directive.js

@@ -2,10 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.directiveGenerator = directiveGenerator;
 const devkit_1 = require("@nx/devkit");
+const assert_supported_angular_version_1 = require("../../utils/assert-supported-angular-version");
 const utils_1 = require("../utils");
 const version_utils_1 = require("../utils/version-utils");
 const lib_1 = require("./lib");
 async function directiveGenerator(tree, schema) {
+    (0, assert_supported_angular_version_1.assertSupportedAngularVersion)(tree);
     const options = await (0, lib_1.normalizeOptions)(tree, schema);
     const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
     (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files'), options.directory, {

package/src/generators/directive/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 ??= 'directive';
     }
-    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/federate-module/federate-module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"federate-module.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/federate-module/federate-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AASpB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAEvC,wBAAsB,uBAAuB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,mDAgDvE;AAED,eAAe,uBAAuB,CAAC"}
+{"version":3,"file":"federate-module.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/federate-module/federate-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAUpB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAEvC,wBAAsB,uBAAuB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,mDAiDvE;AAED,eAAe,uBAAuB,CAAC"}

package/src/generators/federate-module/federate-module.js

@@ -2,10 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.federateModuleGenerator = federateModuleGenerator;
 const devkit_1 = require("@nx/devkit");
+const assert_supported_angular_version_1 = require("../../utils/assert-supported-angular-version");
 const test_runners_1 = require("../../utils/test-runners");
 const version_utils_1 = require("../utils/version-utils");
 const lib_1 = require("./lib");
 async function federateModuleGenerator(tree, schema) {
+    (0, assert_supported_angular_version_1.assertSupportedAngularVersion)(tree);
     if (!tree.exists(schema.path)) {
         throw new Error((0, devkit_1.stripIndents) `The "path" provided  does not exist. Please verify the path is correct and pointing to a file that exists in the workspace.
     

package/src/generators/federate-module/lib/add-path-to-exposes.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addPathToExposes = addPathToExposes;
 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");
 let tsModule;
 function addPathToExposes(tree, { projectPath, moduleName, modulePath }) {
     const moduleFederationConfigPath = (0, devkit_1.joinPathFragments)(projectPath, tree.exists((0, devkit_1.joinPathFragments)(projectPath, 'module-federation.config.ts'))
@@ -12,7 +12,7 @@ function addPathToExposes(tree, { projectPath, moduleName, modulePath }) {
 }
 function updateExposesProperty(tree, moduleFederationConfigPath, moduleName, modulePath) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const fileContent = tree.read(moduleFederationConfigPath, 'utf-8');
     const source = tsModule.createSourceFile(moduleFederationConfigPath, fileContent, tsModule.ScriptTarget.ES2015, true);
@@ -25,7 +25,7 @@ function updateExposesProperty(tree, moduleFederationConfigPath, moduleName, mod
 }
 function findExposes(sourceFile) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     let exposesObject = null;
     const visit = (node) => {
@@ -45,14 +45,14 @@ function findExposes(sourceFile) {
 // Create a new property assignment
 function createObjectEntry(moduleName, modulePath) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     return tsModule.factory.createPropertyAssignment(tsModule.factory.createStringLiteral(`./${moduleName}`, true), tsModule.factory.createStringLiteral(modulePath, true));
 }
 // Update the exposes property in the AST
 function updateExposesPropertyinAST(source, exposesObject, newEntry) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const updatedExposes = tsModule.factory.updateObjectLiteralExpression(exposesObject, [...exposesObject.properties, newEntry]);
     const transform = (context) => {
@@ -69,7 +69,7 @@ function updateExposesPropertyinAST(source, exposesObject, newEntry) {
 // Write the updated AST to the file (module-federation.config.js)
 function writeToConfig(tree, filename, source, updatedSourceFile) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const printer = tsModule.createPrinter();
     const update = printer.printNode(tsModule.EmitHint.Unspecified, updatedSourceFile, source);

package/src/generators/federate-module/lib/add-remote.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addRemote = addRemote;
 const tslib_1 = require("tslib");
-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 remote_1 = tslib_1.__importDefault(require("../../remote/remote"));
 const check_remote_exists_1 = require("./check-remote-exists");
@@ -21,7 +21,7 @@ async function addRemote(tree, schema) {
             skipFormat: true,
         });
         tasks.push(remoteGeneratorCallback);
-        const { projectName, projectRoot: remoteRoot } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
+        const { projectName, projectRoot: remoteRoot } = await (0, internal_1.determineProjectNameAndRootOptions)(tree, {
             name: schema.remote,
             directory: schema.remoteDirectory,
             projectType: 'application',

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

@@ -1 +1 @@
-{"version":3,"file":"host.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/host/host.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,IAAI,EAEL,MAAM,YAAY,CAAC;AAgBpB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAEvC,wBAAsB,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,mDAgIpD;AAED,eAAe,IAAI,CAAC"}
+{"version":3,"file":"host.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/host/host.ts"],"names":[],"mappings":"AAIA,OAAO,EAML,IAAI,EAEL,MAAM,YAAY,CAAC;AAapB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAEvC,wBAAsB,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,mDAmIpD;AAED,eAAe,IAAI,CAAC"}

package/src/generators/host/host.js

@@ -2,9 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.host = host;
 const tslib_1 = require("tslib");
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const js_1 = require("@nx/js");
+const assert_supported_angular_version_1 = require("../../utils/assert-supported-angular-version");
 const test_runners_1 = require("../../utils/test-runners");
 const application_1 = tslib_1.__importDefault(require("../application/application"));
 const convert_to_rspack_1 = tslib_1.__importDefault(require("../convert-to-rspack/convert-to-rspack"));
@@ -16,6 +17,7 @@ const validations_1 = require("../utils/validations");
 const version_utils_1 = require("../utils/version-utils");
 const lib_1 = require("./lib");
 async function host(tree, schema) {
+    (0, assert_supported_angular_version_1.assertSupportedAngularVersion)(tree);
     (0, validations_1.assertNotUsingTsSolutionSetup)(tree, 'host');
     (0, lib_1.validateOptions)(tree, schema);
     // TODO: Replace with Rspack when confidence is high enough
@@ -49,17 +51,18 @@ async function host(tree, schema) {
             }
         });
     }
-    await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'application');
-    const { projectName: hostProjectName, projectRoot: appRoot } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
+    await (0, internal_1.ensureRootProjectName)(options, 'application');
+    const { projectName: hostProjectName, projectRoot: appRoot } = await (0, internal_1.determineProjectNameAndRootOptions)(tree, {
         name: options.name,
         projectType: 'application',
         directory: options.directory,
     });
+    const hostPort = options.port ?? 4200;
     const appInstallTask = await (0, application_1.default)(tree, {
         ...options,
         standalone: options.standalone,
         routing: true,
-        port: 4200,
+        port: hostPort,
         skipFormat: true,
         bundler: 'webpack',
     });
@@ -68,7 +71,7 @@ async function host(tree, schema) {
         appName: hostProjectName,
         mfType: 'host',
         routing: true,
-        port: 4200,
+        port: hostPort,
         remotes: remotesToIntegrate ?? [],
         federationType: options.dynamic ? 'dynamic' : 'static',
         skipPackageJson: options.skipPackageJson,
@@ -97,7 +100,7 @@ async function host(tree, schema) {
             name: remote,
             directory: remoteDirectory,
             host: hostProjectName,
-            port: isRspack ? 4200 + i + 1 : undefined,
+            port: isRspack ? hostPort + i + 1 : undefined,
             skipFormat: true,
             standalone: options.standalone,
             typescriptConfiguration,
@@ -114,7 +117,7 @@ async function host(tree, schema) {
     const project = (0, devkit_1.readProjectConfiguration)(tree, hostProjectName);
     project.targets.serve ??= {};
     project.targets.serve.options ??= {};
-    project.targets.serve.options.port = 4200;
+    project.targets.serve.options.port = hostPort;
     (0, devkit_1.updateProjectConfiguration)(tree, hostProjectName, project);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);

package/src/generators/host/lib/update-ssr-setup.js

@@ -2,13 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateSsrSetup = updateSsrSetup;
 const devkit_1 = require("@nx/devkit");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/js/internal");
 const path_1 = require("path");
 const versions_1 = require("../../../utils/versions");
 const version_utils_1 = require("../../utils/version-utils");
 async function updateSsrSetup(tree, options, appName, typescriptConfiguration) {
     let project = (0, devkit_1.readProjectConfiguration)(tree, appName);
-    const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(project, tree);
+    const sourceRoot = (0, internal_1.getProjectSourceRoot)(project, tree);
     tree.rename((0, devkit_1.joinPathFragments)(sourceRoot, 'main.server.ts'), (0, devkit_1.joinPathFragments)(sourceRoot, 'bootstrap.server.ts'));
     const pathToServerEntry = (0, devkit_1.joinPathFragments)(sourceRoot, 'server.ts');
     tree.write(pathToServerEntry, `import('./main.server');`);

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

@@ -6,6 +6,7 @@ export interface Schema {
   directory: string;
   name?: string;
   bundler?: 'webpack' | 'rspack';
+  port?: number;
   remotes?: string[];
   dynamic?: boolean;
   setParserOptionsProject?: boolean;

package/src/generators/host/schema.json

@@ -43,6 +43,10 @@
       "default": "webpack",
       "enum": ["webpack", "rspack"]
     },
+    "port": {
+      "type": "number",
+      "description": "The port at which the Consumer (host) application should be served. Defaults to 4200."
+    },
     "dynamic": {
       "type": "boolean",
       "description": "Should the host application use dynamic federation?",

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

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/init/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,iBAAiB,EAItB,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAQpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,iBAAiB,CAAC,CA8B5B;AA2ED,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/init/init.ts"],"names":[],"mappings":"AACA,OAAO,EAKL,KAAK,iBAAiB,EAItB,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAQpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,iBAAiB,CAAC,CA+B5B;AA2ED,eAAe,oBAAoB,CAAC"}

package/src/generators/init/init.js

@@ -1,12 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.angularInitGenerator = angularInitGenerator;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const add_plugin_1 = require("@nx/devkit/src/utils/add-plugin");
 const plugin_1 = require("../../plugins/plugin");
+const assert_supported_angular_version_1 = require("../../utils/assert-supported-angular-version");
 const validations_1 = require("../utils/validations");
 const version_utils_1 = require("../utils/version-utils");
 async function angularInitGenerator(tree, options) {
+    (0, assert_supported_angular_version_1.assertSupportedAngularVersion)(tree);
     (0, validations_1.assertNotUsingTsSolutionSetup)(tree, 'init');
     ignoreAngularCacheDirectory(tree);
     const installTask = installAngularDevkitCoreIfMissing(tree, options);
@@ -16,7 +18,7 @@ async function angularInitGenerator(tree, options) {
     // by most folks we've talked to.
     options.addPlugin ??= process.env.NX_RUNNING_NX_IMPORT === 'true';
     if (options.addPlugin) {
-        await (0, add_plugin_1.addPlugin)(tree, await (0, devkit_1.createProjectGraphAsync)(), '@nx/angular/plugin', plugin_1.createNodesV2, {
+        await (0, internal_1.addPlugin)(tree, await (0, devkit_1.createProjectGraphAsync)(), '@nx/angular/plugin', plugin_1.createNodesV2, {
             targetNamePrefix: ['', 'angular:', 'angular-'],
         }, options.updatePackageScripts);
     }

package/src/generators/library/lib/add-children.js

@@ -5,14 +5,14 @@ const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const ast_utils_1 = require("../../../utils/nx-devkit/ast-utils");
 const route_utils_1 = require("../../../utils/nx-devkit/route-utils");
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
+const internal_1 = require("@nx/js/internal");
 let tsModule;
 function addChildren(tree, options) {
     if (!tree.exists(options.parent)) {
         throw new Error(`Cannot find '${options.parent}'`);
     }
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const routeFileSource = tree.read(options.parent, 'utf-8');
     const constName = options.standalone

package/src/generators/library/lib/add-load-children.js

@@ -3,14 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addLoadChildren = addLoadChildren;
 const devkit_1 = require("@nx/devkit");
 const route_utils_1 = require("../../../utils/nx-devkit/route-utils");
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
+const internal_1 = require("@nx/js/internal");
 let tsModule;
 function addLoadChildren(tree, options) {
     if (!tree.exists(options.parent)) {
         throw new Error(`Cannot find '${options.parent}'`);
     }
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const moduleSource = tree.read(options.parent, 'utf-8');
     const sourceFile = tsModule.createSourceFile(options.parent, moduleSource, tsModule.ScriptTarget.Latest, true);

package/src/generators/library/lib/add-project.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addProject = addProject;
+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 add_release_config_1 = require("@nx/js/src/generators/library/utils/add-release-config");
+const internal_2 = require("@nx/js/internal");
 async function addProject(tree, libraryOptions) {
     const project = {
         name: libraryOptions.name,
@@ -18,7 +18,7 @@ async function addProject(tree, libraryOptions) {
         const executor = libraryOptions.publishable
             ? '@nx/angular:package'
             : '@nx/angular:ng-packagr-lite';
-        (0, target_defaults_utils_1.addBuildTargetDefaults)(tree, executor);
+        (0, internal_1.addBuildTargetDefaults)(tree, executor);
         project.targets.build = {
             executor,
             outputs: ['{workspaceRoot}/dist/{projectRoot}'],
@@ -36,7 +36,7 @@ async function addProject(tree, libraryOptions) {
         };
         if (libraryOptions.publishable) {
             const nxJson = (0, devkit_1.readJson)(tree, 'nx.json');
-            await (0, add_release_config_1.addReleaseConfigForNonTsSolution)(tree, libraryOptions.name, project);
+            await (0, internal_2.addReleaseConfigForNonTsSolution)(tree, libraryOptions.name, project);
         }
     }
     (0, devkit_1.addProjectConfiguration)(tree, libraryOptions.name, project);

package/src/generators/library/lib/create-files.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createFiles = createFiles;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/js/internal");
 const semver_1 = require("semver");
 const test_runners_1 = require("../../../utils/test-runners");
 const version_utils_1 = require("../../utils/version-utils");
@@ -51,7 +51,7 @@ function createFiles(tree, options, project) {
         }
     }
     if (!options.libraryOptions.routing) {
-        tree.delete((0, devkit_1.joinPathFragments)((0, ts_solution_setup_1.getProjectSourceRoot)(project, tree), `lib/lib.routes.ts`));
+        tree.delete((0, devkit_1.joinPathFragments)((0, internal_1.getProjectSourceRoot)(project, tree), `lib/lib.routes.ts`));
     }
     if (!options.libraryOptions.buildable &&
         !options.libraryOptions.publishable) {

package/src/generators/library/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 artifact_types_1 = require("../../utils/artifact-types");
 const version_utils_1 = require("../../utils/version-utils");
@@ -21,8 +21,8 @@ async function normalizeOptions(host, schema) {
         skipModule: schema.skipModule || schema.standalone,
         ...schema,
     };
-    await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'library');
-    const { projectName, names: projectNames, projectRoot, importPath, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+    await (0, internal_1.ensureRootProjectName)(options, 'library');
+    const { projectName, names: projectNames, projectRoot, importPath, } = await (0, internal_1.determineProjectNameAndRootOptions)(host, {
         name: options.name,
         projectType: 'library',
         directory: options.directory,

package/src/generators/library/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_project_root_tsconfig_1 = require("../../utils/update-project-root-tsconfig");
@@ -59,7 +59,7 @@ function updateTsConfigFiles(tree, options) {
             ...json.compilerOptions,
             ...compilerOptions,
         };
-        json.compilerOptions = (0, configuration_1.getNeededCompilerOptionOverrides)(tree, json.compilerOptions, rootTsConfigPath);
+        json.compilerOptions = (0, internal_1.getNeededCompilerOptionOverrides)(tree, json.compilerOptions, rootTsConfigPath);
         if (options.strict) {
             json.angularCompilerOptions = {
                 ...json.angularCompilerOptions,
@@ -79,7 +79,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/library/library.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"library.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/library/library.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,iBAAiB,EAIjB,IAAI,EACL,MAAM,YAAY,CAAC;AAuBpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,iBAAiB,CAAC,CAiE5B;AAoED,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"library.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/library/library.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,iBAAiB,EAIjB,IAAI,EACL,MAAM,YAAY,CAAC;AAuBpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,iBAAiB,CAAC,CAqE5B;AAoED,eAAe,gBAAgB,CAAC"}

package/src/generators/library/library.js

@@ -2,11 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.libraryGenerator = libraryGenerator;
 const tslib_1 = require("tslib");
+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 add_release_config_1 = require("@nx/js/src/generators/library/utils/add-release-config");
+const internal_2 = require("@nx/js/internal");
 const init_1 = tslib_1.__importDefault(require("../../generators/init/init"));
+const assert_supported_angular_version_1 = require("../../utils/assert-supported-angular-version");
 const test_runners_1 = require("../../utils/test-runners");
 const add_linting_1 = tslib_1.__importDefault(require("../add-linting/add-linting"));
 const add_jest_1 = require("../utils/add-jest");
@@ -25,6 +26,7 @@ const update_lib_package_npm_scope_1 = require("./lib/update-lib-package-npm-sco
 const update_tsconfig_files_1 = require("./lib/update-tsconfig-files");
 const validate_options_1 = require("./lib/validate-options");
 async function libraryGenerator(tree, schema) {
+    (0, assert_supported_angular_version_1.assertSupportedAngularVersion)(tree);
     (0, validations_1.assertNotUsingTsSolutionSetup)(tree, 'library');
     (0, validate_options_1.validateOptions)(tree, schema);
     const options = await (0, normalize_options_1.normalizeOptions)(tree, schema);
@@ -43,7 +45,7 @@ async function libraryGenerator(tree, schema) {
     }
     const project = await (0, add_project_1.addProject)(tree, libraryOptions);
     (0, create_files_1.createFiles)(tree, options, project);
-    await addUnitTestRunner(tree, libraryOptions);
+    const unitTestRunnerTask = await addUnitTestRunner(tree, libraryOptions);
     (0, update_tsconfig_files_1.updateTsConfigFiles)(tree, libraryOptions);
     updateNpmScopeIfBuildableOrPublishable(tree, libraryOptions);
     (0, set_generator_defaults_1.setGeneratorDefaults)(tree, options);
@@ -64,11 +66,14 @@ async function libraryGenerator(tree, schema) {
     if (!libraryOptions.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
-    const tasks = [() => (0, devkit_1.installPackagesTask)(tree)];
+    const tasks = [
+        unitTestRunnerTask,
+        () => (0, devkit_1.installPackagesTask)(tree),
+    ];
     if (libraryOptions.publishable) {
-        tasks.push(await (0, add_release_config_1.releaseTasks)(tree));
+        tasks.push(await (0, internal_2.releaseTasks)(tree));
     }
-    tasks.push(() => (0, log_show_project_command_1.logShowProjectCommand)(libraryOptions.name));
+    tasks.push(() => (0, internal_1.logShowProjectCommand)(libraryOptions.name));
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 async function addUnitTestRunner(host, options) {
@@ -83,17 +88,16 @@ async function addUnitTestRunner(host, options) {
                 runtimeTsconfigFileName: 'tsconfig.lib.json',
                 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.projectRoot,
                 skipPackageJson: options.skipPackageJson,
                 useNxUnitTestRunnerExecutor: true,
             });
-            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.projectRoot,
                 skipFormat: options.skipFormat,
@@ -101,7 +105,8 @@ async function addUnitTestRunner(host, options) {
                 strict: options.strict,
                 zoneless,
             });
-            break;
+        default:
+            return () => { };
     }
 }
 function updateNpmScopeIfBuildableOrPublishable(host, options) {

package/src/generators/library-secondary-entry-point/library-secondary-entry-point.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"library-secondary-entry-point.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/library-secondary-entry-point/library-secondary-entry-point.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,IAAI,EAAE,MAAM,YAAY,CAAC;AAO/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAE5C,wBAAsB,mCAAmC,CACvD,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,gBAAgB,iBAW7B;AAED,eAAe,mCAAmC,CAAC"}
+{"version":3,"file":"library-secondary-entry-point.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/library-secondary-entry-point/library-secondary-entry-point.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,IAAI,EAAE,MAAM,YAAY,CAAC;AAQ/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAE5C,wBAAsB,mCAAmC,CACvD,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,gBAAgB,iBAY7B;AAED,eAAe,mCAAmC,CAAC"}