@nx/react 0.0.0-pr-28808-6acf6c6 → 0.0.0-pr-28808-bceb02f

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react",
-  "version": "0.0.0-pr-28808-6acf6c6",
+  "version": "0.0.0-pr-28808-bceb02f",
   "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": {
@@ -39,10 +39,10 @@
     "picocolors": "^1.1.0",
     "tslib": "^2.3.0",
     "@module-federation/enhanced": "0.6.9",
-    "@nx/devkit": "0.0.0-pr-28808-6acf6c6",
-    "@nx/js": "0.0.0-pr-28808-6acf6c6",
-    "@nx/eslint": "0.0.0-pr-28808-6acf6c6",
-    "@nx/web": "0.0.0-pr-28808-6acf6c6",
+    "@nx/devkit": "0.0.0-pr-28808-bceb02f",
+    "@nx/js": "0.0.0-pr-28808-bceb02f",
+    "@nx/eslint": "0.0.0-pr-28808-bceb02f",
+    "@nx/web": "0.0.0-pr-28808-bceb02f",
     "express": "^4.19.2",
     "http-proxy-middleware": "^3.0.3"
   },

package/src/generators/application/application.js

@@ -80,6 +80,7 @@ async function applicationGeneratorInternal(host, schema) {
         tsConfigName: schema.rootProject ? 'tsconfig.json' : 'tsconfig.base.json',
         skipFormat: true,
         addTsPlugin: schema.useTsSolution,
+        formatter: schema.formatter,
     });
     tasks.push(jsInitTask);
     const options = await (0, normalize_options_1.normalizeOptions)(host, schema);
@@ -256,6 +257,7 @@ async function applicationGeneratorInternal(host, schema) {
         jsx: 'react-jsx',
         module: 'esnext',
         moduleResolution: 'bundler',
+        // outDir: 'dist/app',
     });
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);

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

@@ -4,7 +4,6 @@ exports.addProject = addProject;
 const devkit_1 = require("@nx/devkit");
 const has_webpack_plugin_1 = require("../../../utils/has-webpack-plugin");
 const maybe_js_1 = require("../../../utils/maybe-js");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const get_import_path_1 = require("@nx/js/src/utils/get-import-path");
 function addProject(host, options) {
     const project = {
@@ -22,7 +21,7 @@ function addProject(host, options) {
             };
         }
     }
-    if ((0, ts_solution_setup_1.isUsingTsSolutionSetup)(host)) {
+    if (options.isUsingTsSolutionConfig) {
         (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'package.json'), {
             name: (0, get_import_path_1.getImportPath)(host, options.name),
             version: '0.0.1',
@@ -32,7 +31,7 @@ function addProject(host, options) {
             },
         });
     }
-    else {
+    if (!options.isUsingTsSolutionConfig || options.alwaysGenerateProjectJson) {
         (0, devkit_1.addProjectConfiguration)(host, options.projectName, {
             ...project,
         });

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

@@ -29,6 +29,8 @@ export interface Schema {
   addPlugin?: boolean;
   nxCloudToken?: string;
   useTsSolution?: boolean;
+  formatter?: 'prettier' | 'none';
+  alwaysGenerateProjectJson?: boolean; // this is needed for MF currently
 }
 
 export interface NormalizedSchema<T extends Schema = Schema> extends T {

package/src/generators/application/schema.json

@@ -102,7 +102,7 @@
       "description": "The tool to use for running lint checks.",
       "type": "string",
       "enum": ["eslint", "none"],
-      "default": "none",
+      "default": "eslint",
       "x-prompt": "Which linter would you like to use?",
       "x-priority": "important"
     },
@@ -110,7 +110,7 @@
       "type": "string",
       "enum": ["vitest", "jest", "none"],
       "description": "Test runner to use for unit tests.",
-      "default": "none",
+      "default": "vitest",
       "x-priority": "important"
     },
     "inSourceTests": {
@@ -123,7 +123,7 @@
       "enum": ["playwright", "cypress", "none"],
       "description": "Test runner to use for end to end (E2E) tests.",
       "x-prompt": "Which E2E test runner would you like to use?",
-      "default": "none"
+      "default": "playwright"
     },
     "tags": {
       "type": "string",

package/src/generators/host/host.js

@@ -15,6 +15,7 @@ const add_mf_env_to_inputs_1 = require("../../utils/add-mf-env-to-inputs");
 const js_1 = require("@nx/js");
 const versions_1 = require("../../utils/versions");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
+const update_module_federation_tsconfig_1 = require("./lib/update-module-federation-tsconfig");
 async function hostGenerator(host, schema) {
     const tasks = [];
     const options = {
@@ -46,6 +47,7 @@ async function hostGenerator(host, schema) {
         // The target use-case is loading remotes as child routes, thus always enable routing.
         routing: true,
         skipFormat: true,
+        alwaysGenerateProjectJson: true,
     });
     tasks.push(initTask);
     const remotesWithPorts = [];
@@ -78,6 +80,7 @@ async function hostGenerator(host, schema) {
     (0, add_module_federation_files_1.addModuleFederationFiles)(host, options, remotesWithPorts);
     (0, update_module_federation_project_1.updateModuleFederationProject)(host, options);
     (0, update_module_federation_e2e_project_1.updateModuleFederationE2eProject)(host, options);
+    (0, update_module_federation_tsconfig_1.updateModuleFederationTsconfig)(host, options);
     if (options.ssr) {
         const setupSsrTask = await (0, setup_ssr_1.default)(host, {
             project: options.projectName,

package/src/generators/host/lib/update-module-federation-tsconfig.d.ts

@@ -0,0 +1,3 @@
+import { type Tree } from '@nx/devkit';
+import { NormalizedSchema } from '../schema';
+export declare function updateModuleFederationTsconfig(host: Tree, options: NormalizedSchema): void;

package/src/generators/host/lib/update-module-federation-tsconfig.js

@@ -0,0 +1,44 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateModuleFederationTsconfig = updateModuleFederationTsconfig;
+const devkit_1 = require("@nx/devkit");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+function updateModuleFederationTsconfig(host, options) {
+    const tsconfigPath = (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.json');
+    const tsconfigRuntimePath = (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json');
+    if (!host.exists(tsconfigPath) || !host.exists(tsconfigRuntimePath))
+        return;
+    // Using `composite: true` and not setting `baseUrl` currently does not work with MF.
+    // In integrated setup, `baseUrl` was set in `tsconfig.base.json` and we did not set `composite: true`.
+    if ((0, ts_solution_setup_1.isUsingTsSolutionSetup)(host)) {
+        (0, devkit_1.updateJson)(host, tsconfigRuntimePath, (json) => {
+            json.compilerOptions = {
+                ...json.compilerOptions,
+                composite: false,
+                baseUrl: (0, devkit_1.offsetFromRoot)(options.appProjectRoot),
+            };
+            return json;
+        });
+        // Update references to match what `nx sync` does.
+        if (options.remotes?.length) {
+            (0, devkit_1.updateJson)(host, tsconfigPath, (json) => {
+                json.references ??= [];
+                for (const remote of options.remotes) {
+                    const remotePath = `../${remote}`;
+                    if (!json.references.some((ref) => ref.path === remotePath))
+                        json.references.push({ path: remotePath });
+                }
+                return json;
+            });
+            (0, devkit_1.updateJson)(host, tsconfigRuntimePath, (json) => {
+                json.references ??= [];
+                for (const remote of options.remotes) {
+                    const remotePath = `../${remote}/tsconfig.app.json`;
+                    if (!json.references.some((ref) => ref.path === remotePath))
+                        json.references.push({ path: remotePath });
+                }
+                return json;
+            });
+        }
+    }
+}

package/src/generators/library/schema.json

@@ -75,14 +75,14 @@
       "description": "The tool to use for running lint checks.",
       "type": "string",
       "enum": ["eslint", "none"],
-      "default": "none",
+      "default": "eslint",
       "x-prompt": "Which linter would you like to use?",
       "x-priority": "important"
     },
     "unitTestRunner": {
       "type": "string",
       "enum": ["vitest", "jest", "none"],
-      "default": "none",
+      "default": "vitest",
       "description": "Test runner to use for unit tests.",
       "x-prompt": "What unit test runner should be used?",
       "x-priority": "important"

package/src/generators/remote/remote.js

@@ -80,6 +80,7 @@ async function remoteGenerator(host, schema) {
         ...options,
         name: options.projectName,
         skipFormat: true,
+        alwaysGenerateProjectJson: true,
     });
     tasks.push(initAppTask);
     if (schema.host) {