From c9c15fdc55c170f137fb56be6d378309c21f2a0d Mon Sep 17 00:00:00 2001
From: sky <hubcarl@126.com>
Date: Thu, 1 Nov 2018 14:35:25 +0800
Subject: [PATCH] fix: client render entry error for babel-loader path

---
 lib/client.js       | 5 ++---
 package.json        | 2 +-
 test/client.test.js | 2 --
 test/loader.test.js | 2 +-
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/lib/client.js b/lib/client.js
index 91c1607..282b8f5 100644
--- a/lib/client.js
+++ b/lib/client.js
@@ -100,8 +100,6 @@ class WebpackClientBuilder extends WebpackBaseBuilder {
         // 如果存在同名 html 模板文件, 全局 template 配置非必须
         globalTemplate = globalTemplate && this.utils.normalizePath(globalTemplate, config.baseDir);
 
-        const entry = this.utils.getEntry(config, this.type);
-
         let deps;
         if (this.config.dll) {
           const manifest = this.getPluginByName('manifest');
@@ -110,6 +108,8 @@ class WebpackClientBuilder extends WebpackBaseBuilder {
             deps = require(filepath).deps;
           }
         }
+        const entry = this.webpackConfig.entry;
+
         Object.keys(entry).forEach(entryName => {
           const entryFile = (Array.isArray(entry[entryName]) ? entry[entryName].slice(-1)[0] : entry[entryName])
             .replace(/^.*!/, ''); // 提取'xx-loader!index.vue'后面的路径
@@ -136,7 +136,6 @@ class WebpackClientBuilder extends WebpackBaseBuilder {
             this.plugins[entryName] = this.merge({ args: { minify, chunks, filename, template, css, js } }, plugin);
           }
         });
-        this.addEntry(entry);
       }
     }
     this.removePlugin('html'); // remove html single config
diff --git a/package.json b/package.json
index ccde6ad..f16b712 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "easywebpack",
-  "version": "4.9.0",
+  "version": "4.9.1",
   "description": "基于 Webpack 的前端构建工程化解决方案",
   "keywords": [
     "webpack",
diff --git a/test/client.test.js b/test/client.test.js
index 526df2f..890fdc9 100644
--- a/test/client.test.js
+++ b/test/client.test.js
@@ -333,10 +333,8 @@ describe('client.test.js', () => {
       const webpackConfig = builder.create();
       const tsLoader = getLoaderByName('ts', webpackConfig.module.rules);
       const tslint = getLoaderByName('tslint', webpackConfig.module.rules);
-      const eslint = getLoaderByName('eslint', webpackConfig.module.rules);
       expect(tsLoader).to.be.undefined;
       expect(tslint).to.be.undefined;
-      expect(eslint.use[0].loader).to.equal('eslint-loader');
     });
 
     it('should typescript cache enable test', () => {
diff --git a/test/loader.test.js b/test/loader.test.js
index a956a67..3cc64b2 100644
--- a/test/loader.test.js
+++ b/test/loader.test.js
@@ -68,7 +68,7 @@ describe('loader.test.js', () => {
       const builder1 = createBuilder();
       const webpackConfig1 = builder1.create();
       const rules1 = webpackConfig1.module.rules;
-      expect(getLoaderByName('eslint', rules1)).to.include.all.keys(['test', 'use']);
+      expect(getLoaderByName('eslint', rules1)).to.be.undefined;
       expect(getLoaderByName('babel', rules1)).to.include.all.keys(['test', 'use']);
       expect(getLoaderByTest(/\.(woff2?|eot|ttf|otf)(\?.*)?$/, rules1)).to.include.all.keys(['test', 'use']);