support rollup.config.mjs & webpack.config.mjs

sveltejs#1791
btakita · Jul 19, 2021 · a4b26c0 · a4b26c0
1 parent e5c776f
commit a4b26c0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/api/utils/validate_bundler.ts b/src/api/utils/validate_bundler.ts
@@ -3,8 +3,8 @@ import * as fs from 'fs';
 export default function validate_bundler(bundler?: 'rollup' | 'webpack') {
 	if (!bundler) {
 		bundler = (
-			fs.existsSync('rollup.config.js') || fs.existsSync('rollup.config.ts') ? 'rollup' :
-				fs.existsSync('webpack.config.js') || fs.existsSync('webpack.config.ts') ? 'webpack' : null
+			fs.existsSync('rollup.config.js') || fs.existsSync('rollup.config.mjs') || fs.existsSync('rollup.config.ts') ? 'rollup' :
+				fs.existsSync('webpack.config.js') || fs.existsSync('webpack.config.mjs') || fs.existsSync('webpack.config.ts') ? 'webpack' : null
 		);
 
 		if (!bundler) {

diff --git a/src/core/create_compilers/RollupCompiler.ts b/src/core/create_compilers/RollupCompiler.ts
@@ -1,4 +1,5 @@
 import * as path from 'path';
+import { access, constants } from 'fs/promise';
 import color from 'kleur';
 import relative from 'require-relative';
 import { dependenciesForTree, DependencyTreeOptions } from 'rollup-dependency-tree';
@@ -401,7 +402,14 @@ export default class RollupCompiler {
 	static async load_config(cwd: string) {
 		if (!rollup) rollup = relative('rollup', cwd);
 
-		const input = path.resolve(cwd, 'rollup.config.js');
+		let input: string;
+		try {
+		  input = path.resolve(cwd, 'rollup.config.mjs');
+			await access(input, constants.F_OK | constants.R_OK);
+		} catch (_e) {
+		  input = path.resolve(cwd, 'rollup.config.js');
+			await access(input, constants.F_OK | constants.R_OK);
+    }
 
 		const bundle = await rollup.rollup({
 			input,