umbrella22

升级依赖

...@@ -219,13 +219,17 @@ if (process.env.NODE_ENV === 'production') { ...@@ -219,13 +219,17 @@ if (process.env.NODE_ENV === 'production') {
219 219
220 rendererConfig.plugins.push( 220 rendererConfig.plugins.push(
221 new MinifyPlugin(), 221 new MinifyPlugin(),
222 - new CopyWebpackPlugin([ 222 + new CopyWebpackPlugin({
223 + patterns: [
223 { 224 {
224 from: path.join(__dirname, '../static'), 225 from: path.join(__dirname, '../static'),
225 to: path.join(__dirname, '../dist/electron/static'), 226 to: path.join(__dirname, '../dist/electron/static'),
227 + globOptions: {
226 ignore: ['.*'] 228 ignore: ['.*']
227 } 229 }
228 - ]), 230 + }
231 + ]
232 + }),
229 new webpack.DefinePlugin({ 233 new webpack.DefinePlugin({
230 'process.env.NODE_ENV': '"production"' 234 'process.env.NODE_ENV': '"production"'
231 }), 235 }),
......
...@@ -166,13 +166,17 @@ if (process.env.NODE_ENV === 'production') { ...@@ -166,13 +166,17 @@ if (process.env.NODE_ENV === 'production') {
166 166
167 webConfig.plugins.push( 167 webConfig.plugins.push(
168 new MinifyPlugin(), 168 new MinifyPlugin(),
169 - new CopyWebpackPlugin([ 169 + new CopyWebpackPlugin({
170 + patterns: [
170 { 171 {
171 from: path.join(__dirname, '../static'), 172 from: path.join(__dirname, '../static'),
172 - to: path.join(__dirname, '../dist/web/static'), 173 + to: path.join(__dirname, '../dist/electron/static'),
174 + globOptions: {
173 ignore: ['.*'] 175 ignore: ['.*']
174 } 176 }
175 - ]), 177 + }
178 + ]
179 + }),
176 new webpack.DefinePlugin({ 180 new webpack.DefinePlugin({
177 'process.env.NODE_ENV': '"production"' 181 'process.env.NODE_ENV': '"production"'
178 }), 182 }),
......
此文件的差异太大,无法显示。
...@@ -81,51 +81,51 @@ ...@@ -81,51 +81,51 @@
81 "nprogress": "^0.2.0", 81 "nprogress": "^0.2.0",
82 "vue": "^2.6.11", 82 "vue": "^2.6.11",
83 "vue-router": "^3.3.2", 83 "vue-router": "^3.3.2",
84 - "vuex": "^3.4.0" 84 + "vuex": "^3.5.1"
85 }, 85 },
86 "devDependencies": { 86 "devDependencies": {
87 - "@babel/core": "^7.10.3", 87 + "@babel/core": "^7.10.4",
88 - "@babel/plugin-proposal-class-properties": "^7.10.1", 88 + "@babel/plugin-proposal-class-properties": "^7.10.4",
89 - "@babel/plugin-proposal-decorators": "^7.10.3", 89 + "@babel/plugin-proposal-decorators": "^7.10.4",
90 - "@babel/plugin-proposal-do-expressions": "^7.10.1", 90 + "@babel/plugin-proposal-do-expressions": "^7.10.4",
91 - "@babel/plugin-proposal-export-default-from": "^7.10.1", 91 + "@babel/plugin-proposal-export-default-from": "^7.10.4",
92 - "@babel/plugin-proposal-export-namespace-from": "^7.10.1", 92 + "@babel/plugin-proposal-export-namespace-from": "^7.10.4",
93 - "@babel/plugin-proposal-function-bind": "^7.10.1", 93 + "@babel/plugin-proposal-function-bind": "^7.10.4",
94 - "@babel/plugin-proposal-function-sent": "^7.10.1", 94 + "@babel/plugin-proposal-function-sent": "^7.10.4",
95 - "@babel/plugin-proposal-json-strings": "^7.10.1", 95 + "@babel/plugin-proposal-json-strings": "^7.10.4",
96 - "@babel/plugin-proposal-logical-assignment-operators": "^7.10.3", 96 + "@babel/plugin-proposal-logical-assignment-operators": "^7.10.4",
97 - "@babel/plugin-proposal-nullish-coalescing-operator": "^7.10.1", 97 + "@babel/plugin-proposal-nullish-coalescing-operator": "^7.10.4",
98 - "@babel/plugin-proposal-numeric-separator": "^7.10.1", 98 + "@babel/plugin-proposal-numeric-separator": "^7.10.4",
99 - "@babel/plugin-proposal-optional-chaining": "^7.10.3", 99 + "@babel/plugin-proposal-optional-chaining": "^7.10.4",
100 - "@babel/plugin-proposal-pipeline-operator": "^7.10.1", 100 + "@babel/plugin-proposal-pipeline-operator": "^7.10.4",
101 - "@babel/plugin-proposal-throw-expressions": "^7.10.1", 101 + "@babel/plugin-proposal-throw-expressions": "^7.10.4",
102 "@babel/plugin-syntax-dynamic-import": "^7.8.3", 102 "@babel/plugin-syntax-dynamic-import": "^7.8.3",
103 - "@babel/plugin-syntax-import-meta": "^7.10.1", 103 + "@babel/plugin-syntax-import-meta": "^7.10.4",
104 - "@babel/plugin-transform-runtime": "^7.10.3", 104 + "@babel/plugin-transform-runtime": "^7.10.4",
105 - "@babel/polyfill": "^7.10.1", 105 + "@babel/polyfill": "^7.10.4",
106 - "@babel/preset-env": "^7.10.3", 106 + "@babel/preset-env": "^7.10.4",
107 - "@babel/register": "^7.10.3", 107 + "@babel/register": "^7.10.4",
108 - "@babel/runtime": "^7.10.3", 108 + "@babel/runtime": "^7.10.4",
109 - "ajv": "^6.12.2", 109 + "ajv": "^6.12.3",
110 "babel-eslint": "^9.0.0", 110 "babel-eslint": "^9.0.0",
111 "babel-loader": "^8.1.0", 111 "babel-loader": "^8.1.0",
112 "babel-minify-webpack-plugin": "^0.3.1", 112 "babel-minify-webpack-plugin": "^0.3.1",
113 "cache-loader": "^4.1.0", 113 "cache-loader": "^4.1.0",
114 "cfonts": "^2.8.2", 114 "cfonts": "^2.8.2",
115 "chalk": "^4.0.0", 115 "chalk": "^4.0.0",
116 - "copy-webpack-plugin": "^5.1.1", 116 + "copy-webpack-plugin": "^6.0.3",
117 "cross-env": "^7.0.2", 117 "cross-env": "^7.0.2",
118 "css-loader": "^3.5.3", 118 "css-loader": "^3.5.3",
119 "del": "^5.1.0", 119 "del": "^5.1.0",
120 - "electron": "^9.0.4", 120 + "electron": "^9.1.0",
121 "electron-builder": "^22.6.1", 121 "electron-builder": "^22.6.1",
122 - "electron-devtools-installer": "^3.0.0", 122 + "electron-devtools-installer": "^3.1.0",
123 "eslint": "^6.8.0", 123 "eslint": "^6.8.0",
124 "eslint-config-standard": "^14.1.1", 124 "eslint-config-standard": "^14.1.1",
125 "eslint-friendly-formatter": "^4.0.1", 125 "eslint-friendly-formatter": "^4.0.1",
126 "eslint-loader": "^3.0.4", 126 "eslint-loader": "^3.0.4",
127 "eslint-plugin-html": "^6.0.2", 127 "eslint-plugin-html": "^6.0.2",
128 - "eslint-plugin-import": "^2.20.2", 128 + "eslint-plugin-import": "^2.22.0",
129 "eslint-plugin-node": "^9.2.0", 129 "eslint-plugin-node": "^9.2.0",
130 "eslint-plugin-promise": "^4.2.1", 130 "eslint-plugin-promise": "^4.2.1",
131 "eslint-plugin-standard": "^4.0.0", 131 "eslint-plugin-standard": "^4.0.0",
...@@ -136,22 +136,22 @@ ...@@ -136,22 +136,22 @@
136 "multispinner": "^0.2.1", 136 "multispinner": "^0.2.1",
137 "node-loader": "^0.6.0", 137 "node-loader": "^0.6.0",
138 "portfinder": "^1.0.26", 138 "portfinder": "^1.0.26",
139 - "sass": "^1.26.8", 139 + "sass": "^1.26.10",
140 - "sass-loader": "^8.0.2", 140 + "sass-loader": "^9.0.1",
141 "split2": "^3.1.1", 141 "split2": "^3.1.1",
142 "style-loader": "^1.2.1", 142 "style-loader": "^1.2.1",
143 - "svg-sprite-loader": "^4.3.0", 143 + "svg-sprite-loader": "^5.0.0",
144 "terser-webpack-plugin": "^3.0.6", 144 "terser-webpack-plugin": "^3.0.6",
145 "through2-filter": "^3.0.0", 145 "through2-filter": "^3.0.0",
146 "url-loader": "^4.1.0", 146 "url-loader": "^4.1.0",
147 "vue-html-loader": "^1.2.4", 147 "vue-html-loader": "^1.2.4",
148 - "vue-loader": "^15.9.2", 148 + "vue-loader": "^15.9.3",
149 "vue-style-loader": "^4.1.2", 149 "vue-style-loader": "^4.1.2",
150 "vue-template-compiler": "^2.6.11", 150 "vue-template-compiler": "^2.6.11",
151 "webpack": "^4.43.0", 151 "webpack": "^4.43.0",
152 "webpack-cli": "^3.3.12", 152 "webpack-cli": "^3.3.12",
153 "webpack-dev-server": "^3.11.0", 153 "webpack-dev-server": "^3.11.0",
154 "webpack-hot-middleware": "^2.25.0", 154 "webpack-hot-middleware": "^2.25.0",
155 - "webpack-merge": "^4.2.2" 155 + "webpack-merge": "^5.0.7"
156 } 156 }
157 } 157 }
......