From a4d0f11e737dbc3981d8414656b8554e1e17f7ef Mon Sep 17 00:00:00 2001 From: Jeremy Forsythe Date: Fri, 14 Aug 2020 19:42:21 -0400 Subject: [PATCH] cleanup(misc): formatter changes --- .../remove/lib/update-workspace.spec.ts | 15 ++++++------ .../schematics/remove/lib/update-workspace.ts | 23 ++++++++++++------- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/packages/workspace/src/schematics/remove/lib/update-workspace.spec.ts b/packages/workspace/src/schematics/remove/lib/update-workspace.spec.ts index a27ee5cd1b..196addadef 100644 --- a/packages/workspace/src/schematics/remove/lib/update-workspace.spec.ts +++ b/packages/workspace/src/schematics/remove/lib/update-workspace.spec.ts @@ -66,9 +66,9 @@ describe('updateWorkspace Rule', () => { it('should delete the project', async () => { let workspace = JSON.parse(tree.read('workspace.json').toString()); expect(workspace.projects['ng-app']).toBeDefined(); - + tree = (await callRule(updateWorkspace(schema), tree)) as UnitTestTree; - + workspace = JSON.parse(tree.read('workspace.json').toString()); expect(workspace.projects['ng-app']).toBeUndefined(); }); @@ -136,12 +136,12 @@ describe('updateWorkspace Rule', () => { skipFormat: false, forceRemove: false, }; - + let workspace = JSON.parse(tree.read('workspace.json').toString()); expect(workspace.defaultProject).toBeDefined(); - + tree = (await callRule(updateWorkspace(schema), tree)) as UnitTestTree; - + workspace = JSON.parse(tree.read('workspace.json').toString()); expect(workspace.defaultProject).toBeUndefined(); }); @@ -155,12 +155,11 @@ describe('updateWorkspace Rule', () => { let workspace = JSON.parse(tree.read('workspace.json').toString()); expect(workspace.defaultProject).toBeDefined(); - + tree = (await callRule(updateWorkspace(schema), tree)) as UnitTestTree; - + workspace = JSON.parse(tree.read('workspace.json').toString()); expect(workspace.defaultProject).toBeDefined(); }); }); - }); diff --git a/packages/workspace/src/schematics/remove/lib/update-workspace.ts b/packages/workspace/src/schematics/remove/lib/update-workspace.ts index 771bbfd37b..eabdacbbd2 100644 --- a/packages/workspace/src/schematics/remove/lib/update-workspace.ts +++ b/packages/workspace/src/schematics/remove/lib/update-workspace.ts @@ -8,13 +8,20 @@ import { updateWorkspaceInTree, getWorkspacePath } from '@nrwl/workspace'; * @param schema The options provided to the schematic */ export function updateWorkspace(schema: Schema) { - return updateWorkspaceInTree((workspace, context: SchematicContext, host: Tree) => { - delete workspace.projects[schema.projectName]; - if (workspace.defaultProject && workspace.defaultProject === schema.projectName) { - delete workspace.defaultProject; - const workspacePath = getWorkspacePath(host); - context.logger.warn(`Default project was removed in ${workspacePath} because it was "${schema.projectName}". If you want a default project you should define a new one.`); + return updateWorkspaceInTree( + (workspace, context: SchematicContext, host: Tree) => { + delete workspace.projects[schema.projectName]; + if ( + workspace.defaultProject && + workspace.defaultProject === schema.projectName + ) { + delete workspace.defaultProject; + const workspacePath = getWorkspacePath(host); + context.logger.warn( + `Default project was removed in ${workspacePath} because it was "${schema.projectName}". If you want a default project you should define a new one.` + ); + } + return workspace; } - return workspace; - }); + ); }