rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Always use async import()

Browse Source 
import() works with CommonJS and ESM modules, so we don't need two
different code paths.
This commit is contained in:
valadaptive
2023-12-17 12:29:54 -05:00
parent 7ae0e05946
commit 0162d54e5b
1 changed files with 1 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugin-loader.js
View File

@ -129,7 +129,7 @@ async function loadFromPackage(app, packageJsonPath, exitHooks) {
*/ */
async function loadFromFile(app, pluginFilePath, exitHooks) { async function loadFromFile(app, pluginFilePath, exitHooks) {
try { try {
const plugin = await getPluginModule(pluginFilePath); const plugin = await import(pluginFilePath);
console.log(`Initializing plugin from ${pluginFilePath}`); console.log(`Initializing plugin from ${pluginFilePath}`);
return await initPlugin(app, plugin, exitHooks); return await initPlugin(app, plugin, exitHooks);
} catch (error) { } catch (error) {
@ -198,21 +198,6 @@ async function initPlugin(app, plugin, exitHooks) {
return true; return true;
} }
/**
* Loads a module from a file depending on the module type.
* @param {string} pluginFilePath Path to plugin file
* @returns {Promise<any>} Promise that resolves to plugin module
*/
async function getPluginModule(pluginFilePath) {
if (isCommonJS(pluginFilePath)) {
return require(pluginFilePath);
}
if (isESModule(pluginFilePath)) {
return await import(pluginFilePath);
}
throw new Error(`Unsupported module type in ${pluginFilePath}`);
}
module.exports = { module.exports = {
loadPlugins, loadPlugins,
}; };