From a0b2df5395d1ef9d29df1e042cade83a33e9ae8b Mon Sep 17 00:00:00 2001
From: Noriyuki Shinpuku <puku0x@gmail.com>
Date: Sat, 12 Jun 2021 08:06:59 +0900
Subject: [PATCH] fix(core): fix remove generator for custom layout (#5921)

---
 .../src/generators/remove/lib/update-tsconfig.ts          | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/workspace/src/generators/remove/lib/update-tsconfig.ts b/packages/workspace/src/generators/remove/lib/update-tsconfig.ts
index 0f08c2681d..0ef5cdcf2a 100644
--- a/packages/workspace/src/generators/remove/lib/update-tsconfig.ts
+++ b/packages/workspace/src/generators/remove/lib/update-tsconfig.ts
@@ -16,13 +16,17 @@ export function updateTsconfig(
   schema: Schema,
   project: ProjectConfiguration
 ) {
-  const { npmScope } = getWorkspaceLayout(tree);
+  const { appsDir, libsDir, npmScope } = getWorkspaceLayout(tree);
 
   const tsConfigPath = 'tsconfig.base.json';
   if (tree.exists(tsConfigPath)) {
     updateJson(tree, tsConfigPath, (json) => {
       delete json.compilerOptions.paths[
-        `@${npmScope}/${project.root.substr(5)}`
+        `@${npmScope}/${project.root.substr(
+          project.projectType === 'application'
+            ? appsDir.length + 1
+            : libsDir.length + 1
+        )}`
       ];
 
       return json;