@nx/react 20.7.0-canary.20250326-9dd4766 → 20.7.0-canary.20250327-1a235d7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react",
-  "version": "20.7.0-canary.20250326-9dd4766",
+  "version": "20.7.0-canary.20250327-1a235d7",
   "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.7.0-canary.20250326-9dd4766",
-    "@nx/js": "20.7.0-canary.20250326-9dd4766",
-    "@nx/eslint": "20.7.0-canary.20250326-9dd4766",
-    "@nx/web": "20.7.0-canary.20250326-9dd4766",
-    "@nx/module-federation": "20.7.0-canary.20250326-9dd4766",
+    "@nx/devkit": "20.7.0-canary.20250327-1a235d7",
+    "@nx/js": "20.7.0-canary.20250327-1a235d7",
+    "@nx/eslint": "20.7.0-canary.20250327-1a235d7",
+    "@nx/web": "20.7.0-canary.20250327-1a235d7",
+    "@nx/module-federation": "20.7.0-canary.20250327-1a235d7",
     "express": "^4.21.2",
     "http-proxy-middleware": "^3.0.3",
     "semver": "^7.6.3"

package/src/generators/application/application.js

@@ -168,7 +168,7 @@ async function applicationGeneratorInternal(tree, schema) {
         moduleResolution: 'bundler',
     }, options.linter === 'eslint'
         ? ['eslint.config.js', 'eslint.config.cjs', 'eslint.config.mjs']
-        : undefined);
+        : undefined, options.useReactRouter ? 'app' : 'src');
     (0, sort_fields_1.sortPackageJsonFields)(tree, options.appProjectRoot);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);

package/src/generators/application/files/react-router-ssr/common/app/app-nav.tsx__tmpl__

@@ -1,4 +1,3 @@
-import * as React from "react";
 import { NavLink } from "react-router";
 
 export function AppNav() {

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

@@ -3,19 +3,43 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addJest = addJest;
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../../utils/versions");
+const node_path_1 = require("node:path");
 async function addJest(host, options) {
     if (options.unitTestRunner === 'none') {
         return () => { };
     }
     const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/jest', versions_1.nxVersion);
-    return await configurationGenerator(host, {
+    await configurationGenerator(host, {
         ...options,
         project: options.projectName,
         supportTsx: true,
         skipSerializers: true,
-        setupFile: 'none',
+        setupFile: options.useReactRouter ? 'react-router' : 'none',
         compiler: options.compiler,
         skipFormat: true,
         runtimeTsconfigFileName: 'tsconfig.app.json',
     });
+    if (options.useReactRouter) {
+        (0, devkit_1.updateJson)(host, (0, node_path_1.join)(options.appProjectRoot, 'tsconfig.spec.json'), (json) => {
+            json.include = json.include ?? [];
+            const reactRouterTestGlob = options.js
+                ? [
+                    'test/**/*.spec.jsx',
+                    'test/**/*.spec.js',
+                    'test/**/*.test.jsx',
+                    'test/**/*.test.js',
+                ]
+                : [
+                    'test/**/*.spec.tsx',
+                    'test/**/*.spec.ts',
+                    'test/**/*.test.tsx',
+                    'test/**/*.test.ts',
+                ];
+            return {
+                ...json,
+                include: Array.from(new Set([...json.include, ...reactRouterTestGlob])),
+            };
+        });
+    }
+    return () => { };
 }