@nx/module-federation 22.0.0-beta.4 → 22.0.0-beta.5

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": "22.0.0-beta.4",
+  "version": "22.0.0-beta.5",
   "type": "commonjs",
   "repository": {
     "type": "git",
@@ -27,9 +27,9 @@
     "@module-federation/enhanced": "^0.18.0",
     "@module-federation/node": "^2.7.11",
     "@module-federation/sdk": "^0.18.0",
-    "@nx/devkit": "22.0.0-beta.4",
-    "@nx/js": "22.0.0-beta.4",
-    "@nx/web": "22.0.0-beta.4",
+    "@nx/devkit": "22.0.0-beta.5",
+    "@nx/js": "22.0.0-beta.5",
+    "@nx/web": "22.0.0-beta.5",
     "@rspack/core": "^1.3.8",
     "express": "^4.21.2",
     "http-proxy-middleware": "^3.0.5",
@@ -38,7 +38,7 @@
     "webpack": "^5.101.3"
   },
   "devDependencies": {
-    "nx": "22.0.0-beta.4"
+    "nx": "22.0.0-beta.5"
   },
   "nx-migrations": {
     "migrations": "./migrations.json"

package/src/utils/dependencies.js

@@ -53,5 +53,7 @@ function getLibraryImportPath(library, projectGraph) {
             }
         }
     }
-    return undefined;
+    // Return library name if not found in TS path mappings
+    // This supports TS Solution + PM Workspaces where libs use package.json instead
+    return library;
 }

package/src/utils/share.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"share.d.ts","sourceRoot":"","sources":["../../../../../packages/module-federation/src/utils/share.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,mBAAmB,EACnB,4BAA4B,EAC5B,gBAAgB,EACjB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,sBAAsB,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAQlE,OAAO,EACL,KAAK,YAAY,EAKlB,MAAM,YAAY,CAAC;AAKpB;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CACrC,aAAa,EAAE,gBAAgB,EAAE,EACjC,YAAY,SAAwD,EACpE,OAAO,GAAE,QAAQ,GAAG,SAAoB,GACvC,4BAA4B,CA8I9B;AAED;;;;;GAKG;AACH,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,GACd,mBAAmB,GAAG,SAAS,CAYjC;AAED;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,MAAM,EAAE,GACjB,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAkBrC;AAED;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CACjC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,EACjD,QAAQ,EAAE,cAAc,GAAG,SAAS,GACnC,IAAI,CAgBN;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,qBAAqB,CACnC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,EACjD,gBAAgB,EAAE,sBAAsB,GAAG,SAAS,EACpD,YAAY,EAAE,YAAY,GACzB,IAAI,CAcN"}
+{"version":3,"file":"share.d.ts","sourceRoot":"","sources":["../../../../../packages/module-federation/src/utils/share.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,mBAAmB,EACnB,4BAA4B,EAC5B,gBAAgB,EACjB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,sBAAsB,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAQlE,OAAO,EACL,KAAK,YAAY,EAKlB,MAAM,YAAY,CAAC;AAKpB;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CACrC,aAAa,EAAE,gBAAgB,EAAE,EACjC,YAAY,SAAwD,EACpE,OAAO,GAAE,QAAQ,GAAG,SAAoB,GACvC,4BAA4B,CA0M9B;AAED;;;;;GAKG;AACH,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,GACd,mBAAmB,GAAG,SAAS,CAYjC;AAED;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,MAAM,EAAE,GACjB,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAkBrC;AAED;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CACjC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,EACjD,QAAQ,EAAE,cAAc,GAAG,SAAS,GACnC,IAAI,CAgBN;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,qBAAqB,CACnC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,EACjD,gBAAgB,EAAE,sBAAsB,GAAG,SAAS,EACpD,YAAY,EAAE,YAAY,GACzB,IAAI,CAcN"}

package/src/utils/share.js

@@ -25,9 +25,6 @@ function shareWorkspaceLibraries(workspaceLibs, tsConfigPath = process.env.NX_TS
         return getEmptySharedLibrariesConfig();
     }
     const tsconfigPathAliases = (0, typescript_1.readTsPathMappings)(tsConfigPath);
-    if (!Object.keys(tsconfigPathAliases).length) {
-        return getEmptySharedLibrariesConfig();
-    }
     // Nested projects must come first, sort them as such
     const sortedTsConfigPathAliases = {};
     Object.keys(tsconfigPathAliases)
@@ -52,6 +49,16 @@ function shareWorkspaceLibraries(workspaceLibs, tsConfigPath = process.env.NX_TS
             path: (0, path_1.normalize)((0, path_1.join)(devkit_1.workspaceRoot, paths[0])),
         });
     }
+    // Collect workspace libs that are not in TS path mappings
+    // This supports TS Solution + PM Workspaces where libs use package.json
+    const workspaceLibrariesAsDeps = [];
+    if (Object.keys(sortedTsConfigPathAliases).length !== workspaceLibs.length) {
+        for (const workspaceLib of workspaceLibs) {
+            if (!sortedTsConfigPathAliases[workspaceLib.importKey]) {
+                workspaceLibrariesAsDeps.push(workspaceLib.importKey);
+            }
+        }
+    }
     const normalModuleReplacementPluginImpl = bundler === 'rspack'
         ? core_1.NormalModuleReplacementPlugin
         : require('webpack').NormalModuleReplacementPlugin;
@@ -68,7 +75,7 @@ function shareWorkspaceLibraries(workspaceLibs, tsConfigPath = process.env.NX_TS
                 (0, fs_1.existsSync)((0, devkit_1.joinPathFragments)(devkit_1.workspaceRoot, projectRoot, 'package.json'))) {
                 pkgJson = (0, devkit_1.readJsonFile)((0, devkit_1.joinPathFragments)(devkit_1.workspaceRoot, projectRoot, 'package.json'));
             }
-            return pathMappings.reduce((libraries, library) => {
+            const libraries = pathMappings.reduce((libraries, library) => {
                 // Check to see if the library version is declared in the app's package.json
                 let version = pkgJson?.dependencies?.[library.name];
                 if (!version && workspaceLibs.length > 0) {
@@ -96,6 +103,48 @@ function shareWorkspaceLibraries(workspaceLibs, tsConfigPath = process.env.NX_TS
                     },
                 };
             }, {});
+            // Add workspace libs from package.json dependencies
+            // This supports TS Solution + PM Workspaces
+            for (const libraryName of workspaceLibrariesAsDeps) {
+                let version = pkgJson?.dependencies?.[libraryName] ??
+                    pkgJson?.devDependencies?.[libraryName];
+                // Normalize workspace protocol versions (workspace:*, workspace:^, *, etc.)
+                if (version &&
+                    (version === '*' ||
+                        version.startsWith('workspace:') ||
+                        version.startsWith('file:'))) {
+                    // Look up the actual version from the library's package.json
+                    const workspaceLib = workspaceLibs.find((lib) => lib.importKey === libraryName);
+                    if (workspaceLib) {
+                        const libPackageJsonPath = (0, path_1.join)(devkit_1.workspaceRoot, workspaceLib.root, 'package.json');
+                        if ((0, fs_1.existsSync)(libPackageJsonPath)) {
+                            const libPkgJson = (0, devkit_1.readJsonFile)(libPackageJsonPath);
+                            if (libPkgJson?.version) {
+                                version = libPkgJson.version;
+                            }
+                            else {
+                                // Library has no version, treat as no version requirement
+                                version = null;
+                            }
+                        }
+                        else {
+                            // Can't find library package.json, treat as no version requirement
+                            version = null;
+                        }
+                    }
+                    else {
+                        // Can't find workspace library, treat as no version requirement
+                        version = null;
+                    }
+                }
+                libraries[libraryName] = {
+                    ...(version
+                        ? { requiredVersion: version, singleton: true }
+                        : { requiredVersion: false }),
+                    eager,
+                };
+            }
+            return libraries;
         },
         getReplacementPlugin: () => new normalModuleReplacementPluginImpl(/./, (req) => {
             if (!req.request.startsWith('.')) {