Skip to content

Commit a15c714

Browse files
committed
feature #1083 fix: Babel loader files add .mjs (minimit)
This PR was squashed before being merged into the main branch. Discussion ---------- fix: Babel loader files add .mjs I just added `.mjs` to babel loader. Closes: #1081 Commits ------- c2d5c14 fix: Babel loader files add .mjs
2 parents 2de681f + c2d5c14 commit a15c714

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

lib/loaders/babel.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ module.exports = {
110110
*/
111111
getTest(webpackConfig) {
112112
const extensions = [
113-
'jsx?', // match .js and .jsx
113+
'm?jsx?', // match .js and .jsx and .mjs
114114
];
115115

116116
if (webpackConfig.useBabelTypeScriptPreset) {

test/config-generator.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -670,7 +670,7 @@ describe('The config-generator function', () => {
670670

671671
const actualConfig = configGenerator(config);
672672

673-
const jsRule = findRule(/\.(jsx?)$/, actualConfig.module.rules);
673+
const jsRule = findRule(/\.(m?jsx?)$/, actualConfig.module.rules);
674674

675675
// check for the default env preset only
676676
expect(JSON.stringify(jsRule.use[0].options.presets)).contains('@babel/preset-env');
@@ -1011,7 +1011,7 @@ describe('The config-generator function', () => {
10111011

10121012
const actualConfig = configGenerator(config);
10131013

1014-
const jsRule = findRule(/\.(jsx?)$/, actualConfig.module.rules);
1014+
const jsRule = findRule(/\.(m?jsx?)$/, actualConfig.module.rules);
10151015
expect(String(jsRule.exclude)).to.equal(String(/(node_modules|bower_components)/));
10161016

10171017
const babelLoader = jsRule.use.find(loader => /babel-loader/.test(loader.loader));
@@ -1030,7 +1030,7 @@ describe('The config-generator function', () => {
10301030

10311031
const actualConfig = configGenerator(config);
10321032

1033-
const jsRule = findRule(/\.(jsx?)$/, actualConfig.module.rules);
1033+
const jsRule = findRule(/\.(m?jsx?)$/, actualConfig.module.rules);
10341034
expect(String(jsRule.exclude)).to.equal(String(/foo/));
10351035
});
10361036

@@ -1045,7 +1045,7 @@ describe('The config-generator function', () => {
10451045

10461046
const actualConfig = configGenerator(config);
10471047

1048-
const jsRule = findRule(/\.(jsx?)$/, actualConfig.module.rules);
1048+
const jsRule = findRule(/\.(m?jsx?)$/, actualConfig.module.rules);
10491049
expect(jsRule.exclude).to.be.a('Function');
10501050
expect(jsRule.exclude(path.join('test', 'node_modules', 'foo', 'index.js'))).to.be.false;
10511051
expect(jsRule.exclude(path.join('test', 'node_modules', 'bar', 'index.js'))).to.be.true;
@@ -1063,7 +1063,7 @@ describe('The config-generator function', () => {
10631063

10641064
const actualConfig = configGenerator(config);
10651065

1066-
const jsRule = findRule(/\.(jsx?)$/, actualConfig.module.rules);
1066+
const jsRule = findRule(/\.(m?jsx?)$/, actualConfig.module.rules);
10671067
const babelLoader = jsRule.use.find(loader => /babel-loader/.test(loader.loader));
10681068
const babelEnvPreset = babelLoader.options.presets.find(([name]) => name === '@babel/preset-env');
10691069
expect(babelEnvPreset[1].useBuiltIns).to.equal('usage');
@@ -1080,7 +1080,7 @@ describe('The config-generator function', () => {
10801080

10811081
const actualConfig = configGenerator(config);
10821082

1083-
const jsRule = findRule(/\.(jsx?)$/, actualConfig.module.rules);
1083+
const jsRule = findRule(/\.(m?jsx?)$/, actualConfig.module.rules);
10841084
const babelLoader = jsRule.use.find(loader => /babel-loader/.test(loader.loader));
10851085
const babelEnvPreset = babelLoader.options.presets.find(([name]) => name === '@babel/preset-env');
10861086
expect(babelEnvPreset[1].useBuiltIns).to.equal(false);
@@ -1097,7 +1097,7 @@ describe('The config-generator function', () => {
10971097

10981098
const actualConfig = configGenerator(config);
10991099

1100-
const jsRule = findRule(/\.(jsx?)$/, actualConfig.module.rules);
1100+
const jsRule = findRule(/\.(m?jsx?)$/, actualConfig.module.rules);
11011101
const babelLoader = jsRule.use.find(loader => /babel-loader/.test(loader.loader));
11021102
const babelEnvPreset = babelLoader.options.presets.find(([name]) => name === '@babel/preset-env');
11031103
expect(babelEnvPreset[1].useBuiltIns).to.equal('usage');

test/loaders/babel.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,14 +193,14 @@ describe('loaders/babel', () => {
193193
const config = createConfig();
194194

195195
const actualTest = babelLoader.getTest(config);
196-
expect(actualTest.toString()).to.equals(/\.(jsx?)$/.toString());
196+
expect(actualTest.toString()).to.equals(/\.(m?jsx?)$/.toString());
197197
});
198198

199199
it('getTest() with TypeScript', () => {
200200
const config = createConfig();
201201
config.enableBabelTypeScriptPreset();
202202

203203
const actualTest = babelLoader.getTest(config);
204-
expect(actualTest.toString()).to.equals(/\.(jsx?|tsx?)$/.toString());
204+
expect(actualTest.toString()).to.equals(/\.(m?jsx?|tsx?)$/.toString());
205205
});
206206
});

0 commit comments

Comments
 (0)