From a14a94cbef70581369e45d3ad92e61dbdc082f0a Mon Sep 17 00:00:00 2001
From: "gaoyang.lamb" <gaoyang.lamb@bytedance.com>
Date: Tue, 4 Aug 2020 12:16:07 +0800
Subject: [PATCH] feat: config img-opttimize-loader

---
 package.json           |  2 +-
 webpack.config.prod.js | 13 +------------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/package.json b/package.json
index e307ecb..77ecebe 100755
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
 		"exif-js": "^2.3.0",
 		"font-awesome": "^4.7.0",
 		"hammerjs": "^2.0.8",
-		"img-optimize-loader": "^1.0.6",
+		"img-optimize-loader": "^1.0.7",
 		"inputmask": "^5.0.3",
 		"jquery": "^3.5.1",
 		"jquery-hammerjs": "^2.0.0",
diff --git a/webpack.config.prod.js b/webpack.config.prod.js
index 1abc75c..0b7f56d 100755
--- a/webpack.config.prod.js
+++ b/webpack.config.prod.js
@@ -274,12 +274,10 @@ module.exports = merge(common, {
           },
         ],
       },
-      /*{
+      {
         test: /\.(png|webp|jpg|jpeg|gif|svg)$/,
         loader: 'img-optimize-loader',
         options: {
-          //name: '[path][name].[ext]', //'[path][name]-[contenthash].[ext]'
-          name: conf['webp'] ? '[path][name].webp' : '[path][name].[ext]',
           outputPath: 'img/',
           publicPath: '../img/',
           compress: {
@@ -292,15 +290,6 @@ module.exports = merge(common, {
             limit: 1,
           },
         },
-      },*/
-      {
-        test: /\.(png|webp|jpg|jpeg|gif|svg)$/,
-        loader: 'file-loader',
-        options: {
-          name: conf['webp'] ? '[name].webp' : '[name].[ext]',
-          outputPath: 'img/',
-          publicPath: '../img/',
-        },
       },
     ],
   },