Skip to content
Closed
Show file tree
Hide file tree
Changes from 8 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion packages/webpack-cli/lib/groups/ConfigGroup.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,19 @@ class ConfigGroup extends GroupHelper {

requireConfig(configModule) {
const extension = Object.keys(jsVariants).find((t) => configModule.ext.endsWith(t));
let config;

if (extension) {
this.requireLoader(extension, configModule.path);
}

let config = require(configModule.path);
if (extension == '.mjs') {
const ESMRequire = require('esm')(module);
config = ESMRequire(configModule.path);
} else {
config = require(configModule.path);
}

if (config.default) {
config = config.default;
}
Expand Down Expand Up @@ -178,6 +185,7 @@ class ConfigGroup extends GroupHelper {
});

const configFiles = tmpConfigFiles.map(this.requireConfig.bind(this));

if (configFiles.length) {
const defaultConfig = configFiles.find((p) => p.path.includes(mode) || p.path.includes(modeAlias[mode]));
if (defaultConfig) {
Expand Down
5 changes: 3 additions & 2 deletions packages/webpack-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,19 @@
"web"
],
"dependencies": {
"@webpack-cli/package-utils": "^1.0.1-alpha.4",
"@webpack-cli/info": "^1.0.1-alpha.4",
"@webpack-cli/init": "^1.0.1-alpha.5",
"@webpack-cli/package-utils": "^1.0.1-alpha.4",
"@webpack-cli/serve": "^1.0.1-alpha.5",
"ansi-escapes": "^4.3.1",
"colorette": "^1.2.1",
"command-line-usage": "^6.1.0",
"commander": "^6.0.0",
"enquirer": "^2.3.4",
"esm": "^3.2.25",
"execa": "^4.0.0",
"import-local": "^3.0.2",
"interpret": "^2.0.0",
"interpret": "^2.2.0",
"rechoir": "^0.7.0",
"v8-compile-cache": "^2.1.0",
"webpack-merge": "^4.2.2"
Expand Down
1 change: 1 addition & 0 deletions test/config-format/mjs/main.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
console.log('Hoshiumi');
13 changes: 13 additions & 0 deletions test/config-format/mjs/mjs-config.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
const { run } = require('../../utils/test-utils');
const { existsSync } = require('fs');
const { resolve } = require('path');

describe('webpack cli', () => {
it('should support mjs file', () => {
const { stderr, stdout } = run(__dirname, ['-c', 'webpack.config.mjs'], false);
expect(stderr).toBeFalsy();
expect(stdout).toBeTruthy();
console.log({ stderr, stdout });
expect(existsSync(resolve(__dirname, 'dist/foo.bundle.js'))).toBeTruthy();
});
});
8 changes: 8 additions & 0 deletions test/config-format/mjs/webpack.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
export default {
mode: 'production',
entry: './main.js',
output: {
path: './dist',
filename: 'foo.bundle.js',
},
};
2 changes: 1 addition & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6849,7 +6849,7 @@ interpret@^1.0.0:
resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz#d5061a6224be58e8083985f5014d844359576296"
integrity sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==

interpret@^2.0.0:
interpret@^2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/interpret/-/interpret-2.2.0.tgz#1a78a0b5965c40a5416d007ad6f50ad27c417df9"
integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==
Expand Down