From 13831771d05e8be16dea0114d043e47396d09ab0 Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Sun, 24 Apr 2022 09:37:55 +0800
Subject: [PATCH] Merge branch 'dev-3.3' of
 https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3

---
 nezha-fronted/build/webpack.dev.conf.js  | 2 +-
 nezha-fronted/build/webpack.prod.conf.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nezha-fronted/build/webpack.dev.conf.js b/nezha-fronted/build/webpack.dev.conf.js
index b9343e8db..3c79326bf 100644
--- a/nezha-fronted/build/webpack.dev.conf.js
+++ b/nezha-fronted/build/webpack.dev.conf.js
@@ -55,7 +55,7 @@ const devWebpackConfig = merge(baseWebpackConfig, {
     new webpack.NoEmitOnErrorsPlugin(),
     // https://github.com/ampedandwired/html-webpack-plugin
     new HtmlWebpackPlugin({
-      favicon: require('../src/assets/img/favicon.ico'),
+      favicon: path.resolve(__dirname, '../src/assets/img/favicon.ico'),
       filename: 'index.html',
       template: 'index.html',
       inject: true
diff --git a/nezha-fronted/build/webpack.prod.conf.js b/nezha-fronted/build/webpack.prod.conf.js
index 1f2600c43..b3d516e39 100644
--- a/nezha-fronted/build/webpack.prod.conf.js
+++ b/nezha-fronted/build/webpack.prod.conf.js
@@ -91,7 +91,7 @@ const webpackConfig = merge(baseWebpackConfig, {
     // you can customize output by editing /index.html
     // see https://github.com/ampedandwired/html-webpack-plugin
     new HtmlWebpackPlugin({
-      favicon: require('../src/assets/img/favicon.ico'),
+      favicon: path.resolve(__dirname, '../src/assets/img/favicon.ico'),
       filename: config.build.index,
       template: 'index.html',
       hash: false,