@nx/angular 0.0.0-pr-31222-862e973 → 0.0.0-pr-31313-387cdca

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

@@ -0,0 +1,77 @@
+"use strict";
+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 path_1 = require("path");
+const tsquery_1 = require("@phenomnomnominal/tsquery");
+const FILE_EXTENSION_REGEX = /\.[^.]+$/;
+async function getCustomWebpackConfig(tree, projectRoot, pathToCustomWebpackConfig) {
+    const webpackConfigContents = tree.read(pathToCustomWebpackConfig, 'utf-8');
+    if (webpackConfigContents.includes('@nx/module-federation/angular') &&
+        webpackConfigContents.includes('withModuleFederation')) {
+        tree.write(pathToCustomWebpackConfig, convertWebpackConfigToUseNxModuleFederationPlugin(webpackConfigContents));
+        return {
+            isWebpackConfigFunction: false,
+            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 webpackConfig = 'default' in configFile ? configFile.default : configFile;
+    return {
+        isWebpackConfigFunction: typeof webpackConfig === 'function',
+        normalizedPathToCustomWebpackConfig: `./${(0, path_1.relative)(projectRoot, pathToCustomWebpackConfig).replace(FILE_EXTENSION_REGEX, '')}`,
+    };
+}
+function convertWebpackConfigToUseNxModuleFederationPlugin(webpackConfigContents) {
+    let newWebpackConfigContents = webpackConfigContents;
+    let ast = tsquery_1.tsquery.ast(webpackConfigContents);
+    const withModuleFederationImportNodes = (0, tsquery_1.tsquery)(ast, 'ImportDeclaration:has(StringLiteral[value=@nx/module-federation/angular])');
+    if (withModuleFederationImportNodes.length > 0) {
+        const withModuleFederationImportNode = withModuleFederationImportNodes[0];
+        newWebpackConfigContents = `${webpackConfigContents.slice(0, withModuleFederationImportNode.getStart())}import { NxModuleFederationPlugin, NxModuleFederationDevServerPlugin } from '@nx/module-federation/angular';${webpackConfigContents.slice(withModuleFederationImportNode.getEnd())}`;
+        ast = tsquery_1.tsquery.ast(newWebpackConfigContents);
+        const exportedWithModuleFederationNodes = (0, tsquery_1.tsquery)(ast, 'ExportAssignment:has(CallExpression > Identifier[name=withModuleFederation])');
+        if (exportedWithModuleFederationNodes.length > 0) {
+            const exportedWithModuleFederationNode = exportedWithModuleFederationNodes[0];
+            newWebpackConfigContents = `${newWebpackConfigContents.slice(0, exportedWithModuleFederationNode.getStart())}${newWebpackConfigContents.slice(exportedWithModuleFederationNode.getEnd())}
+    export default {
+      plugins: [
+        new NxModuleFederationPlugin({ config }, {
+          dts: false,
+        }),
+        new NxModuleFederationDevServerPlugin({ config }),
+      ]
+    }
+    `;
+        }
+        else {
+            devkit_1.logger.warn("Could not find 'export default withModuleFederation' in the webpack config file. Skipping conversion.");
+        }
+    }
+    const withModuleFederationRequireNodes = (0, tsquery_1.tsquery)(ast, 'VariableStatement:has(CallExpression > Identifier[name=withModuleFederation], StringLiteral[value=@nx/module-federation/angular])');
+    if (withModuleFederationRequireNodes.length > 0) {
+        const withModuleFederationRequireNode = withModuleFederationRequireNodes[0];
+        newWebpackConfigContents = `${webpackConfigContents.slice(0, withModuleFederationRequireNode.getStart())}const { NxModuleFederationPlugin, NxModuleFederationDevServerPlugin } = require('@nx/module-federation/rspack');${webpackConfigContents.slice(withModuleFederationRequireNode.getEnd())}`;
+        ast = tsquery_1.tsquery.ast(newWebpackConfigContents);
+        const exportedWithModuleFederationNodes = (0, tsquery_1.tsquery)(ast, 'ExpressionStatement:has(BinaryExpression > PropertyAccessExpression:has(Identifier[name=module], Identifier[name=exports]), CallExpression:has(Identifier[name=withModuleFederation]))');
+        if (exportedWithModuleFederationNodes.length > 0) {
+            const exportedWithModuleFederationNode = exportedWithModuleFederationNodes[0];
+            newWebpackConfigContents = `${newWebpackConfigContents.slice(0, exportedWithModuleFederationNode.getStart())}${newWebpackConfigContents.slice(exportedWithModuleFederationNode.getEnd())}
+    module.exports = {
+      plugins: [
+        new NxModuleFederationPlugin({ config }, {
+          dts: false,
+        }),
+        new NxModuleFederationDevServerPlugin({ config }),
+      ]
+    }
+    `;
+        }
+        else {
+            devkit_1.logger.warn("Could not find 'module.exports = withModuleFederation' in the webpack config file. Skipping conversion.");
+        }
+    }
+    return newWebpackConfigContents;
+}

package/src/generators/convert-to-rspack/lib/update-tsconfig.d.ts

@@ -0,0 +1,2 @@
+import { Tree } from '@nx/devkit';
+export declare function updateTsconfig(tree: Tree, projectRoot: string): void;

package/src/generators/convert-to-rspack/lib/update-tsconfig.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateTsconfig = updateTsconfig;
+const devkit_1 = require("@nx/devkit");
+const js_1 = require("@nx/js");
+function updateTsconfig(tree, projectRoot) {
+    const tsconfigPath = (0, devkit_1.joinPathFragments)(projectRoot, 'tsconfig.json');
+    const tsconfig = (0, devkit_1.readJson)(tree, tsconfigPath);
+    tsconfig['ts-node'] ??= {};
+    tsconfig['ts-node'].compilerOptions ??= {};
+    tsconfig['ts-node'].compilerOptions.module = 'CommonJS';
+    tsconfig['ts-node'].compilerOptions.moduleResolution = 'Node10';
+    if (tsconfig.compilerOptions?.customConditions) {
+        tsconfig['ts-node'].compilerOptions.customConditions = null;
+    }
+    else {
+        const rootTsconfigFile = (0, js_1.getRootTsConfigFileName)(tree);
+        if (rootTsconfigFile) {
+            const rootTsconfigJson = (0, devkit_1.readJson)(tree, rootTsconfigFile);
+            if (rootTsconfigJson.compilerOptions?.customConditions) {
+                tsconfig['ts-node'].compilerOptions.customConditions = null;
+            }
+        }
+    }
+    (0, devkit_1.writeJson)(tree, tsconfigPath, tsconfig);
+}

package/src/generators/convert-to-rspack/lib/validate-supported-executor.d.ts

@@ -0,0 +1,2 @@
+import { TargetConfiguration } from '@nx/devkit';
+export declare function validateSupportedBuildExecutor(targets: TargetConfiguration[]): void;

package/src/generators/convert-to-rspack/lib/validate-supported-executor.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateSupportedBuildExecutor = validateSupportedBuildExecutor;
+const SUPPORTED_BUILD_EXECUTORS = [
+    '@angular-devkit/build-angular:browser',
+    '@nx/angular:webpack-browser',
+];
+function validateSupportedBuildExecutor(targets) {
+    const executorsUsedByProject = targets.map((target) => target.executor);
+    if (!executorsUsedByProject.some((executor) => SUPPORTED_BUILD_EXECUTORS.includes(executor))) {
+        throw new Error('The project does not use a supported build executor. Please use one of the following executors: ' +
+            SUPPORTED_BUILD_EXECUTORS.join(', '));
+    }
+}

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

@@ -0,0 +1,5 @@
+export interface ConvertToRspackSchema {
+  project: string;
+  skipFormat?: boolean;
+  skipInstall?: boolean;
+}

package/src/generators/convert-to-rspack/schema.json

@@ -0,0 +1,30 @@
+{
+  "$schema": "https://json-schema.org/schema",
+  "$id": "GeneratorNxApp",
+  "title": "Creates an Angular application.",
+  "description": "Creates an Angular application.",
+  "type": "object",
+  "cli": "nx",
+  "properties": {
+    "project": {
+      "type": "string",
+      "aliases": ["name", "projectName"],
+      "description": "Project for which to convert to rspack.",
+      "$default": {
+        "$source": "argv",
+        "index": 0
+      },
+      "x-priority": "important"
+    },
+    "skipFormat": {
+      "description": "Skip formatting files.",
+      "type": "boolean",
+      "default": false
+    },
+    "skipInstall": {
+      "description": "Skip installing dependencies.",
+      "type": "boolean",
+      "default": false
+    }
+  }
+}

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

@@ -1,9 +1,8 @@
 import { Tree } from '@nx/devkit';
 import { CypressComponentConfigSchema } from './schema';
-export declare function cypressComponentConfiguration(tree: Tree, options: CypressComponentConfigSchema): Promise<import("@nx/devkit").GeneratorCallback>;
 /**
  * This is for cypress built in component testing, if you want to test with
  * storybook + cypress then use the componentCypressGenerator instead.
  */
-export declare function cypressComponentConfigurationInternal(tree: Tree, options: CypressComponentConfigSchema): Promise<import("@nx/devkit").GeneratorCallback>;
+export declare function cypressComponentConfiguration(tree: Tree, options: CypressComponentConfigSchema): Promise<import("@nx/devkit").GeneratorCallback>;
 export default cypressComponentConfiguration;

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

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cypressComponentConfiguration = cypressComponentConfiguration;
-exports.cypressComponentConfigurationInternal = cypressComponentConfigurationInternal;
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 const versions_1 = require("../../utils/versions");
@@ -10,16 +9,11 @@ const component_info_1 = require("../utils/storybook-ast/component-info");
 const entry_point_1 = require("../utils/storybook-ast/entry-point");
 const module_info_1 = require("../utils/storybook-ast/module-info");
 const update_app_editor_tsconfig_excluded_files_1 = require("../utils/update-app-editor-tsconfig-excluded-files");
-function cypressComponentConfiguration(tree, options) {
-    return cypressComponentConfigurationInternal(tree, {
-        ...options,
-    });
-}
 /**
  * This is for cypress built in component testing, if you want to test with
  * storybook + cypress then use the componentCypressGenerator instead.
  */
-async function cypressComponentConfigurationInternal(tree, options) {
+async function cypressComponentConfiguration(tree, options) {
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     const { componentConfigurationGenerator: baseCyCTConfig } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
     const installTask = await baseCyCTConfig(tree, {

package/src/generators/directive/directive.js

@@ -3,14 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.directiveGenerator = directiveGenerator;
 const devkit_1 = require("@nx/devkit");
 const utils_1 = require("../utils");
+const version_utils_1 = require("../utils/version-utils");
 const lib_1 = require("./lib");
 async function directiveGenerator(tree, schema) {
     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, {
         selector: options.selector,
         symbolName: options.symbolName,
         fileName: options.fileName,
         standalone: options.standalone,
+        // Angular v19 or higher defaults to true, while v18 or lower defaults to false
+        setStandalone: (angularMajorVersion >= 19 && !options.standalone) ||
+            (angularMajorVersion < 19 && options.standalone),
         tpl: '',
     });
     if (options.skipTests) {

package/src/generators/directive/files/__fileName__.ts__tpl__

@@ -1,8 +1,8 @@
 import { Directive } from '@angular/core';
 
 @Directive({
-  selector: '[<%= selector %>]'<% if(standalone) {%>,
-  standalone: true<%}%>
+  selector: '[<%= selector %>]'<% if (setStandalone) { %>,
+  standalone: <%= standalone %><% } %>
 })
 export class <%= symbolName %> {
   constructor() {}

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

@@ -2,22 +2,21 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
 const devkit_1 = require("@nx/devkit");
-const selector_1 = require("../../utils/selector");
 const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
+const selector_1 = require("../../utils/selector");
+const validations_1 = require("../../utils/validations");
 async function normalizeOptions(tree, options) {
     const { artifactName: name, directory, fileName, filePath, project: projectName, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
-        artifactType: 'directive',
-        callingGenerator: '@nx/angular:directive',
         name: options.name,
-        directory: options.directory ?? options.path,
-        flat: options.flat,
-        nameAndDirectoryFormat: options.nameAndDirectoryFormat,
-        project: options.project,
+        path: options.path,
         suffix: 'directive',
+        allowedFileExtensions: ['ts'],
+        fileExtension: 'ts',
     });
     const { className } = (0, devkit_1.names)(name);
     const { className: suffixClassName } = (0, devkit_1.names)('directive');
     const symbolName = `${className}${suffixClassName}`;
+    (0, validations_1.validateClassName)(symbolName);
     const { prefix } = (0, devkit_1.readProjectConfiguration)(tree, projectName);
     const selector = options.selector ??
         (0, selector_1.buildSelector)(name, options.prefix, prefix, 'propertyName');

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

@@ -1,9 +1,6 @@
-import { NameAndDirectoryFormat } from '@nx/devkit/src/generators/artifact-name-and-directory-utils';
-
 export interface Schema {
-  name: string;
-  directory?: string;
-  nameAndDirectoryFormat?: NameAndDirectoryFormat;
+  path: string;
+  name?: string;
   prefix?: string;
   skipTests?: boolean;
   skipImport?: boolean;
@@ -12,18 +9,6 @@ export interface Schema {
   module?: string;
   export?: boolean;
   skipFormat?: boolean;
-  /**
-   * @deprecated Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v20.
-   */
-  flat?: boolean;
-  /**
-   * @deprecated Provide the `directory` option instead. It will be removed in Nx v20.
-   */
-  path?: string;
-  /**
-   * @deprecated Provide the `directory` option instead. The project will be determined from the directory provided. It will be removed in Nx v20.
-   */
-  project?: string;
 }
 
 export interface NormalizedSchema extends Schema {

package/src/generators/directive/schema.json

@@ -6,35 +6,33 @@
   "type": "object",
   "description": "Creates a new Angular directive.",
   "additionalProperties": false,
+  "examples": [
+    {
+      "description": "Generate a directive with the exported symbol matching the file name. It results in the directive `FooDirective` at `mylib/src/lib/foo.directive.ts`",
+      "command": "nx g @nx/angular:directive mylib/src/lib/foo.directive.ts"
+    },
+    {
+      "description": "Generate a directive without providing the file extension. It results in the directive `FooDirective` at `mylib/src/lib/foo.directive.ts`",
+      "command": "nx g @nx/angular:directive mylib/src/lib/foo"
+    },
+    {
+      "description": "Generate a directive with the exported symbol different from the file name. It results in the directive `CustomDirective` at `mylib/src/lib/foo.directive.ts`",
+      "command": "nx g @nx/angular:directive mylib/src/lib/foo --name=custom"
+    }
+  ],
   "properties": {
-    "name": {
+    "path": {
       "type": "string",
-      "description": "The name of the new directive.",
+      "description": "The file path to the directive. Relative to the current working directory.",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use for the directive?"
+      "x-prompt": "What is the directive file path?"
     },
-    "directory": {
-      "type": "string",
-      "description": "The directory at which to create the directive file. When `--nameAndDirectoryFormat=as-provided`, it will be relative to the current working directory. Otherwise, it will be relative to the workspace root.",
-      "aliases": ["dir", "path"],
-      "x-priority": "important"
-    },
-    "nameAndDirectoryFormat": {
-      "description": "Whether to generate the directive in the directory as provided, relative to the current working directory and ignoring the project (`as-provided`) or generate it using the project and directory relative to the workspace root (`derived`).",
-      "type": "string",
-      "enum": ["as-provided", "derived"]
-    },
-    "project": {
+    "name": {
       "type": "string",
-      "description": "The name of the project.",
-      "$default": {
-        "$source": "projectName"
-      },
-      "x-dropdown": "projects",
-      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v20."
+      "description": "The directive symbol name. Defaults to the last segment of the file path."
     },
     "prefix": {
       "type": "string",
@@ -70,12 +68,6 @@
       "type": "boolean",
       "default": true
     },
-    "flat": {
-      "type": "boolean",
-      "description": "When true (the default), creates the new files at the top level of the current project.",
-      "default": true,
-      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v20."
-    },
     "module": {
       "type": "string",
       "description": "The filename of the declaring NgModule.",
@@ -92,5 +84,5 @@
       "description": "Skip formatting of files."
     }
   },
-  "required": ["name"]
+  "required": ["path"]
 }

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

@@ -16,7 +16,6 @@ async function addRemote(tree, schema) {
             directory: schema.remoteDirectory,
             host: schema.host,
             standalone: schema.standalone,
-            projectNameAndRootFormat: schema.projectNameAndRootFormat ?? 'derived',
             unitTestRunner: schema.unitTestRunner ?? test_runners_1.UnitTestRunner.Jest,
             e2eTestRunner: schema.e2eTestRunner ?? test_runners_1.E2eTestRunner.Cypress,
             skipFormat: true,
@@ -26,8 +25,6 @@ async function addRemote(tree, schema) {
             name: schema.remote,
             directory: schema.remoteDirectory,
             projectType: 'application',
-            projectNameAndRootFormat: schema.projectNameAndRootFormat ?? 'derived',
-            callingGenerator: '@nx/angular:federate-module',
         });
         projectRoot = remoteRoot;
         remoteName = projectName;

package/src/generators/federate-module/schema.d.ts

@@ -1,4 +1,3 @@
-import { type ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
 import { UnitTestRunner, E2eTestRunner } from '../utils/testing';
 
 export interface Schema {
@@ -7,7 +6,6 @@ export interface Schema {
   remote: string;
   remoteDirectory?: string;
   host?: string;
-  projectNameAndRootFormat?: ProjectNameAndRootFormat;
   unitTestRunner?: UnitTestRunner;
   e2eTestRunner?: E2eTestRunner;
   standalone?: boolean;

package/src/generators/federate-module/schema.json

@@ -3,11 +3,15 @@
   "cli": "nx",
   "$id": "NxReactFederateModule",
   "title": "Federate Module",
-  "description": "Create a federated module, which is exposed by a remote and can be subsequently loaded by a host.",
+  "description": "Create a federated module, which is exposed by a Producer (remote) and can be subsequently loaded by a Consumer (host).",
   "examples": [
     {
-      "command": "nx g federate-module MyModule --path=./src/component/my-cmp.ts --remote=my-remote-app --remoteDirectory=apps/my-remote-app",
+      "command": "nx g federate-module MyModule --path=./src/component/my-cmp.ts --remote=myRemoteApp --remoteDirectory=apps/myRemoteApp",
       "description": "Create a federated module from my-remote-app, that exposes my-cmp from ./src/component/my-cmp.ts as MyModule."
+    },
+    {
+      "command": "nx g federate-module MyModule --path=./src/component/my-cmp.ts --producer=myProducer --producerDirectory=apps/myProducer",
+      "description": "Create a federated module from myProducer, that exposes my-cmp from ./src/component/my-cmp.ts as MyModule."
     }
   ],
   "type": "object",
@@ -30,20 +34,17 @@
     },
     "remote": {
       "type": "string",
-      "description": "The name of the remote.",
-      "x-prompt": "What is/should the remote be named?"
+      "description": "The name of the Producer (remote).",
+      "x-prompt": "What is/should the Producer (remote) be named?",
+      "alias": "producer"
     },
     "remoteDirectory": {
-      "description": "The directory of the new remote application if one needs to be created.",
-      "type": "string"
-    },
-    "projectNameAndRootFormat": {
-      "description": "Whether to generate the project name and root directory as provided (`as-provided`) or generate them composing their values and taking the configured layout into account (`derived`).",
+      "description": "The directory of the new Producer (remote) application if one needs to be created.",
       "type": "string",
-      "enum": ["as-provided", "derived"]
+      "alias": "producerDirectory"
     },
     "style": {
-      "description": "The file extension to be used for style files for the remote if one needs to be created.",
+      "description": "The file extension to be used for style files for the Producer (remote) if one needs to be created.",
       "type": "string",
       "default": "css",
       "enum": ["css", "scss", "sass", "less"]
@@ -56,24 +57,26 @@
     },
     "unitTestRunner": {
       "type": "string",
-      "enum": ["jest", "none"],
-      "description": "Test runner to use for unit tests of the remote if it needs to be created.",
+      "enum": ["jest", "vitest", "none"],
+      "description": "Test runner to use for unit tests of the Producer (remote) if it needs to be created.",
+      "x-prompt": "Which unit test runner would you like to use?",
       "default": "jest"
     },
     "e2eTestRunner": {
       "type": "string",
       "enum": ["cypress", "none"],
-      "description": "Test runner to use for end to end (e2e) tests of the remote if it needs to be created.",
+      "description": "Test runner to use for end to end (e2e) tests of the Producer (remote) if it needs to be created.",
       "default": "cypress"
     },
     "standalone": {
-      "description": "Whether to generate the remote application with standalone components if it needs to be created.",
+      "description": "Whether to generate the Producer (remote) application with standalone components if it needs to be created.",
       "type": "boolean",
       "default": true
     },
     "host": {
       "type": "string",
-      "description": "The host / shell application for this remote."
+      "description": "The Consumer (host) application for this Producer (remote).",
+      "alias": "consumer"
     }
   },
   "required": ["name", "path", "remote"],

package/src/generators/host/files/common/{v17+/src → src}/main.server.ts__tmpl__

@@ -1,7 +1,7 @@
 import 'zone.js/node';
 
 import { APP_BASE_HREF } from '@angular/common';
-import { CommonEngine } from '@angular/ssr';
+import { CommonEngine } from '<%= commonEngineEntryPoint %>';
 import * as express from 'express';
 import * as cors from 'cors';
 import { existsSync } from 'node:fs';

package/src/generators/host/files/js/webpack.server.config.js__tmpl__

@@ -1,4 +1,4 @@
-const { withModuleFederationForSSR } = require('@nx/angular/module-federation');
+const { withModuleFederationForSSR } = require('@nx/module-federation/angular');
 const config = require('./module-federation.config');
 /**
  * DTS Plugin is disabled in Nx Workspaces as Nx already provides Typing support for Module Federation

package/src/generators/host/files/ts/webpack.server.config.ts__tmpl__

@@ -1,4 +1,4 @@
-import { withModuleFederationForSSR } from '@nx/angular/module-federation';
+import { withModuleFederationForSSR } from '@nx/module-federation/angular';
 import config from './module-federation.config';
 
 /**

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

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

package/src/generators/host/host.js

@@ -1,24 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.host = host;
-exports.hostInternal = hostInternal;
 const tslib_1 = require("tslib");
 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 ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const test_runners_1 = require("../../utils/test-runners");
 const application_1 = tslib_1.__importDefault(require("../application/application"));
 const remote_1 = tslib_1.__importDefault(require("../remote/remote"));
 const setup_mf_1 = require("../setup-mf/setup-mf");
-const lib_1 = require("./lib");
 const add_mf_env_to_inputs_1 = require("../utils/add-mf-env-to-inputs");
-const js_1 = require("@nx/js");
-async function host(tree, options) {
-    return await hostInternal(tree, {
-        projectNameAndRootFormat: 'derived',
-        ...options,
-    });
-}
-async function hostInternal(tree, schema) {
+const lib_1 = require("./lib");
+const assert_mf_utils_1 = require("../utils/assert-mf-utils");
+const convert_to_rspack_1 = tslib_1.__importDefault(require("../convert-to-rspack/convert-to-rspack"));
+async function host(tree, schema) {
+    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(tree, 'angular', 'host');
+    // TODO: Replace with Rspack when confidence is high enough
+    schema.bundler ??= 'webpack';
+    const isRspack = schema.bundler === 'rspack';
+    (0, assert_mf_utils_1.assertRspackIsCSR)(schema.bundler, schema.ssr ?? false, schema.serverRouting ?? false);
     const { typescriptConfiguration = true, ...options } = schema;
     options.standalone = options.standalone ?? true;
     const projects = (0, devkit_1.getProjects)(tree);
@@ -44,14 +45,12 @@ async function hostInternal(tree, schema) {
             }
         });
     }
-    const { projectName: hostProjectName, projectNameAndRootFormat } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
+    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, {
         name: options.name,
         projectType: 'application',
         directory: options.directory,
-        projectNameAndRootFormat: options.projectNameAndRootFormat,
-        callingGenerator: '@nx/angular:host',
     });
-    options.projectNameAndRootFormat = projectNameAndRootFormat;
     const appInstallTask = await (0, application_1.default)(tree, {
         ...options,
         standalone: options.standalone,
@@ -82,28 +81,37 @@ async function hostInternal(tree, schema) {
         let ssrInstallTask = await (0, lib_1.updateSsrSetup)(tree, options, hostProjectName, typescriptConfiguration);
         installTasks.push(ssrInstallTask);
     }
-    for (const remote of remotesToGenerate) {
-        let remoteDirectory = options.directory;
-        if (options.projectNameAndRootFormat === 'as-provided' &&
-            options.directory) {
-            /**
-             * With the `as-provided` format, the provided directory would be the root
-             * of the host application. Append the remote name to the host parent
-             * directory to get the remote directory.
-             */
-            remoteDirectory = (0, devkit_1.joinPathFragments)(options.directory, '..', remote);
-        }
+    for (let i = 0; i < remotesToGenerate.length; i++) {
+        const remote = remotesToGenerate[i];
+        const remoteDirectory = options.directory
+            ? (0, devkit_1.joinPathFragments)(options.directory, '..', remote)
+            : appRoot === '.'
+                ? remote
+                : (0, devkit_1.joinPathFragments)(appRoot, '..', remote);
         await (0, remote_1.default)(tree, {
             ...options,
             name: remote,
             directory: remoteDirectory,
             host: hostProjectName,
+            port: isRspack ? 4200 + i + 1 : undefined,
             skipFormat: true,
             standalone: options.standalone,
             typescriptConfiguration,
         });
     }
     (0, add_mf_env_to_inputs_1.addMfEnvToTargetDefaultInputs)(tree);
+    if (isRspack) {
+        await (0, convert_to_rspack_1.default)(tree, {
+            project: hostProjectName,
+            skipInstall: options.skipPackageJson,
+            skipFormat: true,
+        });
+    }
+    const project = (0, devkit_1.readProjectConfiguration)(tree, hostProjectName);
+    project.targets.serve ??= {};
+    project.targets.serve.options ??= {};
+    project.targets.serve.options.port = 4200;
+    (0, devkit_1.updateProjectConfiguration)(tree, hostProjectName, project);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }