@nx/angular 0.0.0-pr-32978-f3ca7f3 → 0.0.0-pr-32946-2118cbf

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "0.0.0-pr-32978-f3ca7f3",
+  "version": "0.0.0-pr-32946-2118cbf",
   "private": false,
   "description": "The Nx Plugin for Angular contains executors, generators, and utilities for managing Angular applications and libraries within an Nx workspace. It provides: \n\n- Integration with libraries such as Storybook, Jest, ESLint, Tailwind CSS, Playwright and Cypress. \n\n- Generators to help scaffold code quickly (like: Micro Frontends, Libraries, both internal to your codebase and publishable to npm) \n\n- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -58,14 +58,14 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "0.0.0-pr-32978-f3ca7f3",
-    "@nx/eslint": "0.0.0-pr-32978-f3ca7f3",
-    "@nx/js": "0.0.0-pr-32978-f3ca7f3",
-    "@nx/module-federation": "0.0.0-pr-32978-f3ca7f3",
-    "@nx/rspack": "0.0.0-pr-32978-f3ca7f3",
-    "@nx/web": "0.0.0-pr-32978-f3ca7f3",
-    "@nx/webpack": "0.0.0-pr-32978-f3ca7f3",
-    "@nx/workspace": "0.0.0-pr-32978-f3ca7f3",
+    "@nx/devkit": "0.0.0-pr-32946-2118cbf",
+    "@nx/eslint": "0.0.0-pr-32946-2118cbf",
+    "@nx/js": "0.0.0-pr-32946-2118cbf",
+    "@nx/module-federation": "0.0.0-pr-32946-2118cbf",
+    "@nx/rspack": "0.0.0-pr-32946-2118cbf",
+    "@nx/web": "0.0.0-pr-32946-2118cbf",
+    "@nx/webpack": "0.0.0-pr-32946-2118cbf",
+    "@nx/workspace": "0.0.0-pr-32946-2118cbf",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "@typescript-eslint/type-utils": "^8.0.0",
     "enquirer": "~2.3.6",

package/src/generators/init/init.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/init/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,iBAAiB,EAItB,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAQpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,iBAAiB,CAAC,CA8B5B;AA2ED,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/init/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,iBAAiB,EAGtB,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AASpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,iBAAiB,CAAC,CA8B5B;AA2ED,eAAe,oBAAoB,CAAC"}

package/src/generators/init/init.js

@@ -26,7 +26,7 @@ async function angularInitGenerator(tree, options) {
     return installTask;
 }
 function installAngularDevkitCoreIfMissing(tree, options) {
-    const packageVersion = (0, devkit_1.getDependencyVersionFromPackageJson)(tree, '@angular-devkit/core');
+    const packageVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular-devkit/core');
     if (!packageVersion) {
         const pkgVersions = (0, version_utils_1.versions)(tree);
         const devkitVersion = (0, version_utils_1.getInstalledAngularDevkitVersion)(tree) ??

package/src/generators/ngrx/lib/normalize-options.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"normalize-options.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ngrx/lib/normalize-options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,IAAI,EAAE,MAAM,YAAY,CAAC;AAKnD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;AAEtD,MAAM,MAAM,8BAA8B,GAAG,oBAAoB,GAAG;IAClE,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,oBAAoB,GAC5B,8BAA8B,CAyBhC"}
+{"version":3,"file":"normalize-options.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ngrx/lib/normalize-options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,IAAI,EAAE,MAAM,YAAY,CAAC;AAKnD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;AAEtD,MAAM,MAAM,8BAA8B,GAAG,oBAAoB,GAAG;IAClE,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,oBAAoB,GAC5B,8BAA8B,CAwBhC"}

package/src/generators/ngrx/lib/normalize-options.js

@@ -9,10 +9,10 @@ const versions_1 = require("../../../utils/versions");
 function normalizeOptions(tree, options) {
     let rxjsVersion;
     try {
-        rxjsVersion = (0, semver_1.checkAndCleanWithSemver)(tree, 'rxjs', (0, devkit_1.readJson)(tree, 'package.json').dependencies['rxjs']);
+        rxjsVersion = (0, semver_1.checkAndCleanWithSemver)('rxjs', (0, devkit_1.readJson)(tree, 'package.json').dependencies['rxjs']);
     }
     catch {
-        rxjsVersion = (0, semver_1.checkAndCleanWithSemver)(tree, 'rxjs', versions_1.rxjsVersion);
+        rxjsVersion = (0, semver_1.checkAndCleanWithSemver)('rxjs', versions_1.rxjsVersion);
     }
     const rxjsMajorVersion = (0, semver_2.major)(rxjsVersion);
     return {

package/src/generators/ngrx-feature-store/lib/normalize-options.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"normalize-options.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ngrx-feature-store/lib/normalize-options.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAMvC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAExC,MAAM,MAAM,0CAA0C,GAAG,MAAM,GAAG;IAChE,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,MAAM,GACd,0CAA0C,CAyB5C"}
+{"version":3,"file":"normalize-options.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ngrx-feature-store/lib/normalize-options.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAMvC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAExC,MAAM,MAAM,0CAA0C,GAAG,MAAM,GAAG;IAChE,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,MAAM,GACd,0CAA0C,CAwB5C"}

package/src/generators/ngrx-feature-store/lib/normalize-options.js

@@ -9,10 +9,10 @@ const versions_1 = require("../../../utils/versions");
 function normalizeOptions(tree, options) {
     let rxjsVersion;
     try {
-        rxjsVersion = (0, semver_1.checkAndCleanWithSemver)(tree, 'rxjs', (0, devkit_1.readJson)(tree, 'package.json').dependencies['rxjs']);
+        rxjsVersion = (0, semver_1.checkAndCleanWithSemver)('rxjs', (0, devkit_1.readJson)(tree, 'package.json').dependencies['rxjs']);
     }
     catch {
-        rxjsVersion = (0, semver_1.checkAndCleanWithSemver)(tree, 'rxjs', versions_1.rxjsVersion);
+        rxjsVersion = (0, semver_1.checkAndCleanWithSemver)('rxjs', versions_1.rxjsVersion);
     }
     const rxjsMajorVersion = (0, semver_2.major)(rxjsVersion);
     const { subdirectory, name } = determineSubdirectoryAndName(options.name);

package/src/generators/ngrx-root-store/lib/normalize-options.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"normalize-options.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ngrx-root-store/lib/normalize-options.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AASvC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAIxC,MAAM,MAAM,uCAAuC,GAAG,MAAM,GAAG;IAC7D,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,MAAM,GACd,uCAAuC,CAgDzC"}
+{"version":3,"file":"normalize-options.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ngrx-root-store/lib/normalize-options.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AASvC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAIxC,MAAM,MAAM,uCAAuC,GAAG,MAAM,GAAG;IAC7D,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,MAAM,GACd,uCAAuC,CA+CzC"}

package/src/generators/ngrx-root-store/lib/normalize-options.js

@@ -9,10 +9,10 @@ const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-set
 function normalizeOptions(tree, options) {
     let rxjsVersion;
     try {
-        rxjsVersion = (0, semver_1.checkAndCleanWithSemver)(tree, 'rxjs', (0, devkit_1.readJson)(tree, 'package.json').dependencies['rxjs']);
+        rxjsVersion = (0, semver_1.checkAndCleanWithSemver)('rxjs', (0, devkit_1.readJson)(tree, 'package.json').dependencies['rxjs']);
     }
     catch {
-        rxjsVersion = (0, semver_1.checkAndCleanWithSemver)(tree, 'rxjs', versions_1.rxjsVersion);
+        rxjsVersion = (0, semver_1.checkAndCleanWithSemver)('rxjs', versions_1.rxjsVersion);
     }
     const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     const isStandalone = (0, ast_utils_1.isNgStandaloneApp)(tree, options.project);

package/src/generators/setup-ssr/lib/add-dependencies.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-dependencies.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-ssr/lib/add-dependencies.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAOpB,wBAAgB,eAAe,CAC7B,IAAI,EAAE,IAAI,EACV,yBAAyB,EAAE,OAAO,GACjC,IAAI,CAkCN"}
+{"version":3,"file":"add-dependencies.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-ssr/lib/add-dependencies.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgC,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAQrE,wBAAgB,eAAe,CAC7B,IAAI,EAAE,IAAI,EACV,yBAAyB,EAAE,OAAO,GACjC,IAAI,CAkCN"}

package/src/generators/setup-ssr/lib/add-dependencies.js

@@ -6,7 +6,7 @@ const version_utils_1 = require("../../utils/version-utils");
 function addDependencies(tree, isUsingApplicationBuilder) {
     const pkgVersions = (0, version_utils_1.versions)(tree);
     const dependencies = {
-        '@angular/platform-server': (0, devkit_1.getDependencyVersionFromPackageJson)(tree, '@angular/platform-server') ??
+        '@angular/platform-server': (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular/platform-server') ??
             pkgVersions.angularVersion,
         express: pkgVersions.expressVersion,
     };

package/src/generators/setup-ssr/lib/generate-files.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate-files.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-ssr/lib/generate-files.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAgBvC,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,WAAW,CAAC;AAE5D,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,0BAA0B,QAiFpC"}
+{"version":3,"file":"generate-files.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-ssr/lib/generate-files.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAkBvC,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,WAAW,CAAC;AAE5D,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,0BAA0B,QAiFpC"}

package/src/generators/setup-ssr/lib/generate-files.js

@@ -33,7 +33,7 @@ function generateSSRFiles(tree, options) {
         pathToFiles = (0, path_1.join)(baseFilesPath, 'pre-v19', options.standalone ? 'standalone-src' : 'ngmodule-src');
     }
     const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(project, tree);
-    const ssrVersion = (0, devkit_1.getDependencyVersionFromPackageJson)(tree, '@angular/ssr');
+    const ssrVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular/ssr');
     const cleanedSsrVersion = ssrVersion
         ? (0, semver_1.clean)(ssrVersion) ?? (0, semver_1.coerce)(ssrVersion).version
         : null;

package/src/generators/setup-tailwind/lib/detect-tailwind-installed-version.js

@@ -10,7 +10,7 @@ function detectTailwindInstalledVersion(tree) {
     if (!tailwindVersion) {
         return undefined;
     }
-    const version = (0, semver_1.checkAndCleanWithSemver)(tree, 'tailwindcss', tailwindVersion);
+    const version = (0, semver_1.checkAndCleanWithSemver)('tailwindcss', tailwindVersion);
     if ((0, semver_2.lt)(version, '2.0.0')) {
         throw new Error(`The Tailwind CSS version "${tailwindVersion}" is not supported. Please upgrade to v2.0.0 or higher.`);
     }

package/src/generators/utils/ensure-angular-dependencies.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ensure-angular-dependencies.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/ensure-angular-dependencies.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,iBAAiB,EACtB,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAQpB,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,IAAI,GAAG,iBAAiB,CAuEvE"}
+{"version":3,"file":"ensure-angular-dependencies.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/ensure-angular-dependencies.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,iBAAiB,EACtB,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAQpB,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,IAAI,GAAG,iBAAiB,CAkEvE"}

package/src/generators/utils/ensure-angular-dependencies.js

@@ -7,8 +7,7 @@ function ensureAngularDependencies(tree) {
     const dependencies = {};
     const devDependencies = {};
     const pkgVersions = (0, version_utils_1.versions)(tree);
-    const packageJson = (0, devkit_1.readJson)(tree, 'package.json');
-    const installedAngularCoreVersion = (0, devkit_1.getDependencyVersionFromPackageJson)(tree, '@angular/core', packageJson);
+    const installedAngularCoreVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular/core');
     if (!installedAngularCoreVersion) {
         /**
          * If @angular/core is already installed, we assume the workspace was already
@@ -17,12 +16,9 @@ function ensureAngularDependencies(tree) {
          * might have removed.
          */
         const angularVersion = pkgVersions.angularVersion;
-        const rxjsVersion = (0, devkit_1.getDependencyVersionFromPackageJson)(tree, 'rxjs', packageJson) ??
-            pkgVersions.rxjsVersion;
-        const tsLibVersion = (0, devkit_1.getDependencyVersionFromPackageJson)(tree, 'tslib', packageJson) ??
-            pkgVersions.tsLibVersion;
-        const zoneJsVersion = (0, devkit_1.getDependencyVersionFromPackageJson)(tree, 'zone.js', packageJson) ??
-            pkgVersions.zoneJsVersion;
+        const rxjsVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, 'rxjs') ?? pkgVersions.rxjsVersion;
+        const tsLibVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, 'tslib') ?? pkgVersions.tsLibVersion;
+        const zoneJsVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, 'zone.js') ?? pkgVersions.zoneJsVersion;
         dependencies['@angular/common'] = angularVersion;
         dependencies['@angular/compiler'] = angularVersion;
         dependencies['@angular/core'] = angularVersion;

package/src/generators/utils/version-utils.d.ts

@@ -7,6 +7,7 @@ export declare function getInstalledAngularVersionInfo(tree: Tree): {
     version: string;
     major: number;
 };
+export declare function getInstalledPackageVersion(tree: Tree, pkgName: string): string | null;
 export declare function getInstalledPackageVersionInfo(tree: Tree, pkgName: string): {
     major: number;
     version: string;

package/src/generators/utils/version-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"version-utils.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/version-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuC,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAE5E,OAAO,EAEL,KAAK,qBAAqB,EAC1B,KAAK,qBAAqB,EAC3B,MAAM,0CAA0C,CAAC;AAIlD,wBAAgB,gCAAgC,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,GAAG,IAAI,CAO1E;AAED,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAiB7D;AAED,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAElE;AAED,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,IAAI;;;EAOxD;AAED,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM;;;EAIzE;AAED,wBAAgB,QAAQ,CACtB,IAAI,EAAE,IAAI,GACT,qBAAqB,GAAG,qBAAqB,CAU/C;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,GAAG,IAAI,CAcjE"}
+{"version":3,"file":"version-utils.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/version-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAEjD,OAAO,EAEL,KAAK,qBAAqB,EAC1B,KAAK,qBAAqB,EAC3B,MAAM,0CAA0C,CAAC;AAIlD,wBAAgB,gCAAgC,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,GAAG,IAAI,CAK1E;AAED,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAgB7D;AAED,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAElE;AAED,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,IAAI;;;EAOxD;AAED,wBAAgB,0BAA0B,CACxC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,MAAM,GACd,MAAM,GAAG,IAAI,CAKf;AAED,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM;;;EAIzE;AAED,wBAAgB,QAAQ,CACtB,IAAI,EAAE,IAAI,GACT,qBAAqB,GAAG,qBAAqB,CAU/C;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,GAAG,IAAI,CAcjE"}

package/src/generators/utils/version-utils.js

@@ -4,6 +4,7 @@ exports.getInstalledAngularDevkitVersion = getInstalledAngularDevkitVersion;
 exports.getInstalledAngularVersion = getInstalledAngularVersion;
 exports.getInstalledAngularMajorVersion = getInstalledAngularMajorVersion;
 exports.getInstalledAngularVersionInfo = getInstalledAngularVersionInfo;
+exports.getInstalledPackageVersion = getInstalledPackageVersion;
 exports.getInstalledPackageVersionInfo = getInstalledPackageVersionInfo;
 exports.versions = versions;
 exports.getAngularRspackVersion = getAngularRspackVersion;
@@ -14,10 +15,12 @@ const backward_compatible_versions_1 = require("../../utils/backward-compatible-
 const latestVersions = tslib_1.__importStar(require("../../utils/versions"));
 const versions_1 = require("../../utils/versions");
 function getInstalledAngularDevkitVersion(tree) {
-    return ((0, devkit_1.getDependencyVersionFromPackageJson)(tree, '@angular-devkit/build-angular') ?? (0, devkit_1.getDependencyVersionFromPackageJson)(tree, '@angular/build'));
+    return (getInstalledPackageVersion(tree, '@angular-devkit/build-angular') ??
+        getInstalledPackageVersion(tree, '@angular/build'));
 }
 function getInstalledAngularVersion(tree) {
-    const installedAngularVersion = (0, devkit_1.getDependencyVersionFromPackageJson)(tree, '@angular/core');
+    const pkgJson = (0, devkit_1.readJson)(tree, 'package.json');
+    const installedAngularVersion = pkgJson.dependencies && pkgJson.dependencies['@angular/core'];
     if (!installedAngularVersion ||
         installedAngularVersion === 'latest' ||
         installedAngularVersion === 'next') {
@@ -35,8 +38,13 @@ function getInstalledAngularVersionInfo(tree) {
         major: (0, semver_1.major)(installedVersion),
     };
 }
+function getInstalledPackageVersion(tree, pkgName) {
+    const { dependencies, devDependencies } = (0, devkit_1.readJson)(tree, 'package.json');
+    const version = dependencies?.[pkgName] ?? devDependencies?.[pkgName];
+    return version;
+}
 function getInstalledPackageVersionInfo(tree, pkgName) {
-    const version = (0, devkit_1.getDependencyVersionFromPackageJson)(tree, pkgName);
+    const version = getInstalledPackageVersion(tree, pkgName);
     return version ? { major: (0, semver_1.major)((0, semver_1.coerce)(version)), version } : null;
 }
 function versions(tree) {

package/src/migrations/update-16-4-0/update-angular-cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update-angular-cli.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-16-4-0/update-angular-cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,IAAI,EACL,MAAM,YAAY,CAAC;AAEpB,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAE3C,yBAA+B,IAAI,EAAE,IAAI,iBAaxC"}
+{"version":3,"file":"update-angular-cli.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-16-4-0/update-angular-cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,IAAI,EAAc,MAAM,YAAY,CAAC;AAE3D,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAE3C,yBAA+B,IAAI,EAAE,IAAI,iBAkBxC"}

package/src/migrations/update-16-4-0/update-angular-cli.js

@@ -5,10 +5,19 @@ exports.default = default_1;
 const devkit_1 = require("@nx/devkit");
 exports.angularCliVersion = '~16.1.0';
 async function default_1(tree) {
-    const { devDependencies, dependencies } = (0, devkit_1.readJson)(tree, 'package.json');
-    const hasAngularCli = devDependencies?.['@angular/cli'] || dependencies?.['@angular/cli'];
-    if (hasAngularCli) {
-        (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@angular/cli': exports.angularCliVersion });
+    let shouldFormat = false;
+    (0, devkit_1.updateJson)(tree, 'package.json', (json) => {
+        if (json.devDependencies?.['@angular/cli']) {
+            json.devDependencies['@angular/cli'] = exports.angularCliVersion;
+            shouldFormat = true;
+        }
+        else if (json.dependencies?.['@angular/cli']) {
+            json.dependencies['@angular/cli'] = exports.angularCliVersion;
+            shouldFormat = true;
+        }
+        return json;
+    });
+    if (shouldFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
 }

package/src/migrations/update-16-7-0/update-angular-cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update-angular-cli.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-16-7-0/update-angular-cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,IAAI,EACL,MAAM,YAAY,CAAC;AAEpB,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAE3C,yBAA+B,IAAI,EAAE,IAAI,iBAaxC"}
+{"version":3,"file":"update-angular-cli.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-16-7-0/update-angular-cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,IAAI,EAAc,MAAM,YAAY,CAAC;AAE3D,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAE3C,yBAA+B,IAAI,EAAE,IAAI,iBAkBxC"}

package/src/migrations/update-16-7-0/update-angular-cli.js

@@ -5,10 +5,19 @@ exports.default = default_1;
 const devkit_1 = require("@nx/devkit");
 exports.angularCliVersion = '~16.2.0';
 async function default_1(tree) {
-    const { devDependencies, dependencies } = (0, devkit_1.readJson)(tree, 'package.json');
-    const hasAngularCli = devDependencies?.['@angular/cli'] || dependencies?.['@angular/cli'];
-    if (hasAngularCli) {
-        (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@angular/cli': exports.angularCliVersion });
+    let shouldFormat = false;
+    (0, devkit_1.updateJson)(tree, 'package.json', (json) => {
+        if (json.devDependencies?.['@angular/cli']) {
+            json.devDependencies['@angular/cli'] = exports.angularCliVersion;
+            shouldFormat = true;
+        }
+        else if (json.dependencies?.['@angular/cli']) {
+            json.dependencies['@angular/cli'] = exports.angularCliVersion;
+            shouldFormat = true;
+        }
+        return json;
+    });
+    if (shouldFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
 }

package/src/migrations/update-17-1-0/update-angular-cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update-angular-cli.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-17-1-0/update-angular-cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,IAAI,EACL,MAAM,YAAY,CAAC;AAEpB,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAE3C,yBAA+B,IAAI,EAAE,IAAI,iBAaxC"}
+{"version":3,"file":"update-angular-cli.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-17-1-0/update-angular-cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,IAAI,EAAc,MAAM,YAAY,CAAC;AAE3D,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAE3C,yBAA+B,IAAI,EAAE,IAAI,iBAkBxC"}

package/src/migrations/update-17-1-0/update-angular-cli.js

@@ -5,10 +5,19 @@ exports.default = default_1;
 const devkit_1 = require("@nx/devkit");
 exports.angularCliVersion = '~17.0.0';
 async function default_1(tree) {
-    const { devDependencies, dependencies } = (0, devkit_1.readJson)(tree, 'package.json');
-    const hasAngularCli = devDependencies?.['@angular/cli'] || dependencies?.['@angular/cli'];
-    if (hasAngularCli) {
-        (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@angular/cli': exports.angularCliVersion });
+    let shouldFormat = false;
+    (0, devkit_1.updateJson)(tree, 'package.json', (json) => {
+        if (json.devDependencies?.['@angular/cli']) {
+            json.devDependencies['@angular/cli'] = exports.angularCliVersion;
+            shouldFormat = true;
+        }
+        else if (json.dependencies?.['@angular/cli']) {
+            json.dependencies['@angular/cli'] = exports.angularCliVersion;
+            shouldFormat = true;
+        }
+        return json;
+    });
+    if (shouldFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
 }

package/src/migrations/update-17-3-0/add-autoprefixer-dependency.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-autoprefixer-dependency.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-17-3-0/add-autoprefixer-dependency.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAEpB,yBAA+B,IAAI,EAAE,IAAI,iBA6BxC"}
+{"version":3,"file":"add-autoprefixer-dependency.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-17-3-0/add-autoprefixer-dependency.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAGpB,yBAA+B,IAAI,EAAE,IAAI,iBA0BxC"}

package/src/migrations/update-17-3-0/add-autoprefixer-dependency.js

@@ -2,8 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 const devkit_1 = require("@nx/devkit");
+const version_utils_1 = require("../../generators/utils/version-utils");
 async function default_1(tree) {
-    const autprefixerVersion = (0, devkit_1.getDependencyVersionFromPackageJson)(tree, 'autoprefixer');
+    const autprefixerVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, 'autoprefixer');
     if (autprefixerVersion) {
         return;
     }

package/src/migrations/update-17-3-0/add-browser-sync-dependency.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-browser-sync-dependency.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-17-3-0/add-browser-sync-dependency.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAEpB,yBAA+B,IAAI,EAAE,IAAI,iBA6BxC"}
+{"version":3,"file":"add-browser-sync-dependency.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-17-3-0/add-browser-sync-dependency.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAGpB,yBAA+B,IAAI,EAAE,IAAI,iBA0BxC"}

package/src/migrations/update-17-3-0/add-browser-sync-dependency.js

@@ -2,8 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 const devkit_1 = require("@nx/devkit");
+const version_utils_1 = require("../../generators/utils/version-utils");
 async function default_1(tree) {
-    const browserSyncVersion = (0, devkit_1.getDependencyVersionFromPackageJson)(tree, 'browser-sync');
+    const browserSyncVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, 'browser-sync');
     if (browserSyncVersion) {
         return;
     }

package/src/migrations/update-17-3-0/update-angular-cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update-angular-cli.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-17-3-0/update-angular-cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,IAAI,EACL,MAAM,YAAY,CAAC;AAEpB,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAE3C,yBAA+B,IAAI,EAAE,IAAI,iBAaxC"}
+{"version":3,"file":"update-angular-cli.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-17-3-0/update-angular-cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,IAAI,EAAc,MAAM,YAAY,CAAC;AAE3D,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAE3C,yBAA+B,IAAI,EAAE,IAAI,iBAkBxC"}

package/src/migrations/update-17-3-0/update-angular-cli.js

@@ -5,10 +5,19 @@ exports.default = default_1;
 const devkit_1 = require("@nx/devkit");
 exports.angularCliVersion = '~17.1.0';
 async function default_1(tree) {
-    const { devDependencies, dependencies } = (0, devkit_1.readJson)(tree, 'package.json');
-    const hasAngularCli = devDependencies?.['@angular/cli'] || dependencies?.['@angular/cli'];
-    if (hasAngularCli) {
-        (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@angular/cli': exports.angularCliVersion });
+    let shouldFormat = false;
+    (0, devkit_1.updateJson)(tree, 'package.json', (json) => {
+        if (json.devDependencies?.['@angular/cli']) {
+            json.devDependencies['@angular/cli'] = exports.angularCliVersion;
+            shouldFormat = true;
+        }
+        else if (json.dependencies?.['@angular/cli']) {
+            json.dependencies['@angular/cli'] = exports.angularCliVersion;
+            shouldFormat = true;
+        }
+        return json;
+    });
+    if (shouldFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
 }

package/src/migrations/update-18-1-0/update-angular-cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update-angular-cli.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-18-1-0/update-angular-cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,IAAI,EACL,MAAM,YAAY,CAAC;AAEpB,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAE3C,yBAA+B,IAAI,EAAE,IAAI,iBAaxC"}
+{"version":3,"file":"update-angular-cli.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-18-1-0/update-angular-cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,IAAI,EAAc,MAAM,YAAY,CAAC;AAE3D,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAE3C,yBAA+B,IAAI,EAAE,IAAI,iBAkBxC"}

package/src/migrations/update-18-1-0/update-angular-cli.js

@@ -5,10 +5,19 @@ exports.default = default_1;
 const devkit_1 = require("@nx/devkit");
 exports.angularCliVersion = '~17.2.0';
 async function default_1(tree) {
-    const { devDependencies, dependencies } = (0, devkit_1.readJson)(tree, 'package.json');
-    const hasAngularCli = devDependencies?.['@angular/cli'] || dependencies?.['@angular/cli'];
-    if (hasAngularCli) {
-        (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@angular/cli': exports.angularCliVersion });
+    let shouldFormat = false;
+    (0, devkit_1.updateJson)(tree, 'package.json', (json) => {
+        if (json.devDependencies?.['@angular/cli']) {
+            json.devDependencies['@angular/cli'] = exports.angularCliVersion;
+            shouldFormat = true;
+        }
+        else if (json.dependencies?.['@angular/cli']) {
+            json.dependencies['@angular/cli'] = exports.angularCliVersion;
+            shouldFormat = true;
+        }
+        return json;
+    });
+    if (shouldFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
 }

package/src/migrations/update-18-2-0/update-angular-cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update-angular-cli.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-18-2-0/update-angular-cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,IAAI,EACL,MAAM,YAAY,CAAC;AAEpB,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAE3C,yBAA+B,IAAI,EAAE,IAAI,iBAaxC"}
+{"version":3,"file":"update-angular-cli.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-18-2-0/update-angular-cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,IAAI,EAAc,MAAM,YAAY,CAAC;AAE3D,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAE3C,yBAA+B,IAAI,EAAE,IAAI,iBAkBxC"}

package/src/migrations/update-18-2-0/update-angular-cli.js

@@ -5,10 +5,19 @@ exports.default = default_1;
 const devkit_1 = require("@nx/devkit");
 exports.angularCliVersion = '~17.3.0';
 async function default_1(tree) {
-    const { devDependencies, dependencies } = (0, devkit_1.readJson)(tree, 'package.json');
-    const hasAngularCli = devDependencies?.['@angular/cli'] || dependencies?.['@angular/cli'];
-    if (hasAngularCli) {
-        (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@angular/cli': exports.angularCliVersion });
+    let shouldFormat = false;
+    (0, devkit_1.updateJson)(tree, 'package.json', (json) => {
+        if (json.devDependencies?.['@angular/cli']) {
+            json.devDependencies['@angular/cli'] = exports.angularCliVersion;
+            shouldFormat = true;
+        }
+        else if (json.dependencies?.['@angular/cli']) {
+            json.dependencies['@angular/cli'] = exports.angularCliVersion;
+            shouldFormat = true;
+        }
+        return json;
+    });
+    if (shouldFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
 }

package/src/migrations/update-19-1-0/update-angular-cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update-angular-cli.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-19-1-0/update-angular-cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,IAAI,EACL,MAAM,YAAY,CAAC;AAEpB,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAE3C,yBAA+B,IAAI,EAAE,IAAI,iBAaxC"}
+{"version":3,"file":"update-angular-cli.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-19-1-0/update-angular-cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,IAAI,EAAc,MAAM,YAAY,CAAC;AAE3D,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAE3C,yBAA+B,IAAI,EAAE,IAAI,iBAkBxC"}

package/src/migrations/update-19-1-0/update-angular-cli.js

@@ -5,10 +5,19 @@ exports.default = default_1;
 const devkit_1 = require("@nx/devkit");
 exports.angularCliVersion = '~18.0.0';
 async function default_1(tree) {
-    const { devDependencies, dependencies } = (0, devkit_1.readJson)(tree, 'package.json');
-    const hasAngularCli = devDependencies?.['@angular/cli'] || dependencies?.['@angular/cli'];
-    if (hasAngularCli) {
-        (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@angular/cli': exports.angularCliVersion });
+    let shouldFormat = false;
+    (0, devkit_1.updateJson)(tree, 'package.json', (json) => {
+        if (json.devDependencies?.['@angular/cli']) {
+            json.devDependencies['@angular/cli'] = exports.angularCliVersion;
+            shouldFormat = true;
+        }
+        else if (json.dependencies?.['@angular/cli']) {
+            json.dependencies['@angular/cli'] = exports.angularCliVersion;
+            shouldFormat = true;
+        }
+        return json;
+    });
+    if (shouldFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
 }

package/src/migrations/update-19-2-1/add-typescript-eslint-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-typescript-eslint-utils.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-19-2-1/add-typescript-eslint-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAGpB,eAAO,MAAM,4BAA4B,YAAY,CAAC;AAEtD,yBAA+B,IAAI,EAAE,IAAI,iBAsBxC"}
+{"version":3,"file":"add-typescript-eslint-utils.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-19-2-1/add-typescript-eslint-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAMpB,eAAO,MAAM,4BAA4B,YAAY,CAAC;AAEtD,yBAA+B,IAAI,EAAE,IAAI,iBAsBxC"}

package/src/migrations/update-19-2-1/add-typescript-eslint-utils.js

@@ -6,7 +6,7 @@ const devkit_1 = require("@nx/devkit");
 const version_utils_1 = require("../../generators/utils/version-utils");
 exports.typescriptEslintUtilsVersion = '^7.16.0';
 async function default_1(tree) {
-    if ((0, devkit_1.getDependencyVersionFromPackageJson)(tree, '@typescript-eslint/utils')) {
+    if ((0, version_utils_1.getInstalledPackageVersion)(tree, '@typescript-eslint/utils')) {
         return;
     }
     const eslintPluginVersionInfo = (0, version_utils_1.getInstalledPackageVersionInfo)(tree, '@angular-eslint/eslint-plugin') ??

package/src/migrations/update-19-5-0/update-angular-cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update-angular-cli.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-19-5-0/update-angular-cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,IAAI,EACL,MAAM,YAAY,CAAC;AAEpB,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAE3C,yBAA+B,IAAI,EAAE,IAAI,iBAaxC"}
+{"version":3,"file":"update-angular-cli.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-19-5-0/update-angular-cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,IAAI,EAAc,MAAM,YAAY,CAAC;AAE3D,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAE3C,yBAA+B,IAAI,EAAE,IAAI,iBAkBxC"}

package/src/migrations/update-19-5-0/update-angular-cli.js

@@ -5,10 +5,19 @@ exports.default = default_1;
 const devkit_1 = require("@nx/devkit");
 exports.angularCliVersion = '~18.1.0';
 async function default_1(tree) {
-    const { devDependencies, dependencies } = (0, devkit_1.readJson)(tree, 'package.json');
-    const hasAngularCli = devDependencies?.['@angular/cli'] || dependencies?.['@angular/cli'];
-    if (hasAngularCli) {
-        (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@angular/cli': exports.angularCliVersion });
+    let shouldFormat = false;
+    (0, devkit_1.updateJson)(tree, 'package.json', (json) => {
+        if (json.devDependencies?.['@angular/cli']) {
+            json.devDependencies['@angular/cli'] = exports.angularCliVersion;
+            shouldFormat = true;
+        }
+        else if (json.dependencies?.['@angular/cli']) {
+            json.dependencies['@angular/cli'] = exports.angularCliVersion;
+            shouldFormat = true;
+        }
+        return json;
+    });
+    if (shouldFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
 }

package/src/migrations/update-19-6-0/update-angular-cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update-angular-cli.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-19-6-0/update-angular-cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,IAAI,EACL,MAAM,YAAY,CAAC;AAEpB,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAE3C,yBAA+B,IAAI,EAAE,IAAI,iBAaxC"}
+{"version":3,"file":"update-angular-cli.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-19-6-0/update-angular-cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,IAAI,EAAc,MAAM,YAAY,CAAC;AAE3D,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAE3C,yBAA+B,IAAI,EAAE,IAAI,iBAkBxC"}

package/src/migrations/update-19-6-0/update-angular-cli.js

@@ -5,10 +5,19 @@ exports.default = default_1;
 const devkit_1 = require("@nx/devkit");
 exports.angularCliVersion = '~18.2.0';
 async function default_1(tree) {
-    const { devDependencies, dependencies } = (0, devkit_1.readJson)(tree, 'package.json');
-    const hasAngularCli = devDependencies?.['@angular/cli'] || dependencies?.['@angular/cli'];
-    if (hasAngularCli) {
-        (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@angular/cli': exports.angularCliVersion });
+    let shouldFormat = false;
+    (0, devkit_1.updateJson)(tree, 'package.json', (json) => {
+        if (json.devDependencies?.['@angular/cli']) {
+            json.devDependencies['@angular/cli'] = exports.angularCliVersion;
+            shouldFormat = true;
+        }
+        else if (json.dependencies?.['@angular/cli']) {
+            json.dependencies['@angular/cli'] = exports.angularCliVersion;
+            shouldFormat = true;
+        }
+        return json;
+    });
+    if (shouldFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
 }

package/src/migrations/update-20-2-0/update-angular-cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update-angular-cli.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-20-2-0/update-angular-cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,IAAI,EACL,MAAM,YAAY,CAAC;AAEpB,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAE3C,yBAA+B,IAAI,EAAE,IAAI,iBAaxC"}
+{"version":3,"file":"update-angular-cli.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-20-2-0/update-angular-cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,IAAI,EAAc,MAAM,YAAY,CAAC;AAE3D,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAE3C,yBAA+B,IAAI,EAAE,IAAI,iBAkBxC"}

package/src/migrations/update-20-2-0/update-angular-cli.js

@@ -5,10 +5,19 @@ exports.default = default_1;
 const devkit_1 = require("@nx/devkit");
 exports.angularCliVersion = '~19.0.0';
 async function default_1(tree) {
-    const { devDependencies, dependencies } = (0, devkit_1.readJson)(tree, 'package.json');
-    const hasAngularCli = devDependencies?.['@angular/cli'] || dependencies?.['@angular/cli'];
-    if (hasAngularCli) {
-        (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@angular/cli': exports.angularCliVersion });
+    let shouldFormat = false;
+    (0, devkit_1.updateJson)(tree, 'package.json', (json) => {
+        if (json.devDependencies?.['@angular/cli']) {
+            json.devDependencies['@angular/cli'] = exports.angularCliVersion;
+            shouldFormat = true;
+        }
+        else if (json.dependencies?.['@angular/cli']) {
+            json.dependencies['@angular/cli'] = exports.angularCliVersion;
+            shouldFormat = true;
+        }
+        return json;
+    });
+    if (shouldFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
 }

package/src/migrations/update-20-4-0/update-angular-cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update-angular-cli.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-20-4-0/update-angular-cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,IAAI,EACL,MAAM,YAAY,CAAC;AAEpB,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAE3C,yBAA+B,IAAI,EAAE,IAAI,iBAaxC"}
+{"version":3,"file":"update-angular-cli.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-20-4-0/update-angular-cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,IAAI,EAAc,MAAM,YAAY,CAAC;AAE3D,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAE3C,yBAA+B,IAAI,EAAE,IAAI,iBAkBxC"}

package/src/migrations/update-20-4-0/update-angular-cli.js

@@ -5,10 +5,19 @@ exports.default = default_1;
 const devkit_1 = require("@nx/devkit");
 exports.angularCliVersion = '~19.1.0';
 async function default_1(tree) {
-    const { devDependencies, dependencies } = (0, devkit_1.readJson)(tree, 'package.json');
-    const hasAngularCli = devDependencies?.['@angular/cli'] || dependencies?.['@angular/cli'];
-    if (hasAngularCli) {
-        (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@angular/cli': exports.angularCliVersion });
+    let shouldFormat = false;
+    (0, devkit_1.updateJson)(tree, 'package.json', (json) => {
+        if (json.devDependencies?.['@angular/cli']) {
+            json.devDependencies['@angular/cli'] = exports.angularCliVersion;
+            shouldFormat = true;
+        }
+        else if (json.dependencies?.['@angular/cli']) {
+            json.dependencies['@angular/cli'] = exports.angularCliVersion;
+            shouldFormat = true;
+        }
+        return json;
+    });
+    if (shouldFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
 }

package/src/migrations/update-20-5-0/update-angular-cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update-angular-cli.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-20-5-0/update-angular-cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,IAAI,EACL,MAAM,YAAY,CAAC;AAEpB,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAE3C,yBAA+B,IAAI,EAAE,IAAI,iBAaxC"}
+{"version":3,"file":"update-angular-cli.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-20-5-0/update-angular-cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,IAAI,EAAc,MAAM,YAAY,CAAC;AAE3D,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAE3C,yBAA+B,IAAI,EAAE,IAAI,iBAkBxC"}

package/src/migrations/update-20-5-0/update-angular-cli.js

@@ -5,10 +5,19 @@ exports.default = default_1;
 const devkit_1 = require("@nx/devkit");
 exports.angularCliVersion = '~19.2.0';
 async function default_1(tree) {
-    const { devDependencies, dependencies } = (0, devkit_1.readJson)(tree, 'package.json');
-    const hasAngularCli = devDependencies?.['@angular/cli'] || dependencies?.['@angular/cli'];
-    if (hasAngularCli) {
-        (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@angular/cli': exports.angularCliVersion });
+    let shouldFormat = false;
+    (0, devkit_1.updateJson)(tree, 'package.json', (json) => {
+        if (json.devDependencies?.['@angular/cli']) {
+            json.devDependencies['@angular/cli'] = exports.angularCliVersion;
+            shouldFormat = true;
+        }
+        else if (json.dependencies?.['@angular/cli']) {
+            json.dependencies['@angular/cli'] = exports.angularCliVersion;
+            shouldFormat = true;
+        }
+        return json;
+    });
+    if (shouldFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
 }

package/src/migrations/update-21-2-0/update-angular-cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update-angular-cli.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-21-2-0/update-angular-cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,IAAI,EACL,MAAM,YAAY,CAAC;AAEpB,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAE3C,yBAA+B,IAAI,EAAE,IAAI,iBAaxC"}
+{"version":3,"file":"update-angular-cli.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-21-2-0/update-angular-cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,IAAI,EAAc,MAAM,YAAY,CAAC;AAE3D,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAE3C,yBAA+B,IAAI,EAAE,IAAI,iBAkBxC"}

package/src/migrations/update-21-2-0/update-angular-cli.js

@@ -5,10 +5,19 @@ exports.default = default_1;
 const devkit_1 = require("@nx/devkit");
 exports.angularCliVersion = '~20.0.0';
 async function default_1(tree) {
-    const { devDependencies, dependencies } = (0, devkit_1.readJson)(tree, 'package.json');
-    const hasAngularCli = devDependencies?.['@angular/cli'] || dependencies?.['@angular/cli'];
-    if (hasAngularCli) {
-        (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@angular/cli': exports.angularCliVersion });
+    let shouldFormat = false;
+    (0, devkit_1.updateJson)(tree, 'package.json', (json) => {
+        if (json.devDependencies?.['@angular/cli']) {
+            json.devDependencies['@angular/cli'] = exports.angularCliVersion;
+            shouldFormat = true;
+        }
+        else if (json.dependencies?.['@angular/cli']) {
+            json.dependencies['@angular/cli'] = exports.angularCliVersion;
+            shouldFormat = true;
+        }
+        return json;
+    });
+    if (shouldFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
 }

package/src/migrations/update-21-3-0/update-angular-cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update-angular-cli.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-21-3-0/update-angular-cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,IAAI,EACL,MAAM,YAAY,CAAC;AAEpB,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAE3C,yBAA+B,IAAI,EAAE,IAAI,iBAaxC"}
+{"version":3,"file":"update-angular-cli.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-21-3-0/update-angular-cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,IAAI,EAAc,MAAM,YAAY,CAAC;AAE3D,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAE3C,yBAA+B,IAAI,EAAE,IAAI,iBAkBxC"}

package/src/migrations/update-21-3-0/update-angular-cli.js

@@ -5,10 +5,19 @@ exports.default = default_1;
 const devkit_1 = require("@nx/devkit");
 exports.angularCliVersion = '~20.1.0';
 async function default_1(tree) {
-    const { devDependencies, dependencies } = (0, devkit_1.readJson)(tree, 'package.json');
-    const hasAngularCli = devDependencies?.['@angular/cli'] || dependencies?.['@angular/cli'];
-    if (hasAngularCli) {
-        (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@angular/cli': exports.angularCliVersion });
+    let shouldFormat = false;
+    (0, devkit_1.updateJson)(tree, 'package.json', (json) => {
+        if (json.devDependencies?.['@angular/cli']) {
+            json.devDependencies['@angular/cli'] = exports.angularCliVersion;
+            shouldFormat = true;
+        }
+        else if (json.dependencies?.['@angular/cli']) {
+            json.dependencies['@angular/cli'] = exports.angularCliVersion;
+            shouldFormat = true;
+        }
+        return json;
+    });
+    if (shouldFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
 }

package/src/migrations/update-21-5-0/update-angular-cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update-angular-cli.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-21-5-0/update-angular-cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,IAAI,EACL,MAAM,YAAY,CAAC;AAEpB,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAE3C,yBAA+B,IAAI,EAAE,IAAI,iBAaxC"}
+{"version":3,"file":"update-angular-cli.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-21-5-0/update-angular-cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,IAAI,EAAc,MAAM,YAAY,CAAC;AAE3D,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAE3C,yBAA+B,IAAI,EAAE,IAAI,iBAkBxC"}

package/src/migrations/update-21-5-0/update-angular-cli.js

@@ -5,10 +5,19 @@ exports.default = default_1;
 const devkit_1 = require("@nx/devkit");
 exports.angularCliVersion = '~20.2.0';
 async function default_1(tree) {
-    const { devDependencies, dependencies } = (0, devkit_1.readJson)(tree, 'package.json');
-    const hasAngularCli = devDependencies?.['@angular/cli'] || dependencies?.['@angular/cli'];
-    if (hasAngularCli) {
-        (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@angular/cli': exports.angularCliVersion });
+    let shouldFormat = false;
+    (0, devkit_1.updateJson)(tree, 'package.json', (json) => {
+        if (json.devDependencies?.['@angular/cli']) {
+            json.devDependencies['@angular/cli'] = exports.angularCliVersion;
+            shouldFormat = true;
+        }
+        else if (json.dependencies?.['@angular/cli']) {
+            json.dependencies['@angular/cli'] = exports.angularCliVersion;
+            shouldFormat = true;
+        }
+        return json;
+    });
+    if (shouldFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
 }

package/src/migrations/update-21-6-1/update-angular-cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update-angular-cli.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-21-6-1/update-angular-cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,IAAI,EACL,MAAM,YAAY,CAAC;AAEpB,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAE3C,yBAA+B,IAAI,EAAE,IAAI,iBAaxC"}
+{"version":3,"file":"update-angular-cli.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-21-6-1/update-angular-cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,IAAI,EAAc,MAAM,YAAY,CAAC;AAE3D,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAE3C,yBAA+B,IAAI,EAAE,IAAI,iBAkBxC"}

package/src/migrations/update-21-6-1/update-angular-cli.js

@@ -5,10 +5,19 @@ exports.default = default_1;
 const devkit_1 = require("@nx/devkit");
 exports.angularCliVersion = '~20.3.0';
 async function default_1(tree) {
-    const { devDependencies, dependencies } = (0, devkit_1.readJson)(tree, 'package.json');
-    const hasAngularCli = devDependencies?.['@angular/cli'] || dependencies?.['@angular/cli'];
-    if (hasAngularCli) {
-        (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@angular/cli': exports.angularCliVersion });
+    let shouldFormat = false;
+    (0, devkit_1.updateJson)(tree, 'package.json', (json) => {
+        if (json.devDependencies?.['@angular/cli']) {
+            json.devDependencies['@angular/cli'] = exports.angularCliVersion;
+            shouldFormat = true;
+        }
+        else if (json.dependencies?.['@angular/cli']) {
+            json.dependencies['@angular/cli'] = exports.angularCliVersion;
+            shouldFormat = true;
+        }
+        return json;
+    });
+    if (shouldFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
 }