From f92011b067716fc502f12e0196b24ff5854494b1 Mon Sep 17 00:00:00 2001 From: FrozenPandaz Date: Fri, 10 Mar 2023 17:30:23 -0500 Subject: [PATCH] fix(misc): handle standalone repos when removing nested projects --- .../check-project-is-safe-to-remove.spec.ts | 21 +++++++++++++++++++ .../lib/check-project-is-safe-to-remove.ts | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/packages/workspace/src/generators/remove/lib/check-project-is-safe-to-remove.spec.ts b/packages/workspace/src/generators/remove/lib/check-project-is-safe-to-remove.spec.ts index 4d5d031680dc2..0aefc97af3c5d 100644 --- a/packages/workspace/src/generators/remove/lib/check-project-is-safe-to-remove.spec.ts +++ b/packages/workspace/src/generators/remove/lib/check-project-is-safe-to-remove.spec.ts @@ -49,4 +49,25 @@ describe('checkProjectIsSafeToRemove', () => { ); }).toThrow(); }); + + it('should be able to remove e2e project in standalone', () => { + addProjectConfiguration(tree, 'e2e', { + root: 'e2e', + }); + addProjectConfiguration(tree, 'root', { + root: '.', + }); + + expect(() => { + checkProjectIsSafeToRemove( + tree, + { + projectName: 'e2e', + forceRemove: false, + skipFormat: false, + }, + readProjectConfiguration(tree, 'e2e') + ); + }).not.toThrow(); + }); }); diff --git a/packages/workspace/src/generators/remove/lib/check-project-is-safe-to-remove.ts b/packages/workspace/src/generators/remove/lib/check-project-is-safe-to-remove.ts index 67f51dcd803d0..fa77d3ddfc5e1 100644 --- a/packages/workspace/src/generators/remove/lib/check-project-is-safe-to-remove.ts +++ b/packages/workspace/src/generators/remove/lib/check-project-is-safe-to-remove.ts @@ -26,7 +26,7 @@ export function checkProjectIsSafeToRemove( for (const [_, p] of getProjects(tree)) { if ( project.name !== p.name && - !normalizePath(relative(project.root, p.root)).startsWith('../') + !normalizePath(relative(project.root, p.root)).startsWith('..') ) { containedProjects.push(p.name); }