术习电报 / electron-vue-template

转到一个项目
切换导航栏
切换导航栏固定状态
张恒
45298790 1 个父辈 f89c234f

激进更新依赖，将所有依赖提升至最新，已通过打包测试和服务测试

内嵌 并排
正在显示 6 个修改的文件 包含 159 行增加 和 52 行删除
1 { 1 {
2 "comments": false, 2 "comments": false,
3 "env": { 3 "env": {
4 - "test": {
5 - "presets": [
6 - ["env", {
7 - "targets": { "node": 7 }
8 - }],
9 - "stage-0"
10 - ],
11 - "plugins": ["istanbul"]
12 - },
13 "main": { 4 "main": {
14 "presets": [ 5 "presets": [
15 - ["env", { 6 + [
16 - "targets": { "node": 7 } 7 + "@babel/preset-env",
17 - }], 8 + {
18 - "stage-0" 9 + "targets": {
10 + "node": 7
11 + }
12 + }
13 + ]
14 + ],
15 + "plugins": [
16 + "@babel/plugin-syntax-dynamic-import",
17 + "@babel/plugin-syntax-import-meta",
18 + "@babel/plugin-proposal-class-properties",
19 + "@babel/plugin-proposal-json-strings",
20 + [
21 + "@babel/plugin-proposal-decorators",
22 + {
23 + "legacy": true
24 + }
25 + ],
26 + "@babel/plugin-proposal-function-sent",
27 + "@babel/plugin-proposal-export-namespace-from",
28 + "@babel/plugin-proposal-numeric-separator",
29 + "@babel/plugin-proposal-throw-expressions",
30 + "@babel/plugin-proposal-export-default-from",
31 + "@babel/plugin-proposal-logical-assignment-operators",
32 + "@babel/plugin-proposal-optional-chaining",
33 + [
34 + "@babel/plugin-proposal-pipeline-operator",
35 + {
36 + "proposal": "minimal"
37 + }
38 + ],
39 + "@babel/plugin-proposal-nullish-coalescing-operator",
40 + "@babel/plugin-proposal-do-expressions",
41 + "@babel/plugin-proposal-function-bind"
19 ] 42 ]
20 }, 43 },
21 "renderer": { 44 "renderer": {
22 "presets": [ 45 "presets": [
23 - ["env", { 46 + [
47 + "@babel/preset-env",
48 + {
24 "modules": false 49 "modules": false
25 - }], 50 + }
26 - "stage-3" 51 + ]
52 + ],
53 + "plugins": [
54 + "@babel/plugin-syntax-dynamic-import",
55 + "@babel/plugin-syntax-import-meta",
56 + "@babel/plugin-proposal-class-properties",
57 + "@babel/plugin-proposal-json-strings",
58 + [
59 + "@babel/plugin-proposal-decorators",
60 + {
61 + "legacy": true
62 + }
63 + ],
64 + "@babel/plugin-proposal-function-sent",
65 + "@babel/plugin-proposal-export-namespace-from",
66 + "@babel/plugin-proposal-numeric-separator",
67 + "@babel/plugin-proposal-throw-expressions",
68 + "@babel/plugin-proposal-export-default-from",
69 + "@babel/plugin-proposal-logical-assignment-operators",
70 + "@babel/plugin-proposal-optional-chaining",
71 + [
72 + "@babel/plugin-proposal-pipeline-operator",
73 + {
74 + "proposal": "minimal"
75 + }
76 + ],
77 + "@babel/plugin-proposal-nullish-coalescing-operator",
78 + "@babel/plugin-proposal-do-expressions",
79 + "@babel/plugin-proposal-function-bind"
27 ] 80 ]
28 }, 81 },
29 "web": { 82 "web": {
30 "presets": [ 83 "presets": [
31 - ["env", { 84 + [
85 + "@babel/preset-env",
86 + {
32 "modules": false 87 "modules": false
33 - }], 88 + }
34 - "stage-3" 89 + ]
90 + ],
91 + "plugins": [
92 + "@babel/plugin-syntax-dynamic-import",
93 + "@babel/plugin-syntax-import-meta",
94 + "@babel/plugin-proposal-class-properties",
95 + "@babel/plugin-proposal-json-strings",
96 + [
97 + "@babel/plugin-proposal-decorators",
98 + {
99 + "legacy": true
100 + }
101 + ],
102 + "@babel/plugin-proposal-function-sent",
103 + "@babel/plugin-proposal-export-namespace-from",
104 + "@babel/plugin-proposal-numeric-separator",
105 + "@babel/plugin-proposal-throw-expressions",
106 + "@babel/plugin-proposal-export-default-from",
107 + "@babel/plugin-proposal-logical-assignment-operators",
108 + "@babel/plugin-proposal-optional-chaining",
109 + [
110 + "@babel/plugin-proposal-pipeline-operator",
111 + {
112 + "proposal": "minimal"
113 + }
114 + ],
115 + "@babel/plugin-proposal-nullish-coalescing-operator",
116 + "@babel/plugin-proposal-do-expressions",
117 + "@babel/plugin-proposal-function-bind"
35 ] 118 ]
36 } 119 }
37 }, 120 },
38 - "plugins": ["transform-runtime","dynamic-import-webpack"] 121 + "plugins": [
122 + "@babel/transform-runtime",
123 + "@babel/plugin-syntax-dynamic-import"
124 + ]
39 } 125 }
......
...@@ -6,7 +6,7 @@ const path = require('path') ...@@ -6,7 +6,7 @@ const path = require('path')
6 const { dependencies } = require('../package.json') 6 const { dependencies } = require('../package.json')
7 const webpack = require('webpack') 7 const webpack = require('webpack')
8 8
9 -const BabiliWebpackPlugin = require('babili-webpack-plugin') 9 +const MinifyPlugin = require("babel-minify-webpack-plugin");
10 10
11 let mainConfig = { 11 let mainConfig = {
12 entry: { 12 entry: {
...@@ -73,7 +73,7 @@ if (process.env.NODE_ENV !== 'production') { ...@@ -73,7 +73,7 @@ if (process.env.NODE_ENV !== 'production') {
73 */ 73 */
74 if (process.env.NODE_ENV === 'production') { 74 if (process.env.NODE_ENV === 'production') {
75 mainConfig.plugins.push( 75 mainConfig.plugins.push(
76 - new BabiliWebpackPlugin(), 76 + new MinifyPlugin(),
77 new webpack.DefinePlugin({ 77 new webpack.DefinePlugin({
78 'process.env.NODE_ENV': '"production"' 78 'process.env.NODE_ENV': '"production"'
79 }) 79 })
......
...@@ -7,7 +7,7 @@ const { dependencies } = require('../package.json') ...@@ -7,7 +7,7 @@ const { dependencies } = require('../package.json')
7 const webpack = require('webpack') 7 const webpack = require('webpack')
8 const config = require('../config') 8 const config = require('../config')
9 9
10 -const BabiliWebpackPlugin = require('babili-webpack-plugin') 10 +const MinifyPlugin = require("babel-minify-webpack-plugin");
11 const CopyWebpackPlugin = require('copy-webpack-plugin') 11 const CopyWebpackPlugin = require('copy-webpack-plugin')
12 const MiniCssExtractPlugin = require('mini-css-extract-plugin') 12 const MiniCssExtractPlugin = require('mini-css-extract-plugin')
13 const HtmlWebpackPlugin = require('html-webpack-plugin') 13 const HtmlWebpackPlugin = require('html-webpack-plugin')
...@@ -186,7 +186,7 @@ if (process.env.NODE_ENV === 'production') { ...@@ -186,7 +186,7 @@ if (process.env.NODE_ENV === 'production') {
186 rendererConfig.devtool = '' 186 rendererConfig.devtool = ''
187 187
188 rendererConfig.plugins.push( 188 rendererConfig.plugins.push(
189 - new BabiliWebpackPlugin(), 189 + new MinifyPlugin(),
190 new CopyWebpackPlugin([ 190 new CopyWebpackPlugin([
191 { 191 {
192 from: path.join(__dirname, '../static'), 192 from: path.join(__dirname, '../static'),
......
...@@ -5,7 +5,7 @@ process.env.BABEL_ENV = 'web' ...@@ -5,7 +5,7 @@ process.env.BABEL_ENV = 'web'
5 const path = require('path') 5 const path = require('path')
6 const webpack = require('webpack') 6 const webpack = require('webpack')
7 7
8 -const BabiliWebpackPlugin = require('babili-webpack-plugin') 8 +const MinifyPlugin = require("babel-minify-webpack-plugin");
9 const CopyWebpackPlugin = require('copy-webpack-plugin') 9 const CopyWebpackPlugin = require('copy-webpack-plugin')
10 const MiniCssExtractPlugin = require('mini-css-extract-plugin') 10 const MiniCssExtractPlugin = require('mini-css-extract-plugin')
11 const HtmlWebpackPlugin = require('html-webpack-plugin') 11 const HtmlWebpackPlugin = require('html-webpack-plugin')
...@@ -144,7 +144,7 @@ if (process.env.NODE_ENV === 'production') { ...@@ -144,7 +144,7 @@ if (process.env.NODE_ENV === 'production') {
144 webConfig.devtool = '' 144 webConfig.devtool = ''
145 145
146 webConfig.plugins.push( 146 webConfig.plugins.push(
147 - new BabiliWebpackPlugin(), 147 + new MinifyPlugin(),
148 new CopyWebpackPlugin([ 148 new CopyWebpackPlugin([
149 { 149 {
150 from: path.join(__dirname, '../static'), 150 from: path.join(__dirname, '../static'),
......
...@@ -66,43 +66,59 @@ ...@@ -66,43 +66,59 @@
66 "vuex-electron": "^1.0.3" 66 "vuex-electron": "^1.0.3"
67 }, 67 },
68 "devDependencies": { 68 "devDependencies": {
69 - "ajv": "^6.5.0", 69 + "@babel/core": "^7.5.5",
70 - "babel-core": "^6.26.3", 70 + "@babel/plugin-proposal-class-properties": "^7.0.0",
71 - "babel-eslint": "^8.2.3", 71 + "@babel/plugin-proposal-decorators": "^7.0.0",
72 - "babel-loader": "^7.1.4", 72 + "@babel/plugin-proposal-do-expressions": "^7.0.0",
73 - "babel-plugin-dynamic-import-webpack": "^1.1.0", 73 + "@babel/plugin-proposal-export-default-from": "^7.0.0",
74 - "babel-plugin-transform-runtime": "^6.23.0", 74 + "@babel/plugin-proposal-export-namespace-from": "^7.0.0",
75 - "babel-preset-env": "^1.7.0", 75 + "@babel/plugin-proposal-function-bind": "^7.0.0",
76 - "babel-preset-stage-0": "^6.24.1", 76 + "@babel/plugin-proposal-function-sent": "^7.0.0",
77 - "babel-register": "^6.26.0", 77 + "@babel/plugin-proposal-json-strings": "^7.0.0",
78 - "babili-webpack-plugin": "^0.1.2", 78 + "@babel/plugin-proposal-logical-assignment-operators": "^7.0.0",
79 + "@babel/plugin-proposal-nullish-coalescing-operator": "^7.0.0",
80 + "@babel/plugin-proposal-numeric-separator": "^7.0.0",
81 + "@babel/plugin-proposal-optional-chaining": "^7.0.0",
82 + "@babel/plugin-proposal-pipeline-operator": "^7.0.0",
83 + "@babel/plugin-proposal-throw-expressions": "^7.0.0",
84 + "@babel/plugin-syntax-dynamic-import": "^7.0.0",
85 + "@babel/plugin-syntax-import-meta": "^7.0.0",
86 + "@babel/plugin-transform-runtime": "^7.5.5",
87 + "@babel/polyfill": "^7.4.4",
88 + "@babel/preset-env": "^7.5.5",
89 + "@babel/register": "^7.5.5",
90 + "@babel/runtime": "^7.5.5",
91 + "ajv": "^6.10.2",
92 + "babel-eslint": "^9.0.0",
93 + "babel-loader": "^8.0.6",
94 + "babel-minify-webpack-plugin": "^0.3.1",
79 "cfonts": "^2.1.2", 95 "cfonts": "^2.1.2",
80 - "chalk": "^2.4.1", 96 + "chalk": "^2.4.2",
81 - "copy-webpack-plugin": "^4.5.1", 97 + "copy-webpack-plugin": "^5.0.4",
82 "cross-env": "^5.1.6", 98 "cross-env": "^5.1.6",
83 "css-loader": "^3.1.0", 99 "css-loader": "^3.1.0",
84 "del": "^5.0.0", 100 "del": "^5.0.0",
85 "devtron": "^1.4.0", 101 "devtron": "^1.4.0",
86 - "electron": "^6.0.1", 102 + "electron": "^6.0.2",
87 "electron-builder": "^21.2.0", 103 "electron-builder": "^21.2.0",
88 "electron-debug": "^3.0.1", 104 "electron-debug": "^3.0.1",
89 "electron-devtools-installer": "^2.2.4", 105 "electron-devtools-installer": "^2.2.4",
90 - "eslint": "^4.19.1", 106 + "eslint": "^6.1.0",
91 - "eslint-config-standard": "^11.0.0", 107 + "eslint-config-standard": "^13.0.1",
92 "eslint-friendly-formatter": "^4.0.1", 108 "eslint-friendly-formatter": "^4.0.1",
93 - "eslint-loader": "^2.0.0", 109 + "eslint-loader": "^2.2.1",
94 - "eslint-plugin-html": "^4.0.3", 110 + "eslint-plugin-html": "^6.0.0",
95 - "eslint-plugin-import": "^2.17.2", 111 + "eslint-plugin-import": "^2.18.2",
96 - "eslint-plugin-node": "^6.0.1", 112 + "eslint-plugin-node": "^9.1.0",
97 - "eslint-plugin-promise": "^3.8.0", 113 + "eslint-plugin-promise": "^4.2.1",
98 - "eslint-plugin-standard": "^3.1.0", 114 + "eslint-plugin-standard": "^4.0.0",
99 - "file-loader": "^1.1.11", 115 + "file-loader": "^4.2.0",
100 "html-webpack-plugin": "^3.2.0", 116 "html-webpack-plugin": "^3.2.0",
101 "mini-css-extract-plugin": "0.8.0", 117 "mini-css-extract-plugin": "0.8.0",
102 "multispinner": "^0.2.1", 118 "multispinner": "^0.2.1",
103 "node-sass": "^4.12.0", 119 "node-sass": "^4.12.0",
104 "sass-loader": "^7.0.3", 120 "sass-loader": "^7.0.3",
105 - "style-loader": "^0.21.0", 121 + "style-loader": "^1.0.0",
106 "svg-sprite-loader": "^4.1.6", 122 "svg-sprite-loader": "^4.1.6",
107 "url-loader": "^2.1.0", 123 "url-loader": "^2.1.0",
108 "vue-html-loader": "^1.2.4", 124 "vue-html-loader": "^1.2.4",
......
...@@ -20,10 +20,10 @@ ...@@ -20,10 +20,10 @@
20 <i class="el-icon-picture-outline"></i> 20 <i class="el-icon-picture-outline"></i>
21 </div> 21 </div>
22 </el-image> 22 </el-image>
23 - <span class="el-dropdown-link"> 23 + <div class="el-dropdown-link">
24 这里是用户名 24 这里是用户名
25 <i class="el-icon-arrow-down el-icon--right"></i> 25 <i class="el-icon-arrow-down el-icon--right"></i>
26 - </span> 26 + </div>
27 </div> 27 </div>
28 <el-dropdown-menu slot="dropdown"> 28 <el-dropdown-menu slot="dropdown">
29 <router-link to="/"> 29 <router-link to="/">
...@@ -139,6 +139,7 @@ export default { ...@@ -139,6 +139,7 @@ export default {
139 .avatar { 139 .avatar {
140 width: 30px; 140 width: 30px;
141 height: 30px; 141 height: 30px;
142 + margin-right: 10px;
142 /deep/ img { 143 /deep/ img {
143 width: 100%; 144 width: 100%;
144 height: 100%; 145 height: 100%;
...@@ -159,10 +160,14 @@ export default { ...@@ -159,10 +160,14 @@ export default {
159 font-size: 6px; 160 font-size: 6px;
160 } 161 }
161 .select-right { 162 .select-right {
162 - .el-dropdown-link { 163 + /deep/ .el-dropdown-link {
163 color: #333333; 164 color: #333333;
164 font-weight: 400; 165 font-weight: 400;
165 } 166 }
167 + /deep/ .el-dropdown-selfdefine {
168 + display: flex;
169 + align-items: center;
170 + }
166 } 171 }
167 } 172 }
168 } 173 }
......