fix(core): fix migrations for adding tao and cli (#4249)

Author: FrozenPandaz

packages/workspace/src/migrations/update-10-3-0/add-cli-dependency.ts

@@ -1,10 +1,23 @@
 import { chain, Rule } from '@angular-devkit/schematics';
-import { formatFiles, addDepsToPackageJson } from '@nrwl/workspace';
-import { nxVersion } from '../../../src/utils/versions';
+import { formatFiles } from '../../utils/rules/format-files';
+import { nxVersion } from '../../utils/versions';
+import { sortObjectByKeys, updateJsonInTree } from '../../utils/ast-utils';
 
 export default function update(): Rule {
   return chain([
-    addDepsToPackageJson({}, { '@nrwl/cli': nxVersion }),
+    updateJsonInTree('package.json', (json) => {
+      json.dependencies = json.dependencies || {};
+
+      json.devDependencies = json.devDependencies || {};
+
+      delete json.dependencies['@nrwl/cli'];
+      json.devDependencies['@nrwl/cli'] = nxVersion;
+
+      json.dependencies = sortObjectByKeys(json.dependencies);
+      json.devDependencies = sortObjectByKeys(json.devDependencies);
+
+      return json;
+    }),
     formatFiles(),
   ]);
 }

packages/workspace/src/migrations/update-10-4-0/add-explicit-dep-on-tao.ts

@@ -1,13 +1,25 @@
 import { chain, Rule } from '@angular-devkit/schematics';
-import { formatFiles, addDepsToPackageJson } from '@nrwl/workspace';
-import { nxVersion } from '../../../src/utils/versions';
+import { formatFiles } from '../../utils/rules/format-files';
+import { nxVersion } from '../../utils/versions';
+import { sortObjectByKeys, updateJsonInTree } from '../../utils/ast-utils';
 
 export default function update(): Rule {
   return chain([
-    addDepsToPackageJson(
-      {},
-      { '@nrwl/tao': nxVersion, '@nrwl/cli': nxVersion }
-    ),
+    updateJsonInTree('package.json', (json) => {
+      json.dependencies = json.dependencies || {};
+
+      json.devDependencies = json.devDependencies || {};
+
+      delete json.dependencies['@nrwl/cli'];
+      json.devDependencies['@nrwl/cli'] = nxVersion;
+      delete json.dependencies['@nrwl/tao'];
+      json.devDependencies['@nrwl/tao'] = nxVersion;
+
+      json.dependencies = sortObjectByKeys(json.dependencies);
+      json.devDependencies = sortObjectByKeys(json.devDependencies);
+
+      return json;
+    }),
     formatFiles(),
   ]);
 }

packages/workspace/src/utils/ast-utils.ts

@@ -60,7 +60,7 @@ function insertAfterLastOccurrence(
   return new InsertChange(file, lastItemPosition, toInsert);
 }
 
-function sortObjectByKeys(obj: unknown) {
+export function sortObjectByKeys(obj: unknown) {
   return Object.keys(obj)
     .sort()
     .reduce((result, key) => {