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';
+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 = () => {};
+    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	// Plugin is a CommonJS module.	93	// Plugin is a module file.
94	const cjsFilePath = path.join(pluginDirectoryPath, 'index.js');	94	const fileTypes = ['index.js', 'index.cjs', '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	const esmFilePath = path.join(pluginDirectoryPath, 'index.mjs');	97	const filePath = path.join(pluginDirectoryPath, fileType);
103	if (fs.existsSync(esmFilePath)) {	98	if (fs.existsSync(filePath)) {
104	if (await loadFromFile(app, esmFilePath, exitHooks)) {	99	if (await loadFromFile(app, filePath, exitHooks)) {
105	return;	100	return;
		101	}
106	}	102	}
107	}	103	}
108	}	104	}