fix(core): handle non-existing cli entry in nx.json in migration to r…

…emove default collection (#10632)
nrwl · Jun 8, 2022 · d4274b3 · d4274b3
1 parent 31c753e
commit d4274b3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
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
@@ -41,4 +41,12 @@ describe('remove-default-collection', () => {
       readWorkspaceConfiguration(tree).cli?.defaultCollection
     ).toBeUndefined();
   });
+
+  it('should not error when "cli" is not defined', async () => {
+    const config = readWorkspaceConfiguration(tree);
+    delete config.cli;
+    updateWorkspaceConfiguration(tree, config);
+
+    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
@@ -9,7 +9,10 @@ export default async function (tree: Tree) {
   const workspaceConfiguration = readWorkspaceConfiguration(tree);
 
   delete workspaceConfiguration.cli?.defaultCollection;
-  if (Object.keys(workspaceConfiguration.cli).length === 0) {
+  if (
+    workspaceConfiguration.cli &&
+    Object.keys(workspaceConfiguration.cli).length === 0
+  ) {
     delete workspaceConfiguration.cli;
   }