张恒

使用del模块去删除原打包遗留文件不再使用clean-plugin,解决当某些极端情况下导致文件丢失

...@@ -23,7 +23,7 @@ else if (process.env.BUILD_TARGET === 'web') web() ...@@ -23,7 +23,7 @@ else if (process.env.BUILD_TARGET === 'web') web()
23 else build() 23 else build()
24 24
25 function clean () { 25 function clean () {
26 - del.sync(['build/*', '!build/icons','!build/lib','!build/lib/electron-build.*', '!build/icons/icon.*']) 26 + del.sync(['dist/electron/*','build/*', '!build/icons','!build/lib','!build/lib/electron-build.*', '!build/icons/icon.*'])
27 console.log(`\n${doneLog}clear done`) 27 console.log(`\n${doneLog}clear done`)
28 process.exit() 28 process.exit()
29 } 29 }
......
...@@ -7,7 +7,6 @@ const path = require('path') ...@@ -7,7 +7,6 @@ const path = require('path')
7 const { dependencies } = require('../package.json') 7 const { dependencies } = require('../package.json')
8 const webpack = require('webpack') 8 const webpack = require('webpack')
9 const MinifyPlugin = require("babel-minify-webpack-plugin"); 9 const MinifyPlugin = require("babel-minify-webpack-plugin");
10 -const { CleanWebpackPlugin } = require('clean-webpack-plugin')
11 const HappyPack = require('happypack') 10 const HappyPack = require('happypack')
12 const HappyThreadPool = HappyPack.ThreadPool({ size: os.cpus().length }) 11 const HappyThreadPool = HappyPack.ThreadPool({ size: os.cpus().length })
13 12
...@@ -57,9 +56,6 @@ let mainConfig = { ...@@ -57,9 +56,6 @@ let mainConfig = {
57 }, 56 },
58 plugins: [ 57 plugins: [
59 new webpack.NoEmitOnErrorsPlugin(), 58 new webpack.NoEmitOnErrorsPlugin(),
60 - new CleanWebpackPlugin({
61 - cleanOnceBeforeBuildPatterns: resolve('dist/electron')
62 - }),
63 new HappyPack({ 59 new HappyPack({
64 id: "MainHappyBabel", 60 id: "MainHappyBabel",
65 loaders: [{ 61 loaders: [{
......
...@@ -2905,12 +2905,6 @@ ...@@ -2905,12 +2905,6 @@
2905 "defer-to-connect": "^1.0.1" 2905 "defer-to-connect": "^1.0.1"
2906 } 2906 }
2907 }, 2907 },
2908 - "@types/anymatch": {
2909 - "version": "1.3.1",
2910 - "resolved": "https://registry.npm.taobao.org/@types/anymatch/download/@types/anymatch-1.3.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fanymatch%2Fdownload%2F%40types%2Fanymatch-1.3.1.tgz",
2911 - "integrity": "sha1-M2utwb7sudrMOL6izzKt9ieoQho=",
2912 - "dev": true
2913 - },
2914 "@types/color-name": { 2908 "@types/color-name": {
2915 "version": "1.1.1", 2909 "version": "1.1.1",
2916 "resolved": "https://registry.npm.taobao.org/@types/color-name/download/@types/color-name-1.1.1.tgz?cache=0&sync_timestamp=1572460951965&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fcolor-name%2Fdownload%2F%40types%2Fcolor-name-1.1.1.tgz", 2910 "resolved": "https://registry.npm.taobao.org/@types/color-name/download/@types/color-name-1.1.1.tgz?cache=0&sync_timestamp=1572460951965&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fcolor-name%2Fdownload%2F%40types%2Fcolor-name-1.1.1.tgz",
...@@ -2968,76 +2962,6 @@ ...@@ -2968,76 +2962,6 @@
2968 "@types/node": "*" 2962 "@types/node": "*"
2969 } 2963 }
2970 }, 2964 },
2971 - "@types/source-list-map": {
2972 - "version": "0.1.2",
2973 - "resolved": "https://registry.npm.taobao.org/@types/source-list-map/download/@types/source-list-map-0.1.2.tgz",
2974 - "integrity": "sha1-AHiDYGP/rxdBI0m7o2QIfgrALsk=",
2975 - "dev": true
2976 - },
2977 - "@types/tapable": {
2978 - "version": "1.0.4",
2979 - "resolved": "https://registry.npm.taobao.org/@types/tapable/download/@types/tapable-1.0.4.tgz",
2980 - "integrity": "sha1-tP/H3Je0mMlps2CkHu4kf4JhY3A=",
2981 - "dev": true
2982 - },
2983 - "@types/uglify-js": {
2984 - "version": "3.0.4",
2985 - "resolved": "https://registry.npm.taobao.org/@types/uglify-js/download/@types/uglify-js-3.0.4.tgz",
2986 - "integrity": "sha1-lr6uI99vVhhiqDC0KIpJ6GuqwII=",
2987 - "dev": true,
2988 - "requires": {
2989 - "source-map": "^0.6.1"
2990 - },
2991 - "dependencies": {
2992 - "source-map": {
2993 - "version": "0.6.1",
2994 - "resolved": "https://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz",
2995 - "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
2996 - "dev": true
2997 - }
2998 - }
2999 - },
3000 - "@types/webpack": {
3001 - "version": "4.41.0",
3002 - "resolved": "https://registry.npm.taobao.org/@types/webpack/download/@types/webpack-4.41.0.tgz",
3003 - "integrity": "sha1-uBOgRNiw3sffzXYi/b4ye94G65o=",
3004 - "dev": true,
3005 - "requires": {
3006 - "@types/anymatch": "*",
3007 - "@types/node": "*",
3008 - "@types/tapable": "*",
3009 - "@types/uglify-js": "*",
3010 - "@types/webpack-sources": "*",
3011 - "source-map": "^0.6.0"
3012 - },
3013 - "dependencies": {
3014 - "source-map": {
3015 - "version": "0.6.1",
3016 - "resolved": "https://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz",
3017 - "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
3018 - "dev": true
3019 - }
3020 - }
3021 - },
3022 - "@types/webpack-sources": {
3023 - "version": "0.1.5",
3024 - "resolved": "https://registry.npm.taobao.org/@types/webpack-sources/download/@types/webpack-sources-0.1.5.tgz",
3025 - "integrity": "sha1-vkfBD3g9PW7+FHH/fwQmEb1GSpI=",
3026 - "dev": true,
3027 - "requires": {
3028 - "@types/node": "*",
3029 - "@types/source-list-map": "*",
3030 - "source-map": "^0.6.1"
3031 - },
3032 - "dependencies": {
3033 - "source-map": {
3034 - "version": "0.6.1",
3035 - "resolved": "https://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz",
3036 - "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
3037 - "dev": true
3038 - }
3039 - }
3040 - },
3041 "@types/yargs": { 2965 "@types/yargs": {
3042 "version": "15.0.4", 2966 "version": "15.0.4",
3043 "resolved": "https://registry.npm.taobao.org/@types/yargs/download/@types/yargs-15.0.4.tgz?cache=0&sync_timestamp=1582662949167&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fyargs%2Fdownload%2F%40types%2Fyargs-15.0.4.tgz", 2967 "resolved": "https://registry.npm.taobao.org/@types/yargs/download/@types/yargs-15.0.4.tgz?cache=0&sync_timestamp=1582662949167&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fyargs%2Fdownload%2F%40types%2Fyargs-15.0.4.tgz",
...@@ -5406,39 +5330,6 @@ ...@@ -5406,39 +5330,6 @@
5406 "integrity": "sha1-7oRy27Ep5yezHooQpCfe6d/kAIs=", 5330 "integrity": "sha1-7oRy27Ep5yezHooQpCfe6d/kAIs=",
5407 "dev": true 5331 "dev": true
5408 }, 5332 },
5409 - "clean-webpack-plugin": {
5410 - "version": "3.0.0",
5411 - "resolved": "https://registry.npm.taobao.org/clean-webpack-plugin/download/clean-webpack-plugin-3.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fclean-webpack-plugin%2Fdownload%2Fclean-webpack-plugin-3.0.0.tgz",
5412 - "integrity": "sha1-qZ2Ow0wcYopFQVZ6p7RXRGRgxis=",
5413 - "dev": true,
5414 - "requires": {
5415 - "@types/webpack": "^4.4.31",
5416 - "del": "^4.1.1"
5417 - },
5418 - "dependencies": {
5419 - "del": {
5420 - "version": "4.1.1",
5421 - "resolved": "https://registry.npm.taobao.org/del/download/del-4.1.1.tgz",
5422 - "integrity": "sha1-no8RciLqRKMf86FWwEm5kFKp8LQ=",
5423 - "dev": true,
5424 - "requires": {
5425 - "@types/glob": "^7.1.1",
5426 - "globby": "^6.1.0",
5427 - "is-path-cwd": "^2.0.0",
5428 - "is-path-in-cwd": "^2.0.0",
5429 - "p-map": "^2.0.0",
5430 - "pify": "^4.0.1",
5431 - "rimraf": "^2.6.3"
5432 - }
5433 - },
5434 - "pify": {
5435 - "version": "4.0.1",
5436 - "resolved": "https://registry.npm.taobao.org/pify/download/pify-4.0.1.tgz",
5437 - "integrity": "sha1-SyzSXFDVmHNcUCkiJP2MbfQeMjE=",
5438 - "dev": true
5439 - }
5440 - }
5441 - },
5442 "cli-boxes": { 5333 "cli-boxes": {
5443 "version": "2.2.0", 5334 "version": "2.2.0",
5444 "resolved": "https://registry.npm.taobao.org/cli-boxes/download/cli-boxes-2.2.0.tgz", 5335 "resolved": "https://registry.npm.taobao.org/cli-boxes/download/cli-boxes-2.2.0.tgz",
...@@ -15768,7 +15659,7 @@ ...@@ -15768,7 +15659,7 @@
15768 }, 15659 },
15769 "universalify": { 15660 "universalify": {
15770 "version": "0.1.2", 15661 "version": "0.1.2",
15771 - "resolved": "https://registry.npm.taobao.org/universalify/download/universalify-0.1.2.tgz?cache=0&sync_timestamp=1583530825899&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Funiversalify%2Fdownload%2Funiversalify-0.1.2.tgz", 15662 + "resolved": "https://registry.npm.taobao.org/universalify/download/universalify-0.1.2.tgz",
15772 "integrity": "sha1-tkb2m+OULavOzJ1mOcgNwQXvqmY=" 15663 "integrity": "sha1-tkb2m+OULavOzJ1mOcgNwQXvqmY="
15773 }, 15664 },
15774 "unpipe": { 15665 "unpipe": {
......
...@@ -6,12 +6,12 @@ ...@@ -6,12 +6,12 @@
6 "license": "MIT", 6 "license": "MIT",
7 "main": "./dist/electron/main.js", 7 "main": "./dist/electron/main.js",
8 "scripts": { 8 "scripts": {
9 - "dev": "node .electron-vue/dev-runner.js", 9 + "dev": "cross-env BUILD_TARGET=clean node .electron-vue/build.js && node .electron-vue/dev-runner.js",
10 - "build": "node .electron-vue/build.js && electron-builder", 10 + "build": "cross-env BUILD_TARGET=clean node .electron-vue/build.js && node .electron-vue/build.js && electron-builder",
11 - "build:win32": "node .electron-vue/build.js && electron-builder --win --ia32", 11 + "build:win32": "cross-env BUILD_TARGET=clean node .electron-vue/build.js && node .electron-vue/build.js && electron-builder --win --ia32",
12 - "build:win64": "node .electron-vue/build.js && electron-builder --win --x64", 12 + "build:win64": "cross-env BUILD_TARGET=clean node .electron-vue/build.js && node .electron-vue/build.js && electron-builder --win --x64",
13 - "build:mac": "node .electron-vue/build.js && electron-builder --mac", 13 + "build:mac": "cross-env BUILD_TARGET=clean node .electron-vue/build.js && node .electron-vue/build.js && electron-builder --mac",
14 - "build:dir": "node .electron-vue/build.js && electron-builder --dir", 14 + "build:dir": "cross-env BUILD_TARGET=clean node .electron-vue/build.js && node .electron-vue/build.js && electron-builder --dir",
15 "build:clean": "cross-env BUILD_TARGET=clean node .electron-vue/build.js", 15 "build:clean": "cross-env BUILD_TARGET=clean node .electron-vue/build.js",
16 "build:web": "cross-env BUILD_TARGET=web node .electron-vue/build.js", 16 "build:web": "cross-env BUILD_TARGET=web node .electron-vue/build.js",
17 "pack": "npm run pack:main && npm run pack:renderer", 17 "pack": "npm run pack:main && npm run pack:renderer",
...@@ -114,7 +114,6 @@ ...@@ -114,7 +114,6 @@
114 "babel-minify-webpack-plugin": "^0.3.1", 114 "babel-minify-webpack-plugin": "^0.3.1",
115 "cfonts": "^2.8.1", 115 "cfonts": "^2.8.1",
116 "chalk": "^3.0.0", 116 "chalk": "^3.0.0",
117 - "clean-webpack-plugin": "^3.0.0",
118 "copy-webpack-plugin": "^5.1.1", 117 "copy-webpack-plugin": "^5.1.1",
119 "cross-env": "^7.0.2", 118 "cross-env": "^7.0.2",
120 "css-loader": "^3.4.2", 119 "css-loader": "^3.4.2",
......