Merge pull request #17088 from webpack/feat-allow-cli-to-be-esm

feat: allow CLI to be ESM
webpack · Apr 28, 2023 · 102e25f · 102e25f
2 parents b71c780 + 6ce8ad2
commit 102e25f
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -77,6 +77,13 @@ module.exports = {
 		}
 	},
 	overrides: [
+		{
+			// Allow to use `dynamic` import
+			files: ["bin/**/*.js"],
+			parserOptions: {
+				ecmaVersion: 2020
+			}
+		},
 		{
 			files: ["lib/**/*.runtime.js", "hot/*.js"],
 			env: {

diff --git a/bin/webpack.js b/bin/webpack.js
@@ -78,8 +78,19 @@ const runCli = cli => {
 	const pkgPath = require.resolve(`${cli.package}/package.json`);
 	// eslint-disable-next-line node/no-missing-require
 	const pkg = require(pkgPath);
-	// eslint-disable-next-line node/no-missing-require
-	require(path.resolve(path.dirname(pkgPath), pkg.bin[cli.binName]));
+
+	if (pkg.type === "module" || /\.mjs/i.test(pkg.bin[cli.binName])) {
+		// eslint-disable-next-line node/no-unsupported-features/es-syntax
+		import(path.resolve(path.dirname(pkgPath), pkg.bin[cli.binName])).catch(
+			error => {
+				console.error(error);
+				process.exitCode = 1;
+			}
+		);
+	} else {
+		// eslint-disable-next-line node/no-missing-require
+		require(path.resolve(path.dirname(pkgPath), pkg.bin[cli.binName]));
+	}
 };
 
 /**