From 1bfde3978ed94e00a991922d59e4f6baf89ffe75 Mon Sep 17 00:00:00 2001
From: Norbert de Langen <ndelangen@me.com>
Date: Tue, 18 Oct 2022 09:48:47 +0200
Subject: [PATCH] change use of fs-extra

---
 code/lib/builder-manager/src/index.ts         |  8 +++----
 code/lib/builder-manager/src/utils/files.ts   |  4 ++--
 .../lib/builder-manager/src/utils/template.ts | 22 +++++++++----------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/code/lib/builder-manager/src/index.ts b/code/lib/builder-manager/src/index.ts
index 10f4e5c5e20..547e4b55240 100644
--- a/code/lib/builder-manager/src/index.ts
+++ b/code/lib/builder-manager/src/index.ts
@@ -1,5 +1,5 @@
 import { dirname, join } from 'path';
-import { copy, writeFile, remove } from 'fs-extra';
+import fs from 'fs-extra';
 import express from 'express';
 
 import { logger } from '@storybook/node-logger';
@@ -111,7 +111,7 @@ const starter: StarterFunction = async function* starterGeneratorFn({
   // make sure we clear output directory of addons dir before starting
   // this could cause caching issues where addons are loaded when they shouldn't
   const addonsDir = config.outdir;
-  await remove(addonsDir);
+  await fs.remove(addonsDir);
 
   yield;
 
@@ -191,7 +191,7 @@ const builder: BuilderFunction = async function* builderGeneratorFn({ startTime,
 
   yield;
 
-  const managerFiles = copy(coreDirOrigin, coreDirTarget);
+  const managerFiles = fs.copy(coreDirOrigin, coreDirTarget);
   const { cssFiles, jsFiles } = await readOrderedFiles(addonsDir, compilation?.outputFiles);
 
   yield;
@@ -211,7 +211,7 @@ const builder: BuilderFunction = async function* builderGeneratorFn({ startTime,
 
   await Promise.all([
     //
-    writeFile(join(options.outputDir, 'index.html'), html),
+    fs.writeFile(join(options.outputDir, 'index.html'), html),
     managerFiles,
   ]);
 
diff --git a/code/lib/builder-manager/src/utils/files.ts b/code/lib/builder-manager/src/utils/files.ts
index 0b7fd8fedba..cf279e16a30 100644
--- a/code/lib/builder-manager/src/utils/files.ts
+++ b/code/lib/builder-manager/src/utils/files.ts
@@ -1,5 +1,5 @@
 import { OutputFile } from 'esbuild';
-import { writeFile, ensureFile } from 'fs-extra';
+import fs from 'fs-extra';
 import { join } from 'path';
 import { Compilation } from '../types';
 
@@ -12,7 +12,7 @@ export async function readOrderedFiles(
       // convert deeply nested paths to a single level, also remove special characters
       const { location, url } = sanitizePath(file, addonsDir);
 
-      await ensureFile(location).then(() => writeFile(location, file.contents));
+      await fs.ensureFile(location).then(() => fs.writeFile(location, file.contents));
       return url;
     }) || []
   );
diff --git a/code/lib/builder-manager/src/utils/template.ts b/code/lib/builder-manager/src/utils/template.ts
index b9d619ee701..6917c1fdafc 100644
--- a/code/lib/builder-manager/src/utils/template.ts
+++ b/code/lib/builder-manager/src/utils/template.ts
@@ -1,5 +1,5 @@
 import path, { dirname, join } from 'path';
-import { readFile, pathExists } from 'fs-extra';
+import fs from 'fs-extra';
 
 import { render } from 'ejs';
 
@@ -19,21 +19,21 @@ export const getTemplatePath = async (template: string) => {
 export const readTemplate = async (template: string) => {
   const path = await getTemplatePath(template);
 
-  return readFile(path, 'utf8');
+  return fs.readFile(path, 'utf8');
 };
 
 export async function getManagerHeadTemplate(
   configDirPath: string,
   interpolations: Record<string, string>
 ) {
-  const head = await pathExists(path.resolve(configDirPath, 'manager-head.html')).then<
-    Promise<string> | false
-  >((exists) => {
-    if (exists) {
-      return readFile(path.resolve(configDirPath, 'manager-head.html'), 'utf8');
-    }
-    return false;
-  });
+  const head = await fs
+    .pathExists(path.resolve(configDirPath, 'manager-head.html'))
+    .then<Promise<string> | false>((exists) => {
+      if (exists) {
+        return fs.readFile(path.resolve(configDirPath, 'manager-head.html'), 'utf8');
+      }
+      return false;
+    });
 
   if (!head) {
     return '';
@@ -76,6 +76,6 @@ export const renderHTML = async (
       PREVIEW_URL: JSON.stringify(previewUrl, null, 2), // global preview URL
       SERVER_CHANNEL_URL: JSON.stringify(serverChannelUrl, null, 2),
     },
-    head: customHeadRef ? await readFile(customHeadRef, 'utf8') : '',
+    head: customHeadRef ? await fs.readFile(customHeadRef, 'utf8') : '',
   });
 };