From aa447735b6193db207d3dedb555530cb61f4ffb4 Mon Sep 17 00:00:00 2001 From: Marcus Crane Date: Sat, 27 Aug 2022 13:35:09 +1200 Subject: [PATCH] Use fs promises where possible Signed-off-by: Marcus Crane --- .../src/lib/files/serializeDirectoryContents.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/scaffolder-backend/src/lib/files/serializeDirectoryContents.ts b/plugins/scaffolder-backend/src/lib/files/serializeDirectoryContents.ts index 46c1002259..0c389969b9 100644 --- a/plugins/scaffolder-backend/src/lib/files/serializeDirectoryContents.ts +++ b/plugins/scaffolder-backend/src/lib/files/serializeDirectoryContents.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import fs from 'fs-extra'; +import { promises as fs, existsSync } from 'fs'; import globby from 'globby'; import limiterFactory from 'p-limit'; import { resolveSafeChildPath } from '@backstage/backend-common'; @@ -58,7 +58,8 @@ export async function serializeDirectoryContents( .filter(({ dirent }) => !dirent.isDirectory()) .filter(({ dirent, path }) => { if (!dirent.isSymbolicLink()) return true; - if (!fs.existsSync(resolveSafeChildPath(sourcePath, path))) return true; // We only want symlinks that DO NOT exist (yet) + const safePath = resolveSafeChildPath(sourcePath, path); + if (!existsSync(safePath)) return true; // We only want symlinks that DO NOT exist (yet) return false; }) .map(async ({ dirent, path, stats }) => ({ @@ -66,7 +67,7 @@ export async function serializeDirectoryContents( content: await limiter(async () => { const absFilePath = resolveSafeChildPath(sourcePath, path); if (dirent.isSymbolicLink()) { - return fs.readlinkSync(absFilePath, 'buffer'); + return fs.readlink(absFilePath, 'buffer'); } return fs.readFile(absFilePath); }),