From dc6dcbefaca7fd202038ea1d1720f6b38f808d18 Mon Sep 17 00:00:00 2001
From: Leo Mendez <leomendez@Leos-MacBook-Pro.local>
Date: Wed, 8 Apr 2020 14:30:28 -0500
Subject: [PATCH 01/19] Add clean script

---
 package.json | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/package.json b/package.json
index 0387a4e7ce..2348780603 100644
--- a/package.json
+++ b/package.json
@@ -8,6 +8,12 @@
     "start": "yarn workspace example-app start",
     "bundle": "yarn build && yarn workspace example-app bundle",
     "build": "lerna run build",
+    "clean": "yarn run clean:cli && yarn run clean:app && yarn run clean:core && yarn run clean:storybook && yarn clean:root",
+    "clean:root": "rimraf node_modules/",
+    "clean:cli":"rimraf packages/cli/dist/ packages/cli/node_modules/",
+    "clean:app":"rimraf packages/app/node_modules/",
+    "clean:core": "rimraf packages/core/dist packages/core/node_modules",
+    "clean:storybook":"rimraf packages/storybook/node_modules",
     "test": "yarn build && lerna run test --since origin/master -- --coverage",
     "test:all": "yarn build && lerna run test -- --coverage",
     "lint": "lerna run lint --since origin/master --",
@@ -32,6 +38,7 @@
     "lerna": "^3.20.2",
     "lint-staged": "^10.1.0",
     "prettier": "^1.19.1",
+    "rimraf": "^3.0.2",
     "typescript": "^3.7.5",
     "zombie": "^6.1.4"
   },

From 5a2c94640d7d2f41a6fd2f5eed8fbe0f12d4b8ff Mon Sep 17 00:00:00 2001
From: Leo Mendez <leomendez@Leos-MacBook-Pro.local>
Date: Wed, 8 Apr 2020 14:51:12 -0500
Subject: [PATCH 02/19] Add yarn lock file

---
 yarn.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yarn.lock b/yarn.lock
index acf9de9c97..469ca10af5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -17292,7 +17292,7 @@ rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.2, rimraf@^2.6.3, rimra
   dependencies:
     glob "^7.1.3"
 
-rimraf@^3.0.0:
+rimraf@^3.0.0, rimraf@^3.0.2:
   version "3.0.2"
   resolved "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
   integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==

From 9770623d6bdeef6e4bf8509e2006d8a21984032e Mon Sep 17 00:00:00 2001
From: Leo Mendez <leomendez@Leos-MacBook-Pro.local>
Date: Thu, 9 Apr 2020 15:22:27 -0500
Subject: [PATCH 03/19] Create clean command

---
 packages/cli/src/commands/clean/clean.ts | 28 ++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 packages/cli/src/commands/clean/clean.ts

diff --git a/packages/cli/src/commands/clean/clean.ts b/packages/cli/src/commands/clean/clean.ts
new file mode 100644
index 0000000000..f1759aeb8b
--- /dev/null
+++ b/packages/cli/src/commands/clean/clean.ts
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2020 Spotify AB
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import fs from 'fs-extra';
+import { getDefaultCacheOptions } from 'commands/build-cache/options';
+
+const cacheOptions = getDefaultCacheOptions();
+
+export default async function clean(
+  outputPath: string = cacheOptions.output,
+  cachePath: string = cacheOptions.cacheDir,
+) {
+  fs.remove(outputPath);
+  fs.remove(cachePath);
+}

From ff5d455c23e99a890ead1563e2c05846cbd0c0a3 Mon Sep 17 00:00:00 2001
From: Leo Mendez <leomendez@Leos-MacBook-Pro.local>
Date: Thu, 9 Apr 2020 15:23:01 -0500
Subject: [PATCH 04/19] Add clean command to index

---
 packages/cli/src/index.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts
index ca39c1ac3b..d21ff90c34 100644
--- a/packages/cli/src/index.ts
+++ b/packages/cli/src/index.ts
@@ -90,6 +90,11 @@ const main = (argv: string[]) => {
     )
     .action(actionHandler(() => require('commands/build-cache')));
 
+  program
+    .command('clean')
+    .description('Delete cache directories')
+    .action(actionHandler(() => require('commands/clean/clean')));
+
   program.on('command:*', () => {
     console.log();
     console.log(

From 81c18f22f76a73832124e937947816e8edec97db Mon Sep 17 00:00:00 2001
From: Leo Mendez <leomendez@Leos-MacBook-Pro.local>
Date: Thu, 9 Apr 2020 15:23:33 -0500
Subject: [PATCH 05/19] Add clean script to package file

---
 packages/cli/package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index 1764d19bf2..40c8b9b266 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -22,6 +22,7 @@
     "build": "backstage-cli build-cache -- tsc",
     "lint": "backstage-cli lint",
     "test": "backstage-cli test",
+    "clean": "backstage-cli clean",
     "start": "nodemon ."
   },
   "devDependencies": {

From 4c6f1ab100e767a218bbb014c8a485441c480b24 Mon Sep 17 00:00:00 2001
From: Leo Mendez <leomendez@Leos-MacBook-Pro.local>
Date: Thu, 9 Apr 2020 15:28:20 -0500
Subject: [PATCH 06/19] Delete default formal arguments

---
 packages/cli/src/commands/clean/clean.ts | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/packages/cli/src/commands/clean/clean.ts b/packages/cli/src/commands/clean/clean.ts
index f1759aeb8b..dcbb8654cd 100644
--- a/packages/cli/src/commands/clean/clean.ts
+++ b/packages/cli/src/commands/clean/clean.ts
@@ -19,10 +19,7 @@ import { getDefaultCacheOptions } from 'commands/build-cache/options';
 
 const cacheOptions = getDefaultCacheOptions();
 
-export default async function clean(
-  outputPath: string = cacheOptions.output,
-  cachePath: string = cacheOptions.cacheDir,
-) {
-  fs.remove(outputPath);
-  fs.remove(cachePath);
+export default async function clean() {
+  await fs.remove(cacheOptions.output);
+  await fs.remove(cacheOptions.cacheDir);
 }

From 2c4328f5e15612c40ceaa7bb75de42235bb6de1a Mon Sep 17 00:00:00 2001
From: Leo Mendez <leomendez@Leos-MacBook-Pro.local>
Date: Sun, 12 Apr 2020 14:09:44 -0500
Subject: [PATCH 07/19] Add package path

---
 packages/cli/src/commands/clean/clean.ts | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/packages/cli/src/commands/clean/clean.ts b/packages/cli/src/commands/clean/clean.ts
index dcbb8654cd..f18250d210 100644
--- a/packages/cli/src/commands/clean/clean.ts
+++ b/packages/cli/src/commands/clean/clean.ts
@@ -15,11 +15,19 @@
  */
 
 import fs from 'fs-extra';
+import { resolve as resolvePath, relative as relativePath } from 'path';
 import { getDefaultCacheOptions } from 'commands/build-cache/options';
-
-const cacheOptions = getDefaultCacheOptions();
+import { paths } from 'helpers/paths';
 
 export default async function clean() {
+  const cacheOptions = getDefaultCacheOptions();
+  const packagePath = getPackagePath(cacheOptions.cacheDir);
   await fs.remove(cacheOptions.output);
-  await fs.remove(cacheOptions.cacheDir);
+  await fs.remove(packagePath);
+}
+
+function getPackagePath(cacheDir: string) {
+  const relativePackagePath = relativePath(paths.targetRoot, paths.targetDir);
+  const packagePath = resolvePath(cacheDir, relativePackagePath);
+  return packagePath;
 }

From f5b8433aa2d789e62d7ecb2a0670a1beb17bbdde Mon Sep 17 00:00:00 2001
From: Leo Mendez <leomendez@Leos-MacBook-Pro.local>
Date: Sun, 12 Apr 2020 14:19:47 -0500
Subject: [PATCH 08/19] Add clean script to template app

---
 packages/cli/templates/default-app/package.json.hbs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/cli/templates/default-app/package.json.hbs b/packages/cli/templates/default-app/package.json.hbs
index def7b3178b..0ee61c6302 100644
--- a/packages/cli/templates/default-app/package.json.hbs
+++ b/packages/cli/templates/default-app/package.json.hbs
@@ -6,6 +6,7 @@
     "build": "lerna run build",
     "test": "cross-env CI=true lerna run test -- --coverage",
     "create-plugin": "backstage-cli create-plugin",
+    "clean": "backstage-cli clean",
     "lint": "lerna run lint"
   },
   "workspaces": {

From 0bd526a4a35c11fb1d0879498a7172c28d944234 Mon Sep 17 00:00:00 2001
From: Leo Mendez <leomendez@Leos-MacBook-Pro.local>
Date: Sun, 12 Apr 2020 14:20:47 -0500
Subject: [PATCH 09/19] Add clean script to template plugin

---
 packages/cli/templates/default-plugin/package.json.hbs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/cli/templates/default-plugin/package.json.hbs b/packages/cli/templates/default-plugin/package.json.hbs
index 49d8d20d71..32479b879b 100644
--- a/packages/cli/templates/default-plugin/package.json.hbs
+++ b/packages/cli/templates/default-plugin/package.json.hbs
@@ -8,7 +8,8 @@
   "scripts": {
     "build": "backstage-cli plugin:build",
     "lint": "backstage-cli lint",
-    "test": "backstage-cli test"
+    "test": "backstage-cli test", 
+    "clean": "backstage-cli clean"
   },
   "devDependencies": {
     "@backstage/cli": "^{{version}}",

From f1c9e804356814972f6372966bb19ed25dd6cb6f Mon Sep 17 00:00:00 2001
From: Leo Mendez <leomendez@Leos-MacBook-Pro.local>
Date: Sun, 12 Apr 2020 14:22:53 -0500
Subject: [PATCH 10/19] Add clean script packages/app

---
 packages/app/package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/app/package.json b/packages/app/package.json
index 232a00416d..d9e91a122a 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -30,6 +30,7 @@
   "scripts": {
     "start": "backstage-cli app:serve",
     "bundle": "backstage-cli app:build",
+    "clean": "backstage-cli clean",
     "test": "backstage-cli test",
     "test:e2e": "start-server-and-test start http://localhost:3000 cy:dev",
     "test:e2e:ci": "start-server-and-test start http://localhost:3000 cy:run",

From 4d0c5b084d4e08a82ed38cb32c280daf980d79fa Mon Sep 17 00:00:00 2001
From: Leo Mendez <leomendez@Leos-MacBook-Pro.local>
Date: Sun, 12 Apr 2020 14:23:34 -0500
Subject: [PATCH 11/19] Add clean script packages/core

---
 packages/core/package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/core/package.json b/packages/core/package.json
index 3dc8150f83..014fc0ce33 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -21,7 +21,8 @@
   "scripts": {
     "build": "backstage-cli plugin:build",
     "lint": "backstage-cli lint",
-    "test": "backstage-cli test"
+    "test": "backstage-cli test", 
+    "clean": "backstage-cli clean"
   },
   "dependencies": {
     "@material-ui/core": "^4.9.1",

From 2467e4088358dea647d93edcec9560f1f64b0228 Mon Sep 17 00:00:00 2001
From: Leo Mendez <leomendez@Leos-MacBook-Pro.local>
Date: Sun, 12 Apr 2020 14:24:16 -0500
Subject: [PATCH 12/19] Add clean script packages/test-utils

---
 packages/test-utils/package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json
index 55b7436aae..68d7088918 100644
--- a/packages/test-utils/package.json
+++ b/packages/test-utils/package.json
@@ -21,7 +21,8 @@
   "scripts": {
     "build": "backstage-cli plugin:build",
     "lint": "backstage-cli lint",
-    "test": "backstage-cli test"
+    "test": "backstage-cli test", 
+    "clean": "backstage-cli clean"
   },
   "devDependencies": {
     "@backstage/cli": "^0.1.1-alpha.3",

From 8015b55a0fde1c64881d500fffb7141498b0e5f8 Mon Sep 17 00:00:00 2001
From: Leo Mendez <leomendez@Leos-MacBook-Pro.local>
Date: Sun, 12 Apr 2020 14:24:40 -0500
Subject: [PATCH 13/19] Add clean script packages/theme

---
 packages/theme/package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/theme/package.json b/packages/theme/package.json
index b08014e9d6..09c9ce2089 100644
--- a/packages/theme/package.json
+++ b/packages/theme/package.json
@@ -20,7 +20,8 @@
   "types": "dist/index.d.ts",
   "scripts": {
     "build": "backstage-cli plugin:build",
-    "lint": "backstage-cli lint"
+    "lint": "backstage-cli lint", 
+    "clean": "backstage-cli clean"
   },
   "devDependencies": {
     "@backstage/cli": "^0.1.1-alpha.3",

From 0b7b6c4bedc864a2080ce0959b230e89bba64bc9 Mon Sep 17 00:00:00 2001
From: Leo Mendez <leomendez@Leos-MacBook-Pro.local>
Date: Sun, 12 Apr 2020 14:28:57 -0500
Subject: [PATCH 14/19] Add clean script to root package

---
 package.json | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 2348780603..7ec98d692f 100644
--- a/package.json
+++ b/package.json
@@ -8,12 +8,7 @@
     "start": "yarn workspace example-app start",
     "bundle": "yarn build && yarn workspace example-app bundle",
     "build": "lerna run build",
-    "clean": "yarn run clean:cli && yarn run clean:app && yarn run clean:core && yarn run clean:storybook && yarn clean:root",
-    "clean:root": "rimraf node_modules/",
-    "clean:cli":"rimraf packages/cli/dist/ packages/cli/node_modules/",
-    "clean:app":"rimraf packages/app/node_modules/",
-    "clean:core": "rimraf packages/core/dist packages/core/node_modules",
-    "clean:storybook":"rimraf packages/storybook/node_modules",
+    "clean": "lerna run clean",
     "test": "yarn build && lerna run test --since origin/master -- --coverage",
     "test:all": "yarn build && lerna run test -- --coverage",
     "lint": "lerna run lint --since origin/master --",

From c171718840fff36e42b1f5560a4a89e1c442868a Mon Sep 17 00:00:00 2001
From: Leo Mendez <leomendez@Leos-MacBook-Pro.local>
Date: Sun, 12 Apr 2020 14:32:03 -0500
Subject: [PATCH 15/19] Delete rimraf library

---
 package.json | 1 -
 yarn.lock    | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 7ec98d692f..10a5daa4c1 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,6 @@
     "lerna": "^3.20.2",
     "lint-staged": "^10.1.0",
     "prettier": "^1.19.1",
-    "rimraf": "^3.0.2",
     "typescript": "^3.7.5",
     "zombie": "^6.1.4"
   },
diff --git a/yarn.lock b/yarn.lock
index 469ca10af5..acf9de9c97 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -17292,7 +17292,7 @@ rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.2, rimraf@^2.6.3, rimra
   dependencies:
     glob "^7.1.3"
 
-rimraf@^3.0.0, rimraf@^3.0.2:
+rimraf@^3.0.0:
   version "3.0.2"
   resolved "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
   integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==

From b03d937e7dc771661f3b08e8fc647c7ca932b8be Mon Sep 17 00:00:00 2001
From: Leo Mendez <leomendez@Leos-MacBook-Pro.local>
Date: Sun, 12 Apr 2020 14:53:53 -0500
Subject: [PATCH 16/19] Add clean script

---
 plugins/home-page/package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/home-page/package.json b/plugins/home-page/package.json
index 7f78f1bf63..d87851babe 100644
--- a/plugins/home-page/package.json
+++ b/plugins/home-page/package.json
@@ -8,7 +8,8 @@
   "scripts": {
     "build": "backstage-cli plugin:build",
     "lint": "backstage-cli lint",
-    "test": "backstage-cli test"
+    "test": "backstage-cli test", 
+    "clean": "backstage-cli clean"
   },
   "devDependencies": {
     "@backstage/cli": "^0.1.1-alpha.3",

From 97604a3832c1cd14938721a966843c043a40a699 Mon Sep 17 00:00:00 2001
From: Leo Mendez <leomendez@Leos-MacBook-Pro.local>
Date: Sun, 12 Apr 2020 14:54:11 -0500
Subject: [PATCH 17/19] Add clean script to plugins/lighthouse

---
 plugins/lighthouse/package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/lighthouse/package.json b/plugins/lighthouse/package.json
index 721f20f802..e53ff85546 100644
--- a/plugins/lighthouse/package.json
+++ b/plugins/lighthouse/package.json
@@ -9,7 +9,8 @@
     "build:watch": "backstage-cli plugin:build --watch",
     "build": "backstage-cli plugin:build",
     "lint": "backstage-cli lint",
-    "test": "backstage-cli test"
+    "test": "backstage-cli test",
+    "clean": "backstage-cli clean"
   },
   "dependencies": {
     "react-markdown": "^4.3.1",

From c94a42c8120aa01ea35a77a73be39685ba6b94f1 Mon Sep 17 00:00:00 2001
From: Leo Mendez <leomendez@Leos-MacBook-Pro.local>
Date: Sun, 12 Apr 2020 14:57:28 -0500
Subject: [PATCH 18/19] Add clean script to plugins/welcome

---
 plugins/welcome/package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/welcome/package.json b/plugins/welcome/package.json
index 3ee95e8898..beab06746e 100644
--- a/plugins/welcome/package.json
+++ b/plugins/welcome/package.json
@@ -8,7 +8,8 @@
   "scripts": {
     "build": "backstage-cli plugin:build",
     "lint": "backstage-cli lint",
-    "test": "backstage-cli test"
+    "test": "backstage-cli test",
+    "clean": "backstage-cli clean"
   },
   "devDependencies": {
     "@backstage/cli": "^0.1.1-alpha.3",

From 1820d3e67bf8146c9c15d06ce9680c1c79f9c350 Mon Sep 17 00:00:00 2001
From: Leo Mendez <leomendez@Leos-MacBook-Pro.local>
Date: Wed, 15 Apr 2020 10:15:22 -0500
Subject: [PATCH 19/19] Change backstage cli clean to lerna run clean command

---
 packages/cli/templates/default-app/package.json.hbs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/cli/templates/default-app/package.json.hbs b/packages/cli/templates/default-app/package.json.hbs
index 0ee61c6302..03371f887c 100644
--- a/packages/cli/templates/default-app/package.json.hbs
+++ b/packages/cli/templates/default-app/package.json.hbs
@@ -6,7 +6,7 @@
     "build": "lerna run build",
     "test": "cross-env CI=true lerna run test -- --coverage",
     "create-plugin": "backstage-cli create-plugin",
-    "clean": "backstage-cli clean",
+    "clean": "lerna run clean",
     "lint": "lerna run lint"
   },
   "workspaces": {