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

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.5",
+  "version": "22.0.0-beta.6",
   "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.5",
-    "@nx/js": "22.0.0-beta.5",
-    "@nx/web": "22.0.0-beta.5",
+    "@nx/devkit": "22.0.0-beta.6",
+    "@nx/js": "22.0.0-beta.6",
+    "@nx/web": "22.0.0-beta.6",
     "@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.5"
+    "nx": "22.0.0-beta.6"
   },
   "nx-migrations": {
     "migrations": "./migrations.json"

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

@@ -1,9 +1,3 @@
-export declare function readRootPackageJson(): {
-    dependencies?: {
-        [key: string]: string;
-    };
-    devDependencies?: {
-        [key: string]: string;
-    };
-};
+import type { PackageJson } from 'nx/src/utils/package-json';
+export declare function readRootPackageJson(): PackageJson;
 //# sourceMappingURL=package-json.d.ts.map

package/src/utils/package-json.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"package-json.d.ts","sourceRoot":"","sources":["../../../../../packages/module-federation/src/utils/package-json.ts"],"names":[],"mappings":"AAGA,wBAAgB,mBAAmB,IAAI;IACrC,YAAY,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IACzC,eAAe,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;CAC7C,CASA"}
+{"version":3,"file":"package-json.d.ts","sourceRoot":"","sources":["../../../../../packages/module-federation/src/utils/package-json.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAE7D,wBAAgB,mBAAmB,IAAI,WAAW,CASjD"}

package/src/utils/package-json.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.readRootPackageJson = readRootPackageJson;
-const fs_1 = require("fs");
 const devkit_1 = require("@nx/devkit");
+const fs_1 = require("fs");
 function readRootPackageJson() {
     const pkgJsonPath = (0, devkit_1.joinPathFragments)(devkit_1.workspaceRoot, 'package.json');
     if (!(0, fs_1.existsSync)(pkgJsonPath)) {

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,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"}
+{"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,EAMlB,MAAM,YAAY,CAAC;AAKpB;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CACrC,aAAa,EAAE,gBAAgB,EAAE,EACjC,YAAY,SAAwD,EACpE,OAAO,GAAE,QAAQ,GAAG,SAAoB,GACvC,4BAA4B,CAgN9B;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,CAqBrC;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

@@ -77,7 +77,9 @@ function shareWorkspaceLibraries(workspaceLibs, tsConfigPath = process.env.NX_TS
             }
             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];
+                let version = pkgJson
+                    ? (0, devkit_1.getDependencyVersionFromPackageJson)(library.name, devkit_1.workspaceRoot, pkgJson)
+                    : null;
                 if (!version && workspaceLibs.length > 0) {
                     const workspaceLib = workspaceLibs.find((lib) => lib.importKey === library.name);
                     const libPackageJsonPath = workspaceLib
@@ -198,7 +200,7 @@ function sharePackages(packages) {
     const pkgJson = (0, package_json_1.readRootPackageJson)();
     const allPackages = [];
     packages.forEach((pkg) => {
-        const pkgVersion = pkgJson.dependencies?.[pkg] ?? pkgJson.devDependencies?.[pkg];
+        const pkgVersion = (0, devkit_1.getDependencyVersionFromPackageJson)(pkg, devkit_1.workspaceRoot, pkgJson);
         allPackages.push({ name: pkg, version: pkgVersion });
         (0, secondary_entry_points_1.collectPackageSecondaryEntryPoints)(pkg, pkgVersion, allPackages);
     });
@@ -267,8 +269,7 @@ function addStringDependencyToSharedConfig(sharedConfig, dependency, projectGrap
     }
     else if (projectGraph.externalNodes?.[`npm:${dependency}`]) {
         const pkgJson = (0, package_json_1.readRootPackageJson)();
-        const config = getNpmPackageSharedConfig(dependency, pkgJson.dependencies?.[dependency] ??
-            pkgJson.devDependencies?.[dependency]);
+        const config = getNpmPackageSharedConfig(dependency, (0, devkit_1.getDependencyVersionFromPackageJson)(dependency, devkit_1.workspaceRoot, pkgJson));
         if (!config) {
             return;
         }