Skip to content

Commit e647ca6

Browse files
committed
fix: no babelrc options merge error
1 parent da96133 commit e647ca6

3 files changed

Lines changed: 4 additions & 3 deletions

File tree

config/loader.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ exports.eslint = {
2525

2626
exports.typescript = {
2727
enable: false,
28-
test: /\.ts$/,
28+
test: /\.tsx?$/,
2929
exclude: /node_modules/,
3030
use() {
3131
const loaders = [];

lib/base.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -612,7 +612,8 @@ class WebpackBaseBuilder extends Config {
612612
return config;
613613
}
614614
// use default babelrc
615-
return this.merge(config, this.merge(babelOptions, this.babelConfig));
615+
const options = this.merge(babelOptions, this.babelConfig);
616+
return this.merge(config, { options });
616617
}
617618

618619
createCacheLoader(loaderOptions, name) {

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "easywebpack",
3-
"version": "4.9.4",
3+
"version": "4.9.5",
44
"description": "基于 Webpack 的前端构建工程化解决方案",
55
"keywords": [
66
"webpack",

0 commit comments

Comments
 (0)