diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 5470402d03..ad11335ae6 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -1,4 +1,5 @@ var utils = require('./utils') +var path = require('path') var webpack = require('webpack') var config = require('../config') var merge = require('webpack-merge') @@ -6,6 +7,10 @@ var baseWebpackConfig = require('./webpack.base.conf') var HtmlWebpackPlugin = require('html-webpack-plugin') var FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin') +function resolveApp(relativePath) { + return path.resolve(relativePath); +} + // add hot-reload related code to entry chunks Object.keys(baseWebpackConfig.entry).forEach(function (name) { baseWebpackConfig.entry[name] = ['./build/dev-client'].concat(baseWebpackConfig.entry[name]) @@ -28,6 +33,7 @@ module.exports = merge(baseWebpackConfig, { new HtmlWebpackPlugin({ filename: 'index.html', template: 'index.html', + favicon: resolveApp('favicon.ico'), inject: true }), new FriendlyErrorsPlugin()