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

package/src/generators/ng-add/migrators/builders/builder.migrator.js

@@ -4,9 +4,9 @@ exports.BuilderMigrator = void 0;
 const utilities_1 = require("../../utilities");
 const migrator_1 = require("../migrator");
 class BuilderMigrator extends migrator_1.Migrator {
-    constructor(tree, builderName, rootFileType, project, projectConfig, logger) {
+    constructor(tree, possibleBuilderNames, rootFileType, project, projectConfig, logger) {
         super(tree, projectConfig, logger);
-        this.builderName = builderName;
+        this.possibleBuilderNames = possibleBuilderNames;
         this.rootFileType = rootFileType;
         this.targets = new Map();
         this.skipMigration = false;
@@ -20,7 +20,7 @@ class BuilderMigrator extends migrator_1.Migrator {
         // expanding what's supported.
         if (this.targets.size > 1) {
             errors.push({
-                message: `There is more than one target using the builder "${this.builderName}": ${(0, utilities_1.arrayToString)([
+                message: `There is more than one target using the builder${this.possibleBuilderNames.length > 1 ? 's' : ''} ${(0, utilities_1.arrayToString)(this.possibleBuilderNames)}: ${(0, utilities_1.arrayToString)([
                     ...this.targets.keys(),
                 ])}. This is not currently supported by the automated migration. These targets will be skipped.`,
                 hint: 'Make sure to manually migrate their configuration and any possible associated files.',
@@ -34,7 +34,7 @@ class BuilderMigrator extends migrator_1.Migrator {
     }
     collectBuilderTargets() {
         for (const [name, target] of Object.entries(this.projectConfig.targets ?? {})) {
-            if (target.executor === this.builderName) {
+            if (this.possibleBuilderNames.includes(target.executor)) {
                 this.targets.set(name, target);
             }
         }

package/src/generators/ng-add/migrators/projects/e2e.migrator.js

@@ -173,8 +173,8 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
         }
         else if (this.isCypressE2eProject()) {
             (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
-            const { installedCypressVersion, } = require('@nx/cypress/src/utils/cypress-version');
-            this.cypressInstalledVersion = installedCypressVersion();
+            const { getInstalledCypressMajorVersion, } = require('@nx/cypress/src/utils/versions');
+            this.cypressInstalledVersion = getInstalledCypressMajorVersion(this.tree);
             this.project = {
                 ...this.project,
                 name,
@@ -215,7 +215,7 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
         if (this.isProjectUsingEsLint) {
             await (0, eslint_1.lintProjectGenerator)(this.tree, {
                 project: this.project.name,
-                linter: eslint_1.Linter.EsLint,
+                linter: 'eslint',
                 unitTestRunner: this.options.unitTestRunner,
                 tsConfigPaths: [
                     (0, devkit_1.joinPathFragments)(this.project.newRoot, 'tsconfig.json'),
@@ -240,7 +240,7 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
         const { configurationGenerator } = (require('@nx/cypress'));
         await configurationGenerator(this.tree, {
             project: this.project.name,
-            linter: this.isProjectUsingEsLint ? eslint_1.Linter.EsLint : eslint_1.Linter.None,
+            linter: this.isProjectUsingEsLint ? 'eslint' : 'none',
             skipFormat: true,
             // any target would do, we replace it later with the target existing in the project being migrated
             devServerTarget: `${this.appName}:serve`,

package/src/generators/ng-add/migrators/projects/project.migrator.js

@@ -88,7 +88,7 @@ class ProjectMigrator extends migrator_1.Migrator {
                 .map((x) => x.builders)
                 .flat(),
         ];
-        allSupportedBuilders.push(...this.builderMigrators.map((migrator) => migrator.builderName));
+        allSupportedBuilders.push(...this.builderMigrators.flatMap((migrator) => migrator.possibleBuilderNames));
         const unsupportedBuilders = [];
         Object.entries(this.projectConfig.targets ?? {}).forEach(([targetName, target]) => {
             if (!allSupportedBuilders.includes(target.executor)) {

package/src/generators/ng-add/utilities/validation-logging.js

@@ -2,7 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.arrayToString = arrayToString;
 exports.getProjectValidationResultMessage = getProjectValidationResultMessage;
-const chalk = require("chalk");
+const tslib_1 = require("tslib");
+const pc = tslib_1.__importStar(require("picocolors"));
 function arrayToString(array) {
     if (array.length === 0) {
         return '';
@@ -15,7 +16,7 @@ function arrayToString(array) {
     return `${rest.map(quote).join(', ')} and ${quote(last)}`;
 }
 function getProjectValidationResultMessage(validationResult) {
-    return `${chalk.bold('Validation results')}:
+    return `${pc.bold('Validation results')}:
 
   ${validationResult
         .map((error) => getValidationErrorText(error))
@@ -23,12 +24,12 @@ function getProjectValidationResultMessage(validationResult) {
 }
 function getValidationErrorText({ message, messageGroup, hint, }) {
     let lines = message
-        ? [`- ${message}`, ...(hint ? [chalk.dim(chalk.italic(`  ${hint}`))] : [])]
+        ? [`- ${message}`, ...(hint ? [pc.dim(pc.italic(`  ${hint}`))] : [])]
         : [
             `- ${messageGroup.title}:`,
             '  - Errors:',
             ...messageGroup.messages.map((message) => `    - ${message}`),
-            ...(hint ? [chalk.dim(chalk.italic(`  - ${hint}`))] : []),
+            ...(hint ? [pc.dim(pc.italic(`  - ${hint}`))] : []),
         ];
     return lines.join('\n  ');
 }

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

@@ -54,7 +54,10 @@ function createNxJson(tree, options, defaultProject) {
                     ]
                     : []),
                 ...(targets.lint
-                    ? ['!{projectRoot}/.eslintrc.json', '!{projectRoot}/eslint.config.js']
+                    ? [
+                        '!{projectRoot}/.eslintrc.json',
+                        '!{projectRoot}/eslint.config.cjs',
+                    ]
                     : []),
             ].filter(Boolean),
         },
@@ -75,7 +78,7 @@ function createNxJson(tree, options, defaultProject) {
                     inputs: [
                         'default',
                         '{workspaceRoot}/.eslintrc.json',
-                        '{workspaceRoot}/eslint.config.js',
+                        '{workspaceRoot}/eslint.config.cjs',
                     ],
                     cache: true,
                 }

package/src/generators/ngrx/ngrx.d.ts

@@ -1,4 +1,7 @@
 import type { GeneratorCallback, Tree } from '@nx/devkit';
 import type { NgRxGeneratorOptions } from './schema';
+/**
+ * @deprecated Use the 'ngrx-root-store' and 'ngrx-feature-store' generators instead. It will be removed in Nx v22.
+ */
 export declare function ngrxGenerator(tree: Tree, schema: NgRxGeneratorOptions): Promise<GeneratorCallback>;
 export default ngrxGenerator;

package/src/generators/ngrx/ngrx.js

@@ -3,6 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ngrxGenerator = ngrxGenerator;
 const devkit_1 = require("@nx/devkit");
 const lib_1 = require("./lib");
+/**
+ * @deprecated Use the 'ngrx-root-store' and 'ngrx-feature-store' generators instead. It will be removed in Nx v22.
+ */
 async function ngrxGenerator(tree, schema) {
     (0, lib_1.validateOptions)(tree, schema);
     const options = (0, lib_1.normalizeOptions)(tree, schema);

package/src/generators/ngrx/schema.json

@@ -3,7 +3,7 @@
   "$id": "NxNgrxGenerator",
   "title": "Add NgRx support to an application or library.",
   "description": "Adds NgRx support to an application or library.",
-  "x-deprecated": "This generator is deprecated and will be removed in a future version of Nx. Use the 'ngrx-root-store' and 'ngrx-feature-store' generators instead.",
+  "x-deprecated": "Use the 'ngrx-root-store' and 'ngrx-feature-store' generators instead. It will be removed in Nx v22.",
   "cli": "nx",
   "type": "object",
   "examples": [

package/src/generators/ngrx-feature-store/schema.d.ts

@@ -2,7 +2,7 @@ export interface Schema {
   name: string;
   minimal: boolean;
   parent: string;
-  directory?: string;
+  directory: string;
   route?: string;
   barrels?: boolean;
   facade?: boolean;

package/src/generators/ngrx-root-store/lib/add-imports.js

@@ -87,14 +87,14 @@ function addImportsToModule(tree, options) {
         sourceFile = addImport(sourceFile, 'StoreModule', '@ngrx/store');
         sourceFile = addImport(sourceFile, 'EffectsModule', '@ngrx/effects');
     }
-    sourceFile = addRootStoreImport(tree, isParentStandalone, sourceFile, parentPath, provideRootStore, storeForRoot);
     sourceFile = addRootEffectsImport(tree, isParentStandalone, sourceFile, parentPath, provideRootEffects, effectsForEmptyRoot);
+    if (options.addDevTools) {
+        sourceFile = addStoreDevTools(tree, sourceFile, parentPath, isParentStandalone, addImport);
+    }
+    sourceFile = addRootStoreImport(tree, isParentStandalone, sourceFile, parentPath, provideRootStore, storeForRoot);
     // this is just a heuristic
     const hasRouter = sourceText.indexOf('RouterModule') > -1;
     if (hasRouter && !isParentStandalone) {
         sourceFile = addRouterStoreImport(tree, sourceFile, addImport, parentPath, storeRouterModule);
     }
-    if (options.addDevTools) {
-        sourceFile = addStoreDevTools(tree, sourceFile, parentPath, isParentStandalone, addImport);
-    }
 }

package/src/generators/ngrx-root-store/lib/normalize-options.js

@@ -24,8 +24,9 @@ function normalizeOptions(tree, options) {
      * --> If so, use that
      * --> If not, use main.ts
      */
-    const parent = !isStandalone
-        ? (0, devkit_1.joinPathFragments)(project.sourceRoot, 'app/app.module.ts')
+    const ngModulePath = (0, devkit_1.joinPathFragments)(project.sourceRoot, 'app/app.module.ts');
+    const parent = !isStandalone && tree.exists(ngModulePath)
+        ? ngModulePath
         : tree.exists(appConfigPath)
             ? appConfigPath
             : appMainPath;

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

@@ -1,8 +1,8 @@
 import { Pipe, PipeTransform } from '@angular/core';
 
 @Pipe({
-  name: '<%= selector %>'<% if(standalone) {%>,
-  standalone: true<%}%>
+  name: '<%= selector %>'<% if (setStandalone) { %>,
+  standalone: <%= standalone %><% } %>
 })
 export class <%= symbolName %> implements PipeTransform {
   transform(value: unknown, ...args: unknown[]): unknown {

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

@@ -1,22 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
-const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
 const devkit_1 = require("@nx/devkit");
+const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
+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: 'pipe',
-        callingGenerator: '@nx/angular:pipe',
         name: options.name,
-        directory: options.directory ?? options.path,
-        flat: options.flat,
-        nameAndDirectoryFormat: options.nameAndDirectoryFormat,
-        project: options.project,
+        path: options.path,
         suffix: 'pipe',
+        allowedFileExtensions: ['ts'],
+        fileExtension: 'ts',
     });
     const { className } = (0, devkit_1.names)(name);
     const { className: suffixClassName } = (0, devkit_1.names)('pipe');
     const symbolName = `${className}${suffixClassName}`;
+    (0, validations_1.validateClassName)(symbolName);
     return {
         ...options,
         projectName,

package/src/generators/pipe/pipe.js

@@ -3,15 +3,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.pipeGenerator = pipeGenerator;
 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 pipeGenerator(tree, rawOptions) {
     const options = await (0, lib_1.normalizeOptions)(tree, rawOptions);
+    const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
     const pipeNames = (0, devkit_1.names)(options.name);
     (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files'), options.directory, {
         symbolName: options.symbolName,
         fileName: options.fileName,
         selector: pipeNames.propertyName,
         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/pipe/schema.d.ts

@@ -1,27 +1,12 @@
-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;
   skipTests?: boolean;
   skipImport?: boolean;
   standalone?: boolean;
   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/pipe/schema.json

@@ -6,41 +6,33 @@
   "cli": "nx",
   "additionalProperties": false,
   "description": "Creates an Angular pipe.",
+  "examples": [
+    {
+      "description": "Generate a pipe with the exported symbol matching the file name. It results in the pipe `FooPipe` at `mylib/src/lib/foo.pipe.ts`",
+      "command": "nx g @nx/angular:pipe mylib/src/lib/foo.pipe.ts"
+    },
+    {
+      "description": "Generate a pipe without providing the file extension. It results in the pipe `FooPipe` at `mylib/src/lib/foo.pipe.ts`",
+      "command": "nx g @nx/angular:pipe mylib/src/lib/foo"
+    },
+    {
+      "description": "Generate a pipe with the exported symbol different from the file name. It results in the pipe `CustomPipe` at `mylib/src/lib/foo.pipe.ts`",
+      "command": "nx g @nx/angular:pipe mylib/src/lib/foo --name=custom"
+    }
+  ],
   "properties": {
-    "name": {
+    "path": {
       "type": "string",
-      "description": "The name of the pipe.",
+      "description": "The file path to the pipe. Relative to the current working directory.",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use for the pipe?"
+      "x-prompt": "What is the pipe file path?"
     },
-    "directory": {
-      "type": "string",
-      "description": "The directory at which to create the pipe 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 pipe 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."
-    },
-    "flat": {
-      "type": "boolean",
-      "default": true,
-      "description": "When true (the default) creates files at the top level of the project.",
-      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v20."
+      "description": "The pipe symbol name. Defaults to the last segment of the file path."
     },
     "skipTests": {
       "type": "boolean",
@@ -73,5 +65,5 @@
       "description": "Skip formatting of files."
     }
   },
-  "required": ["name"]
+  "required": ["path"]
 }

package/src/generators/remote/files/base/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');
 
 /**

package/src/generators/remote/files/base-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/remote/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/remote/lib/update-ssr-setup.js

@@ -6,17 +6,21 @@ const path_1 = require("path");
 const versions_1 = require("../../../utils/versions");
 const version_utils_1 = require("../../utils/version-utils");
 async function updateSsrSetup(tree, { appName, port, standalone, typescriptConfiguration, skipPackageJson, }) {
+    const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
     let project = (0, devkit_1.readProjectConfiguration)(tree, appName);
     tree.rename((0, devkit_1.joinPathFragments)(project.sourceRoot, 'main.server.ts'), (0, devkit_1.joinPathFragments)(project.sourceRoot, 'bootstrap.server.ts'));
-    tree.write((0, devkit_1.joinPathFragments)(project.root, 'server.ts'), "import('./src/main.server');");
+    const pathToServerEntry = (0, devkit_1.joinPathFragments)(angularMajorVersion >= 19
+        ? project.sourceRoot ?? (0, devkit_1.joinPathFragments)(project.root, 'src')
+        : project.root, 'server.ts');
+    tree.write(pathToServerEntry, `import('./${angularMajorVersion >= 19 ? '' : 'src/'}main.server');`);
     const browserBundleOutput = project.targets.build.options.outputPath;
     const serverBundleOutput = project.targets.build.options.outputPath.replace(/\/browser$/, '/server');
-    const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
-    (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, '../files/common', angularMajorVersion >= 17 ? 'v17+' : 'pre-v17'), project.root, {
+    (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, '../files/common'), project.root, {
         appName,
         browserBundleOutput,
         serverBundleOutput,
         standalone,
+        commonEngineEntryPoint: angularMajorVersion >= 19 ? '@angular/ssr/node' : '@angular/ssr',
         tmpl: '',
     });
     const pathToTemplateFiles = typescriptConfiguration ? 'base-ts' : 'base';

package/src/generators/remote/remote.d.ts

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

package/src/generators/remote/remote.js

@@ -1,36 +1,44 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.remote = remote;
-exports.remoteInternal = remoteInternal;
+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 ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const versions_1 = require("@nx/js/src/utils/versions");
 const test_runners_1 = require("../../utils/test-runners");
 const application_1 = require("../application/application");
 const setup_mf_1 = require("../setup-mf/setup-mf");
-const lib_1 = require("./lib");
-const versions_1 = require("@nx/js/src/utils/versions");
 const add_mf_env_to_inputs_1 = require("../utils/add-mf-env-to-inputs");
-async function remote(tree, options) {
-    return await remoteInternal(tree, {
-        projectNameAndRootFormat: 'derived',
-        ...options,
-    });
-}
-async function remoteInternal(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 remote(tree, schema) {
+    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(tree, 'angular', 'remote');
+    // 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);
     if (options.host && !projects.has(options.host)) {
         throw new Error(`The name of the application to be used as the host app does not exist. (${options.host})`);
     }
-    const { projectName: remoteProjectName, projectNameAndRootFormat } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
+    await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'application');
+    const { projectName: remoteProjectName } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
         name: options.name,
         projectType: 'application',
         directory: options.directory,
-        projectNameAndRootFormat: options.projectNameAndRootFormat,
-        callingGenerator: '@nx/angular:remote',
     });
-    options.projectNameAndRootFormat = projectNameAndRootFormat;
+    const REMOTE_NAME_REGEX = '^[a-zA-Z_$][a-zA-Z_$0-9]*$';
+    const remoteNameRegex = new RegExp(REMOTE_NAME_REGEX);
+    if (!remoteNameRegex.test(remoteProjectName)) {
+        throw new Error((0, devkit_1.stripIndents) `Invalid remote name: ${remoteProjectName}. Remote project names must:
+       - Start with a letter, dollar sign ($) or underscore (_)
+       - Followed by any valid character (letters, digits, underscores, or dollar signs)
+      The regular expression used is ${REMOTE_NAME_REGEX}.`);
+    }
     const port = options.port ?? (0, lib_1.findNextAvailablePort)(tree);
     const appInstallTask = await (0, application_1.applicationGenerator)(tree, {
         ...options,
@@ -74,6 +82,22 @@ async function remoteInternal(tree, schema) {
         installTasks.push(ssrInstallTask);
     }
     (0, add_mf_env_to_inputs_1.addMfEnvToTargetDefaultInputs)(tree);
+    if (isRspack) {
+        await (0, convert_to_rspack_1.default)(tree, {
+            project: remoteProjectName,
+            skipInstall: options.skipPackageJson,
+            skipFormat: true,
+        });
+    }
+    const project = (0, devkit_1.readProjectConfiguration)(tree, remoteProjectName);
+    project.targets.serve ??= {};
+    project.targets.serve.options ??= {};
+    if (options.host) {
+        project.targets.serve.dependsOn ??= [];
+        project.targets.serve.dependsOn.push(`${options.host}:serve`);
+    }
+    project.targets.serve.options.port = port;
+    (0, devkit_1.updateProjectConfiguration)(tree, remoteProjectName, project);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }

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

@@ -1,10 +1,11 @@
-import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
 import type { Linter, LinterType } from '@nx/eslint';
 import type { E2eTestRunner, UnitTestRunner } from '../../utils/test-runners';
 import type { Styles } from '../utils/types';
 
 export interface Schema {
-  name: string;
+  directory: string;
+  name?: string;
+  bundler?: 'webpack' | 'rspack';
   host?: string;
   port?: number;
   setParserOptionsProject?: boolean;
@@ -13,20 +14,18 @@ export interface Schema {
   prefix?: string;
   style?: Styles;
   skipTests?: boolean;
-  directory?: string;
-  projectNameAndRootFormat?: ProjectNameAndRootFormat;
   tags?: string;
   linter?: Linter | LinterType;
   unitTestRunner?: UnitTestRunner;
   e2eTestRunner?: E2eTestRunner;
   backendProject?: string;
   strict?: boolean;
-  standaloneConfig?: boolean;
   inlineStyle?: boolean;
   inlineTemplate?: boolean;
   viewEncapsulation?: 'Emulated' | 'Native' | 'None';
   skipFormat?: boolean;
   standalone?: boolean;
   ssr?: boolean;
+  serverRouting?: boolean;
   typescriptConfiguration?: boolean;
 }