@nx/angular 17.0.0-rc.1 → 17.0.0-rc.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "17.0.0-rc.1",
+  "version": "17.0.0-rc.3",
   "private": false,
   "description": "The Nx Plugin for Angular contains executors, generators, and utilities for managing Angular applications and libraries within an Nx workspace. It provides: \n\n- Integration with libraries such as Storybook, Jest, ESLint, Tailwind CSS, and Cypress. \n\n- Generators to help scaffold code quickly (like: Micro Frontends, Libraries, both internal to your codebase and publishable to npm) \n\n- Upgrading AngularJS applications \n\n- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -79,15 +79,15 @@
     "webpack": "^5.80.0",
     "webpack-merge": "^5.8.0",
     "enquirer": "^2.3.6",
-    "@nx/devkit": "17.0.0-rc.1",
-    "@nx/cypress": "17.0.0-rc.1",
-    "@nx/jest": "17.0.0-rc.1",
-    "@nx/js": "17.0.0-rc.1",
-    "@nx/eslint": "17.0.0-rc.1",
-    "@nx/webpack": "17.0.0-rc.1",
-    "@nx/web": "17.0.0-rc.1",
-    "@nx/workspace": "17.0.0-rc.1",
-    "@nrwl/angular": "17.0.0-rc.1"
+    "@nx/devkit": "17.0.0-rc.3",
+    "@nx/cypress": "17.0.0-rc.3",
+    "@nx/jest": "17.0.0-rc.3",
+    "@nx/js": "17.0.0-rc.3",
+    "@nx/eslint": "17.0.0-rc.3",
+    "@nx/webpack": "17.0.0-rc.3",
+    "@nx/web": "17.0.0-rc.3",
+    "@nx/workspace": "17.0.0-rc.3",
+    "@nrwl/angular": "17.0.0-rc.3"
   },
   "peerDependencies": {
     "@angular-devkit/build-angular": ">= 14.0.0 < 17.0.0",

package/src/generators/federate-module/lib/add-remote.d.ts

@@ -2,6 +2,6 @@ import { GeneratorCallback, type Tree } from '@nx/devkit';
 import { type Schema } from '../schema';
 export declare function addRemote(tree: Tree, schema: Schema): Promise<{
     tasks: GeneratorCallback[];
-    projectRoot: string;
-    remoteName: string;
+    projectRoot: any;
+    remoteName: any;
 }>;

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

@@ -11,6 +11,7 @@ const test_runners_1 = require("../../../utils/test-runners");
 async function addRemote(tree, schema) {
     const tasks = [];
     const remote = (0, check_remote_exists_1.getRemoteIfExists)(tree, schema.remote);
+    let projectRoot, remoteName;
     if (!remote) {
         const installedAngularVersionInfo = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
         if ((0, semver_1.lt)(installedAngularVersionInfo.version, '14.1.0') &&
@@ -20,6 +21,7 @@ async function addRemote(tree, schema) {
         }
         const remoteGeneratorCallback = await (0, remote_1.default)(tree, {
             name: schema.remote,
+            directory: schema.remoteDirectory,
             host: schema.host,
             standalone: schema.standalone,
             projectNameAndRootFormat: schema.projectNameAndRootFormat ?? 'derived',
@@ -28,15 +30,20 @@ async function addRemote(tree, schema) {
             skipFormat: true,
         });
         tasks.push(remoteGeneratorCallback);
+        const { projectName, projectRoot: remoteRoot } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
+            name: schema.remote,
+            directory: schema.remoteDirectory,
+            projectType: 'application',
+            projectNameAndRootFormat: schema.projectNameAndRootFormat ?? 'derived',
+            callingGenerator: '@nx/angular:federate-module',
+        });
+        projectRoot = remoteRoot;
+        remoteName = projectName;
+    }
+    else {
+        projectRoot = remote.root;
+        remoteName = remote.name;
     }
-    const { projectName, projectRoot: remoteRoot } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
-        name: schema.remote,
-        projectType: 'application',
-        projectNameAndRootFormat: schema.projectNameAndRootFormat ?? 'derived',
-        callingGenerator: '@nx/angular:federate-module',
-    });
-    const projectRoot = remote ? remote.root : remoteRoot;
-    const remoteName = remote ? remote.name : projectName;
     // TODO(Colum): add implicit dependency if the path points to a file in a different project
     return {
         tasks,

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

@@ -5,6 +5,7 @@ export interface Schema {
   name: string;
   path: string;
   remote: string;
+  remoteDirectory?: string;
   host?: string;
   projectNameAndRootFormat?: ProjectNameAndRootFormat;
   unitTestRunner?: UnitTestRunner;

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

@@ -6,7 +6,7 @@
   "description": "Create a federated module, which is exposed by a remote and can be subsequently loaded by a host.",
   "examples": [
     {
-      "command": "nx g federate-module MyModule --path=./src/component/my-cmp.ts --remote=my-remote-app",
+      "command": "nx g federate-module MyModule --path=./src/component/my-cmp.ts --remote=my-remote-app --remoteDirectory=apps/my-remote-app",
       "description": "Create a federated module from my-remote-app, that exposes my-cmp from ./src/component/my-cmp.ts as MyModule."
     }
   ],
@@ -33,6 +33,10 @@
       "description": "The name of the remote.",
       "x-prompt": "What is/should the remote be named?"
     },
+    "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`).",
       "type": "string",