fix(core): check for nx.json before applying migrations

nrwl · Jan 13, 2023 · 6e6ca5f · 6e6ca5f · vercel · Jan 13, 2023
1 parent 6f253b0
commit 6e6ca5f
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 3 deletions.
diff --git a/packages/nx/src/migrations/update-14-2-0/remove-default-collection.spec.ts b/packages/nx/src/migrations/update-14-2-0/remove-default-collection.spec.ts
@@ -1,10 +1,10 @@
 import { createTreeWithEmptyWorkspace } from '../../generators/testing-utils/create-tree-with-empty-workspace';
 import type { Tree } from '../../generators/tree';
-import removeDefaultCollection from './remove-default-collection';
 import {
   readNxJson,
   updateNxJson,
 } from '../../generators/utils/project-configuration';
+import removeDefaultCollection from './remove-default-collection';
 
 describe('remove-default-collection', () => {
   let tree: Tree;
@@ -47,4 +47,9 @@ describe('remove-default-collection', () => {
 
     await expect(removeDefaultCollection(tree)).resolves.not.toThrow();
   });
+
+  it('should not error when nxJson does not exist', async () => {
+    tree.delete('nx.json');
+    await expect(removeDefaultCollection(tree)).resolves.not.toThrow();
+  });
 });
diff --git a/packages/nx/src/migrations/update-14-2-0/remove-default-collection.ts b/packages/nx/src/migrations/update-14-2-0/remove-default-collection.ts
@@ -1,11 +1,16 @@
+import { formatChangedFilesWithPrettierIfAvailable } from '../../generators/internal-utils/format-changed-files-with-prettier-if-available';
 import { Tree } from '../../generators/tree';
 import {
   readNxJson,
   updateNxJson,
 } from '../../generators/utils/project-configuration';
-import { formatChangedFilesWithPrettierIfAvailable } from '../../generators/internal-utils/format-changed-files-with-prettier-if-available';
 
 export default async function (tree: Tree) {
+  // If the workspace doesn't have a nx.json, don't make any changes
+  if (!tree.exists('nx.json')) {
+    return;
+  }
+
   const nxJson = readNxJson(tree);
 
   delete nxJson.cli?.defaultCollection;

diff --git a/packages/nx/src/migrations/update-14-3-4/create-target-defaults.spec.ts b/packages/nx/src/migrations/update-14-3-4/create-target-defaults.spec.ts
@@ -35,4 +35,9 @@ describe('createTargetDefaults', () => {
     });
     expect(updated.targetDependencies).toBeUndefined();
   });
+
+  it('should not error when nxJson does not exist', async () => {
+    tree.delete('nx.json');
+    await expect(createTargetDefaults(tree)).resolves.not.toThrow();
+  });
 });
diff --git a/packages/nx/src/migrations/update-14-3-4/create-target-defaults.ts b/packages/nx/src/migrations/update-14-3-4/create-target-defaults.ts
@@ -1,11 +1,16 @@
+import { formatChangedFilesWithPrettierIfAvailable } from '../../generators/internal-utils/format-changed-files-with-prettier-if-available';
 import { Tree } from '../../generators/tree';
 import {
   readNxJson,
   updateNxJson,
 } from '../../generators/utils/project-configuration';
-import { formatChangedFilesWithPrettierIfAvailable } from '../../generators/internal-utils/format-changed-files-with-prettier-if-available';
 
 export default async function (tree: Tree) {
+  // If the workspace doesn't have a nx.json, don't make any changes
+  if (!tree.exists('nx.json')) {
+    return;
+  }
+
   const nxJson = readNxJson(tree);
 
   if (nxJson.targetDependencies) {