@nx/react 17.0.0-rc.1 → 17.0.0-rc.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react",
-  "version": "17.0.0-rc.1",
+  "version": "17.0.0-rc.2",
   "private": false,
   "description": "The React plugin for Nx contains executors and generators for managing React applications and libraries within an Nx workspace. It provides:\n\n\n- Integration with libraries such as Jest, Cypress, and Storybook.\n\n- Generators for applications, libraries, components, hooks, and more.\n\n- Library build support for publishing packages to npm or other registries.\n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -37,11 +37,11 @@
     "file-loader": "^6.2.0",
     "minimatch": "3.0.5",
     "tslib": "^2.3.0",
-    "@nx/devkit": "17.0.0-rc.1",
-    "@nx/js": "17.0.0-rc.1",
-    "@nx/eslint": "17.0.0-rc.1",
-    "@nx/web": "17.0.0-rc.1",
-    "@nrwl/react": "17.0.0-rc.1"
+    "@nx/devkit": "17.0.0-rc.2",
+    "@nx/js": "17.0.0-rc.2",
+    "@nx/eslint": "17.0.0-rc.2",
+    "@nx/web": "17.0.0-rc.2",
+    "@nrwl/react": "17.0.0-rc.2"
   },
   "publishConfig": {
     "access": "public"

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

@@ -16,16 +16,12 @@ async function federateModuleGenerator(tree, schema) {
     const tasks = [];
     // Check remote exists
     const remote = (0, utils_1.checkRemoteExists)(tree, schema.remote);
-    const { projectName, projectRoot: remoteRoot } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
-        name: schema.remote,
-        projectType: 'application',
-        projectNameAndRootFormat: schema.projectNameAndRootFormat,
-        callingGenerator: '@nx/react:federate-module',
-    });
+    let projectRoot, remoteName;
     if (!remote) {
         // create remote
         const remoteGenerator = await (0, remote_1.remoteGeneratorInternal)(tree, {
             name: schema.remote,
+            directory: schema.remoteDirectory,
             e2eTestRunner: schema.e2eTestRunner,
             skipFormat: schema.skipFormat,
             linter: schema.linter,
@@ -35,9 +31,20 @@ async function federateModuleGenerator(tree, schema) {
             projectNameAndRootFormat: schema.projectNameAndRootFormat ?? 'derived',
         });
         tasks.push(remoteGenerator);
+        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/react:federate-module',
+        });
+        projectRoot = remoteRoot;
+        remoteName = projectName;
+    }
+    else {
+        projectRoot = remote.root;
+        remoteName = remote.name;
     }
-    const projectRoot = remote ? remote.root : remoteRoot;
-    const remoteName = remote ? remote.name : projectName;
     // add path to exposes property
     (0, utils_1.addPathToExposes)(tree, projectRoot, schema.name, schema.path);
     // Add new path to tsconfig

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

@@ -2,6 +2,7 @@ export interface Schema {
   name: string;
   path: string;
   remote: string;
+  remoteDirectory?: string;
   projectNameAndRootFormat?: ProjectNameAndRootFormat;
   e2eTestRunner?: 'cypress' | 'none';
   host?: string;

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

@@ -6,7 +6,7 @@
   "description": "Create a federated module, which can be loaded by a remote 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",
@@ -41,46 +45,8 @@
     "style": {
       "description": "The file extension to be used for style files.",
       "type": "string",
-      "default": "css",
-      "alias": "s",
-      "x-prompt": {
-        "message": "Which stylesheet format would you like to use?",
-        "type": "list",
-        "items": [
-          {
-            "value": "css",
-            "label": "CSS"
-          },
-          {
-            "value": "scss",
-            "label": "SASS(.scss)       [ http://sass-lang.com                     ]"
-          },
-          {
-            "value": "less",
-            "label": "LESS              [ http://lesscss.org                       ]"
-          },
-          {
-            "value": "styled-components",
-            "label": "styled-components [ https://styled-components.com            ]"
-          },
-          {
-            "value": "@emotion/styled",
-            "label": "emotion           [ https://emotion.sh                       ]"
-          },
-          {
-            "value": "styled-jsx",
-            "label": "styled-jsx        [ https://www.npmjs.com/package/styled-jsx ]"
-          },
-          {
-            "value": "styl",
-            "label": "DEPRECATD: Stylus(.styl) [ http://stylus-lang.com            ]"
-          },
-          {
-            "value": "none",
-            "label": "None"
-          }
-        ]
-      }
+      "default": "none",
+      "alias": "s"
     },
     "linter": {
       "description": "The tool to use for running lint checks.",