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

package/babel.d.ts

@@ -7,6 +7,9 @@ interface NxReactBabelOptions {
         decoratorsBeforeExport?: boolean;
         legacy?: boolean;
     };
+    loose?: boolean;
+    /** @deprecated Use `loose` option instead of `classProperties.loose`
+     */
     classProperties?: {
         loose?: boolean;
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react",
-  "version": "17.0.0-rc.0",
+  "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.0",
-    "@nx/js": "17.0.0-rc.0",
-    "@nx/eslint": "17.0.0-rc.0",
-    "@nx/web": "17.0.0-rc.0",
-    "@nrwl/react": "17.0.0-rc.0"
+    "@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/application/lib/normalize-options.js

@@ -38,7 +38,7 @@ async function normalizeOptions(host, options, callingGenerator = '@nx/react:app
         ? null
         : options.style;
     (0, assertion_1.assertValidStyle)(options.style);
-    if (options.bundler === 'vite') {
+    if (options.bundler === 'vite' && options.unitTestRunner !== 'none') {
         options.unitTestRunner = 'vitest';
     }
     const normalized = {
@@ -58,9 +58,7 @@ async function normalizeOptions(host, options, callingGenerator = '@nx/react:app
     normalized.classComponent = normalized.classComponent ?? false;
     normalized.compiler = normalized.compiler ?? 'babel';
     normalized.bundler = normalized.bundler ?? 'webpack';
-    normalized.unitTestRunner =
-        normalized.unitTestRunner ??
-            (normalized.bundler === 'vite' ? 'vitest' : 'jest');
+    normalized.unitTestRunner = normalized.unitTestRunner ?? 'jest';
     normalized.e2eTestRunner = normalized.e2eTestRunner ?? 'cypress';
     normalized.inSourceTests = normalized.minimal || normalized.inSourceTests;
     normalized.devServerPort ??= (0, find_free_port_1.findFreePort)(host);

package/src/generators/component/component.js

@@ -73,7 +73,7 @@ function addExportsToBarrel(host, options) {
         tsModule = (0, ensure_typescript_1.ensureTypescript)();
     }
     const workspace = (0, devkit_1.getProjects)(host);
-    const isApp = workspace.get(options.project).projectType === 'application';
+    const isApp = workspace.get(options.projectName).projectType === 'application';
     if (options.export && !isApp) {
         const indexFilePath = (0, devkit_1.joinPathFragments)(options.projectSourceRoot, options.js ? 'index.js' : 'index.ts');
         const indexSource = host.read(indexFilePath, 'utf-8');

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

@@ -35,7 +35,7 @@ async function normalizeOptions(tree, options) {
     options.inSourceTests = options.inSourceTests ?? false;
     return {
         ...options,
-        project: projectName,
+        projectName,
         directory,
         styledModule,
         hasStyles: options.style !== 'none',

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

@@ -5,7 +5,7 @@ export interface Schema {
   /**
    * @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 v18.
    */
-  project: string;
+  project?: string;
   style: SupportedStyles;
   skipTests?: boolean;
   directory?: string;
@@ -37,6 +37,7 @@ export interface Schema {
 
 export interface NormalizedSchema extends Schema {
   projectSourceRoot: string;
+  projectName: string;
   fileName: string;
   filePath: string;
   className: string;

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

@@ -7,19 +7,21 @@ const utils_1 = require("./lib/utils");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const js_1 = require("@nx/js");
 async function federateModuleGenerator(tree, schema) {
+    // Check if the file exists
+    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.
+    
+    Path: ${schema.path}`);
+    }
     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,
@@ -29,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."
     }
   ],
@@ -25,7 +25,7 @@
     },
     "path": {
       "type": "string",
-      "description": "The path to locate the federated module.",
+      "description": "The path to locate the federated module. This path should be relative to the workspace root and the file should exist.",
       "x-prompt": "What is the path to the module to be federated?"
     },
     "remote": {
@@ -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.",

package/src/generators/hook/hook.js

@@ -45,7 +45,7 @@ function addExportsToBarrel(host, options) {
         tsModule = (0, ensure_typescript_1.ensureTypescript)();
     }
     const workspace = (0, devkit_1.getProjects)(host);
-    const isApp = workspace.get(options.project).projectType === 'application';
+    const isApp = workspace.get(options.projectName).projectType === 'application';
     if (options.export && !isApp) {
         const indexFilePath = (0, devkit_1.joinPathFragments)(options.projectSourceRoot, options.js ? 'index.js' : 'index.ts');
         const indexSource = host.read(indexFilePath, 'utf-8');
@@ -88,7 +88,7 @@ async function normalizeOptions(host, options) {
             : 'use-'.concat(fileName);
     const hookName = 'use'.concat(className);
     const hookTypeName = 'Use'.concat(className);
-    const project = (0, devkit_1.getProjects)(host).get(options.project);
+    const project = (0, devkit_1.getProjects)(host).get(projectName);
     const { sourceRoot: projectSourceRoot, projectType } = project;
     if (options.export && projectType === 'application') {
         devkit_1.logger.warn(`The "--export" option should not be used with applications and will do nothing.`);
@@ -112,6 +112,7 @@ async function normalizeOptions(host, options) {
         hookTypeName,
         fileName: hookFilename,
         projectSourceRoot,
+        projectName,
     };
 }
 function assertValidOptions(options) {

package/src/generators/redux/redux.js

@@ -115,7 +115,7 @@ async function normalizeOptions(host, options) {
     // for it without needing to specify --appProject.
     options.appProject =
         options.appProject ||
-            (projectType === 'application' ? options.project : undefined);
+            (projectType === 'application' ? projectName : undefined);
     if (options.appProject) {
         const appConfig = projects.get(options.appProject);
         if (appConfig.projectType !== 'application') {

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

@@ -1,6 +1,9 @@
 export interface Schema {
   name: string;
-  project: string;
+  /**
+   * @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 v18.
+   */
+  project?: string;
   directory?: string;
   appProject?: string;
   js?: string;

package/src/generators/stories/schema.json

@@ -44,6 +44,9 @@
         "type": "string",
         "description": "Path to ignore."
       },
+      "default": [
+        "*.stories.ts,*.stories.tsx,*.stories.js,*.stories.jsx,*.stories.mdx"
+      ],
       "examples": [
         "apps/my-app/src/not-stories/**",
         "**/**/src/**/not-stories/**",

package/src/generators/storybook-configuration/schema.json

@@ -78,6 +78,9 @@
         "type": "string",
         "description": "Path to ignore."
       },
+      "default": [
+        "*.stories.ts,*.stories.tsx,*.stories.js,*.stories.jsx,*.stories.mdx"
+      ],
       "examples": [
         "apps/my-app/src/not-stories/**",
         "**/**/src/**/not-stories/**",