@nx/react 0.0.0-pr-28808-bceb02f → 0.0.0-pr-28808-f5b5ede

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react",
-  "version": "0.0.0-pr-28808-bceb02f",
+  "version": "0.0.0-pr-28808-f5b5ede",
   "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-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",
+    "@nx/devkit": "0.0.0-pr-28808-f5b5ede",
+    "@nx/js": "0.0.0-pr-28808-f5b5ede",
+    "@nx/eslint": "0.0.0-pr-28808-f5b5ede",
+    "@nx/web": "0.0.0-pr-28808-f5b5ede",
     "express": "^4.19.2",
     "http-proxy-middleware": "^3.0.3"
   },

package/src/generators/application/application.js

@@ -257,7 +257,6 @@ 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/host/lib/update-module-federation-tsconfig.js

@@ -8,15 +8,10 @@ function updateModuleFederationTsconfig(host, options) {
     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`.
+    // Not setting `baseUrl` does not work with MF.
     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),
-            };
+        (0, devkit_1.updateJson)(host, 'tsconfig.base.json', (json) => {
+            json.compilerOptions.baseUrl = '.';
             return json;
         });
         // Update references to match what `nx sync` does.

package/src/rules/update-module-federation-project.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateModuleFederationProject = updateModuleFederationProject;
 const devkit_1 = require("@nx/devkit");
 const maybe_js_1 = require("../utils/maybe-js");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 function updateModuleFederationProject(host, options) {
     const projectConfig = (0, devkit_1.readProjectConfiguration)(host, options.projectName);
     if (options.bundler === 'rspack') {
@@ -76,5 +77,10 @@ function updateModuleFederationProject(host, options) {
             },
         },
     };
+    // Typechecks must be performed first before build and serve to generate remote d.ts files.
+    if ((0, ts_solution_setup_1.isUsingTsSolutionSetup)(host)) {
+        projectConfig.targets.build.dependsOn = ['^build', 'typecheck'];
+        projectConfig.targets.serve.dependsOn = ['typecheck'];
+    }
     (0, devkit_1.updateProjectConfiguration)(host, options.projectName, projectConfig);
 }