Plugins: support .cjs module extension

This commit is contained in:
Cohee
2024-10-11 23:00:37 +03:00
parent fa84b3ede4
commit ffa8716d07

View File

@ -17,7 +17,7 @@ const loadedPlugins = new Map();
* @param {string} file Path to file
* @returns {boolean} True if file is a CommonJS module
*/
const isCommonJS = (file) => path.extname(file) === '.js';
const isCommonJS = (file) => path.extname(file) === '.js' || path.extname(file) === '.cjs';
/**
* Determine if a file is an ECMAScript module.
@ -90,22 +90,18 @@ async function loadFromDirectory(app, pluginDirectoryPath, exitHooks) {
}
}
// Plugin is a CommonJS module.
const cjsFilePath = path.join(pluginDirectoryPath, 'index.js');
if (fs.existsSync(cjsFilePath)) {
if (await loadFromFile(app, cjsFilePath, exitHooks)) {
return;
}
}
// Plugin is a module file.
const fileTypes = ['index.js', 'index.cjs', 'index.mjs'];
// Plugin is an ECMAScript module.
const esmFilePath = path.join(pluginDirectoryPath, 'index.mjs');
if (fs.existsSync(esmFilePath)) {
if (await loadFromFile(app, esmFilePath, exitHooks)) {
for (const fileType of fileTypes) {
const filePath = path.join(pluginDirectoryPath, fileType);
if (fs.existsSync(filePath)) {
if (await loadFromFile(app, filePath, exitHooks)) {
return;
}
}
}
}
/**
* Loads and initializes a plugin from an npm package.