From 6b61c65b58d558b72f68fb9eb86d447a6af392d7 Mon Sep 17 00:00:00 2001
From: Martin Brenner <martin.brenner94@gmail.com>
Date: Wed, 11 Mar 2020 15:37:31 +0100
Subject: [PATCH] Toolkit: use fs-extra instead of fs (#22723)

* use fs-extra instead of fs

* use moveSync instead of renameSync
---
 packages/grafana-toolkit/package.json               | 2 ++
 packages/grafana-toolkit/src/cli/tasks/plugin.ci.ts | 4 ++--
 yarn.lock                                           | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/grafana-toolkit/package.json b/packages/grafana-toolkit/package.json
index 9367802a117..aa79c20e544 100644
--- a/packages/grafana-toolkit/package.json
+++ b/packages/grafana-toolkit/package.json
@@ -36,6 +36,7 @@
     "@types/command-exists": "^1.2.0",
     "@types/execa": "^0.9.0",
     "@types/expect-puppeteer": "3.3.1",
+    "@types/fs-extra": "^8.1.0",
     "@types/inquirer": "^6.0.3",
     "@types/jest": "24.0.13",
     "@types/jest-cli": "^23.6.0",
@@ -66,6 +67,7 @@
     "execa": "^1.0.0",
     "expect-puppeteer": "4.1.1",
     "file-loader": "^4.0.0",
+    "fs-extra": "^8.1.0",
     "globby": "^10.0.1",
     "html-loader": "0.5.5",
     "html-webpack-plugin": "^3.2.0",
diff --git a/packages/grafana-toolkit/src/cli/tasks/plugin.ci.ts b/packages/grafana-toolkit/src/cli/tasks/plugin.ci.ts
index 3681599457d..31abc542229 100644
--- a/packages/grafana-toolkit/src/cli/tasks/plugin.ci.ts
+++ b/packages/grafana-toolkit/src/cli/tasks/plugin.ci.ts
@@ -8,7 +8,7 @@ import { PluginMeta } from '@grafana/data';
 // @ts-ignore
 import execa = require('execa');
 import path = require('path');
-import fs from 'fs';
+import fs from 'fs-extra';
 import { getPackageDetails, findImagesInFolder, getGrafanaVersions, readGitLog } from '../../plugins/utils';
 import {
   job,
@@ -57,7 +57,7 @@ const buildPluginRunner: TaskRunner<PluginCIOptions> = async ({ finish }) => {
     for (const name of ['dist', 'coverage']) {
       const dir = path.resolve(process.cwd(), name);
       if (fs.existsSync(dir)) {
-        fs.renameSync(dir, path.resolve(workDir, name));
+        fs.moveSync(dir, path.resolve(workDir, name));
       }
     }
     writeJobStats(start, workDir);
diff --git a/yarn.lock b/yarn.lock
index 90da25b6754..46285721eee 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5178,7 +5178,7 @@
   resolved "https://registry.yarnpkg.com/@types/flatbuffers/-/flatbuffers-1.9.1.tgz#1910bebfc15c8f67a287fae07bfc061f94e9d291"
   integrity sha512-TC3X0Nkj5wgvuY217VkodBtjbD3Yr0JNApDY1GW9IU5Mzm5ie1IJErqe4vRm+wy08IRz3bemaDATrdEw1CJlVQ==
 
-"@types/fs-extra@^8.0.1":
+"@types/fs-extra@^8.0.1", "@types/fs-extra@^8.1.0":
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-8.1.0.tgz#1114834b53c3914806cd03b3304b37b3bd221a4d"
   integrity sha512-UoOfVEzAUpeSPmjm7h1uk5MH6KZma2z2O7a75onTGjnNvAvMVrPzPL/vBbT65iIGHWj6rokwfmYcmxmlSf2uwg==