Commit 4da3d2c534f1296b22172d2236fae1fec14ccd1d
1 parent
d62d0ca0
chore: vscode configuration adjustment
Showing
4 changed files
with
31 additions
and
77 deletions
.env.development
.vscode/settings.json
@@ -7,23 +7,9 @@ | @@ -7,23 +7,9 @@ | ||
7 | //=========================================== | 7 | //=========================================== |
8 | "explorer.openEditors.visible": 0, | 8 | "explorer.openEditors.visible": 0, |
9 | "editor.tabSize": 2, | 9 | "editor.tabSize": 2, |
10 | - "editor.renderControlCharacters": true, | ||
11 | - "editor.minimap.renderCharacters": false, | ||
12 | - "editor.minimap.maxColumn": 300, | ||
13 | - "editor.minimap.showSlider": "always", | ||
14 | - "editor.cursorBlinking": "phase", | ||
15 | - "editor.cursorSmoothCaretAnimation": true, | ||
16 | - "editor.detectIndentation": false, | ||
17 | "editor.defaultFormatter": "esbenp.prettier-vscode", | 10 | "editor.defaultFormatter": "esbenp.prettier-vscode", |
18 | "diffEditor.ignoreTrimWhitespace": false, | 11 | "diffEditor.ignoreTrimWhitespace": false, |
19 | - "javascript.format.insertSpaceBeforeFunctionParenthesis": true, | ||
20 | - "editor.suggestSelection": "first", | ||
21 | "editor.trimAutoWhitespace": true, | 12 | "editor.trimAutoWhitespace": true, |
22 | - "editor.quickSuggestions": { | ||
23 | - "other": true, | ||
24 | - "comments": true, | ||
25 | - "strings": true | ||
26 | - }, | ||
27 | //=========================================== | 13 | //=========================================== |
28 | //============= Other ======================= | 14 | //============= Other ======================= |
29 | //=========================================== | 15 | //=========================================== |
@@ -34,24 +20,12 @@ | @@ -34,24 +20,12 @@ | ||
34 | //=========================================== | 20 | //=========================================== |
35 | "emmet.triggerExpansionOnTab": true, | 21 | "emmet.triggerExpansionOnTab": true, |
36 | "emmet.showAbbreviationSuggestions": true, | 22 | "emmet.showAbbreviationSuggestions": true, |
37 | - "emmet.showExpandedAbbreviation": "always", | ||
38 | - "emmet.syntaxProfiles": { | ||
39 | - "vue-html": "html", | ||
40 | - "vue": "html", | ||
41 | - "xml": { | ||
42 | - "attr_quotes": "single" | ||
43 | - } | ||
44 | - }, | ||
45 | - "emmet.includeLanguages": { | ||
46 | - "jsx-sublime-babel-tags": "javascriptreact" | ||
47 | - }, | ||
48 | //=========================================== | 23 | //=========================================== |
49 | //============= files ======================= | 24 | //============= files ======================= |
50 | //=========================================== | 25 | //=========================================== |
51 | "files.trimTrailingWhitespace": true, | 26 | "files.trimTrailingWhitespace": true, |
52 | "files.insertFinalNewline": true, | 27 | "files.insertFinalNewline": true, |
53 | "files.trimFinalNewlines": true, | 28 | "files.trimFinalNewlines": true, |
54 | - "files.eol": "\n", | ||
55 | "search.exclude": { | 29 | "search.exclude": { |
56 | "**/node_modules": true, | 30 | "**/node_modules": true, |
57 | "**/*.log": true, | 31 | "**/*.log": true, |
@@ -97,29 +71,11 @@ | @@ -97,29 +71,11 @@ | ||
97 | }, | 71 | }, |
98 | "stylelint.enable": true, | 72 | "stylelint.enable": true, |
99 | "stylelint.packageManager": "yarn", | 73 | "stylelint.packageManager": "yarn", |
100 | - // ↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓ | ||
101 | - // =========================================== | ||
102 | - // ================ Eslint =================== | ||
103 | - // =========================================== | ||
104 | - "eslint.alwaysShowStatus": true, | ||
105 | - "eslint.validate": [ | ||
106 | - "javascript", | ||
107 | - "typescript", | ||
108 | - "reacttypescript", | ||
109 | - "reactjavascript", | ||
110 | - "html", | ||
111 | - "vue" | ||
112 | - ], | ||
113 | // =========================================== | 74 | // =========================================== |
114 | // ================ Vetur ==================== | 75 | // ================ Vetur ==================== |
115 | // =========================================== | 76 | // =========================================== |
116 | "vetur.experimental.templateInterpolationService": true, | 77 | "vetur.experimental.templateInterpolationService": true, |
117 | "vetur.format.options.tabSize": 2, | 78 | "vetur.format.options.tabSize": 2, |
118 | - "vetur.format.defaultFormatter.html": "prettier", | ||
119 | - "vetur.format.defaultFormatter.scss": "prettier", | ||
120 | - "vetur.format.defaultFormatter.css": "prettier", | ||
121 | - "vetur.format.defaultFormatter.ts": "prettier-tslint", | ||
122 | - "vetur.format.defaultFormatter.js": "prettier", | ||
123 | "vetur.languageFeatures.codeActions": false, | 79 | "vetur.languageFeatures.codeActions": false, |
124 | "vetur.format.defaultFormatterOptions": { | 80 | "vetur.format.defaultFormatterOptions": { |
125 | "js-beautify-html": { | 81 | "js-beautify-html": { |
package.json
@@ -71,7 +71,7 @@ | @@ -71,7 +71,7 @@ | ||
71 | "@types/inquirer": "^7.3.1", | 71 | "@types/inquirer": "^7.3.1", |
72 | "@types/lodash-es": "^4.17.4", | 72 | "@types/lodash-es": "^4.17.4", |
73 | "@types/mockjs": "^1.0.3", | 73 | "@types/mockjs": "^1.0.3", |
74 | - "@types/node": "^15.6.1", | 74 | + "@types/node": "^15.12.0", |
75 | "@types/nprogress": "^0.2.0", | 75 | "@types/nprogress": "^0.2.0", |
76 | "@types/qrcode": "^1.4.0", | 76 | "@types/qrcode": "^1.4.0", |
77 | "@types/qs": "^6.9.6", | 77 | "@types/qs": "^6.9.6", |
@@ -111,7 +111,7 @@ | @@ -111,7 +111,7 @@ | ||
111 | "stylelint-order": "^4.1.0", | 111 | "stylelint-order": "^4.1.0", |
112 | "ts-node": "^10.0.0", | 112 | "ts-node": "^10.0.0", |
113 | "typescript": "4.3.2", | 113 | "typescript": "4.3.2", |
114 | - "vite": "2.3.3", | 114 | + "vite": "2.3.6", |
115 | "vite-plugin-compression": "^0.2.5", | 115 | "vite-plugin-compression": "^0.2.5", |
116 | "vite-plugin-html": "^2.0.7", | 116 | "vite-plugin-html": "^2.0.7", |
117 | "vite-plugin-imagemin": "^0.3.2", | 117 | "vite-plugin-imagemin": "^0.3.2", |
@@ -121,14 +121,14 @@ | @@ -121,14 +121,14 @@ | ||
121 | "vite-plugin-style-import": "^0.10.1", | 121 | "vite-plugin-style-import": "^0.10.1", |
122 | "vite-plugin-svg-icons": "^0.7.0", | 122 | "vite-plugin-svg-icons": "^0.7.0", |
123 | "vite-plugin-theme": "^0.8.1", | 123 | "vite-plugin-theme": "^0.8.1", |
124 | - "vite-plugin-windicss": "^0.16.7", | 124 | + "vite-plugin-windicss": "^0.17.0", |
125 | "vue-eslint-parser": "^7.6.0", | 125 | "vue-eslint-parser": "^7.6.0", |
126 | "vue-tsc": "^0.1.7" | 126 | "vue-tsc": "^0.1.7" |
127 | }, | 127 | }, |
128 | "resolutions": { | 128 | "resolutions": { |
129 | "//": "Used to install imagemin dependencies, because imagemin may not be installed in China. If it is abroad, you can delete it", | 129 | "//": "Used to install imagemin dependencies, because imagemin may not be installed in China. If it is abroad, you can delete it", |
130 | "bin-wrapper": "npm:bin-wrapper-china", | 130 | "bin-wrapper": "npm:bin-wrapper-china", |
131 | - "rollup": "^2.50.5" | 131 | + "rollup": "^2.50.6" |
132 | }, | 132 | }, |
133 | "repository": { | 133 | "repository": { |
134 | "type": "git", | 134 | "type": "git", |
yarn.lock
@@ -1688,10 +1688,10 @@ | @@ -1688,10 +1688,10 @@ | ||
1688 | resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.1.tgz#5e07e0cb2ff793aa7a1b41deae76221e6166049f" | 1688 | resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.1.tgz#5e07e0cb2ff793aa7a1b41deae76221e6166049f" |
1689 | integrity sha512-/tpUyFD7meeooTRwl3sYlihx2BrJE7q9XF71EguPFIySj9B7qgnRtHsHTho+0AUm4m1SvWGm6uSncrR94q6Vtw== | 1689 | integrity sha512-/tpUyFD7meeooTRwl3sYlihx2BrJE7q9XF71EguPFIySj9B7qgnRtHsHTho+0AUm4m1SvWGm6uSncrR94q6Vtw== |
1690 | 1690 | ||
1691 | -"@types/node@^15.6.1": | ||
1692 | - version "15.6.1" | ||
1693 | - resolved "https://registry.npmjs.org/@types/node/-/node-15.6.1.tgz#32d43390d5c62c5b6ec486a9bc9c59544de39a08" | ||
1694 | - integrity sha512-7EIraBEyRHEe7CH+Fm1XvgqU6uwZN8Q7jppJGcqjROMT29qhAuuOxYB1uEY5UMYQKEmA5D+5tBnhdaPXSsLONA== | 1691 | +"@types/node@^15.12.0": |
1692 | + version "15.12.0" | ||
1693 | + resolved "https://registry.npmjs.org/@types/node/-/node-15.12.0.tgz#6a459d261450a300e6865faeddb5af01c3389bb3" | ||
1694 | + integrity sha512-+aHJvoCsVhO2ZCuT4o5JtcPrCPyDE3+1nvbDprYes+pPkEsbjH7AGUCNtjMOXS0fqH14t+B7yLzaqSz92FPWyw== | ||
1695 | 1695 | ||
1696 | "@types/normalize-package-data@^2.4.0": | 1696 | "@types/normalize-package-data@^2.4.0": |
1697 | version "2.4.0" | 1697 | version "2.4.0" |
@@ -2048,15 +2048,15 @@ | @@ -2048,15 +2048,15 @@ | ||
2048 | dependencies: | 2048 | dependencies: |
2049 | vue-demi "*" | 2049 | vue-demi "*" |
2050 | 2050 | ||
2051 | -"@windicss/plugin-utils@0.16.7": | ||
2052 | - version "0.16.7" | ||
2053 | - resolved "https://registry.yarnpkg.com/@windicss/plugin-utils/-/plugin-utils-0.16.7.tgz#54cd31841515e849f116a6d89e625da368f7de23" | ||
2054 | - integrity sha512-mxgTj/MkemN8JlyfaS20OAJ0BqTUoUlDT9wD/m5U+nUa5SN/r0kPlg1IW9SbmRTrYjNXWEENf9F0Fjb/X4zn6g== | 2051 | +"@windicss/plugin-utils@0.17.0": |
2052 | + version "0.17.0" | ||
2053 | + resolved "https://registry.npmjs.org/@windicss/plugin-utils/-/plugin-utils-0.17.0.tgz#c12123d6025b0aa439932aeef01467b58c4cc6a1" | ||
2054 | + integrity sha512-abRdBdA0hZKuixWq8a7bdi5KNvLEGtcQSGcE6mV83Xbjs8XWYY/S8g7Icy4g/0/SQLW2cda+jj14hkYTMlk5fw== | ||
2055 | dependencies: | 2055 | dependencies: |
2056 | "@antfu/utils" "^0.1.6" | 2056 | "@antfu/utils" "^0.1.6" |
2057 | debug "^4.3.2" | 2057 | debug "^4.3.2" |
2058 | fast-glob "^3.2.5" | 2058 | fast-glob "^3.2.5" |
2059 | - jiti "^1.9.2" | 2059 | + jiti "^1.10.1" |
2060 | magic-string "^0.25.7" | 2060 | magic-string "^0.25.7" |
2061 | micromatch "^4.0.4" | 2061 | micromatch "^4.0.4" |
2062 | windicss "^3.0.12" | 2062 | windicss "^3.0.12" |
@@ -6317,10 +6317,10 @@ jest-worker@^26.2.1: | @@ -6317,10 +6317,10 @@ jest-worker@^26.2.1: | ||
6317 | merge-stream "^2.0.0" | 6317 | merge-stream "^2.0.0" |
6318 | supports-color "^7.0.0" | 6318 | supports-color "^7.0.0" |
6319 | 6319 | ||
6320 | -jiti@^1.9.2: | ||
6321 | - version "1.9.2" | ||
6322 | - resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.9.2.tgz#2ee44830883dbb1b2e222adc053c3052d0bf3b61" | ||
6323 | - integrity sha512-wymUBR/YGGVNVRAxX52yvFoZdUAYKEGjk0sYrz6gXLCvMblnRvJAmDUnMvQiH4tUHDBtbKHnZ4GT3R+m3Hc39A== | 6320 | +jiti@^1.10.1: |
6321 | + version "1.10.1" | ||
6322 | + resolved "https://registry.npmjs.org/jiti/-/jiti-1.10.1.tgz#bc2a175b9435274dc8659d3d9a121a91c6b3a1af" | ||
6323 | + integrity sha512-qux9juDtAC8HlZxAk/fku73ak4TWNLigRFTNzFShE/kw4bXVFsVu538vLXAxvNyPszXgpX4YxkXfwTYEi+zf5A== | ||
6324 | 6324 | ||
6325 | js-base64@^2.1.9: | 6325 | js-base64@^2.1.9: |
6326 | version "2.6.4" | 6326 | version "2.6.4" |
@@ -8863,10 +8863,10 @@ rollup-plugin-visualizer@5.5.0: | @@ -8863,10 +8863,10 @@ rollup-plugin-visualizer@5.5.0: | ||
8863 | source-map "^0.7.3" | 8863 | source-map "^0.7.3" |
8864 | yargs "^16.2.0" | 8864 | yargs "^16.2.0" |
8865 | 8865 | ||
8866 | -rollup@^2.38.5, rollup@^2.43.1, rollup@^2.45.2, rollup@^2.50.5: | ||
8867 | - version "2.50.5" | ||
8868 | - resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.50.5.tgz#bbee9d6411af3f5fa5c6e7e2c69f7a65b753e568" | ||
8869 | - integrity sha512-Ztz4NurU2LbS3Jn5rlhnYv35z6pkjBUmYKr94fOBIKINKRO6kug9NTFHArT7jqwMP2kqEZ39jJuEtkk91NBltQ== | 8866 | +rollup@^2.38.5, rollup@^2.43.1, rollup@^2.45.2, rollup@^2.50.6: |
8867 | + version "2.50.6" | ||
8868 | + resolved "https://registry.npmjs.org/rollup/-/rollup-2.50.6.tgz#24e2211caf9031081656e98a5e5e94d3b5e786e2" | ||
8869 | + integrity sha512-6c5CJPLVgo0iNaZWWliNu1Kl43tjP9LZcp6D/tkf2eLH2a9/WeHxg9vfTFl8QV/2SOyaJX37CEm9XuGM0rviUg== | ||
8870 | optionalDependencies: | 8870 | optionalDependencies: |
8871 | fsevents "~2.3.1" | 8871 | fsevents "~2.3.1" |
8872 | 8872 | ||
@@ -10639,22 +10639,22 @@ vite-plugin-theme@^0.8.1: | @@ -10639,22 +10639,22 @@ vite-plugin-theme@^0.8.1: | ||
10639 | esbuild-plugin-alias "^0.1.2" | 10639 | esbuild-plugin-alias "^0.1.2" |
10640 | tinycolor2 "^1.4.2" | 10640 | tinycolor2 "^1.4.2" |
10641 | 10641 | ||
10642 | -vite-plugin-windicss@^0.16.7: | ||
10643 | - version "0.16.7" | ||
10644 | - resolved "https://registry.yarnpkg.com/vite-plugin-windicss/-/vite-plugin-windicss-0.16.7.tgz#5e6b849a607139ce769f7a757cc3b56b9d5349df" | ||
10645 | - integrity sha512-fNBLO2EBdQsJNU3IyehSmqPdrHc6Ve+hPYDaf5SrW8nGd9Wbd8ZVh6cX/1blRcjMw0qOjgcx7GM8pRWBjhzt3Q== | 10642 | +vite-plugin-windicss@^0.17.0: |
10643 | + version "0.17.0" | ||
10644 | + resolved "https://registry.npmjs.org/vite-plugin-windicss/-/vite-plugin-windicss-0.17.0.tgz#721a82e1b9be165364fbed319ce2fc5059b43866" | ||
10645 | + integrity sha512-zbx4J209cqxPpJECWr8nwqDMloUvMmni+GJFvrVBboU0bb/0+mXFQj9VMVsbe7Ac00/vC0i7D0ml65x1PiXf4w== | ||
10646 | dependencies: | 10646 | dependencies: |
10647 | - "@windicss/plugin-utils" "0.16.7" | 10647 | + "@windicss/plugin-utils" "0.17.0" |
10648 | chalk "^4.1.1" | 10648 | chalk "^4.1.1" |
10649 | debug "^4.3.2" | 10649 | debug "^4.3.2" |
10650 | windicss "^3.0.12" | 10650 | windicss "^3.0.12" |
10651 | 10651 | ||
10652 | -vite@2.3.3: | ||
10653 | - version "2.3.3" | ||
10654 | - resolved "https://registry.yarnpkg.com/vite/-/vite-2.3.3.tgz#7e88a71abd03985c647789938d784cce0ee3b0fd" | ||
10655 | - integrity sha512-eO1iwRbn3/BfkNVMNJDeANAFCZ5NobYOFPu7IqfY7DcI7I9nFGjJIZid0EViTmLDGwwSUPmRAq3cRBbO3+DsMA== | 10652 | +vite@2.3.6: |
10653 | + version "2.3.6" | ||
10654 | + resolved "https://registry.npmjs.org/vite/-/vite-2.3.6.tgz#1f7cfde88a51a802d69000c7bac85d481c2e871c" | ||
10655 | + integrity sha512-fsEpNKDHgh3Sn66JH06ZnUBnIgUVUtw6ucDhlOj1CEqxIkymU25yv1/kWDPlIjyYHnalr0cN6V+zzUJ+fmWHYw== | ||
10656 | dependencies: | 10656 | dependencies: |
10657 | - esbuild "^0.11.23" | 10657 | + esbuild "^0.12.5" |
10658 | postcss "^8.2.10" | 10658 | postcss "^8.2.10" |
10659 | resolve "^1.19.0" | 10659 | resolve "^1.19.0" |
10660 | rollup "^2.38.5" | 10660 | rollup "^2.38.5" |