fix(webpack_config/client): eslint fixes

Metnew · Sep 13, 2017 · 4080878 · 4080878
1 parent 768dc97
commit 4080878
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 15 deletions.
diff --git a/webpack_config/client/webpack.base.js b/webpack_config/client/webpack.base.js
@@ -10,6 +10,7 @@ const {
 	GA_ID,
 	SENTRY_PUBLIC_DSN,
 	CLIENT_DIST_PATH,
+	rootPath,
 	srcPath,
 	publicPath,
 	isProduction,
@@ -108,24 +109,24 @@ const baseBuild = {
 			// add theme-color property
 			background: manifest.theme,
 			prefix: `favicons/`,
-			logo: path.resolve(config.rootPath, './static/images/logo.png'),
+			logo: path.join(rootPath, './static/images/logo.png'),
 			title,
 			emitStats: true,
 			statsFilename: 'favicons-stats.json',
-			// Inject the html into the html-webpack-plugin
+			// Inject generated html into html-webpack-plugin
 			inject: false,
 			// which icons should be generated (see https://github.com/haydenbleasel/favicons#usage)
 			icons: {
-				android: true,
-				appleIcon: true,
-				appleStartup: true,
-				coast: false,
-				favicons: true,
-				firefox: true,
-				opengraph: false,
-				twitter: true,
-				yandex: false,
-				windows: true
+				// android: true,
+				// appleIcon: true,
+				// appleStartup: true,
+				// coast: false,
+				// favicons: true,
+				// firefox: true,
+				// opengraph: false,
+				// twitter: true,
+				// yandex: false,
+				// windows: true
 			}
 		}),
 		new WebpackAssetsManifest({

diff --git a/webpack_config/client/webpack.dev.babel.js b/webpack_config/client/webpack.dev.babel.js
@@ -43,8 +43,8 @@ baseWebpackConfig.entry.client = [
 
 // add dev plugins
 baseWebpackConfig.plugins.push(
-	new webpack.HotModuleReplacementPlugin(),
 	new WriteFilePlugin(),
+	new webpack.HotModuleReplacementPlugin(),
 	new AutoDllPlugin({
 		debug: true,
 		filename,

diff --git a/webpack_config/client/webpack.prod.babel.js b/webpack_config/client/webpack.prod.babel.js
@@ -2,15 +2,13 @@ import webpack from 'webpack'
 import ExtractTextPlugin from 'extract-text-webpack-plugin'
 import CompressionPlugin from 'compression-webpack-plugin'
 import OptimizeCssAssetsPlugin from 'optimize-css-assets-webpack-plugin'
-import AutoDllPlugin from 'autodll-webpack-plugin'
 import ProgressPlugin from 'webpack/lib/ProgressPlugin'
 import OfflinePlugin from 'offline-plugin'
 import UglifyJSPlugin from 'uglifyjs-webpack-plugin'
 import {Plugin as ShakePlugin} from 'webpack-common-shake'
 import OptimizeJsPlugin from 'optimize-js-plugin'
 // import git from 'git-rev-sync'
 // import _ from 'lodash'
-import path from 'path'
 // NOTE: WebpackShellPlugin allows you to run custom shell commands before and after build
 // import WebpackShellPlugin from 'webpack-shell-plugin'
 import {BundleAnalyzerPlugin} from 'webpack-bundle-analyzer'