@nx/module-federation 21.0.4-beta.0 → 21.0.4

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@nx/module-federation",
   "description": "The Nx Plugin for Module Federation contains executors and utilities that support building applications using Module Federation.",
-  "version": "21.0.4-beta.0",
+  "version": "21.0.4",
   "type": "commonjs",
   "repository": {
     "type": "git",
@@ -25,9 +25,9 @@
   "executors": "./executors.json",
   "dependencies": {
     "tslib": "^2.3.0",
-    "@nx/devkit": "21.0.4-beta.0",
-    "@nx/js": "21.0.4-beta.0",
-    "@nx/web": "21.0.4-beta.0",
+    "@nx/devkit": "21.0.4",
+    "@nx/js": "21.0.4",
+    "@nx/web": "21.0.4",
     "picocolors": "^1.1.0",
     "webpack": "^5.88.0",
     "@rspack/core": "^1.3.8",

package/src/executors/utils/start-remote-iterators.js

@@ -9,7 +9,8 @@ async function startRemoteIterators(options, context, startRemoteFn, pathToManif
     const nxBin = require.resolve('nx/bin/nx');
     const { projects: workspaceProjects } = (0, devkit_1.readProjectsConfigurationFromProjectGraph)(context.projectGraph);
     const project = workspaceProjects[context.projectName];
-    const moduleFederationConfig = (0, utils_1.getModuleFederationConfig)(project.targets.build.options.tsConfig, context.root, project.root, pluginName);
+    const buildTargetName = (0, utils_1.getBuildTargetNameFromMFDevServer)(project, context.projectGraph);
+    const moduleFederationConfig = (0, utils_1.getModuleFederationConfig)(project.targets?.[buildTargetName]?.options?.tsConfig, context.root, project.root, pluginName);
     const remoteNames = options.devRemotes.map((r) => typeof r === 'string' ? r : r.remoteName);
     const remotes = (0, utils_1.getRemotes)(remoteNames, options.skipRemotes, moduleFederationConfig, {
         projectName: project.name,

package/src/utils/get-remotes-for-host.d.ts

@@ -1,10 +1,11 @@
-import { type ProjectGraph } from '@nx/devkit';
+import { type ProjectConfiguration, type ProjectGraph } from '@nx/devkit';
 import { ModuleFederationConfig } from './models';
 interface ModuleFederationExecutorContext {
     projectName: string;
     projectGraph: ProjectGraph;
     root: string;
 }
+export declare function getBuildTargetNameFromMFDevServer(projectConfig: ProjectConfiguration, projectGraph: ProjectGraph): string;
 export declare function getRemotes(devRemotes: string[], skipRemotes: string[], config: ModuleFederationConfig, context: ModuleFederationExecutorContext, pathToManifestFile?: string): {
     staticRemotes: string[];
     devRemotes: any[];
@@ -12,5 +13,5 @@ export declare function getRemotes(devRemotes: string[], skipRemotes: string[],
     remotePorts: any[];
     staticRemotePort: number;
 };
-export declare function getModuleFederationConfig(tsconfigPath: string, workspaceRoot: string, projectRoot: string, pluginName?: 'react' | 'angular'): any;
+export declare function getModuleFederationConfig(tsconfigPath: string | undefined, workspaceRoot: string, projectRoot: string, pluginName?: 'react' | 'angular'): any;
 export {};

package/src/utils/get-remotes-for-host.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getBuildTargetNameFromMFDevServer = getBuildTargetNameFromMFDevServer;
 exports.getRemotes = getRemotes;
 exports.getModuleFederationConfig = getModuleFederationConfig;
 const devkit_1 = require("@nx/devkit");
@@ -28,17 +29,10 @@ function extractRemoteProjectsFromConfig(config, pathToManifestFile) {
     remotes.push(...staticRemotes);
     return { remotes, dynamicRemotes };
 }
-function collectRemoteProjects(remote, collected, context) {
-    const remoteProject = context.projectGraph.nodes[remote]?.data;
-    if (!context.projectGraph.nodes[remote] || collected.has(remote)) {
-        return;
-    }
-    collected.add(remote);
-    const remoteProjectRoot = remoteProject.root;
-    // Find the target that uses the module-federation-dev-server executor
-    let buildTargetName = 'build';
-    if (remoteProject.targets) {
-        for (const [targetKey, targetConfig] of Object.entries(remoteProject.targets)) {
+// Find the target that uses the module-federation-dev-server executor
+function getBuildTargetNameFromMFDevServer(projectConfig, projectGraph) {
+    if (projectConfig.targets) {
+        for (const [targetKey, targetConfig] of Object.entries(projectConfig.targets)) {
             const executor = targetConfig.executor || '';
             // Extract the portion after the `:` in the executor name
             const executorParts = executor.split(':');
@@ -46,23 +40,23 @@ function collectRemoteProjects(remote, collected, context) {
             if (executorName === 'module-federation-dev-server') {
                 // Extract the buildTarget from the options
                 if (targetConfig.options?.buildTarget) {
-                    const parsedTarget = (0, devkit_1.parseTargetString)(targetConfig.options.buildTarget, context.projectGraph);
-                    buildTargetName = parsedTarget.target;
-                    break;
+                    const parsedTarget = (0, devkit_1.parseTargetString)(targetConfig.options.buildTarget, projectGraph);
+                    return parsedTarget.target;
                 }
             }
         }
     }
-    let remoteProjectTsConfig = remoteProject.targets?.[buildTargetName]?.options?.tsConfig ??
-        [
-            (0, path_1.join)(remoteProjectRoot, 'tsconfig.app.json'),
-            (0, path_1.join)(remoteProjectRoot, 'tsconfig.json'),
-            (0, path_1.join)(context.root, 'tsconfig.json'),
-            (0, path_1.join)(context.root, 'tsconfig.base.json'),
-        ].find((p) => (0, fs_1.existsSync)(p));
-    if (!remoteProjectTsConfig) {
-        throw new Error(`Could not find a tsconfig for remote project ${remote}. Please add a tsconfig.app.json or tsconfig.json to the project.`);
+    return 'build';
+}
+function collectRemoteProjects(remote, collected, context) {
+    const remoteProject = context.projectGraph.nodes[remote]?.data;
+    if (!context.projectGraph.nodes[remote] || collected.has(remote)) {
+        return;
     }
+    collected.add(remote);
+    const remoteProjectRoot = remoteProject.root;
+    const buildTargetName = getBuildTargetNameFromMFDevServer(remoteProject, context.projectGraph);
+    let remoteProjectTsConfig = remoteProject.targets?.[buildTargetName]?.options?.tsConfig;
     const remoteProjectConfig = getModuleFederationConfig(remoteProjectTsConfig, context.root, remoteProjectRoot);
     const { remotes: remoteProjectRemotes } = extractRemoteProjectsFromConfig(remoteProjectConfig);
     remoteProjectRemotes.forEach((r) => collectRemoteProjects(r, collected, context));
@@ -113,6 +107,17 @@ function getModuleFederationConfig(tsconfigPath, workspaceRoot, projectRoot, plu
     const moduleFederationConfigPathJS = (0, path_1.join)(workspaceRoot, projectRoot, 'module-federation.config.js');
     const moduleFederationConfigPathTS = (0, path_1.join)(workspaceRoot, projectRoot, 'module-federation.config.ts');
     let moduleFederationConfigPath = moduleFederationConfigPathJS;
+    tsconfigPath =
+        tsconfigPath ??
+            [
+                (0, path_1.join)(projectRoot, 'tsconfig.app.json'),
+                (0, path_1.join)(projectRoot, 'tsconfig.json'),
+                (0, path_1.join)(workspaceRoot, 'tsconfig.json'),
+                (0, path_1.join)(workspaceRoot, 'tsconfig.base.json'),
+            ].find((p) => (0, fs_1.existsSync)(p));
+    if (!tsconfigPath) {
+        throw new Error(`Could not find a tsconfig for remote project located at ${projectRoot}. Please add a tsconfig.app.json or tsconfig.json to the project.`);
+    }
     // create a no-op so this can be called with issue
     const fullTSconfigPath = tsconfigPath.startsWith(workspaceRoot)
         ? tsconfigPath