From cc638e81f4d24d147941dfaf5e5a47ea1ab41b75 Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryantxu@gmail.com>
Date: Mon, 2 Mar 2020 11:29:09 -0800
Subject: [PATCH] Toolkit: don't clean dist folder before build (#22521)

---
 packages/grafana-toolkit/src/cli/tasks/plugin.build.ts | 1 -
 packages/grafana-toolkit/src/cli/tasks/plugin.ci.ts    | 7 ++++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/grafana-toolkit/src/cli/tasks/plugin.build.ts b/packages/grafana-toolkit/src/cli/tasks/plugin.build.ts
index 5e76a9d0c61..0a3ee9da376 100644
--- a/packages/grafana-toolkit/src/cli/tasks/plugin.build.ts
+++ b/packages/grafana-toolkit/src/cli/tasks/plugin.build.ts
@@ -109,7 +109,6 @@ export const lintPlugin = useSpinner<Fixable>('Linting', async ({ fix } = {}) =>
 });
 
 export const pluginBuildRunner: TaskRunner<PluginBuildOptions> = async ({ coverage }) => {
-  await clean();
   await prepare();
   await lintPlugin({ fix: false });
   await testPlugin({ updateSnapshot: false, coverage, watch: false });
diff --git a/packages/grafana-toolkit/src/cli/tasks/plugin.ci.ts b/packages/grafana-toolkit/src/cli/tasks/plugin.ci.ts
index 978e03b39b7..982f2124aae 100644
--- a/packages/grafana-toolkit/src/cli/tasks/plugin.ci.ts
+++ b/packages/grafana-toolkit/src/cli/tasks/plugin.ci.ts
@@ -25,6 +25,9 @@ import { runEndToEndTests } from '../../plugins/e2e/launcher';
 import { getEndToEndSettings } from '../../plugins/index';
 import { manifestTask } from './manifest';
 import { execTask } from '../utils/execTask';
+import rimrafCallback from 'rimraf';
+import { promisify } from 'util';
+const rimraf = promisify(rimrafCallback);
 
 export interface PluginCIOptions {
   backend?: boolean;
@@ -46,7 +49,9 @@ export interface PluginCIOptions {
 const buildPluginRunner: TaskRunner<PluginCIOptions> = async ({ backend }) => {
   const start = Date.now();
   const workDir = getJobFolder();
-  await execa('rimraf', [workDir]);
+
+  await rimraf(`${process.cwd()}/dist`);
+  await rimraf(workDir);
   fs.mkdirSync(workDir);
 
   if (backend) {