@nx/react 17.0.1 → 17.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react",
-  "version": "17.0.1",
+  "version": "17.0.3",
   "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.1",
-    "@nx/js": "17.0.1",
-    "@nx/eslint": "17.0.1",
-    "@nx/web": "17.0.1",
-    "@nrwl/react": "17.0.1"
+    "@nx/devkit": "17.0.3",
+    "@nx/js": "17.0.3",
+    "@nx/eslint": "17.0.3",
+    "@nx/web": "17.0.3",
+    "@nrwl/react": "17.0.3"
   },
   "publishConfig": {
     "access": "public"

package/src/executors/module-federation-dev-server/module-federation-dev-server.impl.js

@@ -15,7 +15,8 @@ function getBuildOptions(buildTarget, context) {
     };
 }
 async function* moduleFederationDevServer(options, context) {
-    const nxBin = require.resolve('nx');
+    // Force Node to resolve to look for the nx binary that is inside node_modules
+    const nxBin = require.resolve('nx/bin/nx');
     const currIter = options.static
         ? (0, file_server_impl_1.default)({
             ...options,

package/src/generators/application/lib/add-e2e.js

@@ -6,25 +6,36 @@ const web_1 = require("@nx/web");
 const versions_1 = require("../../../utils/versions");
 async function addE2e(tree, options) {
     switch (options.e2eTestRunner) {
-        case 'cypress':
+        case 'cypress': {
             (0, web_1.webStaticServeGenerator)(tree, {
                 buildTarget: `${options.projectName}:build`,
                 targetName: 'serve-static',
             });
-            const { cypressProjectGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
-            return await cypressProjectGenerator(tree, {
+            const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
+            (0, devkit_1.addProjectConfiguration)(tree, options.e2eProjectName, {
+                projectType: 'application',
+                root: options.e2eProjectRoot,
+                sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
+                targets: {},
+                implicitDependencies: [options.projectName],
+                tags: [],
+            });
+            return await configurationGenerator(tree, {
                 ...options,
-                name: options.e2eProjectName,
-                directory: options.e2eProjectRoot,
+                project: options.e2eProjectName,
+                directory: 'src',
                 // the name and root are already normalized, instruct the generator to use them as is
-                projectNameAndRootFormat: 'as-provided',
-                project: options.projectName,
                 bundler: options.bundler === 'rspack' ? 'webpack' : options.bundler,
                 skipFormat: true,
+                devServerTarget: `${options.projectName}:serve`,
+                jsx: true,
+                rootProject: options.rootProject,
             });
-        case 'playwright':
+        }
+        case 'playwright': {
             const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/playwright', versions_1.nxVersion);
             (0, devkit_1.addProjectConfiguration)(tree, options.e2eProjectName, {
+                projectType: 'application',
                 root: options.e2eProjectRoot,
                 sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
                 targets: {},
@@ -40,7 +51,9 @@ async function addE2e(tree, options) {
                 setParserOptionsProject: options.setParserOptionsProject,
                 webServerCommand: `${(0, devkit_1.getPackageManagerCommand)().exec} nx serve ${options.name}`,
                 webServerAddress: 'http://localhost:4200',
+                rootProject: options.rootProject,
             });
+        }
         case 'none':
         default:
             return () => { };

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

@@ -16,6 +16,7 @@ async function cypressComponentConfigGenerator(tree, options) {
     const installTask = await baseCyCtConfig(tree, {
         project: options.project,
         skipFormat: true,
+        jsx: true,
     });
     const found = await (0, ct_utils_1.addCTTargetWithBuildTarget)(tree, {
         project: options.project,

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

@@ -12,22 +12,22 @@
   ],
   "type": "object",
   "properties": {
-    "name": {
-      "description": "The name of the module.",
+    "path": {
       "type": "string",
       "$default": {
         "$source": "argv",
         "index": 0
       },
+      "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?"
+    },
+    "name": {
+      "description": "The name of the module.",
+      "type": "string",
       "x-prompt": "What name would you like to use for the module?",
       "pattern": "^[a-zA-Z][^:]*$",
       "x-priority": "important"
     },
-    "path": {
-      "type": "string",
-      "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": {
       "type": "string",
       "description": "The name of the remote.",

package/src/generators/setup-tailwind/lib/add-tailwind-style-imports.js

@@ -11,6 +11,9 @@ const knownLocations = [
     'pages/styles.css',
     'pages/styles.scss',
     'pages/styles.less',
+    'app/global.css',
+    'app/global.scss',
+    'app/global.less',
 ];
 function addTailwindStyleImports(tree, project, _options) {
     const candidates = knownLocations.map((x) => (0, devkit_1.joinPathFragments)(project.root, x));

package/src/module-federation/utils.js

@@ -8,7 +8,13 @@ function getFunctionDeterminateRemoteUrl(isServer = false) {
     const target = isServer ? 'serve-server' : 'serve';
     const remoteEntry = isServer ? 'server/remoteEntry.js' : 'remoteEntry.js';
     return function (remote) {
-        const remoteConfiguration = (0, project_graph_1.readCachedProjectConfiguration)(remote);
+        let remoteConfiguration = null;
+        try {
+            remoteConfiguration = (0, project_graph_1.readCachedProjectConfiguration)(remote);
+        }
+        catch (e) {
+            throw new Error(`Cannot find remote: "${remote}". Check that the remote name is correct in your module federation config file.\n`);
+        }
         const serveTarget = remoteConfiguration?.targets?.[target];
         if (!serveTarget) {
             throw new Error(`Cannot automatically determine URL of remote (${remote}). Looked for property "host" in the project's "${serveTarget}" target.\n

package/src/utils/versions.d.ts

@@ -5,8 +5,8 @@ export declare const reactDomVersion = "18.2.0";
 export declare const reactIsVersion = "18.2.0";
 export declare const swcLoaderVersion = "0.1.15";
 export declare const babelLoaderVersion = "^9.1.2";
-export declare const typesReactVersion = "18.2.24";
-export declare const typesReactDomVersion = "18.2.9";
+export declare const typesReactVersion = "18.2.33";
+export declare const typesReactDomVersion = "18.2.14";
 export declare const typesReactIsVersion = "18.2.2";
 export declare const typesNodeVersion = "18.14.2";
 export declare const babelPresetReactVersion = "^7.14.5";

package/src/utils/versions.js

@@ -9,8 +9,8 @@ exports.reactDomVersion = '18.2.0';
 exports.reactIsVersion = '18.2.0';
 exports.swcLoaderVersion = '0.1.15';
 exports.babelLoaderVersion = '^9.1.2';
-exports.typesReactVersion = '18.2.24';
-exports.typesReactDomVersion = '18.2.9';
+exports.typesReactVersion = '18.2.33';
+exports.typesReactDomVersion = '18.2.14';
 exports.typesReactIsVersion = '18.2.2';
 exports.typesNodeVersion = '18.14.2';
 exports.babelPresetReactVersion = '^7.14.5';