feat: dev mode node.console: true

Author: hubcarl

config/.babelrc

@@ -0,0 +1,15 @@
+{
+  "presets": [["env", {
+    "modules": false,
+    "targets": {
+      "browsers": ["last 2 versions", "safari >= 7"]
+    }
+  }]],
+  "plugins": [
+    "transform-object-rest-spread",
+    "syntax-dynamic-import",
+    "transform-object-assign",
+    "transform-runtime"
+  ],
+  "comments": false
+}

config/config.js

@@ -30,6 +30,9 @@ exports.devConfig = {
   cssExtract: false,
   plugins:{
     hot: true,
+  },
+  node: {
+    console: true
   }
 };
 

config/loader.js

@@ -8,13 +8,9 @@ exports.babel = {
     const loaders = [];
     const compile = this.config.compile;
     if (compile.thread) {
-      loaders.unshift(this.createThreadLoader(this.config.thread));
-    }
-    if (compile.cache) {
-      loaders.push(this.createCacheLoader(this.config.cache, 'babel-loader'));
-    } else {
-      loaders.push({ loader: 'babel-loader', options: {} });
+      loaders.unshift(this.createThreadLoader(compile.thread));
     }
+    loaders.push(this.createBabelLoader());
     return loaders;
   }
 };

lib/base.js

@@ -579,6 +579,18 @@ class WebpackBaseBuilder extends Config {
     return { loader, options };
   }
 
+  createBabelLoader() {
+    const loaderName = 'babel-loader';
+    const config = this.config.compile.cache ? this.createCacheLoader(this.config.compile.cache, loaderName) : { loader: loaderName, options: {} };
+    // use project .babelrc
+    if (fs.existsSync(this.projectBabelrc)) {
+      return config;
+    }
+    // use default .babelrc
+    const options = this.utils.readFile(this.babelrc);
+    return this.merge(config, { options });
+  }
+
   createCacheLoader(loaderOptions, name) {
     const loader = name || 'cache-loader';
     const cacheDirectory = this.utils.getCacheLoaderInfoPath(loader, this.env, this.type);
@@ -588,7 +600,7 @@ class WebpackBaseBuilder extends Config {
 
   createThreadLoader(loaderOptions) {
     const loader = 'thread-loader';
-    const options = this.utils.isObject(loaderOptions) ? this.merge({ workers: 2 }, loaderOptions): {};
+    const options = this.utils.isObject(loaderOptions) ? this.merge({ workers: 2 }, loaderOptions) : {};
     return { loader, options };
   }
 
@@ -639,17 +651,14 @@ class WebpackBaseBuilder extends Config {
 
   // 根据 BABEL_ENV 动态获取 BABEL 配置， 支持 node 和 web 配置
   setBabelENV(value) {
-    const babelrc = path.join(this.baseDir, '.babelrc');
-    if (fs.existsSync(babelrc)) {
-      const jsonStr = fs.readFileSync(babelrc);
-      try {
-        const json = JSON.parse(jsonStr);
-        if (json && json.env && json.env[value]) {
-          process.env.BABEL_ENV = value;
-        }
-      } catch (e) {
-        /* istanbul ignore next */
+    const key = value || this.webpackConfig.target;
+    try {
+      const json = this.utils.readFile(this.babelrc);
+      if (json && json.env && json.env[key]) {
+        process.env.BABEL_ENV = key;
       }
+    } catch (e) {
+      /* istanbul ignore next */
     }
   }
 }

lib/client.js

@@ -7,11 +7,11 @@ class WebpackClientBuilder extends WebpackBaseBuilder {
   constructor(config) {
     super(config);
     this.type = WebpackClientBuilder.TYPE;
-    this.setBabelENV('web');
     this.setDevTool(config.devtool);
     this.setPack(config.packs);
     this.setTarget(WebpackClientBuilder.TARGET);
     this.setCommonsChunkLib();
+    this.setCreateQueue(this.setBabelENV);
     this.setCreateQueue(this.createDllAssetPlugin);
     this.setCreateQueue(this.createDllReferencePlugin);
     this.setCreateQueue(this.createHTML);

lib/config.js

@@ -53,6 +53,7 @@ class Config {
     this.initEntry(this.config);
     this.initialize(this.config);
     this.initEnv(this.config);
+    this.initBabelrc();
   }
 
   // get config() {
@@ -151,6 +152,16 @@ class Config {
     }
   }
 
+  initBabelrc() {
+    const projectBabelrc = path.join(this.baseDir, '.babelrc');
+    if (fs.existsSync(projectBabelrc)) {
+      this.projectBabelrc = projectBabelrc;
+      this.babelrc = projectBabelrc;
+    } else {
+      this.babelrc = path.resolve(__dirname, '../config/.babelrc');
+    }
+  }
+
   initialize(config) {
     this.webpackConfig = this.utils.cloneDeep(require('../config/webpack'));
     this.loaders = this.utils.cloneDeep(require('../config/loader'));
@@ -638,6 +649,12 @@ class Config {
     };
   }
 
+  setBabelrc(babelrc) {
+    if (!this.projectBabelrc) {
+      this.babelrc = babelrc;
+    }
+  }
+
   static getDllConfig(dll) {
     return utils.getDllConfig(dll);
   }

lib/server.js

@@ -8,7 +8,6 @@ class WebpackServerBuilder extends WebpackBaseBuilder {
     super(config);
     this.ssr = true;
     this.type = WebpackServerBuilder.TYPE;
-    this.setBabelENV('node');
     this.setTarget(WebpackServerBuilder.TARGET);
     this.setNode({ __filename: false, __dirname: false });
     this.setLibraryTarget('commonjs');
@@ -31,6 +30,7 @@ class WebpackServerBuilder extends WebpackBaseBuilder {
     };
     this.setExternals([nodeExternals(this.merge(defaultNodeExternals, this.config.nodeExternals))]);
     this.createFileName();
+    this.setCreateQueue(this.setBabelENV);
   }
 
   createFileName() {

package.json

@@ -115,7 +115,8 @@
     "utils",
     "lib",
     "config",
-    "tool"
+    "tool",
+    "config/.babelrc"
   ],
   "nyc": {
     "exclude": [

test/server.test.js

@@ -155,4 +155,14 @@ describe('server.test.js', () => {
     const serviceworker = getPluginByLabel('serviceworker', plugins);
     expect(!!serviceworker).to.be.false;
   });
+  it('should node console env dev test', () => {
+    const builder = createBuilder({ env: 'dev' });
+    const webpackConfig = builder.create();
+    expect(webpackConfig.node.console).to.be.true;
+  });
+  it('should node console env prod test', () => {
+    const builder = createBuilder({ env: 'prod' });
+    const webpackConfig = builder.create();
+    expect(webpackConfig.node.console).to.be.undefined;
+  });
 });

utils/utils.js

@@ -351,7 +351,7 @@ utils.readFile = filepath => {
   } catch (e) {
     /* istanbul ignore next */
   }
-  return null;
+  return undefined;
 };