umbrella22

将happypack修改为thread-loader,并去除win打包默认打包全平台包

...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
13 "build:mac": "cross-env BUILD_TARGET=clean node .electron-vue/build.js && 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": "cross-env BUILD_TARGET=clean node .electron-vue/build.js && 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 ENV_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",
18 "pack:main": "cross-env NODE_ENV=production webpack --progress --colors --config .electron-vue/webpack.main.config.js", 18 "pack:main": "cross-env NODE_ENV=production webpack --progress --colors --config .electron-vue/webpack.main.config.js",
19 "pack:renderer": "cross-env NODE_ENV=production webpack --progress --colors --config .electron-vue/webpack.renderer.config.js", 19 "pack:renderer": "cross-env NODE_ENV=production webpack --progress --colors --config .electron-vue/webpack.renderer.config.js",
...@@ -56,15 +56,7 @@ ...@@ -56,15 +56,7 @@
56 }, 56 },
57 "win": { 57 "win": {
58 "icon": "build/icons/icon.ico", 58 "icon": "build/icons/icon.ico",
59 - "target": [ 59 + "target": "nsis"
60 - {
61 - "target": "nsis",
62 - "arch": [
63 - "x64",
64 - "ia32"
65 - ]
66 - }
67 - ]
68 }, 60 },
69 "linux": { 61 "linux": {
70 "target": "deb", 62 "target": "deb",
...@@ -133,7 +125,6 @@ ...@@ -133,7 +125,6 @@
133 "eslint-plugin-promise": "^4.2.1", 125 "eslint-plugin-promise": "^4.2.1",
134 "eslint-plugin-standard": "^4.0.0", 126 "eslint-plugin-standard": "^4.0.0",
135 "file-loader": "^6.1.0", 127 "file-loader": "^6.1.0",
136 - "happypack": "^5.0.1",
137 "html-webpack-plugin": "^4.4.1", 128 "html-webpack-plugin": "^4.4.1",
138 "mini-css-extract-plugin": "0.11.1", 129 "mini-css-extract-plugin": "0.11.1",
139 "multispinner": "^0.2.1", 130 "multispinner": "^0.2.1",
...@@ -145,6 +136,7 @@ ...@@ -145,6 +136,7 @@
145 "style-loader": "^1.2.1", 136 "style-loader": "^1.2.1",
146 "svg-sprite-loader": "^5.0.0", 137 "svg-sprite-loader": "^5.0.0",
147 "terser-webpack-plugin": "^4.1.0", 138 "terser-webpack-plugin": "^4.1.0",
139 + "thread-loader": "^2.1.3",
148 "through2-filter": "^3.0.0", 140 "through2-filter": "^3.0.0",
149 "ts-loader": "^8.0.3", 141 "ts-loader": "^8.0.3",
150 "typescript": "^4.0.2", 142 "typescript": "^4.0.2",
......
...@@ -1801,11 +1801,6 @@ async@0.9.x: ...@@ -1801,11 +1801,6 @@ async@0.9.x:
1801 resolved "https://registry.npm.taobao.org/async/download/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d" 1801 resolved "https://registry.npm.taobao.org/async/download/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d"
1802 integrity sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0= 1802 integrity sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=
1803 1803
1804 -async@1.5.0:
1805 - version "1.5.0"
1806 - resolved "https://registry.npm.taobao.org/async/download/async-1.5.0.tgz#2796642723573859565633fc6274444bee2f8ce3"
1807 - integrity sha1-J5ZkJyNXOFlWVjP8YnRES+4vjOM=
1808 -
1809 async@^2.6.2: 1804 async@^2.6.2:
1810 version "2.6.3" 1805 version "2.6.3"
1811 resolved "https://registry.npm.taobao.org/async/download/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff" 1806 resolved "https://registry.npm.taobao.org/async/download/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
...@@ -4847,16 +4842,6 @@ handle-thing@^2.0.0: ...@@ -4847,16 +4842,6 @@ handle-thing@^2.0.0:
4847 resolved "https://registry.npm.taobao.org/handle-thing/download/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e" 4842 resolved "https://registry.npm.taobao.org/handle-thing/download/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e"
4848 integrity sha1-hX95zjWVgMNA1DCBzGSJcNC7I04= 4843 integrity sha1-hX95zjWVgMNA1DCBzGSJcNC7I04=
4849 4844
4850 -happypack@^5.0.1:
4851 - version "5.0.1"
4852 - resolved "https://registry.npm.taobao.org/happypack/download/happypack-5.0.1.tgz#850839426d6205a520bf913e962349fbe523a07c"
4853 - integrity sha1-hQg5Qm1iBaUgv5E+liNJ++UjoHw=
4854 - dependencies:
4855 - async "1.5.0"
4856 - json-stringify-safe "5.0.1"
4857 - loader-utils "1.1.0"
4858 - serialize-error "^2.1.0"
4859 -
4860 has-ansi@^2.0.0: 4845 has-ansi@^2.0.0:
4861 version "2.0.0" 4846 version "2.0.0"
4862 resolved "https://registry.npm.taobao.org/has-ansi/download/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" 4847 resolved "https://registry.npm.taobao.org/has-ansi/download/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
...@@ -5728,7 +5713,7 @@ json-stable-stringify-without-jsonify@^1.0.1: ...@@ -5728,7 +5713,7 @@ json-stable-stringify-without-jsonify@^1.0.1:
5728 resolved "https://registry.npm.taobao.org/json-stable-stringify-without-jsonify/download/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" 5713 resolved "https://registry.npm.taobao.org/json-stable-stringify-without-jsonify/download/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
5729 integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE= 5714 integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
5730 5715
5731 -json-stringify-safe@5.0.1, json-stringify-safe@^5.0.1: 5716 +json-stringify-safe@^5.0.1:
5732 version "5.0.1" 5717 version "5.0.1"
5733 resolved "https://registry.npm.taobao.org/json-stringify-safe/download/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" 5718 resolved "https://registry.npm.taobao.org/json-stringify-safe/download/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
5734 integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= 5719 integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
...@@ -5893,20 +5878,11 @@ loader-fs-cache@^1.0.3: ...@@ -5893,20 +5878,11 @@ loader-fs-cache@^1.0.3:
5893 find-cache-dir "^0.1.1" 5878 find-cache-dir "^0.1.1"
5894 mkdirp "^0.5.1" 5879 mkdirp "^0.5.1"
5895 5880
5896 -loader-runner@^2.4.0: 5881 +loader-runner@^2.3.1, loader-runner@^2.4.0:
5897 version "2.4.0" 5882 version "2.4.0"
5898 resolved "https://registry.npm.taobao.org/loader-runner/download/loader-runner-2.4.0.tgz?cache=0&sync_timestamp=1593786203786&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Floader-runner%2Fdownload%2Floader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357" 5883 resolved "https://registry.npm.taobao.org/loader-runner/download/loader-runner-2.4.0.tgz?cache=0&sync_timestamp=1593786203786&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Floader-runner%2Fdownload%2Floader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357"
5899 integrity sha1-7UcGa/5TTX6ExMe5mYwqdWB9k1c= 5884 integrity sha1-7UcGa/5TTX6ExMe5mYwqdWB9k1c=
5900 5885
5901 -loader-utils@1.1.0:
5902 - version "1.1.0"
5903 - resolved "https://registry.npm.taobao.org/loader-utils/download/loader-utils-1.1.0.tgz?cache=0&sync_timestamp=1584445207623&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Floader-utils%2Fdownload%2Floader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
5904 - integrity sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=
5905 - dependencies:
5906 - big.js "^3.1.3"
5907 - emojis-list "^2.0.0"
5908 - json5 "^0.5.0"
5909 -
5910 loader-utils@^0.2.16: 5886 loader-utils@^0.2.16:
5911 version "0.2.17" 5887 version "0.2.17"
5912 resolved "https://registry.npm.taobao.org/loader-utils/download/loader-utils-0.2.17.tgz?cache=0&sync_timestamp=1584445207623&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Floader-utils%2Fdownload%2Floader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348" 5888 resolved "https://registry.npm.taobao.org/loader-utils/download/loader-utils-0.2.17.tgz?cache=0&sync_timestamp=1584445207623&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Floader-utils%2Fdownload%2Floader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348"
...@@ -6596,7 +6572,7 @@ neo-async@^2.5.0, neo-async@^2.6.1: ...@@ -6596,7 +6572,7 @@ neo-async@^2.5.0, neo-async@^2.6.1:
6596 resolved "https://registry.npm.taobao.org/neo-async/download/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c" 6572 resolved "https://registry.npm.taobao.org/neo-async/download/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c"
6597 integrity sha1-rCetpmFn+ohJpq3dg39rGJrSCBw= 6573 integrity sha1-rCetpmFn+ohJpq3dg39rGJrSCBw=
6598 6574
6599 -neo-async@^2.6.2: 6575 +neo-async@^2.6.0, neo-async@^2.6.2:
6600 version "2.6.2" 6576 version "2.6.2"
6601 resolved "https://registry.npm.taobao.org/neo-async/download/neo-async-2.6.2.tgz?cache=0&sync_timestamp=1594317447342&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fneo-async%2Fdownload%2Fneo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" 6577 resolved "https://registry.npm.taobao.org/neo-async/download/neo-async-2.6.2.tgz?cache=0&sync_timestamp=1594317447342&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fneo-async%2Fdownload%2Fneo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
6602 integrity sha1-tKr7k+OustgXTKU88WOrfXMIMF8= 6578 integrity sha1-tKr7k+OustgXTKU88WOrfXMIMF8=
...@@ -8097,11 +8073,6 @@ sentence-case@^2.1.0: ...@@ -8097,11 +8073,6 @@ sentence-case@^2.1.0:
8097 no-case "^2.2.0" 8073 no-case "^2.2.0"
8098 upper-case-first "^1.1.2" 8074 upper-case-first "^1.1.2"
8099 8075
8100 -serialize-error@^2.1.0:
8101 - version "2.1.0"
8102 - resolved "https://registry.npm.taobao.org/serialize-error/download/serialize-error-2.1.0.tgz?cache=0&sync_timestamp=1589279833260&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fserialize-error%2Fdownload%2Fserialize-error-2.1.0.tgz#50b679d5635cdf84667bdc8e59af4e5b81d5f60a"
8103 - integrity sha1-ULZ51WNc34Rme9yOWa9OW4HV9go=
8104 -
8105 serialize-error@^7.0.1: 8076 serialize-error@^7.0.1:
8106 version "7.0.1" 8077 version "7.0.1"
8107 resolved "https://registry.npm.taobao.org/serialize-error/download/serialize-error-7.0.1.tgz?cache=0&sync_timestamp=1589279833260&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fserialize-error%2Fdownload%2Fserialize-error-7.0.1.tgz#f1360b0447f61ffb483ec4157c737fab7d778e18" 8078 resolved "https://registry.npm.taobao.org/serialize-error/download/serialize-error-7.0.1.tgz?cache=0&sync_timestamp=1589279833260&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fserialize-error%2Fdownload%2Fserialize-error-7.0.1.tgz#f1360b0447f61ffb483ec4157c737fab7d778e18"
...@@ -8797,6 +8768,15 @@ text-table@^0.2.0: ...@@ -8797,6 +8768,15 @@ text-table@^0.2.0:
8797 resolved "https://registry.npm.taobao.org/text-table/download/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" 8768 resolved "https://registry.npm.taobao.org/text-table/download/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
8798 integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= 8769 integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
8799 8770
8771 +thread-loader@^2.1.3:
8772 + version "2.1.3"
8773 + resolved "https://registry.npm.taobao.org/thread-loader/download/thread-loader-2.1.3.tgz#cbd2c139fc2b2de6e9d28f62286ab770c1acbdda"
8774 + integrity sha1-y9LBOfwrLebp0o9iKGq3cMGsvdo=
8775 + dependencies:
8776 + loader-runner "^2.3.1"
8777 + loader-utils "^1.1.0"
8778 + neo-async "^2.6.0"
8779 +
8800 throttle-debounce@^1.0.1: 8780 throttle-debounce@^1.0.1:
8801 version "1.1.0" 8781 version "1.1.0"
8802 resolved "https://registry.npm.taobao.org/throttle-debounce/download/throttle-debounce-1.1.0.tgz?cache=0&sync_timestamp=1591627175939&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fthrottle-debounce%2Fdownload%2Fthrottle-debounce-1.1.0.tgz#51853da37be68a155cb6e827b3514a3c422e89cd" 8782 resolved "https://registry.npm.taobao.org/throttle-debounce/download/throttle-debounce-1.1.0.tgz?cache=0&sync_timestamp=1591627175939&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fthrottle-debounce%2Fdownload%2Fthrottle-debounce-1.1.0.tgz#51853da37be68a155cb6e827b3514a3c422e89cd"
......