@nx/devkit 0.0.0-pr-33021-29491ef → 0.0.0-pr-33300-a25d58c

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/devkit",
-  "version": "0.0.0-pr-33021-29491ef",
+  "version": "0.0.0-pr-33300-a25d58c",
   "private": false,
   "description": "The Nx Devkit is used to customize Nx for different technologies and use cases. It contains many utility functions for reading and writing files, updating configuration, working with Abstract Syntax Trees(ASTs), and more. Learn more about [extending Nx by leveraging the Nx Devkit](https://nx.dev/extending-nx/intro/getting-started) on our docs.",
   "repository": {
@@ -31,17 +31,17 @@
     "@zkochan/js-yaml": "0.0.7",
     "ejs": "^3.1.7",
     "tslib": "^2.3.0",
-    "semver": "^7.5.3",
+    "semver": "^7.6.3",
     "yargs-parser": "21.1.1",
     "minimatch": "9.0.3",
     "enquirer": "~2.3.6"
   },
   "devDependencies": {
-    "jest": "^29.4.1",
-    "nx": "0.0.0-pr-33021-29491ef"
+    "jest": "^30.0.2",
+    "nx": "0.0.0-pr-33300-a25d58c"
   },
   "peerDependencies": {
-    "nx": "0.0.0-pr-33021-29491ef"
+    "nx": "0.0.0-pr-33300-a25d58c"
   },
   "publishConfig": {
     "access": "public"

package/src/utils/package-json.js

@@ -93,7 +93,7 @@ function getDependencyVersionFromPackageJsonFromFileSystem(packageName, root = d
     // Resolve catalog reference if needed
     const manager = (0, catalog_1.getCatalogManager)(root);
     if (version && manager?.isCatalogReference(version)) {
-        version = manager.resolveCatalogReference(packageName, version, root);
+        version = manager.resolveCatalogReference(root, packageName, version);
     }
     return version;
 }

package/src/utils/replace-project-configuration-with-plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"replace-project-configuration-with-plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/devkit/src/utils/replace-project-configuration-with-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EAMb,IAAI,EAGL,MAAM,uBAAuB,CAAC;AAG/B,wBAAsB,sCAAsC,CAAC,CAAC,GAAG,OAAO,EACtE,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EACjC,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC,EAC7B,aAAa,EAAE,CAAC,GACf,OAAO,CAAC,IAAI,CAAC,CA0Df"}
+{"version":3,"file":"replace-project-configuration-with-plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/devkit/src/utils/replace-project-configuration-with-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EAMb,IAAI,EAGL,MAAM,uBAAuB,CAAC;AAO/B,wBAAsB,sCAAsC,CAAC,CAAC,GAAG,OAAO,EACtE,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EACjC,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC,EAC7B,aAAa,EAAE,CAAC,GACf,OAAO,CAAC,IAAI,CAAC,CAiEf"}

package/src/utils/replace-project-configuration-with-plugin.js

@@ -17,9 +17,11 @@ async function replaceProjectConfigurationsWithPlugin(tree, rootMappings, plugin
     (0, devkit_exports_1.updateNxJson)(tree, nxJson);
     const [pluginGlob, createNodesFunction] = createNodes;
     const configFiles = (0, devkit_exports_1.glob)(tree, [pluginGlob]);
+    const additionalProjectConfigurationFiles = (0, devkit_internals_1.multiGlobInAdditionalProjectDirectories)(tree.root, nxJson.additionalProjectDirectories ?? [], [pluginGlob])[0];
     const results = await createNodesFunction(configFiles, pluginOptions, {
         workspaceRoot: tree.root,
         nxJsonConfiguration: (0, devkit_exports_1.readNxJson)(tree),
+        additionalProjectConfigurationFiles,
     });
     for (const [configFile, nodes] of results) {
         try {