diff --git a/package.json b/package.json index 23cbf612..962b2dc9 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,6 @@ "sass-loader": "^7.1.0", "svg-sprite-loader": "^4.1.6", "text-loader": "0.0.1", - "uglifyjs-webpack-plugin": "^2.1.3", "vue-cli-plugin-i18n": "^0.6.0", "vue-template-compiler": "^2.6.10", "webpack-theme-color-replacer": "^1.2.5" diff --git a/vue.config.js b/vue.config.js index 1e8f91f5..0378b75f 100644 --- a/vue.config.js +++ b/vue.config.js @@ -1,4 +1,3 @@ -const UglifyJsPlugin = require('uglifyjs-webpack-plugin') const VueFilenameInjector = require('./tools/vue-filename-injector') const ThemeColorReplacer = require('webpack-theme-color-replacer') @@ -29,21 +28,14 @@ module.exports = { } } }, - // node_modules 需要babel成es5的包 - transpileDependencies: [ - 'webpack-theme-color-replacer' - ], - configureWebpack: { - plugins: [ - new ThemeColorReplacer({ - fileName: 'css/theme-colors.[contenthash:8].css', - matchColors: [ - ...forElementUI.getElementUISeries(process.env.VUE_APP_ELEMENT_COLOR) // Element-ui主色系列 - ], - externalCssFiles: [ './node_modules/element-ui/lib/theme-chalk/index.css' ], // optional, String or string array. Set external css files (such as cdn css) to extract colors. - changeSelector: forElementUI.changeSelector - }) - ] + configureWebpack: config => { + // 非开发环境 + if (process.env.NODE_ENV !== 'development') { + config.optimization.minimizer[0].options.terserOptions.compress.warnings = false + config.optimization.minimizer[0].options.terserOptions.compress.drop_console = true + config.optimization.minimizer[0].options.terserOptions.compress.drop_debugger = true + config.optimization.minimizer[0].options.terserOptions.compress.pure_funcs = ['console.log'] + } }, // 默认设置: https://github.com/vuejs/vue-cli/tree/dev/packages/%40vue/cli-service/lib/config/base.js chainWebpack: config => { @@ -59,6 +51,16 @@ module.exports = { // 解决 cli3 热更新失效 https://github.com/vuejs/vue-cli/issues/1559 config.resolve .symlinks(true) + config + .plugin('theme-color-replacer') + .use(ThemeColorReplacer, [{ + fileName: 'css/theme-colors.[contenthash:8].css', + matchColors: [ + ...forElementUI.getElementUISeries(process.env.VUE_APP_ELEMENT_COLOR) // Element-ui主色系列 + ], + externalCssFiles: [ './node_modules/element-ui/lib/theme-chalk/index.css' ], // optional, String or string array. Set external css files (such as cdn css) to extract colors. + changeSelector: forElementUI.changeSelector + }]) config // 开发环境 .when(process.env.NODE_ENV === 'development', @@ -71,23 +73,6 @@ module.exports = { propName: process.env.VUE_APP_SOURCE_VIEWER_PROP_NAME }) ) - // 非开发环境 - .when(process.env.NODE_ENV !== 'development', config => { - config.optimization - .minimizer([ - new UglifyJsPlugin({ - uglifyOptions: { - // 移除 console - // 其它优化选项 https://segmentfault.com/a/1190000010874406 - compress: { - drop_console: true, - drop_debugger: true, - pure_funcs: ['console.log'] - } - } - }) - ]) - }) // markdown config.module .rule('md') diff --git a/yarn.lock.REMOVED.git-id b/yarn.lock.REMOVED.git-id index 048f4d17..43e8d30a 100644 --- a/yarn.lock.REMOVED.git-id +++ b/yarn.lock.REMOVED.git-id @@ -1 +1 @@ -b90ddad21ccad6e1a280693fba504af4a91c6fd3 \ No newline at end of file +166cefa60c1a43bece188f7803ae15ee9b265caf \ No newline at end of file