@nx/devkit 0.0.0-pr-32978-2f0e271 → 0.0.0-pr-32869-39cffae

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/devkit",
-  "version": "0.0.0-pr-32978-2f0e271",
+  "version": "0.0.0-pr-32869-39cffae",
   "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": {
@@ -28,7 +28,6 @@
   },
   "homepage": "https://nx.dev",
   "dependencies": {
-    "@zkochan/js-yaml": "0.0.7",
     "ejs": "^3.1.7",
     "tslib": "^2.3.0",
     "semver": "^7.5.3",
@@ -38,10 +37,10 @@
   },
   "devDependencies": {
     "jest": "^29.4.1",
-    "nx": "0.0.0-pr-32978-2f0e271"
+    "nx": "0.0.0-pr-32869-39cffae"
   },
   "peerDependencies": {
-    "nx": ">= -1 <= 1"
+    "nx": "0.0.0-pr-32869-39cffae"
   },
   "publishConfig": {
     "access": "public"

package/public-api.d.ts

@@ -39,7 +39,7 @@ export { readTargetOptions } from './src/executors/read-target-options';
 /**
  * @category Utils
  */
-export { addDependenciesToPackageJson, removeDependenciesFromPackageJson, ensurePackage, getDependencyVersionFromPackageJson, NX_VERSION, } from './src/utils/package-json';
+export { addDependenciesToPackageJson, removeDependenciesFromPackageJson, ensurePackage, NX_VERSION, } from './src/utils/package-json';
 /**
  * @category Utils
  */

package/public-api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"public-api.d.ts","sourceRoot":"","sources":["../../../packages/devkit/public-api.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH;;GAEG;AACH,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAE5D;;GAEG;AACH,OAAO,EACL,aAAa,EACb,iBAAiB,GAClB,MAAM,iCAAiC,CAAC;AAEzC;;GAEG;AACH,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAE3D;;GAEG;AACH,OAAO,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AAE/E;;GAEG;AACH,OAAO,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;AAExE;;GAEG;AACH,OAAO,EAAE,oBAAoB,EAAE,MAAM,0CAA0C,CAAC;AAEhF,OAAO,EACL,iBAAiB,EACjB,oBAAoB,GACrB,MAAM,qCAAqC,CAAC;AAE7C;;GAEG;AACH,OAAO,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AAExE;;GAEG;AACH,OAAO,EACL,4BAA4B,EAC5B,iCAAiC,EACjC,aAAa,EACb,mCAAmC,EACnC,UAAU,GACX,MAAM,0BAA0B,CAAC;AAElC;;GAEG;AACH,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAExE;;GAEG;AACH,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAE1C;;GAEG;AACH,OAAO,EACL,kBAAkB,EAClB,sBAAsB,GACvB,MAAM,kCAAkC,CAAC;AAE1C;;GAEG;AACH,YAAY,EACV,YAAY,EACZ,cAAc,EACd,eAAe,GAChB,MAAM,2BAA2B,CAAC;AAEnC;;GAEG;AACH,OAAO,EAAE,oBAAoB,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAE7E;;GAEG;AACH,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAE9D;;GAEG;AACH,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAErE;;GAEG;AACH,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAEpE;;GAEG;AACH,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC"}
+{"version":3,"file":"public-api.d.ts","sourceRoot":"","sources":["../../../packages/devkit/public-api.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH;;GAEG;AACH,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAE5D;;GAEG;AACH,OAAO,EACL,aAAa,EACb,iBAAiB,GAClB,MAAM,iCAAiC,CAAC;AAEzC;;GAEG;AACH,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAE3D;;GAEG;AACH,OAAO,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AAE/E;;GAEG;AACH,OAAO,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;AAExE;;GAEG;AACH,OAAO,EAAE,oBAAoB,EAAE,MAAM,0CAA0C,CAAC;AAEhF,OAAO,EACL,iBAAiB,EACjB,oBAAoB,GACrB,MAAM,qCAAqC,CAAC;AAE7C;;GAEG;AACH,OAAO,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AAExE;;GAEG;AACH,OAAO,EACL,4BAA4B,EAC5B,iCAAiC,EACjC,aAAa,EACb,UAAU,GACX,MAAM,0BAA0B,CAAC;AAElC;;GAEG;AACH,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAExE;;GAEG;AACH,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAE1C;;GAEG;AACH,OAAO,EACL,kBAAkB,EAClB,sBAAsB,GACvB,MAAM,kCAAkC,CAAC;AAE1C;;GAEG;AACH,YAAY,EACV,YAAY,EACZ,cAAc,EACd,eAAe,GAChB,MAAM,2BAA2B,CAAC;AAEnC;;GAEG;AACH,OAAO,EAAE,oBAAoB,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAE7E;;GAEG;AACH,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAE9D;;GAEG;AACH,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAErE;;GAEG;AACH,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAEpE;;GAEG;AACH,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC"}

package/public-api.js

@@ -9,7 +9,7 @@
  *   a. We might need to duplicate code instead of importing from nx until all supported versions of nx contain the file.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.moveFilesToNewDirectory = exports.convertNxExecutor = exports.convertNxGenerator = exports.offsetFromRoot = exports.ChangeType = exports.applyChangesToString = exports.extractLayoutDirectory = exports.getWorkspaceLayout = exports.names = exports.installPackagesTask = exports.NX_VERSION = exports.getDependencyVersionFromPackageJson = exports.ensurePackage = exports.removeDependenciesFromPackageJson = exports.addDependenciesToPackageJson = exports.readTargetOptions = exports.targetToTargetString = exports.parseTargetString = exports.visitNotIgnoredFiles = exports.runTasksInSerial = exports.updateTsConfigsToJs = exports.toJS = exports.OverwriteStrategy = exports.generateFiles = exports.formatFiles = void 0;
+exports.moveFilesToNewDirectory = exports.convertNxExecutor = exports.convertNxGenerator = exports.offsetFromRoot = exports.ChangeType = exports.applyChangesToString = exports.extractLayoutDirectory = exports.getWorkspaceLayout = exports.names = exports.installPackagesTask = exports.NX_VERSION = exports.ensurePackage = exports.removeDependenciesFromPackageJson = exports.addDependenciesToPackageJson = exports.readTargetOptions = exports.targetToTargetString = exports.parseTargetString = exports.visitNotIgnoredFiles = exports.runTasksInSerial = exports.updateTsConfigsToJs = exports.toJS = exports.OverwriteStrategy = exports.generateFiles = exports.formatFiles = void 0;
 /**
  * @category Generators
  */
@@ -56,7 +56,6 @@ var package_json_1 = require("./src/utils/package-json");
 Object.defineProperty(exports, "addDependenciesToPackageJson", { enumerable: true, get: function () { return package_json_1.addDependenciesToPackageJson; } });
 Object.defineProperty(exports, "removeDependenciesFromPackageJson", { enumerable: true, get: function () { return package_json_1.removeDependenciesFromPackageJson; } });
 Object.defineProperty(exports, "ensurePackage", { enumerable: true, get: function () { return package_json_1.ensurePackage; } });
-Object.defineProperty(exports, "getDependencyVersionFromPackageJson", { enumerable: true, get: function () { return package_json_1.getDependencyVersionFromPackageJson; } });
 Object.defineProperty(exports, "NX_VERSION", { enumerable: true, get: function () { return package_json_1.NX_VERSION; } });
 /**
  * @category Utils

package/src/generators/plugin-migrations/executor-to-plugin-migrator.d.ts

@@ -1,5 +1,5 @@
 import type { ProjectConfiguration } from 'nx/src/config/workspace-json-project-json';
-import { type CreateNodes, type CreateNodesV2, type ProjectGraph, type TargetConfiguration, type Tree } from 'nx/src/devkit-exports';
+import { type CreateNodesV2, type ProjectGraph, type TargetConfiguration, type Tree } from 'nx/src/devkit-exports';
 import { logger as devkitLogger } from 'nx/src/devkit-exports';
 export type InferredTargetConfiguration = TargetConfiguration & {
     name: string;
@@ -20,7 +20,7 @@ export declare function migrateProjectExecutorsToPlugin<T>(tree: Tree, projectGr
     skipProjectFilter?: SkipProjectFilter;
     skipTargetFilter?: SkipTargetFilter;
 }>, specificProjectToMigrate?: string, logger?: typeof devkitLogger): Promise<Map<string, Record<string, string>>>;
-export declare function migrateProjectExecutorsToPluginV1<T>(tree: Tree, projectGraph: ProjectGraph, pluginPath: string, createNodes: CreateNodes<T>, defaultPluginOptions: T, migrations: Array<{
+export declare function migrateProjectExecutorsToPluginV1<T>(tree: Tree, projectGraph: ProjectGraph, pluginPath: string, createNodes: CreateNodesV2<T>, defaultPluginOptions: T, migrations: Array<{
     executors: string[];
     targetPluginOptionMapper: (targetName: string) => Partial<T>;
     postTargetTransformer: PostTargetTransformer;

package/src/generators/plugin-migrations/executor-to-plugin-migrator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"executor-to-plugin-migrator.d.ts","sourceRoot":"","sources":["../../../../../../packages/devkit/src/generators/plugin-migrations/executor-to-plugin-migrator.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAEV,oBAAoB,EACrB,MAAM,2CAA2C,CAAC;AACnD,OAAO,EAKL,KAAK,WAAW,EAChB,KAAK,aAAa,EAGlB,KAAK,YAAY,EACjB,KAAK,mBAAmB,EACxB,KAAK,IAAI,EACV,MAAM,uBAAuB,CAAC;AAW/B,OAAO,EAAE,MAAM,IAAI,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAE/D,MAAM,MAAM,2BAA2B,GAAG,mBAAmB,GAAG;IAC9D,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,KAAK,qBAAqB,GAAG,CAC3B,mBAAmB,EAAE,mBAAmB,EACxC,IAAI,EAAE,IAAI,EACV,cAAc,EAAE;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EACrD,2BAA2B,EAAE,2BAA2B,KACrD,mBAAmB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;AACxD,KAAK,gBAAgB,GAAG,CACtB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACtC,oBAAoB,EAAE,oBAAoB,KACvC,KAAK,GAAG,MAAM,CAAC;AACpB,KAAK,iBAAiB,GAAG,CACvB,oBAAoB,EAAE,oBAAoB,KACvC,KAAK,GAAG,MAAM,CAAC;AAsSpB,qBAAa,uBAAwB,SAAQ,KAAK;;CAIjD;AAED,wBAAsB,+BAA+B,CAAC,CAAC,EACrD,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,YAAY,EAC1B,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,aAAa,CAAC,CAAC,CAAC,EAC/B,oBAAoB,EAAE,CAAC,EACvB,UAAU,EAAE,KAAK,CAAC;IAChB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,wBAAwB,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;IAC7D,qBAAqB,EAAE,qBAAqB,CAAC;IAC7C,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACrC,CAAC,EACF,wBAAwB,CAAC,EAAE,MAAM,EACjC,MAAM,CAAC,EAAE,OAAO,YAAY,GAC3B,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,CAc9C;AAED,wBAAsB,iCAAiC,CAAC,CAAC,EACvD,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,YAAY,EAC1B,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC,EAC3B,oBAAoB,EAAE,CAAC,EACvB,UAAU,EAAE,KAAK,CAAC;IAChB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,wBAAwB,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;IAC7D,qBAAqB,EAAE,qBAAqB,CAAC;IAC7C,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACrC,CAAC,EACF,wBAAwB,CAAC,EAAE,MAAM,GAChC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,CAa9C"}
+{"version":3,"file":"executor-to-plugin-migrator.d.ts","sourceRoot":"","sources":["../../../../../../packages/devkit/src/generators/plugin-migrations/executor-to-plugin-migrator.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAEV,oBAAoB,EACrB,MAAM,2CAA2C,CAAC;AACnD,OAAO,EAKL,KAAK,aAAa,EAGlB,KAAK,YAAY,EACjB,KAAK,mBAAmB,EACxB,KAAK,IAAI,EACV,MAAM,uBAAuB,CAAC;AAW/B,OAAO,EAAE,MAAM,IAAI,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAE/D,MAAM,MAAM,2BAA2B,GAAG,mBAAmB,GAAG;IAC9D,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,KAAK,qBAAqB,GAAG,CAC3B,mBAAmB,EAAE,mBAAmB,EACxC,IAAI,EAAE,IAAI,EACV,cAAc,EAAE;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EACrD,2BAA2B,EAAE,2BAA2B,KACrD,mBAAmB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;AACxD,KAAK,gBAAgB,GAAG,CACtB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACtC,oBAAoB,EAAE,oBAAoB,KACvC,KAAK,GAAG,MAAM,CAAC;AACpB,KAAK,iBAAiB,GAAG,CACvB,oBAAoB,EAAE,oBAAoB,KACvC,KAAK,GAAG,MAAM,CAAC;AAsSpB,qBAAa,uBAAwB,SAAQ,KAAK;;CAIjD;AAED,wBAAsB,+BAA+B,CAAC,CAAC,EACrD,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,YAAY,EAC1B,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,aAAa,CAAC,CAAC,CAAC,EAC/B,oBAAoB,EAAE,CAAC,EACvB,UAAU,EAAE,KAAK,CAAC;IAChB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,wBAAwB,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;IAC7D,qBAAqB,EAAE,qBAAqB,CAAC;IAC7C,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACrC,CAAC,EACF,wBAAwB,CAAC,EAAE,MAAM,EACjC,MAAM,CAAC,EAAE,OAAO,YAAY,GAC3B,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,CAc9C;AAED,wBAAsB,iCAAiC,CAAC,CAAC,EACvD,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,YAAY,EAC1B,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC,EAC7B,oBAAoB,EAAE,CAAC,EACvB,UAAU,EAAE,KAAK,CAAC;IAChB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,wBAAwB,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;IAC7D,qBAAqB,EAAE,qBAAqB,CAAC;IAC7C,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACrC,CAAC,EACF,wBAAwB,CAAC,EAAE,MAAM,GAChC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,CAa9C"}

package/src/generators/target-defaults-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"target-defaults-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/devkit/src/generators/target-defaults-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,IAAI,EAGV,MAAM,uBAAuB,CAAC;AAG/B,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,MAAM,EACpB,eAAe,SAAU,GACxB,IAAI,CAYN;AAED,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,IAAI,EACV,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,mBAAmB,EAAE,MAAM,GAC1B,OAAO,CAAC,IAAI,CAAC,CAgEf"}
+{"version":3,"file":"target-defaults-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/devkit/src/generators/target-defaults-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,IAAI,EAGV,MAAM,uBAAuB,CAAC;AAG/B,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,MAAM,EACpB,eAAe,SAAU,GACxB,IAAI,CAYN;AAED,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,IAAI,EACV,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,mBAAmB,EAAE,MAAM,GAC1B,OAAO,CAAC,IAAI,CAAC,CAgEf"}

package/src/utils/add-plugin.d.ts

@@ -1,4 +1,4 @@
-import { CreateNodes, CreateNodesV2, ProjectGraph, Tree } from 'nx/src/devkit-exports';
+import { CreateNodesV2, ProjectGraph, Tree } from 'nx/src/devkit-exports';
 /**
  * Iterates through various forms of plugin options to find the one which does not conflict with the current graph
 
@@ -9,6 +9,6 @@ export declare function addPlugin<PluginOptions>(tree: Tree, graph: ProjectGraph
  * Iterates through various forms of plugin options to find the one which does not conflict with the current graph
 
  */
-export declare function addPluginV1<PluginOptions>(tree: Tree, graph: ProjectGraph, pluginName: string, createNodesTuple: CreateNodes<PluginOptions>, options: Partial<Record<keyof PluginOptions, PluginOptions[keyof PluginOptions][]>>, shouldUpdatePackageJsonScripts: boolean): Promise<void>;
+export declare function addPluginV1<PluginOptions>(tree: Tree, graph: ProjectGraph, pluginName: string, createNodesTuple: CreateNodesV2<PluginOptions>, options: Partial<Record<keyof PluginOptions, PluginOptions[keyof PluginOptions][]>>, shouldUpdatePackageJsonScripts: boolean): Promise<void>;
 export declare function generateCombinations<T>(input: Record<string, T[]>): Record<string, T>[];
 //# sourceMappingURL=add-plugin.d.ts.map

package/src/utils/add-plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/devkit/src/utils/add-plugin.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,WAAW,EACX,aAAa,EAEb,YAAY,EAGZ,IAAI,EAGL,MAAM,uBAAuB,CAAC;AAQ/B;;;GAGG;AACH,wBAAsB,SAAS,CAAC,aAAa,EAC3C,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,YAAY,EACnB,UAAU,EAAE,MAAM,EAClB,gBAAgB,EAAE,aAAa,CAAC,aAAa,CAAC,EAC9C,OAAO,EAAE,OAAO,CACd,MAAM,CAAC,MAAM,aAAa,EAAE,aAAa,CAAC,MAAM,aAAa,CAAC,EAAE,CAAC,CAClE,EACD,8BAA8B,EAAE,OAAO,GACtC,OAAO,CAAC,IAAI,CAAC,CAmBf;AAED;;;;GAIG;AACH,wBAAsB,WAAW,CAAC,aAAa,EAC7C,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,YAAY,EACnB,UAAU,EAAE,MAAM,EAClB,gBAAgB,EAAE,WAAW,CAAC,aAAa,CAAC,EAC5C,OAAO,EAAE,OAAO,CACd,MAAM,CAAC,MAAM,aAAa,EAAE,aAAa,CAAC,MAAM,aAAa,CAAC,EAAE,CAAC,CAClE,EACD,8BAA8B,EAAE,OAAO,GACtC,OAAO,CAAC,IAAI,CAAC,CAmBf;AAoUD,wBAAgB,oBAAoB,CAAC,CAAC,EACpC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,GACzB,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAarB"}
+{"version":3,"file":"add-plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/devkit/src/utils/add-plugin.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,aAAa,EAEb,YAAY,EAGZ,IAAI,EAGL,MAAM,uBAAuB,CAAC;AAQ/B;;;GAGG;AACH,wBAAsB,SAAS,CAAC,aAAa,EAC3C,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,YAAY,EACnB,UAAU,EAAE,MAAM,EAClB,gBAAgB,EAAE,aAAa,CAAC,aAAa,CAAC,EAC9C,OAAO,EAAE,OAAO,CACd,MAAM,CAAC,MAAM,aAAa,EAAE,aAAa,CAAC,MAAM,aAAa,CAAC,EAAE,CAAC,CAClE,EACD,8BAA8B,EAAE,OAAO,GACtC,OAAO,CAAC,IAAI,CAAC,CAmBf;AAED;;;;GAIG;AACH,wBAAsB,WAAW,CAAC,aAAa,EAC7C,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,YAAY,EACnB,UAAU,EAAE,MAAM,EAClB,gBAAgB,EAAE,aAAa,CAAC,aAAa,CAAC,EAC9C,OAAO,EAAE,OAAO,CACd,MAAM,CAAC,MAAM,aAAa,EAAE,aAAa,CAAC,MAAM,aAAa,CAAC,EAAE,CAAC,CAClE,EACD,8BAA8B,EAAE,OAAO,GACtC,OAAO,CAAC,IAAI,CAAC,CAmBf;AAoUD,wBAAgB,oBAAoB,CAAC,CAAC,EACpC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,GACzB,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAarB"}

package/src/utils/calculate-hash-for-create-nodes.d.ts

@@ -1,4 +1,4 @@
-import { CreateNodesContext, CreateNodesContextV2 } from 'nx/src/devkit-exports';
-export declare function calculateHashForCreateNodes(projectRoot: string, options: object, context: CreateNodesContext | CreateNodesContextV2, additionalGlobs?: string[]): Promise<string>;
-export declare function calculateHashesForCreateNodes(projectRoots: string[], options: object, context: CreateNodesContext | CreateNodesContextV2, additionalGlobs?: string[][]): Promise<string[]>;
+import { CreateNodesContextV2 } from 'nx/src/devkit-exports';
+export declare function calculateHashForCreateNodes(projectRoot: string, options: object, context: CreateNodesContextV2, additionalGlobs?: string[]): Promise<string>;
+export declare function calculateHashesForCreateNodes(projectRoots: string[], options: object, context: CreateNodesContextV2, additionalGlobs?: string[][]): Promise<string[]>;
 //# sourceMappingURL=calculate-hash-for-create-nodes.d.ts.map

package/src/utils/calculate-hash-for-create-nodes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"calculate-hash-for-create-nodes.d.ts","sourceRoot":"","sources":["../../../../../packages/devkit/src/utils/calculate-hash-for-create-nodes.ts"],"names":[],"mappings":"AACA,OAAO,EACL,kBAAkB,EAClB,oBAAoB,EAErB,MAAM,uBAAuB,CAAC;AAQ/B,wBAAsB,2BAA2B,CAC/C,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,kBAAkB,GAAG,oBAAoB,EAClD,eAAe,GAAE,MAAM,EAAO,GAC7B,OAAO,CAAC,MAAM,CAAC,CAQjB;AAED,wBAAsB,6BAA6B,CACjD,YAAY,EAAE,MAAM,EAAE,EACtB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,kBAAkB,GAAG,oBAAoB,EAClD,eAAe,GAAE,MAAM,EAAE,EAAO,GAC/B,OAAO,CAAC,MAAM,EAAE,CAAC,CAkBnB"}
+{"version":3,"file":"calculate-hash-for-create-nodes.d.ts","sourceRoot":"","sources":["../../../../../packages/devkit/src/utils/calculate-hash-for-create-nodes.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAa,MAAM,uBAAuB,CAAC;AAQxE,wBAAsB,2BAA2B,CAC/C,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,oBAAoB,EAC7B,eAAe,GAAE,MAAM,EAAO,GAC7B,OAAO,CAAC,MAAM,CAAC,CAQjB;AAED,wBAAsB,6BAA6B,CACjD,YAAY,EAAE,MAAM,EAAE,EACtB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,oBAAoB,EAC7B,eAAe,GAAE,MAAM,EAAE,EAAO,GAC/B,OAAO,CAAC,MAAM,EAAE,CAAC,CAkBnB"}

package/src/utils/find-plugin-for-config-file.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"find-plugin-for-config-file.d.ts","sourceRoot":"","sources":["../../../../../packages/devkit/src/utils/find-plugin-for-config-file.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,IAAI,EACT,KAAK,mBAAmB,EAIzB,MAAM,uBAAuB,CAAC;AAE/B,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,MAAM,EAClB,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAAC,mBAAmB,CAAC,CAqC9B"}
+{"version":3,"file":"find-plugin-for-config-file.d.ts","sourceRoot":"","sources":["../../../../../packages/devkit/src/utils/find-plugin-for-config-file.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,IAAI,EACT,KAAK,mBAAmB,EAGzB,MAAM,uBAAuB,CAAC;AAE/B,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,MAAM,EAClB,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAAC,mBAAmB,CAAC,CAqC9B"}

package/src/utils/get-named-inputs.d.ts

@@ -1,9 +1,9 @@
 import type { InputDefinition } from 'nx/src/config/workspace-json-project-json';
-import { CreateNodesContext, CreateNodesContextV2 } from 'nx/src/devkit-exports';
+import { CreateNodesContextV2 } from 'nx/src/devkit-exports';
 /**
  * Get the named inputs available for a directory
  */
-export declare function getNamedInputs(directory: string, context: CreateNodesContext | CreateNodesContextV2): {
+export declare function getNamedInputs(directory: string, context: CreateNodesContextV2): {
     [inputName: string]: (string | InputDefinition)[];
 };
 //# sourceMappingURL=get-named-inputs.d.ts.map

package/src/utils/get-named-inputs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-named-inputs.d.ts","sourceRoot":"","sources":["../../../../../packages/devkit/src/utils/get-named-inputs.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAC;AAEjF,OAAO,EACL,kBAAkB,EAClB,oBAAoB,EAGrB,MAAM,uBAAuB,CAAC;AAE/B;;GAEG;AACH,wBAAgB,cAAc,CAC5B,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,kBAAkB,GAAG,oBAAoB,GACjD;IAAE,CAAC,SAAS,EAAE,MAAM,GAAG,CAAC,MAAM,GAAG,eAAe,CAAC,EAAE,CAAA;CAAE,CAgBvD"}
+{"version":3,"file":"get-named-inputs.d.ts","sourceRoot":"","sources":["../../../../../packages/devkit/src/utils/get-named-inputs.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAC;AAEjF,OAAO,EACL,oBAAoB,EAGrB,MAAM,uBAAuB,CAAC;AAE/B;;GAEG;AACH,wBAAgB,cAAc,CAC5B,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,oBAAoB,GAC5B;IAAE,CAAC,SAAS,EAAE,MAAM,GAAG,CAAC,MAAM,GAAG,eAAe,CAAC,EAAE,CAAA;CAAE,CAgBvD"}

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

@@ -1,58 +1,4 @@
-import { type GeneratorCallback, type Tree } from 'nx/src/devkit-exports';
-import type { PackageJson } from 'nx/src/utils/package-json';
-/**
- * Get the resolved version of a dependency from package.json.
- *
- * Retrieves a package version and automatically resolves PNPM catalog references
- * (e.g., "catalog:default") to their actual version strings. Searches `dependencies`
- * first, then falls back to `devDependencies`.
- *
- * **Tree-based usage** (generators and migrations):
- * Use when you have a `Tree` object, which is typical in Nx generators and migrations.
- *
- * **Filesystem-based usage** (CLI commands and scripts):
- * Use when reading directly from the filesystem without a `Tree` object.
- *
- * @example
- * ```typescript
- * // Tree-based - from root package.json
- * const reactVersion = getDependencyVersionFromPackageJson(tree, 'react');
- * // Returns: "^18.0.0" (resolves "catalog:default" if present)
- *
- * // Tree-based - from specific package.json
- * const version = getDependencyVersionFromPackageJson(
- *   tree,
- *   '@my/lib',
- *   'packages/my-lib/package.json'
- * );
- *
- * // Tree-based - with pre-loaded package.json
- * const packageJson = readJson(tree, 'package.json');
- * const version = getDependencyVersionFromPackageJson(tree, 'react', packageJson);
- * ```
- *
- * @example
- * ```typescript
- * // Filesystem-based - from current directory
- * const reactVersion = getDependencyVersionFromPackageJson('react');
- *
- * // Filesystem-based - with workspace root
- * const version = getDependencyVersionFromPackageJson('react', '/path/to/workspace');
- *
- * // Filesystem-based - with specific package.json
- * const version = getDependencyVersionFromPackageJson(
- *   'react',
- *   '/path/to/workspace',
- *   'apps/my-app/package.json'
- * );
- * ```
- *
- * @returns The resolved version string, or `null` if the package is not found in either dependencies or devDependencies
- */
-export declare function getDependencyVersionFromPackageJson(tree: Tree, packageName: string, packageJsonPath?: string): string | null;
-export declare function getDependencyVersionFromPackageJson(tree: Tree, packageName: string, packageJson?: PackageJson): string | null;
-export declare function getDependencyVersionFromPackageJson(packageName: string, workspaceRootPath?: string, packageJsonPath?: string): string | null;
-export declare function getDependencyVersionFromPackageJson(packageName: string, workspaceRootPath?: string, packageJson?: PackageJson): string | null;
+import { GeneratorCallback, Tree } from 'nx/src/devkit-exports';
 /**
  * Add Dependencies and Dev Dependencies to package.json
  *

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

@@ -1 +1 @@
-{"version":3,"file":"package-json.d.ts","sourceRoot":"","sources":["../../../../../packages/devkit/src/utils/package-json.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,KAAK,iBAAiB,EAItB,KAAK,IAAI,EAGV,MAAM,uBAAuB,CAAC;AAE/B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAmB7D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgDG;AACH,wBAAgB,mCAAmC,CACjD,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,eAAe,CAAC,EAAE,MAAM,GACvB,MAAM,GAAG,IAAI,CAAC;AACjB,wBAAgB,mCAAmC,CACjD,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,WAAW,CAAC,EAAE,WAAW,GACxB,MAAM,GAAG,IAAI,CAAC;AACjB,wBAAgB,mCAAmC,CACjD,WAAW,EAAE,MAAM,EACnB,iBAAiB,CAAC,EAAE,MAAM,EAC1B,eAAe,CAAC,EAAE,MAAM,GACvB,MAAM,GAAG,IAAI,CAAC;AACjB,wBAAgB,mCAAmC,CACjD,WAAW,EAAE,MAAM,EACnB,iBAAiB,CAAC,EAAE,MAAM,EAC1B,WAAW,CAAC,EAAE,WAAW,GACxB,MAAM,GAAG,IAAI,CAAC;AAyOjB;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACpC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACvC,eAAe,GAAE,MAAuB,EACxC,oBAAoB,CAAC,EAAE,OAAO,GAC7B,iBAAiB,CAqGnB;AAuMD;;;;;;;;;;;;GAYG;AACH,wBAAgB,iCAAiC,CAC/C,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,MAAM,EAAE,EACtB,eAAe,EAAE,MAAM,EAAE,EACzB,eAAe,GAAE,MAAuB,GACvC,iBAAiB,CA6BnB;AAwHD;;;;;GAKG;AAEH;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,aAAa,CAC3B,IAAI,EAAE,IAAI,EACV,GAAG,EAAE,MAAM,EACX,eAAe,EAAE,MAAM,EACvB,OAAO,CAAC,EAAE;IAAE,GAAG,CAAC,EAAE,OAAO,CAAC;IAAC,cAAc,CAAC,EAAE,OAAO,CAAA;CAAE,GACpD,IAAI,CAAC;AAER;;;;;;;;;;;GAWG;AACH,wBAAgB,aAAa,CAAC,CAAC,SAAS,GAAG,GAAG,GAAG,EAC/C,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,MAAM,GACd,CAAC,CAAC;AA4FL;;GAEG;AACH,eAAO,MAAM,UAAU,QAAyC,CAAC"}
+{"version":3,"file":"package-json.d.ts","sourceRoot":"","sources":["../../../../../packages/devkit/src/utils/package-json.ts"],"names":[],"mappings":"AACA,OAAO,EACL,iBAAiB,EAEjB,IAAI,EAGL,MAAM,uBAAuB,CAAC;AAsG/B;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACpC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACvC,eAAe,GAAE,MAAuB,EACxC,oBAAoB,CAAC,EAAE,OAAO,GAC7B,iBAAiB,CAyFnB;AAgCD;;;;;;;;;;;;GAYG;AACH,wBAAgB,iCAAiC,CAC/C,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,MAAM,EAAE,EACtB,eAAe,EAAE,MAAM,EAAE,EACzB,eAAe,GAAE,MAAuB,GACvC,iBAAiB,CA6BnB;AA8FD;;;;;GAKG;AAEH;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,aAAa,CAC3B,IAAI,EAAE,IAAI,EACV,GAAG,EAAE,MAAM,EACX,eAAe,EAAE,MAAM,EACvB,OAAO,CAAC,EAAE;IAAE,GAAG,CAAC,EAAE,OAAO,CAAC;IAAC,cAAc,CAAC,EAAE,OAAO,CAAA;CAAE,GACpD,IAAI,CAAC;AAER;;;;;;;;;;;GAWG;AACH,wBAAgB,aAAa,CAAC,CAAC,SAAS,GAAG,GAAG,GAAG,EAC/C,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,MAAM,GACd,CAAC,CAAC;AA4FL;;GAEG;AACH,eAAO,MAAM,UAAU,QAA0B,CAAC"}

package/src/utils/package-json.js

@@ -1,18 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NX_VERSION = void 0;
-exports.getDependencyVersionFromPackageJson = getDependencyVersionFromPackageJson;
 exports.addDependenciesToPackageJson = addDependenciesToPackageJson;
 exports.removeDependenciesFromPackageJson = removeDependenciesFromPackageJson;
 exports.ensurePackage = ensurePackage;
-const fs_1 = require("fs");
-const module_1 = require("module");
+const semver_1 = require("semver");
 const devkit_exports_1 = require("nx/src/devkit-exports");
 const devkit_internals_1 = require("nx/src/devkit-internals");
 const path_1 = require("path");
-const semver_1 = require("semver");
 const install_packages_task_1 = require("../tasks/install-packages-task");
-const catalog_1 = require("./catalog");
+const module_1 = require("module");
 const UNIDENTIFIED_VERSION = 'UNIDENTIFIED_VERSION';
 const NON_SEMVER_TAGS = {
     '*': 2,
@@ -22,65 +19,6 @@ const NON_SEMVER_TAGS = {
     previous: -1,
     legacy: -2,
 };
-function getDependencyVersionFromPackageJson(treeOrPackageName, packageNameOrRoot, packageJsonPathOrObjectOrRoot) {
-    if (typeof treeOrPackageName !== 'string') {
-        return getDependencyVersionFromPackageJsonFromTree(treeOrPackageName, packageNameOrRoot, packageJsonPathOrObjectOrRoot);
-    }
-    else {
-        return getDependencyVersionFromPackageJsonFromFileSystem(treeOrPackageName, packageNameOrRoot, packageJsonPathOrObjectOrRoot);
-    }
-}
-/**
- * Tree-based implementation for getDependencyVersionFromPackageJson
- */
-function getDependencyVersionFromPackageJsonFromTree(tree, packageName, packageJsonPathOrObject = 'package.json') {
-    let packageJson;
-    if (typeof packageJsonPathOrObject === 'object') {
-        packageJson = packageJsonPathOrObject;
-    }
-    else if (tree.exists(packageJsonPathOrObject)) {
-        packageJson = (0, devkit_exports_1.readJson)(tree, packageJsonPathOrObject);
-    }
-    else {
-        return null;
-    }
-    const manager = (0, catalog_1.getCatalogManager)(tree.root);
-    let version = packageJson.dependencies?.[packageName] ??
-        packageJson.devDependencies?.[packageName] ??
-        null;
-    // Resolve catalog reference if needed
-    if (version && manager.isCatalogReference(version)) {
-        version = manager.resolveCatalogReference(tree, packageName, version);
-    }
-    return version;
-}
-/**
- * Filesystem-based implementation for getDependencyVersionFromPackageJson
- */
-function getDependencyVersionFromPackageJsonFromFileSystem(packageName, root = devkit_exports_1.workspaceRoot, packageJsonPathOrObject = 'package.json') {
-    let packageJson;
-    if (typeof packageJsonPathOrObject === 'object') {
-        packageJson = packageJsonPathOrObject;
-    }
-    else {
-        const packageJsonPath = (0, path_1.resolve)(root, packageJsonPathOrObject);
-        if ((0, fs_1.existsSync)(packageJsonPath)) {
-            packageJson = (0, devkit_exports_1.readJsonFile)(packageJsonPath);
-        }
-        else {
-            return null;
-        }
-    }
-    const manager = (0, catalog_1.getCatalogManager)(root);
-    let version = packageJson.dependencies?.[packageName] ??
-        packageJson.devDependencies?.[packageName] ??
-        null;
-    // Resolve catalog reference if needed
-    if (version && manager.isCatalogReference(version)) {
-        version = manager.resolveCatalogReference(packageName, version, root);
-    }
-    return version;
-}
 function filterExistingDependencies(dependencies, existingAltDependencies) {
     if (!existingAltDependencies) {
         return dependencies;
@@ -89,43 +27,17 @@ function filterExistingDependencies(dependencies, existingAltDependencies) {
         .filter((d) => !existingAltDependencies[d])
         .reduce((acc, d) => ({ ...acc, [d]: dependencies[d] }), {});
 }
-function cleanSemver(tree, version, packageName) {
-    const manager = (0, catalog_1.getCatalogManager)(tree.root);
-    if (manager.isCatalogReference(version)) {
-        const resolvedVersion = manager.resolveCatalogReference(tree, packageName, version);
-        if (!resolvedVersion) {
-            throw new Error(`Failed to resolve catalog reference '${version}' for package '${packageName}'`);
-        }
-        return (0, semver_1.clean)(resolvedVersion) ?? (0, semver_1.coerce)(resolvedVersion);
-    }
+function cleanSemver(version) {
     return (0, semver_1.clean)(version) ?? (0, semver_1.coerce)(version);
 }
-function isIncomingVersionGreater(tree, incomingVersion, existingVersion, packageName) {
-    // the existing version might be a catalog reference, so we need to resolve
-    // it if that's the case
-    let resolvedExistingVersion = existingVersion;
-    const manager = (0, catalog_1.getCatalogManager)(tree.root);
-    if (manager.isCatalogReference(existingVersion)) {
-        if (!manager.supportsCatalogs()) {
-            // If catalog is unsupported, we assume the incoming version is newer
-            return true;
-        }
-        const resolved = manager.resolveCatalogReference(tree, packageName, existingVersion);
-        if (!resolved) {
-            // catalog is supported, but failed to resolve, we throw an error
-            throw new Error(`Failed to resolve catalog reference '${existingVersion}' for package '${packageName}'`);
-        }
-        resolvedExistingVersion = resolved;
-    }
+function isIncomingVersionGreater(incomingVersion, existingVersion) {
     // if version is in the format of "latest", "next" or similar - keep it, otherwise try to parse it
     const incomingVersionCompareBy = incomingVersion in NON_SEMVER_TAGS
         ? incomingVersion
-        : cleanSemver(tree, incomingVersion, packageName)?.toString() ??
-            UNIDENTIFIED_VERSION;
-    const existingVersionCompareBy = resolvedExistingVersion in NON_SEMVER_TAGS
-        ? resolvedExistingVersion
-        : cleanSemver(tree, resolvedExistingVersion, packageName)?.toString() ??
-            UNIDENTIFIED_VERSION;
+        : cleanSemver(incomingVersion)?.toString() ?? UNIDENTIFIED_VERSION;
+    const existingVersionCompareBy = existingVersion in NON_SEMVER_TAGS
+        ? existingVersion
+        : cleanSemver(existingVersion)?.toString() ?? UNIDENTIFIED_VERSION;
     if (incomingVersionCompareBy in NON_SEMVER_TAGS &&
         existingVersionCompareBy in NON_SEMVER_TAGS) {
         return (NON_SEMVER_TAGS[incomingVersionCompareBy] >
@@ -135,9 +47,9 @@ function isIncomingVersionGreater(tree, incomingVersion, existingVersion, packag
         existingVersionCompareBy in NON_SEMVER_TAGS) {
         return true;
     }
-    return (0, semver_1.gt)(cleanSemver(tree, incomingVersion, packageName), cleanSemver(tree, resolvedExistingVersion, packageName));
+    return (0, semver_1.gt)(cleanSemver(incomingVersion), cleanSemver(existingVersion));
 }
-function updateExistingAltDependenciesVersion(tree, dependencies, existingAltDependencies, workspaceRootPath) {
+function updateExistingAltDependenciesVersion(dependencies, existingAltDependencies) {
     return Object.keys(existingAltDependencies || {})
         .filter((d) => {
         if (!dependencies[d]) {
@@ -145,11 +57,11 @@ function updateExistingAltDependenciesVersion(tree, dependencies, existingAltDep
         }
         const incomingVersion = dependencies[d];
         const existingVersion = existingAltDependencies[d];
-        return isIncomingVersionGreater(tree, incomingVersion, existingVersion, d);
+        return isIncomingVersionGreater(incomingVersion, existingVersion);
     })
         .reduce((acc, d) => ({ ...acc, [d]: dependencies[d] }), {});
 }
-function updateExistingDependenciesVersion(tree, dependencies, existingDependencies = {}, workspaceRootPath) {
+function updateExistingDependenciesVersion(dependencies, existingDependencies = {}) {
     return Object.keys(dependencies)
         .filter((d) => {
         if (!existingDependencies[d]) {
@@ -157,7 +69,7 @@ function updateExistingDependenciesVersion(tree, dependencies, existingDependenc
         }
         const incomingVersion = dependencies[d];
         const existingVersion = existingDependencies[d];
-        return isIncomingVersionGreater(tree, incomingVersion, existingVersion, d);
+        return isIncomingVersionGreater(incomingVersion, existingVersion);
     })
         .reduce((acc, d) => ({ ...acc, [d]: dependencies[d] }), {});
 }
@@ -189,143 +101,48 @@ function addDependenciesToPackageJson(tree, dependencies, devDependencies, packa
     // - dependencies of the same type that have greater version
     // - specified dependencies of the other type that have greater version and are already installed as current type
     filteredDependencies = {
-        ...updateExistingDependenciesVersion(tree, filteredDependencies, currentPackageJson.dependencies, tree.root),
-        ...updateExistingAltDependenciesVersion(tree, devDependencies, currentPackageJson.dependencies, tree.root),
+        ...updateExistingDependenciesVersion(filteredDependencies, currentPackageJson.dependencies),
+        ...updateExistingAltDependenciesVersion(devDependencies, currentPackageJson.dependencies),
     };
     filteredDevDependencies = {
-        ...updateExistingDependenciesVersion(tree, filteredDevDependencies, currentPackageJson.devDependencies, tree.root),
-        ...updateExistingAltDependenciesVersion(tree, dependencies, currentPackageJson.devDependencies, tree.root),
+        ...updateExistingDependenciesVersion(filteredDevDependencies, currentPackageJson.devDependencies),
+        ...updateExistingAltDependenciesVersion(dependencies, currentPackageJson.devDependencies),
     };
     if (keepExistingVersions) {
         filteredDependencies = removeExistingDependencies(filteredDependencies, currentPackageJson.dependencies);
         filteredDevDependencies = removeExistingDependencies(filteredDevDependencies, currentPackageJson.devDependencies);
     }
     else {
-        filteredDependencies = removeLowerVersions(tree, filteredDependencies, currentPackageJson.dependencies, tree.root);
-        filteredDevDependencies = removeLowerVersions(tree, filteredDevDependencies, currentPackageJson.devDependencies, tree.root);
+        filteredDependencies = removeLowerVersions(filteredDependencies, currentPackageJson.dependencies);
+        filteredDevDependencies = removeLowerVersions(filteredDevDependencies, currentPackageJson.devDependencies);
     }
-    if (requiresAddingOfPackages(tree, currentPackageJson, filteredDependencies, filteredDevDependencies, tree.root)) {
-        const { catalogUpdates, directDependencies, directDevDependencies } = splitDependenciesByCatalogType(tree, filteredDependencies, filteredDevDependencies, packageJsonPath);
-        writeCatalogDependencies(tree, catalogUpdates);
-        writeDirectDependencies(tree, packageJsonPath, directDependencies, directDevDependencies);
+    if (requiresAddingOfPackages(currentPackageJson, filteredDependencies, filteredDevDependencies)) {
+        (0, devkit_exports_1.updateJson)(tree, packageJsonPath, (json) => {
+            json.dependencies = {
+                ...(json.dependencies || {}),
+                ...filteredDependencies,
+            };
+            json.devDependencies = {
+                ...(json.devDependencies || {}),
+                ...filteredDevDependencies,
+            };
+            json.dependencies = sortObjectByKeys(json.dependencies);
+            json.devDependencies = sortObjectByKeys(json.devDependencies);
+            return json;
+        });
         return () => {
             (0, install_packages_task_1.installPackagesTask)(tree);
         };
     }
     return () => { };
 }
-function splitDependenciesByCatalogType(tree, filteredDependencies, filteredDevDependencies, packageJsonPath) {
-    const allFilteredUpdates = {
-        ...filteredDependencies,
-        ...filteredDevDependencies,
-    };
-    const catalogUpdates = [];
-    let directDependencies = { ...filteredDependencies };
-    let directDevDependencies = { ...filteredDevDependencies };
-    const manager = (0, catalog_1.getCatalogManager)(tree.root);
-    const existingCatalogDeps = (0, catalog_1.getCatalogDependenciesFromPackageJson)(tree, packageJsonPath, manager);
-    if (!existingCatalogDeps.size) {
-        return {
-            catalogUpdates: [],
-            directDependencies: filteredDependencies,
-            directDevDependencies: filteredDevDependencies,
-        };
-    }
-    const supportsCatalogs = manager.supportsCatalogs();
-    // Check filtered results for catalog references or existing catalog dependencies
-    for (const [packageName, version] of Object.entries(allFilteredUpdates)) {
-        if (!existingCatalogDeps.has(packageName)) {
-            continue;
-        }
-        let shouldUseCatalog = false;
-        let catalogName;
-        if (!supportsCatalogs) {
-            // we're trying to update the version of a package that has a catalog reference
-            // but Nx does not support catalogs for this package manager, we warn the user
-            // and update the dependencies directly to package.json to keep the existing
-            // behavior
-            devkit_exports_1.output.warn({
-                title: 'Nx does not support catalogs for this package manager',
-                bodyLines: [
-                    'Dependencies will be added directly to package.json and might override catalog dependencies.',
-                ],
-            });
-            // bail out early since we'll add the dependencies directly to package.json
-            return {
-                catalogUpdates: [],
-                directDependencies: filteredDependencies,
-                directDevDependencies: filteredDevDependencies,
-            };
-        }
-        catalogName = existingCatalogDeps.get(packageName);
-        const catalogRef = catalogName ? `catalog:${catalogName}` : 'catalog:';
-        try {
-            const manager = (0, catalog_1.getCatalogManager)(tree.root);
-            const { isValid, error } = manager.validateCatalogReference(tree, packageName, catalogRef);
-            if (isValid) {
-                shouldUseCatalog = true;
-            }
-            else {
-                devkit_exports_1.output.error({
-                    title: 'Invalid catalog reference',
-                    bodyLines: [
-                        `Invalid catalog reference "${catalogRef}" for package "${packageName}".`,
-                        ...(error?.message ? [error.message] : []),
-                        ...(error?.suggestions || []),
-                    ],
-                });
-                throw new Error(`Could not update "${packageName}" to version "${version}". See above for more details.`);
-            }
-        }
-        catch (error) {
-            devkit_exports_1.output.error({
-                title: 'Could not update catalog dependency',
-                bodyLines: [
-                    `Unexpected error while updating catalog reference "${catalogRef}" for package "${packageName}".`,
-                    ...(error?.message ? [error.message] : []),
-                    ...(error?.stack ? [error.stack] : []),
-                ],
-            });
-            throw new Error(`Could not update "${packageName}" to version "${version}". See above for more details.`);
-        }
-        if (shouldUseCatalog) {
-            catalogUpdates.push({ packageName, version, catalogName });
-            // Remove from direct updates since this will be handled via catalog
-            delete directDependencies[packageName];
-            delete directDevDependencies[packageName];
-        }
-    }
-    return { catalogUpdates, directDependencies, directDevDependencies };
-}
-function writeCatalogDependencies(tree, catalogUpdates) {
-    if (!catalogUpdates.length) {
-        return;
-    }
-    const manager = (0, catalog_1.getCatalogManager)(tree.root);
-    manager.updateCatalogVersions(tree, catalogUpdates);
-}
-function writeDirectDependencies(tree, packageJsonPath, dependencies, devDependencies) {
-    (0, devkit_exports_1.updateJson)(tree, packageJsonPath, (json) => {
-        json.dependencies = {
-            ...(json.dependencies || {}),
-            ...dependencies,
-        };
-        json.devDependencies = {
-            ...(json.devDependencies || {}),
-            ...devDependencies,
-        };
-        json.dependencies = sortObjectByKeys(json.dependencies);
-        json.devDependencies = sortObjectByKeys(json.devDependencies);
-        return json;
-    });
-}
 /**
  * @returns The the incoming dependencies that are higher than the existing verions
  **/
-function removeLowerVersions(tree, incomingDeps, existingDeps, workspaceRootPath) {
+function removeLowerVersions(incomingDeps, existingDeps) {
     return Object.keys(incomingDeps).reduce((acc, d) => {
         if (!existingDeps?.[d] ||
-            isIncomingVersionGreater(tree, incomingDeps[d], existingDeps[d], d)) {
+            isIncomingVersionGreater(incomingDeps[d], existingDeps[d])) {
             acc[d] = incomingDeps[d];
         }
         return acc;
@@ -392,7 +209,7 @@ function sortObjectByKeys(obj) {
  * Verifies whether the given packageJson dependencies require an update
  * given the deps & devDeps passed in
  */
-function requiresAddingOfPackages(tree, packageJsonFile, deps, devDeps, workspaceRootPath) {
+function requiresAddingOfPackages(packageJsonFile, deps, devDeps) {
     let needsDepsUpdate = false;
     let needsDevDepsUpdate = false;
     packageJsonFile.dependencies = packageJsonFile.dependencies || {};
@@ -402,11 +219,11 @@ function requiresAddingOfPackages(tree, packageJsonFile, deps, devDeps, workspac
             const incomingVersion = deps[entry];
             if (packageJsonFile.dependencies[entry]) {
                 const existingVersion = packageJsonFile.dependencies[entry];
-                return isIncomingVersionGreater(tree, incomingVersion, existingVersion, entry);
+                return isIncomingVersionGreater(incomingVersion, existingVersion);
             }
             if (packageJsonFile.devDependencies[entry]) {
                 const existingVersion = packageJsonFile.devDependencies[entry];
-                return isIncomingVersionGreater(tree, incomingVersion, existingVersion, entry);
+                return isIncomingVersionGreater(incomingVersion, existingVersion);
             }
             return true;
         });
@@ -416,11 +233,11 @@ function requiresAddingOfPackages(tree, packageJsonFile, deps, devDeps, workspac
             const incomingVersion = devDeps[entry];
             if (packageJsonFile.devDependencies[entry]) {
                 const existingVersion = packageJsonFile.devDependencies[entry];
-                return isIncomingVersionGreater(tree, incomingVersion, existingVersion, entry);
+                return isIncomingVersionGreater(incomingVersion, existingVersion);
             }
             if (packageJsonFile.dependencies[entry]) {
                 const existingVersion = packageJsonFile.dependencies[entry];
-                return isIncomingVersionGreater(tree, incomingVersion, existingVersion, entry);
+                return isIncomingVersionGreater(incomingVersion, existingVersion);
             }
             return true;
         });
@@ -514,10 +331,10 @@ function addToNodePath(dir) {
     // Update the env variable.
     process.env.NODE_PATH = paths.join(delimiter);
 }
-function getInstalledPackageModuleVersion(pkg) {
+function getPackageVersion(pkg) {
     return require((0, path_1.join)(pkg, 'package.json')).version;
 }
 /**
  * @description The version of Nx used by the workspace. Returns null if no version is found.
  */
-exports.NX_VERSION = getInstalledPackageModuleVersion('nx');
+exports.NX_VERSION = getPackageVersion('nx');

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

@@ -1,3 +1,3 @@
-import { CreateNodes, Tree } from 'nx/src/devkit-exports';
-export declare function replaceProjectConfigurationsWithPlugin<T = unknown>(tree: Tree, rootMappings: Map<string, string>, pluginPath: string, createNodes: CreateNodes<T>, pluginOptions: T): Promise<void>;
+import { CreateNodesV2, Tree } from 'nx/src/devkit-exports';
+export declare function replaceProjectConfigurationsWithPlugin<T = unknown>(tree: Tree, rootMappings: Map<string, string>, pluginPath: string, createNodes: CreateNodesV2<T>, pluginOptions: T): Promise<void>;
 //# sourceMappingURL=replace-project-configuration-with-plugin.d.ts.map

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,WAAW,EAMX,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,WAAW,CAAC,CAAC,CAAC,EAC3B,aAAa,EAAE,CAAC,GACf,OAAO,CAAC,IAAI,CAAC,CAqDf"}
+{"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"}