From 14a9479e69ed6a8b5c64bcafa8383e9093f56e96 Mon Sep 17 00:00:00 2001 From: Richard Hansen Date: Fri, 13 Nov 2020 13:38:31 -0500 Subject: [PATCH] plugins: Use functions from `fs.promises` --- src/static/js/pluginfw/plugins.js | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/static/js/pluginfw/plugins.js b/src/static/js/pluginfw/plugins.js index 0ea55b403..6d8d6745d 100644 --- a/src/static/js/pluginfw/plugins.js +++ b/src/static/js/pluginfw/plugins.js @@ -1,7 +1,7 @@ +const fs = require('fs').promises; var npm = require("npm/lib/npm.js"); var readInstalled = require("./read-installed.js"); var path = require("path"); -var fs = require("fs"); var tsort = require("./tsort"); var util = require("util"); var _ = require("underscore"); @@ -52,16 +52,13 @@ exports.formatHooks = function (hook_set_name) { }; exports.callInit = function () { - const fsp_stat = util.promisify(fs.stat); - const fsp_writeFile = util.promisify(fs.writeFile); - var hooks = require("./hooks"); let p = Object.keys(defs.plugins).map(function(plugin_name) { let plugin = defs.plugins[plugin_name]; let ep_init = path.normalize(path.join(plugin.package.path, ".ep_initialized")); - return fsp_stat(ep_init).catch(async function() { - await fsp_writeFile(ep_init, "done"); + return fs.stat(ep_init).catch(async function() { + await fs.writeFile(ep_init, 'done'); await hooks.aCallAll("init_" + plugin_name, {}); }); }); @@ -123,11 +120,9 @@ exports.getPackages = async function () { }; async function loadPlugin(packages, plugin_name, plugins, parts) { - let fsp_readFile = util.promisify(fs.readFile); - var plugin_path = path.resolve(packages[plugin_name].path, "ep.json"); try { - let data = await fsp_readFile(plugin_path); + let data = await fs.readFile(plugin_path); try { var plugin = JSON.parse(data); plugin['package'] = packages[plugin_name];