From 1b5cd3d2d523201e9358a3fbf32cfa4121c5bb79 Mon Sep 17 00:00:00 2001 From: Pascal Hartig Date: Wed, 27 Oct 2021 11:09:24 -0700 Subject: [PATCH] Fix Flipper lints #12 Reviewed By: timur-valiev Differential Revision: D31932981 fbshipit-source-id: 4cf905495494466462c0494116f56cd16773e549 --- desktop/plugin-lib/src/__tests__/pluginInstaller.node.ts | 2 ++ desktop/plugin-lib/src/getSourcePlugins.ts | 2 +- desktop/plugin-lib/src/pluginInstaller.ts | 5 ++++- desktop/plugin-lib/src/pluginPaths.ts | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/desktop/plugin-lib/src/__tests__/pluginInstaller.node.ts b/desktop/plugin-lib/src/__tests__/pluginInstaller.node.ts index 59fd8b50b..58afd930c 100644 --- a/desktop/plugin-lib/src/__tests__/pluginInstaller.node.ts +++ b/desktop/plugin-lib/src/__tests__/pluginInstaller.node.ts @@ -7,6 +7,8 @@ * @format */ +/* eslint-disable node/no-sync */ + import path from 'path'; import { getInstalledPlugins, diff --git a/desktop/plugin-lib/src/getSourcePlugins.ts b/desktop/plugin-lib/src/getSourcePlugins.ts index 31a57ed58..96eed99f8 100644 --- a/desktop/plugin-lib/src/getSourcePlugins.ts +++ b/desktop/plugin-lib/src/getSourcePlugins.ts @@ -50,7 +50,7 @@ async function entryPointForPluginFolder( pluginsDir: string, ): Promise<{[key: string]: InstalledPluginDetails}> { pluginsDir = expandTilde(pluginsDir); - if (!fs.existsSync(pluginsDir)) { + if (!(await fs.pathExists(pluginsDir))) { return {}; } return await fs diff --git a/desktop/plugin-lib/src/pluginInstaller.ts b/desktop/plugin-lib/src/pluginInstaller.ts index 7e3c28103..8b76c1b11 100644 --- a/desktop/plugin-lib/src/pluginInstaller.ts +++ b/desktop/plugin-lib/src/pluginInstaller.ts @@ -7,6 +7,9 @@ * @format */ +// Heavy use of nested promises but without sacrificing error propagation. +/* eslint-disable promise/no-nesting */ + import path from 'path'; import fs from 'fs-extra'; import {promisify} from 'util'; @@ -205,7 +208,7 @@ export async function moveInstalledPluginsFromLegacyDir() { `Failed to load plugin from ${dir} on moving legacy plugins. Removing it.`, err, ); - fs.remove(dir); + await fs.remove(dir); return null; }), ), diff --git a/desktop/plugin-lib/src/pluginPaths.ts b/desktop/plugin-lib/src/pluginPaths.ts index 6e10c1c7f..13592f1c3 100644 --- a/desktop/plugin-lib/src/pluginPaths.ts +++ b/desktop/plugin-lib/src/pluginPaths.ts @@ -43,7 +43,7 @@ export async function getPluginSourceFolders(): Promise { } pluginFolders.push(path.resolve(__dirname, '..', '..', 'plugins', 'public')); pluginFolders.push(path.resolve(__dirname, '..', '..', 'plugins', 'fb')); - return pluginFolders.map(expandTilde).filter(fs.existsSync); + return pluginFolders.map(expandTilde).filter(async (f) => fs.pathExists(f)); } export function getPluginInstallationDir(name: string) {