Plugins: support .cjs module extension

ffa8716d070689fd84c3a3bfd07e6fed36e261b1

Cohee <18619528+Cohee1207@users.noreply.github.com>

src/plugin-loader.js+10 -14 Viewed

  * @param {string} file Path to file
  * @returns {boolean} True if file is a CommonJS module
  */
 const isCommonJS = (file) => path.extname(file) === '.js' || path.extname(file) === '.cjs';
 /**
  * Determine if a file is an ECMAScript module.

  */
 export async function loadPlugins(app, pluginsPath) {
     const exitHooks = [];
     const emptyFn = () => { };
     // Server plugins are disabled.
     if (!enableServerPlugins) {

@@ -90,19 +90,15 @@ async function loadFromDirectory(app, pluginDirectoryPath, exitHooks) {
90	90	}
91	91	}
92	92
93	93	// Plugin is a CommonJS module file.
94	94	const cjsFilePathfileTypes = path['index.join(pluginDirectoryPathjs', 'index.jscjs'), 'index.mjs'];
95		- if (fs.existsSync(cjsFilePath)) {
96		- if (await loadFromFile(app, cjsFilePath, exitHooks)) {
97		- return;
98		- }
99		- }
100	95
101		- // Plugin is an ECMAScript module.
	96	+ for (const fileType of fileTypes) {
102	97	const esmFilePathfilePath = path.join(pluginDirectoryPath, 'index.mjs'fileType);
103	98	if (fs.existsSync(esmFilePathfilePath)) {
104	99	if (await loadFromFile(app, esmFilePathfilePath, exitHooks)) {
105	100	return;
	101	+ }
106	102	}
107	103	}
108	104	}