merge

build/utils.js

@@ -18,8 +18,7 @@ exports.cssLoaders = function (options) {
   const cssLoader = {
     loader: 'css-loader',
     options: {
-      sourceMap: options.sourceMap,
-      url: false
+      sourceMap: options.sourceMap
     }
   }
 

build/webpack.base.conf.js

@@ -55,37 +55,36 @@ module.exports = {
         use: ["thread-loader",'babel-loader'],
         exclude: /NIM_Web_SDK_v5.0.0.js/,
         include: [resolve('src'), resolve('test')]
-      },
-      {
+      },{
         test: /\.(png|jpe?g|gif|svg)(\?.*)?$/,
-        loader: 'url-loader',
-        options: {
-          limit: 10000,
-          name: utils.assetsPath('img/[name].[hash:7].[ext]')
-        }
+        type: "asset",
+        generator: {
+          
+          filename: utils.assetsPath('img/[name].[hash:7].[ext]')
+        },
       },
       {
         test: /\.(mp4|webm|ogg|mp3|wav|flac|aac)(\?.*)?$/,
-        loader: 'url-loader',
-        options: {
-          limit: 10000,
-          name: utils.assetsPath('media/[name].[hash:7].[ext]')
-        }
+        type: "asset",
+        generator: {
+          
+          filename: utils.assetsPath('media/[name].[hash:7].[ext]')
+        },
       },
       {
         test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/,
-        loader: 'url-loader',
-        options: {
-          limit: 10000,
-          name: utils.assetsPath('fonts/[name].[hash:7].[ext]')
-        }
+        type: "asset",
+        generator: {
+          
+          filename: utils.assetsPath('fonts/[name].[hash:7].[ext]')
+        },
       },
       {
         test: /\.(mp3)(\?.*)?$/,
-        loader: 'url-loader',
-        options: {
-          name: utils.assetsPath('assets/[name].[hash:7].[ext]')
-        }
+        type: "asset",
+        generator: {
+          filename: utils.assetsPath('assets/[name].[hash:7].[ext]')
+        },
       }     
       
     ]

build/webpack.dev.conf.js

@@ -81,34 +81,31 @@ resolve: {
     },
     {
       test: /\.(png|jpe?g|gif|svg)(\?.*)?$/,
-      loader: 'url-loader',
-      options: {
-        limit: 10000,
-        name: utils.assetsPath('img/[name].[hash:7].[ext]')
-      }
+      type: "asset",
+      generator: {
+        filename: utils.assetsPath('img/[name].[hash:10][ext]')
+      },
     },
     {
       test: /\.(mp4|webm|ogg|mp3|wav|flac|aac)(\?.*)?$/,
-      loader: 'url-loader',
-      options: {
-        limit: 10000,
-        name: utils.assetsPath('media/[name].[hash:7].[ext]')
-      }
+      type: "asset",
+      generator: {
+        filename: utils.assetsPath('media/[name].[hash:7].[ext]')
+      },
     },
     {
       test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/,
-      loader: 'url-loader',
-      options: {
-        limit: 10000,
-        name: utils.assetsPath('fonts/[name].[hash:7].[ext]')
-      }
+      type: "asset",
+      generator: {
+        filename: utils.assetsPath('fonts/[name].[hash:7].[ext]')
+      },
     },
     {
       test: /\.(mp3)(\?.*)?$/,
-      loader: 'url-loader',
-      options: {
-        name: utils.assetsPath('assets/[name].[hash:7].[ext]')
-      }
+      type: "asset",
+      generator: {
+        filename: utils.assetsPath('assets/[name].[hash:7].[ext]')
+      },
     }
   ]
   },
@@ -160,11 +157,10 @@ resolve: {
       {
         from: path.resolve(__dirname, '../static'),
         to: config.dev.assetsSubDirectory,
+      globOptions: {
+        ignore: ['.*']
+      },
       },
-      {
-        from: path.resolve(__dirname, '../static'),
-        to: config.dev.assetsSubDirectory,
-      }
     ]})
   ]
 }

build/webpack.prod.conf.js

@@ -11,6 +11,7 @@ const HtmlWebpackPlugin = require('html-webpack-plugin')
 const CssMinimizerPlugin = require("css-minimizer-webpack-plugin");
 // const OptimizeCSSPlugin = require('optimize-css-assets-webpack-plugin')
 // const UglifyJsPlugin = require('uglifyjs-webpack-plugin')
+// const {VueLoaderPlugin} = require('vue-loader')
 
 const env = require('../config/prod.env')
 const version = new Date().getTime();
@@ -41,6 +42,7 @@ const webpackConfig = merge(baseWebpackConfig, {
     new webpack.DefinePlugin({
       'process.env': env
     }),
+    // new VueLoaderPlugin(),
     // new UglifyJsPlugin({
     //   uglifyOptions: {
     //     compress: {
@@ -114,7 +116,10 @@ const webpackConfig = merge(baseWebpackConfig, {
     new CopyWebpackPlugin({patterns:[
       {
         from: path.resolve(__dirname, '../static'),
-        to: config.dev.assetsSubDirectory
+        to: config.dev.assetsSubDirectory,
+      globOptions: {
+        ignore: ['.*']
+      },
       }
     ]})
   ]

package.json

@@ -106,7 +106,7 @@
     "timers-browserify": "^2.0.12",
     "url-loader": "^4.1.1",
     "vue-easytable": "^1.7.2",
-    "vue-loader": "^14.2.3",
+    "vue-loader": "^14.2.4",
     "vue-router": "^3.0.1",
     "vue-style-loader": "^4.1.3",
     "vue-template-compiler": "^2.5.2",

src/App.vue

@@ -192,7 +192,7 @@
   @import "//at.alicdn.com/t/font_635492_wcd7pw1105.css";
   @import "./assets/css/Semibold.css";
   @import "./assets/css/global/config.css";
-  @import "./assets/css/fileIcon.css";
+  /* @import "./assets/css/fileIcon.css"; */
 
   /* html,body{height: 100%; min-width: 1366px; } */
   html,