feat: 如果存在同名 html 模板文件, 全局 template 配置非必须

easy-team · Aug 31, 2018 · 7ec20aa · 7ec20aa
1 parent 70bcae1
commit 7ec20aa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/lib/client.js b/lib/client.js
@@ -96,9 +96,10 @@ class WebpackClientBuilder extends WebpackBaseBuilder {
             config.entry = Object.assign(config.entry, { include: null, exclude: null }, config.entry.html);
           }
         }
-        globalTemplate = this.utils.normalizePath(globalTemplate, config.baseDir);
+        // 如果存在同名 html 模板文件, 全局 template 配置非必须
+        globalTemplate = globalTemplate && this.utils.normalizePath(globalTemplate, config.baseDir);
+
         const entry = this.utils.getEntry(config, this.type);
-        const extMath = this.config.entry.extMatch || '.js';
 
         let deps;
         if (this.config.dll) {

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