fix favico not exist error

lcxfs1991 · lcxfs1991 · commit 384a2e8b5976 · 2018-08-25T19:58:06.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -38,6 +38,7 @@
 - v4.0.1 Support webpack4.x
 - v4.0.2 Fix duplicate resource in watch mode
 - v4.0.3 fix external favico issue
+- v4.0.4 fix favico not exist error
 
 ## 中文
 - v0.0.1 html生成及相关js,css资源内联
@@ -77,4 +78,5 @@
 - v3.2.6 若注入资源中，如果没有引入资源，会让程序继续运行
 - v4.0.1 支持 webpack4.x
 - v4.0.2 修复 watch 模式下资源重复的问题
-- v4.0.3 修复外链 favico 的问题
+- v4.0.3 修复外链 favico 的问题
+- v4.0.4 修复 favico 文件不存在报错
diff --git a/index.js b/index.js
@@ -188,12 +188,18 @@ HtmlResWebpackPlugin.prototype.apply = function(compiler) {
           );
 
           // inject favicon
-          if (this.options.favicon) {
-            this.options.faviconFileName = this.addFileToWebpackAsset(
-              compilation,
-              this.options.favicon,
-              utils.getBaseName(this.options.favicon, null)
-            );
+          let favicon = this.options.favicon;
+          if (favicon) {
+            if (!fs.existsSync(favicon)) {
+              utils.alert(`Favicon file does not exist: ${this.options.favicon}`, 1);
+            }
+            else {
+              this.options.faviconFileName = this.addFileToWebpackAsset(
+                compilation,
+                favicon,
+                utils.getBaseName(favicon, null)
+              );
+            }
           }
 
           // webpack options
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "html-res-webpack-plugin",
-  "version": "4.0.3",
+  "version": "4.0.4",
   "description": "html generation and resource inline or md5 for webpack",
   "keywords": [
     "front-end",
diff --git a/runWebpack/index.js b/runWebpack/index.js
@@ -30,6 +30,7 @@ var webpackConfig = [
   require(basePath + "/resource-favico/webpack.config.js"), // generate favicon
   require(basePath + "/resource-favico-1/webpack.config.js"), // html mode generate favicon
   require(basePath + "/resource-favico-2/webpack.config.js"), // html mode external favicon
+  require(basePath + "/resource-favico-3/webpack.config.js"), // no favicon file but fill in the option
   require(basePath + "/resource-common-1/webpack.config.js"), // common chunk generated by webpack
   require(basePath + "/resource-common-2/webpack.config.js"), // html mode common chunk generated by webpack
   require(basePath + "/resource-copy-plugin-1/webpack.config.js"), //  usage with copy-webpack-plugin-hash
diff --git a/test/result/resource-favico-3/index.html b/test/result/resource-favico-3/index.html
@@ -0,0 +1,18 @@
+<!doctype html>
+<html lang="zh">
+<head>
+    <meta charset="utf-8">
+    <title>Tencent QQ</title>
+    <link rel="shortcut icon" type="image/x-icon" href="//im.qq.com/favicon.ico">
+	<link rel="icon" type="image/x-icon" href="//im.qq.com/favicon.ico">
+    <script src="//localhost:9000/[libs/react.js]"></script>
+    <link rel="stylesheet" href="//localhost:9000/[js/index.css]">
+</head>
+<body>
+	<div id="pages" class="qq-ui"></div>
+
+
+
+	<script src="//localhost:9000/[js/index.js]"></script>
+</body>
+</html>
diff --git a/test/src/resource-favico-3/index.html b/test/src/resource-favico-3/index.html
@@ -0,0 +1,18 @@
+<!doctype html>
+<html lang="zh">
+<head>
+    <meta charset="utf-8">
+    <title>Tencent QQ</title>
+    <link rel="shortcut icon" type="image/x-icon" href="//im.qq.com/favicon.ico">
+	<link rel="icon" type="image/x-icon" href="//im.qq.com/favicon.ico">
+    <script src="libs/react.js"></script>
+    <link rel="stylesheet" href="js/index.css">
+</head>
+<body>
+	<div id="pages" class="qq-ui"></div>
+
+
+
+	<script src="js/index.js"></script>
+</body>
+</html>
diff --git a/test/src/resource-favico-3/index.js b/test/src/resource-favico-3/index.js
@@ -0,0 +1,4 @@
+
+require('./index.less');
+
+var a = "hello world!";
diff --git a/test/src/resource-favico-3/index.less b/test/src/resource-favico-3/index.less
@@ -0,0 +1,8 @@
+html, body {
+	margin: 0;
+	padding: 0;
+}
+
+.img {
+	background-url: url("./logo.png");
+}
diff --git a/test/src/resource-favico-3/libs/react.js b/test/src/resource-favico-3/libs/react.js
@@ -0,0 +1,5 @@
+var react = {
+	reactDom: function() {
+
+	}
+};
diff --git a/test/src/resource-favico-3/logo.png b/test/src/resource-favico-3/logo.png
diff --git a/test/src/resource-favico-3/webpack.config.js b/test/src/resource-favico-3/webpack.config.js
@@ -0,0 +1,81 @@
+"use strict";
+
+const path = require('path');
+
+let webpack = require('webpack');
+let config = require('../../config/config');
+let nodeModulesPath = path.resolve('../node_modules');
+
+let  HtmlResWebpackPlugin = require('../../../index');
+let MiniCssExtractPlugin = require('mini-css-extract-plugin');
+let WebpackAssetPipeline = require('webpack-asset-pipeline');
+
+module.exports = {
+    context: config.path.src,
+	entry: {
+        'libs/react': [path.join(config.path.src, "/resource-favico-3/libs/react")],
+        'js/index': [path.join(config.path.src, "/resource-favico-3/index")],
+    },
+    output: {
+        publicPath: config.defaultPath,
+        path: path.join(config.path.dist + '/resource-favico-3/'),
+        filename: "[name]" + config.chunkhash + ".js",
+        chunkFilename: "chunk/[name]" + config.chunkhash + ".js",
+    },
+    module: {
+        rules: [
+            { 
+                test: /\.js?$/,
+                loader: 'babel-loader',
+                query: {
+                    cacheDirectory: false,
+                    presets: [
+                        'es2015', 
+                    ]
+                },
+                exclude: /node_modules/,
+            },
+            {
+                test: /\.less$/,
+                use: [
+                    MiniCssExtractPlugin.loader,
+                    {
+                        loader: 'css-loader',
+                        options: {
+                            localIdentName: '[name]-[local]-[hash:base64:5]',
+                        }
+                    },
+                    {
+                        loader:  'less-loader',
+                    }
+                ],
+            },
+            {
+                test: /\.html$/,
+                loader: 'html-loader'
+            },
+            {
+                test: /\.(jpe?g|png|gif|svg)$/i,
+                use: [
+                    "url-loader?limit=1000&name=img/[name]" + config.hash + ".[ext]",
+                ],
+                include: path.resolve(config.path.src)
+            },
+        ]
+    },
+    plugins: [
+        new webpack.NoEmitOnErrorsPlugin(),
+        new MiniCssExtractPlugin({filename: "css/[name]-[contenthash:6].css"}),
+        new HtmlResWebpackPlugin({
+            mode: "html",
+        	filename: "index.html",
+	        template: config.path.src + "/resource-favico-3/index.html",
+            favicon: config.path.src + "/resource-favico-3/favicon.ico",
+	        templateContent: function(tpl) {
+	            return tpl;
+	        }, 
+	        htmlMinify: null
+        }),
+        new WebpackAssetPipeline(),
+    ],
+};
diff --git a/test/test.js b/test/test.js
@@ -461,6 +461,29 @@ describe("resource-favico2", function () {
   });
 });
 
+describe("resource-favico3", function () {
+  it("=> no favicon file but fill in the option", function () {
+    let distHtml = path.join(TEST, "dist/resource-favico-3/index.html"),
+      resultHtml = path.join(TEST, "result/resource-favico-3/index.html");
+
+    let distContent = trimString(fs.readFileSync(distHtml, "utf-8")),
+      resultContent = trimString(fs.readFileSync(resultHtml, "utf-8"));
+
+    let assets = JSON.parse(
+      fs.readFileSync(
+        path.join(TEST, "dist/resource-favico-3/manifest.json"),
+        "utf-8"
+      ) || ""
+    );
+
+    Object.keys(assets).forEach(file => {
+      resultContent = resultContent.replace("[" + file + "]", assets[file]);
+    });
+
+    expect(true).to.be(distContent === resultContent);
+  });
+});
+
 describe("resource-common-1", function () {
   it("=> common chunk generated by webpack", function () {
     let distHtml = path.join(TEST, "dist/resource-common-1/index.html"),

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "html-res-webpack-plugin",`
`3`		`- "version": "4.0.3",`
	`3`	`+ "version": "4.0.4",`
`4`	`4`	`"description": "html generation and resource inline or md5 for webpack",`
`5`	`5`	`"keywords": [`
`6`	`6`	`"front-end",`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
++
 +require('./index.less');
++
 +var a = "hello world!";