@nx/react 20.5.0-beta.2 → 20.5.0-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react",
-  "version": "20.5.0-beta.2",
+  "version": "20.5.0-beta.4",
   "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, Vitest, Playwright, 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": {
@@ -38,11 +38,11 @@
     "minimatch": "9.0.3",
     "picocolors": "^1.1.0",
     "tslib": "^2.3.0",
-    "@nx/devkit": "20.5.0-beta.2",
-    "@nx/js": "20.5.0-beta.2",
-    "@nx/eslint": "20.5.0-beta.2",
-    "@nx/web": "20.5.0-beta.2",
-    "@nx/module-federation": "20.5.0-beta.2",
+    "@nx/devkit": "20.5.0-beta.4",
+    "@nx/js": "20.5.0-beta.4",
+    "@nx/eslint": "20.5.0-beta.4",
+    "@nx/web": "20.5.0-beta.4",
+    "@nx/module-federation": "20.5.0-beta.4",
     "express": "^4.21.2",
     "http-proxy-middleware": "^3.0.3",
     "semver": "^7.6.3"

package/src/generators/application/application.js

@@ -89,12 +89,11 @@ async function applicationGeneratorInternal(tree, schema) {
         });
         tasks.push(twTask);
     }
+    const lintTask = await (0, add_linting_1.addLinting)(tree, options);
+    tasks.push(lintTask);
     if (options.bundler === 'vite') {
         await (0, add_vite_1.setupViteConfiguration)(tree, options, tasks);
     }
-    else if (options.bundler === 'rspack') {
-        await (0, add_rspack_1.setupRspackConfiguration)(tree, options, tasks);
-    }
     else if (options.bundler === 'rsbuild') {
         await (0, add_rsbuild_1.setupRsbuildConfiguration)(tree, options, tasks);
     }
@@ -105,8 +104,6 @@ async function applicationGeneratorInternal(tree, schema) {
         options.inSourceTests) {
         tree.delete((0, devkit_1.joinPathFragments)(options.appProjectRoot, `src/app/${options.fileName}.spec.tsx`));
     }
-    const lintTask = await (0, add_linting_1.addLinting)(tree, options);
-    tasks.push(lintTask);
     const e2eTask = await (0, add_e2e_1.addE2e)(tree, options);
     tasks.push(e2eTask);
     if (options.unitTestRunner === 'jest') {

package/src/generators/application/lib/bundlers/add-rspack.d.ts

@@ -1,5 +1,4 @@
 import { type Tree } from '@nx/devkit';
 import { NormalizedSchema, Schema } from '../../schema';
 export declare function initRspack(tree: Tree, options: NormalizedSchema<Schema>, tasks: any[]): Promise<void>;
-export declare function setupRspackConfiguration(tree: Tree, options: NormalizedSchema<Schema>, tasks: any[]): Promise<void>;
 export declare function handleStyledJsxForRspack(tasks: any[], tree: Tree, options: NormalizedSchema<Schema>): void;

package/src/generators/application/lib/bundlers/add-rspack.js

@@ -1,36 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initRspack = initRspack;
-exports.setupRspackConfiguration = setupRspackConfiguration;
 exports.handleStyledJsxForRspack = handleStyledJsxForRspack;
 const devkit_1 = require("@nx/devkit");
 const pc = require("picocolors");
 const versions_1 = require("../../../../utils/versions");
-const maybe_js_1 = require("../../../../utils/maybe-js");
 async function initRspack(tree, options, tasks) {
     const { rspackInitGenerator } = (0, devkit_1.ensurePackage)('@nx/rspack', versions_1.nxVersion);
     const rspackInitTask = await rspackInitGenerator(tree, {
         ...options,
-        addPlugin: false,
         skipFormat: true,
     });
     tasks.push(rspackInitTask);
 }
-async function setupRspackConfiguration(tree, options, tasks) {
-    const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/rspack', versions_1.nxVersion);
-    const rspackTask = await configurationGenerator(tree, {
-        project: options.projectName,
-        main: (0, devkit_1.joinPathFragments)(options.appProjectRoot, (0, maybe_js_1.maybeJs)({
-            js: options.js,
-            useJsx: true,
-        }, `src/main.tsx`)),
-        tsConfig: (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json'),
-        target: 'web',
-        newProject: true,
-        framework: 'react',
-    });
-    tasks.push(rspackTask);
-}
 function handleStyledJsxForRspack(tasks, tree, options) {
     devkit_1.logger.warn(`${pc.bold('styled-jsx')} is not supported by ${pc.bold('Rspack')}. We've added ${pc.bold('babel-loader')} to your project, but using babel will slow down your build.`);
     tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, { 'babel-loader': versions_1.babelLoaderVersion }));

package/src/generators/application/lib/get-app-tests.js

@@ -11,9 +11,9 @@ function getAppTests(options) {
 
   it('should have a greeting as the title', () => {
     ${options.routing
-        ? 'const { getByText } = render(<BrowserRouter><App /></BrowserRouter>);'
-        : 'const { getByText } = render(<App />);'}
-    expect(getByText(new RegExp('Welcome ${options.projectName}', 'gi'))).toBeTruthy();
+        ? 'const { getAllByText } = render(<BrowserRouter><App /></BrowserRouter>);'
+        : 'const { getAllByText } = render(<App />);'}
+    expect(getAllByText(new RegExp('Welcome ${options.projectName}', 'gi')).length > 0).toBeTruthy();
   });
 `;
 }

package/src/generators/library/library.js

@@ -23,6 +23,7 @@ const set_defaults_1 = require("./lib/set-defaults");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const determine_entry_fields_1 = require("./lib/determine-entry-fields");
 const sort_fields_1 = require("@nx/js/src/utils/package-json/sort-fields");
+const add_release_config_1 = require("@nx/js/src/generators/library/utils/add-release-config");
 async function libraryGenerator(host, schema) {
     return await libraryGeneratorInternal(host, {
         addPlugin: false,
@@ -53,7 +54,7 @@ async function libraryGeneratorInternal(host, schema) {
     tasks.push(initTask);
     if (options.isUsingTsSolutionConfig) {
         (0, devkit_1.writeJson)(host, `${options.projectRoot}/package.json`, {
-            name: options.importPath,
+            name: options.importPath ?? options.name,
             version: '0.0.1',
             ...(0, determine_entry_fields_1.determineEntryFields)(options),
             nx: options.parsedTags?.length
@@ -184,10 +185,15 @@ async function libraryGeneratorInternal(host, schema) {
         tasks.push(componentTask);
     }
     if (options.publishable || options.buildable) {
-        (0, devkit_1.updateJson)(host, `${options.projectRoot}/package.json`, (json) => {
-            json.name = options.importPath;
-            return json;
-        });
+        const projectConfiguration = (0, devkit_1.readProjectConfiguration)(host, options.name);
+        if (options.isUsingTsSolutionConfig) {
+            await (0, add_release_config_1.addReleaseConfigForTsSolution)(host, options.name, projectConfiguration);
+        }
+        else {
+            await (0, add_release_config_1.addReleaseConfigForNonTsSolution)(host, options.name, projectConfiguration);
+        }
+        (0, devkit_1.updateProjectConfiguration)(host, options.name, projectConfiguration);
+        tasks.push(await (0, add_release_config_1.releaseTasks)(host));
     }
     if (!options.skipPackageJson) {
         const installReactTask = await (0, install_common_dependencies_1.installCommonDependencies)(host, options);

package/src/utils/versions.d.ts

@@ -23,7 +23,7 @@ export declare const emotionStyledVersion = "11.11.0";
 export declare const emotionReactVersion = "11.11.1";
 export declare const emotionBabelPlugin = "11.11.0";
 export declare const styledJsxVersion = "5.1.2";
-export declare const reactRouterDomVersion = "6.11.2";
+export declare const reactRouterDomVersion = "6.29.0";
 export declare const testingLibraryReactVersion = "16.1.0";
 export declare const testingLibraryDomVersion = "10.4.0";
 export declare const reduxjsToolkitVersion = "1.9.3";

package/src/utils/versions.js

@@ -28,7 +28,7 @@ exports.emotionReactVersion = '11.11.1';
 exports.emotionBabelPlugin = '11.11.0';
 // WARNING: This needs to be in sync with Next.js' dependency or else there might be issues.
 exports.styledJsxVersion = '5.1.2';
-exports.reactRouterDomVersion = '6.11.2';
+exports.reactRouterDomVersion = '6.29.0';
 exports.testingLibraryReactVersion = '16.1.0';
 exports.testingLibraryDomVersion = '10.4.0';
 exports.reduxjsToolkitVersion = '1.9.3';