diff --git a/client/README.md b/client/README.md index 18ae57a..298ce2d 100644 --- a/client/README.md +++ b/client/README.md @@ -1,6 +1,6 @@ -# client +# client2 -> A Vue.js project +> client2 ## Build Setup diff --git a/client/build/webpack.base.conf.js b/client/build/webpack.base.conf.js index 08c0325..a07e683 100644 --- a/client/build/webpack.base.conf.js +++ b/client/build/webpack.base.conf.js @@ -58,11 +58,11 @@ module.exports = { } }, { - test: /\.(eot|ttf|otf|woff|woff2)(\?.*)?$/, + test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/, loader: 'url-loader', options: { limit: 10000, - name: utils.assetsPath('fonts/[name].[ext]') + name: utils.assetsPath('fonts/[name].[hash:7].[ext]') } } ] diff --git a/client/build/webpack.dev.conf.js b/client/build/webpack.dev.conf.js index 3784e76..a7e1065 100755 --- a/client/build/webpack.dev.conf.js +++ b/client/build/webpack.dev.conf.js @@ -17,9 +17,6 @@ const devWebpackConfig = merge(baseWebpackConfig, { module: { rules: utils.styleLoaders({ sourceMap: config.dev.cssSourceMap, usePostCSS: true }) }, - watchOptions: { - ignored: ['uploads', 'node_modules'] - }, // cheap-module-eval-source-map is faster for development devtool: config.dev.devtool, @@ -31,7 +28,8 @@ const devWebpackConfig = merge(baseWebpackConfig, { { from: /.*/, to: path.posix.join(config.dev.assetsPublicPath, 'index.html') }, ], }, - // hot: true, + disableHostCheck: true, + hot: true, contentBase: false, // since we use CopyWebpackPlugin. compress: true, host: HOST || config.dev.host, @@ -43,7 +41,6 @@ const devWebpackConfig = merge(baseWebpackConfig, { publicPath: config.dev.assetsPublicPath, proxy: config.dev.proxyTable, quiet: true, // necessary for FriendlyErrorsPlugin - disableHostCheck: true, watchOptions: { poll: config.dev.poll, } diff --git a/client/config/dev.env.js b/client/config/dev.env.js index 510a3a5..1e22973 100644 --- a/client/config/dev.env.js +++ b/client/config/dev.env.js @@ -4,4 +4,4 @@ const prodEnv = require('./prod.env') module.exports = merge(prodEnv, { NODE_ENV: '"development"' -}) \ No newline at end of file +}) diff --git a/client/config/index.js b/client/config/index.js index df8c6d1..5588a1e 100644 --- a/client/config/index.js +++ b/client/config/index.js @@ -13,13 +13,13 @@ module.exports = { proxyTable: {}, // Various Dev Server settings - host: '0.0.0.0',//'localhost', // can be overwritten by process.env.HOST + host: '0.0.0.0', // can be overwritten by process.env.HOST port: 8444, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: false, errorOverlay: true, notifyOnErrors: true, poll: false, // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions- - + /** * Source Maps diff --git a/client/index.html b/client/index.html index 35f3698..70a68fa 100644 --- a/client/index.html +++ b/client/index.html @@ -3,7 +3,7 @@
- + @@ -14,6 +14,6 @@ - +