@nx/react 0.0.0-pr-3-4212ebd → 0.0.0-pr-30457-3ca7e98

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react",
-  "version": "0.0.0-pr-3-4212ebd",
+  "version": "0.0.0-pr-30457-3ca7e98",
   "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": "0.0.0-pr-3-4212ebd",
-    "@nx/js": "0.0.0-pr-3-4212ebd",
-    "@nx/eslint": "0.0.0-pr-3-4212ebd",
-    "@nx/web": "0.0.0-pr-3-4212ebd",
-    "@nx/module-federation": "0.0.0-pr-3-4212ebd",
+    "@nx/devkit": "0.0.0-pr-30457-3ca7e98",
+    "@nx/js": "0.0.0-pr-30457-3ca7e98",
+    "@nx/eslint": "0.0.0-pr-30457-3ca7e98",
+    "@nx/web": "0.0.0-pr-30457-3ca7e98",
+    "@nx/module-federation": "0.0.0-pr-30457-3ca7e98",
     "express": "^4.21.2",
     "http-proxy-middleware": "^3.0.3",
     "semver": "^7.6.3"

package/src/generators/application/application.js

@@ -46,25 +46,26 @@ async function applicationGeneratorInternal(tree, schema) {
     });
     tasks.push(jsInitTask);
     const options = await (0, normalize_options_1.normalizeOptions)(tree, schema);
-    options.useReactRouter = options.routing
-        ? options.useReactRouter ??
-            (await (0, prompt_1.promptWhenInteractive)({
-                name: 'response',
-                message: 'Would you like to use react-router for server-side rendering?',
-                type: 'autocomplete',
-                choices: [
-                    {
-                        name: 'Yes',
-                        message: 'I want to use react-router   [ https://reactrouter.com/start/framework/routing   ]',
-                    },
-                    {
-                        name: 'No',
-                        message: 'I do not want to use react-router for server-side rendering',
-                    },
-                ],
-                initial: 0,
-            }, { response: 'No' }).then((r) => r.response === 'Yes'))
-        : false;
+    options.useReactRouter =
+        options.routing && options.bundler === 'vite'
+            ? options.useReactRouter ??
+                (await (0, prompt_1.promptWhenInteractive)({
+                    name: 'response',
+                    message: 'Would you like to use react-router for server-side rendering?',
+                    type: 'autocomplete',
+                    choices: [
+                        {
+                            name: 'Yes',
+                            message: 'I want to use react-router   [ https://reactrouter.com/start/framework/routing   ]',
+                        },
+                        {
+                            name: 'No',
+                            message: 'I do not want to use react-router for server-side rendering',
+                        },
+                    ],
+                    initial: 0,
+                }, { response: 'No' }).then((r) => r.response === 'Yes'))
+            : false;
     (0, show_possible_warnings_1.showPossibleWarnings)(tree, options);
     const initTask = await (0, init_1.default)(tree, {
         ...options,
@@ -167,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 () => { };
 }

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

@@ -31,7 +31,10 @@ async function normalizeOptions(host, options) {
         ? null
         : options.style;
     (0, assertion_1.assertValidStyle)(options.style);
-    options.bundler = options.useReactRouter ? 'vite' : options.bundler;
+    (0, assertion_1.assertValidReactRouter)(options.useReactRouter, options.bundler);
+    if (options.useReactRouter && !options.bundler) {
+        options.bundler = 'vite';
+    }
     options.useReactRouter = options.routing ? options.useReactRouter : false;
     const normalized = {
         ...options,

package/src/generators/library/library.js

@@ -190,7 +190,7 @@ async function libraryGeneratorInternal(host, schema) {
         });
         tasks.push(componentTask);
     }
-    if (options.publishable || options.buildable) {
+    if (options.publishable) {
         const projectConfiguration = (0, devkit_1.readProjectConfiguration)(host, options.name);
         if (options.isUsingTsSolutionConfig) {
             await (0, add_release_config_1.addReleaseConfigForTsSolution)(host, options.name, projectConfiguration);

package/src/utils/assertion.d.ts

@@ -1 +1,3 @@
+import { type Schema } from '../generators/application/schema';
 export declare function assertValidStyle(style: string): void;
+export declare function assertValidReactRouter(reactRouter: boolean, bundler: Schema['bundler']): void;

package/src/utils/assertion.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.assertValidStyle = assertValidStyle;
+exports.assertValidReactRouter = assertValidReactRouter;
 const VALID_STYLES = [
     'css',
     'scss',
@@ -16,3 +17,8 @@ function assertValidStyle(style) {
         throw new Error(`Unsupported style option found: ${style}. Valid values are: "${VALID_STYLES.join('", "')}"`);
     }
 }
+function assertValidReactRouter(reactRouter, bundler) {
+    if (reactRouter && bundler !== 'vite') {
+        throw new Error(`Unsupported bundler found: ${bundler}. React Router is only supported with 'vite'.`);
+    }
+}

package/src/utils/ct-utils.d.ts

@@ -10,5 +10,5 @@ export declare function getBundlerFromTarget(found: FoundTarget, tree: Tree): Pr
 export declare function getActualBundler(tree: Tree, options: {
     buildTarget?: string;
     bundler?: 'vite' | 'webpack';
-}, found: FoundTarget): Promise<"vite" | "webpack">;
+}, found: FoundTarget): Promise<"webpack" | "vite">;
 export declare function isComponent(tree: Tree, filePath: string): boolean;

package/src/utils/format-file.d.ts

@@ -1 +0,0 @@
-export declare function formatFile(content: any, ...values: any[]): string;

package/src/utils/format-file.js

@@ -1,11 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatFile = formatFile;
-const prettier_1 = require("prettier");
-const devkit_1 = require("@nx/devkit");
-function formatFile(content, ...values) {
-    return (0, prettier_1.format)((0, devkit_1.stripIndents)(content, values), {
-        singleQuote: true,
-        parser: 'typescript',
-    });
-}