fix: babel7 not support forceEnv, use envName replace

easy-team · Nov 7, 2018 · 5e6f49d · 5e6f49d
1 parent d42c93a
commit 5e6f49d
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 10 deletions.
diff --git a/lib/base.js b/lib/base.js
@@ -301,7 +301,8 @@ class WebpackBaseBuilder extends Config {
 
       if (match && loader) {
         const babel = this.createBabelLoader();
-        const babelOptions = this.merge(babel.options, { babelrc: this.babelrc });
+        const babelrc = this.projectBabelrc ? undefined : this.babelrc;
+        const babelOptions = this.merge(babel.options, { babelrc });
         const babelLoaderString = `${babel.loader}?${JSON.stringify(babelOptions)}`;
         const entryLoaderString = this.utils.getLoaderOptionString(loader, { templateFile });
         const regMatch = match instanceof RegExp ? match : new RegExp(match);
@@ -593,17 +594,25 @@ class WebpackBaseBuilder extends Config {
 
   createBabelLoader() {
     const loaderName = 'babel-loader';
-    const options = process.env.BABEL_ENV ? { forceEnv: process.env.BABEL_ENV } : {};
+    const babelOptions = {};
+    const babelEnv = process.env.BABEL_ENV;
+    if (babelEnv) {
+      if (this.isBabel7) { // @babel/core use envName key
+        babelOptions.envName = babelEnv;
+      } else { // babel-core use forceEnv key
+        babelOptions.forceEnv = babelEnv;
+      }
+    }
     const compile = this.config.compile || {};
     const configCacheOptions = this.utils.isObject(compile.cache) ? compile.cache : {};
-    const cacheOptions = this.merge(options, configCacheOptions);
-    const config = compile.cache ? this.createCacheLoader(cacheOptions, loaderName) : { loader: loaderName, options };
+    const cacheOptions = this.merge(babelOptions, configCacheOptions);
+    const config = compile.cache ? this.createCacheLoader(cacheOptions, loaderName) : { loader: loaderName, babelOptions };
     // use project .babelrc
     if (fs.existsSync(this.projectBabelrc)) {
       return config;
     }
     // use default babelrc
-    return this.merge(config, this.merge(options, this.babelConfig));
+    return this.merge(config, this.merge(babelOptions, this.babelConfig));
   }
 
   createCacheLoader(loaderOptions, name) {

diff --git a/lib/client.js b/lib/client.js
@@ -11,7 +11,7 @@ class WebpackClientBuilder extends WebpackBaseBuilder {
     this.setPack(config.packs);
     this.setTarget(WebpackClientBuilder.TARGET);
     this.setCommonsChunkLib();
-    this.setCreateQueue(this.setBabelENV);
+    this.setStartCreateQueue(this.setBabelENV);
     this.setCreateQueue(this.createDllAssetPlugin);
     this.setCreateQueue(this.createDllReferencePlugin);
     this.setCreateQueue(this.createHTML);

diff --git a/lib/config.js b/lib/config.js
@@ -171,6 +171,8 @@ class Config {
     } else {
       this.babelrc = path.resolve(__dirname, '../config/babelrc');
     }
+    const filepath = path.resolve(this.baseDir, 'node_modules', '@babel/core');
+    this.isBabel7 = fs.existsSync(filepath);
   }
 
   initialize(config) {

diff --git a/lib/dll.js b/lib/dll.js
@@ -5,13 +5,13 @@ class WebpackDllBuilder extends WebpackBaseBuilder {
   constructor(config) {
     super(config);
     this.type = WebpackDllBuilder.TYPE;
-    this.setBabelENV('web');
+    this.setTarget(WebpackDllBuilder.TARGET);
     this.mergeConfig(Config.dllConfig);
     this.setBuildPath(this.utils.getDllCompileFileDir(this.env), true);
     this.setDevTool(config.devtool);
     this.setDllEntry(config.dll);
-    this.setTarget(WebpackDllBuilder.TARGET);
     this.setLibrary('[name]');
+    this.setStartCreateQueue(this.setBabelENV);
     this.setCreateQueue(this.createDllPlugin);
   }
 

diff --git a/lib/server.js b/lib/server.js
@@ -30,7 +30,7 @@ class WebpackServerBuilder extends WebpackBaseBuilder {
     };
     this.setExternals([nodeExternals(this.merge(defaultNodeExternals, this.config.nodeExternals))]);
     this.createFileName();
-    this.setCreateQueue(this.setBabelENV);
+    this.setStartCreateQueue(this.setBabelENV);
   }
 
   createFileName() {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "easywebpack",
-  "version": "4.9.3",
+  "version": "4.9.4",
   "description": "基于 Webpack 的前端构建工程化解决方案",
   "keywords": [
     "webpack",