Merge branch 'base' into tabbar

This commit is contained in:
菲鸽 2024-04-09 14:27:21 +08:00
commit 3f15da98de
3 changed files with 93 additions and 71 deletions

10
.gitignore vendored
View File

@ -32,13 +32,13 @@ components.d.ts
uni-pages.d.ts
# 插件生成的文件
# src/pages.json
# src/manifest.json
src/pages.json
src/manifest.json
# lock 文件还是不要了,我主要的版本写死就好了
# github actions 需要这些文件,所以留着
# pnpm-lock.yaml
# package-lock.json
# github actions 需要这些文件,所以main分支需要留着
pnpm-lock.yaml
package-lock.json
# TIPS如果某些文件已经加入了版本管理现在重新加入 .gitignore 是不生效的,需要执行下面的操作
# `git rm -r --cached .` 然后提交 commit 即可。

View File

@ -1,7 +1,7 @@
{
"name": "unibest",
"type": "commonjs",
"version": "1.4.0",
"version": "1.5.0",
"description": "unibest - 最好的 uniapp 开发模板",
"author": {
"name": "codercup",
@ -97,8 +97,7 @@
"pinia-plugin-persistedstate": "3.2.1",
"qs": "^6.11.2",
"vue": "^3.4.19",
"vue-i18n": "^9.1.9",
"wot-design-uni": "^1.2.5"
"wot-design-uni": "^1.2.13"
},
"devDependencies": {
"@commitlint/cli": "^18.4.3",

149
pnpm-lock.yaml generated
View File

@ -65,12 +65,9 @@ dependencies:
vue:
specifier: ^3.4.19
version: 3.4.19(typescript@4.9.5)
vue-i18n:
specifier: ^9.1.9
version: 9.10.2(vue@3.4.19)
wot-design-uni:
specifier: ^1.2.5
version: 1.2.5(vue@3.4.19)
specifier: ^1.2.13
version: 1.2.13(vue@3.4.19)
devDependencies:
'@commitlint/cli':
@ -144,7 +141,7 @@ devDependencies:
version: 9.1.0(eslint@8.56.0)
eslint-config-standard:
specifier: ^17.1.0
version: 17.1.0(eslint-plugin-import@2.29.1)(eslint-plugin-n@16.5.0)(eslint-plugin-promise@6.1.1)(eslint@8.56.0)
version: 17.1.0(eslint-plugin-import@2.29.1)(eslint-plugin-n@16.6.2)(eslint-plugin-promise@6.1.1)(eslint@8.56.0)
eslint-import-resolver-typescript:
specifier: ^3.6.1
version: 3.6.1(@typescript-eslint/parser@6.15.0)(eslint-plugin-import@2.29.1)(eslint@8.56.0)
@ -3040,14 +3037,6 @@ packages:
'@intlify/shared': 9.1.9
'@intlify/vue-devtools': 9.1.9
/@intlify/core-base@9.10.2:
resolution: {integrity: sha512-HGStVnKobsJL0DoYIyRCGXBH63DMQqEZxDUGrkNI05FuTcruYUtOAxyL3zoAZu/uDGO6mcUvm3VXBaHG2GdZCg==}
engines: {node: '>= 16'}
dependencies:
'@intlify/message-compiler': 9.10.2
'@intlify/shared': 9.10.2
dev: false
/@intlify/devtools-if@9.1.9:
resolution: {integrity: sha512-oKSMKjttG3Ut/1UGEZjSdghuP3fwA15zpDPcjkf/1FjlOIm6uIBGMNS5jXzsZy593u+P/YcnrZD6cD3IVFz9vQ==}
engines: {node: '>= 10'}
@ -3062,14 +3051,6 @@ packages:
'@intlify/shared': 9.1.9
source-map: 0.6.1
/@intlify/message-compiler@9.10.2:
resolution: {integrity: sha512-ntY/kfBwQRtX5Zh6wL8cSATujPzWW2ZQd1QwKyWwAy5fMqJyyixHMeovN4fmEyCqSu+hFfYOE63nU94evsy4YA==}
engines: {node: '>= 16'}
dependencies:
'@intlify/shared': 9.10.2
source-map-js: 1.2.0
dev: false
/@intlify/message-resolver@9.1.9:
resolution: {integrity: sha512-Lx/DBpigeK0sz2BBbzv5mu9/dAlt98HxwbG7xLawC3O2xMF9MNWU5FtOziwYG6TDIjNq0O/3ZbOJAxwITIWXEA==}
engines: {node: '>= 10'}
@ -3086,11 +3067,6 @@ packages:
resolution: {integrity: sha512-xKGM1d0EAxdDFCWedcYXOm6V5Pfw/TMudd6/qCdEb4tv0hk9EKeg7lwQF1azE0dP2phvx0yXxrt7UQK+IZjNdw==}
engines: {node: '>= 10'}
/@intlify/shared@9.10.2:
resolution: {integrity: sha512-ttHCAJkRy7R5W2S9RVnN9KYQYPIpV2+GiS79T4EE37nrPyH6/1SrOh3bmdCRC1T3ocL8qCDx7x2lBJ0xaITU7Q==}
engines: {node: '>= 16'}
dev: false
/@intlify/vue-devtools@9.1.9:
resolution: {integrity: sha512-YPehH9uL4vZcGXky4Ev5qQIITnHKIvsD2GKGXgqf+05osMUI6WSEQHaN9USRa318Rs8RyyPCiDfmA0hRu3k7og==}
engines: {node: '>= 10'}
@ -3120,7 +3096,7 @@ packages:
engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
dependencies:
'@jest/types': 27.5.1
'@types/node': 20.12.4
'@types/node': 20.12.6
chalk: 4.1.2
jest-message-util: 27.5.1
jest-util: 27.5.1
@ -3141,7 +3117,7 @@ packages:
'@jest/test-result': 27.5.1
'@jest/transform': 27.5.1
'@jest/types': 27.5.1
'@types/node': 20.12.4
'@types/node': 20.12.6
ansi-escapes: 4.3.2
chalk: 4.1.2
emittery: 0.8.1
@ -3178,7 +3154,7 @@ packages:
dependencies:
'@jest/fake-timers': 27.5.1
'@jest/types': 27.5.1
'@types/node': 20.12.4
'@types/node': 20.12.6
jest-mock: 27.5.1
dev: true
@ -3188,7 +3164,7 @@ packages:
dependencies:
'@jest/types': 27.5.1
'@sinonjs/fake-timers': 8.1.0
'@types/node': 20.12.4
'@types/node': 20.12.6
jest-message-util: 27.5.1
jest-mock: 27.5.1
jest-util: 27.5.1
@ -3217,7 +3193,7 @@ packages:
'@jest/test-result': 27.5.1
'@jest/transform': 27.5.1
'@jest/types': 27.5.1
'@types/node': 20.12.4
'@types/node': 20.12.6
chalk: 4.1.2
collect-v8-coverage: 1.0.2
exit: 0.1.2
@ -3301,7 +3277,7 @@ packages:
dependencies:
'@types/istanbul-lib-coverage': 2.0.6
'@types/istanbul-reports': 3.0.4
'@types/node': 20.12.4
'@types/node': 20.12.6
'@types/yargs': 16.0.9
chalk: 4.1.2
dev: true
@ -3941,7 +3917,7 @@ packages:
/@types/graceful-fs@4.1.9:
resolution: {integrity: sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==}
dependencies:
'@types/node': 20.12.4
'@types/node': 20.12.6
dev: true
/@types/imagemin-gifsicle@7.0.4:
@ -4058,8 +4034,8 @@ packages:
dependencies:
undici-types: 5.26.5
/@types/node@20.12.4:
resolution: {integrity: sha512-E+Fa9z3wSQpzgYQdYmme5X3OTuejnnTx88A6p6vkkJosR3KBz+HpE3kqNm98VE6cfLFcISx7zW7MsJkH6KwbTw==}
/@types/node@20.12.6:
resolution: {integrity: sha512-3KurE8taB8GCvZBPngVbp0lk5CKi8M9f9k1rsADh0Evdz5SzJ+Q+Hx9uHoFGsLnLnd1xmkDQr2hVhlA0Mn0lKQ==}
dependencies:
undici-types: 5.26.5
dev: true
@ -5706,6 +5682,12 @@ packages:
semver: 7.6.0
dev: true
/builtins@5.1.0:
resolution: {integrity: sha512-SW9lzGTLvWTP1AY8xeAMZimqDrIaSdLQUcVr9DMef51niJ022Ri87SwRRKYm4A6iHfkPaiVUu/Duw2Wc4J7kKg==}
dependencies:
semver: 7.6.0
dev: true
/bundle-name@3.0.0:
resolution: {integrity: sha512-PKA4BeSvBpQKQ8iPOGCSiell+N8P+Tf1DlwqmYhpe2gAhKPHn8EYOxVT+ShuGmhg8lN8XiSlS80yiExKXrURlw==}
engines: {node: '>=12'}
@ -7246,6 +7228,16 @@ packages:
eslint: 8.56.0
dev: true
/eslint-compat-utils@0.5.0(eslint@8.56.0):
resolution: {integrity: sha512-dc6Y8tzEcSYZMHa+CMPLi/hyo1FzNeonbhJL7Ol0ccuKQkwopJcJBA9YL/xmMTLU1eKigXo9vj9nALElWYSowg==}
engines: {node: '>=12'}
peerDependencies:
eslint: '>=6.0.0'
dependencies:
eslint: 8.56.0
semver: 7.6.0
dev: true
/eslint-config-flat-gitignore@0.1.2:
resolution: {integrity: sha512-PcBsqtd5QHEZH4ROvpnRN4EP0qcHh9voCCHgtyHxnJZHGspJREcZn7oPqRG/GfWt9m3C0fkC2l5CuBtMig2wXQ==}
dependencies:
@ -7261,7 +7253,7 @@ packages:
eslint: 8.56.0
dev: true
/eslint-config-standard@17.1.0(eslint-plugin-import@2.29.1)(eslint-plugin-n@16.5.0)(eslint-plugin-promise@6.1.1)(eslint@8.56.0):
/eslint-config-standard@17.1.0(eslint-plugin-import@2.29.1)(eslint-plugin-n@16.6.2)(eslint-plugin-promise@6.1.1)(eslint@8.56.0):
resolution: {integrity: sha512-IwHwmaBNtDK4zDHQukFDW5u/aTb8+meQWZvNFWkiGmbWjD6bqyuSSBxxXKkCftCUzc1zwCH2m/baCNDLGmuO5Q==}
engines: {node: '>=12.0.0'}
peerDependencies:
@ -7272,7 +7264,7 @@ packages:
dependencies:
eslint: 8.56.0
eslint-plugin-import: 2.29.1(@typescript-eslint/parser@6.15.0)(eslint-import-resolver-typescript@3.6.1)(eslint@8.56.0)
eslint-plugin-n: 16.5.0(eslint@8.56.0)
eslint-plugin-n: 16.6.2(eslint@8.56.0)
eslint-plugin-promise: 6.1.1(eslint@8.56.0)
dev: true
@ -7359,6 +7351,18 @@ packages:
eslint-compat-utils: 0.1.2(eslint@8.56.0)
dev: true
/eslint-plugin-es-x@7.6.0(eslint@8.56.0):
resolution: {integrity: sha512-I0AmeNgevgaTR7y2lrVCJmGYF0rjoznpDvqV/kIkZSZbZ8Rw3eu4cGlvBBULScfkSOCzqKbff5LR4CNrV7mZHA==}
engines: {node: ^14.18.0 || >=16.0.0}
peerDependencies:
eslint: '>=8'
dependencies:
'@eslint-community/eslint-utils': 4.4.0(eslint@8.56.0)
'@eslint-community/regexpp': 4.10.0
eslint: 8.56.0
eslint-compat-utils: 0.5.0(eslint@8.56.0)
dev: true
/eslint-plugin-eslint-comments@3.2.0(eslint@8.56.0):
resolution: {integrity: sha512-0jkOl0hfojIHHmEHgmNdqv4fmh7300NdpA9FFpF7zaoLvB/QeXOGNLIo86oAveJFrfB1p05kC8hpEMHM8DwWVQ==}
engines: {node: '>=6.5.0'}
@ -7493,6 +7497,26 @@ packages:
semver: 7.6.0
dev: true
/eslint-plugin-n@16.6.2(eslint@8.56.0):
resolution: {integrity: sha512-6TyDmZ1HXoFQXnhCTUjVFULReoBPOAjpuiKELMkeP40yffI/1ZRO+d9ug/VC6fqISo2WkuIBk3cvuRPALaWlOQ==}
engines: {node: '>=16.0.0'}
peerDependencies:
eslint: '>=7.0.0'
dependencies:
'@eslint-community/eslint-utils': 4.4.0(eslint@8.56.0)
builtins: 5.1.0
eslint: 8.56.0
eslint-plugin-es-x: 7.6.0(eslint@8.56.0)
get-tsconfig: 4.7.3
globals: 13.24.0
ignore: 5.3.1
is-builtin-module: 3.2.1
is-core-module: 2.13.1
minimatch: 3.1.2
resolve: 1.22.8
semver: 7.6.0
dev: true
/eslint-plugin-no-only-tests@3.1.0:
resolution: {integrity: sha512-Lf4YW/bL6Un1R6A76pRZyE1dl1vr31G/ev8UzIc/geCgFWyrKil8hVjYqWVKGB/UIGmb6Slzs9T0wNezdSVegw==}
engines: {node: '>=5.0.0'}
@ -8376,6 +8400,12 @@ packages:
resolve-pkg-maps: 1.0.0
dev: true
/get-tsconfig@4.7.3:
resolution: {integrity: sha512-ZvkrzoUA0PQZM6fy6+/Hce561s+faD1rsNwhnO5FelNjyy7EMGJ3Rz1AQ8GYDWjhRs/7dBLOEJvhK8MiEJOAFg==}
dependencies:
resolve-pkg-maps: 1.0.0
dev: true
/get-value@2.0.6:
resolution: {integrity: sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==}
engines: {node: '>=0.10.0'}
@ -8827,6 +8857,11 @@ packages:
engines: {node: '>= 4'}
dev: true
/ignore@5.3.1:
resolution: {integrity: sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==}
engines: {node: '>= 4'}
dev: true
/image-size@0.5.5:
resolution: {integrity: sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==}
engines: {node: '>=0.10.0'}
@ -9449,7 +9484,7 @@ packages:
'@jest/environment': 27.5.1
'@jest/test-result': 27.5.1
'@jest/types': 27.5.1
'@types/node': 20.12.4
'@types/node': 20.12.6
chalk: 4.1.2
co: 4.6.0
dedent: 0.7.0
@ -9574,7 +9609,7 @@ packages:
'@jest/environment': 27.5.1
'@jest/fake-timers': 27.5.1
'@jest/types': 27.5.1
'@types/node': 20.12.4
'@types/node': 20.12.6
jest-mock: 27.5.1
jest-util: 27.5.1
jsdom: 16.7.0
@ -9592,7 +9627,7 @@ packages:
'@jest/environment': 27.5.1
'@jest/fake-timers': 27.5.1
'@jest/types': 27.5.1
'@types/node': 20.12.4
'@types/node': 20.12.6
jest-mock: 27.5.1
jest-util: 27.5.1
dev: true
@ -9608,7 +9643,7 @@ packages:
dependencies:
'@jest/types': 27.5.1
'@types/graceful-fs': 4.1.9
'@types/node': 20.12.4
'@types/node': 20.12.6
anymatch: 3.1.3
fb-watchman: 2.0.2
graceful-fs: 4.2.11
@ -9630,7 +9665,7 @@ packages:
'@jest/source-map': 27.5.1
'@jest/test-result': 27.5.1
'@jest/types': 27.5.1
'@types/node': 20.12.4
'@types/node': 20.12.6
chalk: 4.1.2
co: 4.6.0
expect: 27.5.1
@ -9685,7 +9720,7 @@ packages:
engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
dependencies:
'@jest/types': 27.5.1
'@types/node': 20.12.4
'@types/node': 20.12.6
dev: true
/jest-pnp-resolver@1.2.3(jest-resolve@27.5.1):
@ -9741,7 +9776,7 @@ packages:
'@jest/test-result': 27.5.1
'@jest/transform': 27.5.1
'@jest/types': 27.5.1
'@types/node': 20.12.4
'@types/node': 20.12.6
chalk: 4.1.2
emittery: 0.8.1
graceful-fs: 4.2.11
@ -9798,7 +9833,7 @@ packages:
resolution: {integrity: sha512-jZCyo6iIxO1aqUxpuBlwTDMkzOAJS4a3eYz3YzgxxVQFwLeSA7Jfq5cbqCY+JLvTDrWirgusI/0KwxKMgrdf7w==}
engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
dependencies:
'@types/node': 20.12.4
'@types/node': 20.12.6
graceful-fs: 4.2.11
dev: true
@ -9837,7 +9872,7 @@ packages:
engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
dependencies:
'@jest/types': 27.5.1
'@types/node': 20.12.4
'@types/node': 20.12.6
chalk: 4.1.2
ci-info: 3.9.0
graceful-fs: 4.2.11
@ -9862,7 +9897,7 @@ packages:
dependencies:
'@jest/test-result': 27.5.1
'@jest/types': 27.5.1
'@types/node': 20.12.4
'@types/node': 20.12.6
ansi-escapes: 4.3.2
chalk: 4.1.2
jest-util: 27.5.1
@ -9873,7 +9908,7 @@ packages:
resolution: {integrity: sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==}
engines: {node: '>= 10.13.0'}
dependencies:
'@types/node': 20.12.4
'@types/node': 20.12.6
merge-stream: 2.0.0
supports-color: 8.1.1
dev: true
@ -13916,18 +13951,6 @@ packages:
- supports-color
dev: true
/vue-i18n@9.10.2(vue@3.4.19):
resolution: {integrity: sha512-ECJ8RIFd+3c1d3m1pctQ6ywG5Yj8Efy1oYoAKQ9neRdkLbuKLVeW4gaY5HPkD/9ssf1pOnUrmIFjx2/gkGxmEw==}
engines: {node: '>= 16'}
peerDependencies:
vue: ^3.0.0
dependencies:
'@intlify/core-base': 9.10.2
'@intlify/shared': 9.10.2
'@vue/devtools-api': 6.5.1
vue: 3.4.19(typescript@4.9.5)
dev: false
/vue-router@4.2.5(vue@3.4.19):
resolution: {integrity: sha512-DIUpKcyg4+PTQKfFPX88UWhlagBEBEfJ5A8XDXRJLUnZOvcpMF8o/dnL90vpVkGaPbjvXazV/rC1qBKrZlFugw==}
peerDependencies:
@ -14063,8 +14086,8 @@ packages:
isexe: 2.0.0
dev: true
/wot-design-uni@1.2.5(vue@3.4.19):
resolution: {integrity: sha512-tbDDUsrT7NI7Hd2DNY/EpmAD1jMTD9ejN0sTeXTexyrMLh4D9B617D+H3ssCtcb4Q1eElhshb/IFu1ESPZX9WQ==}
/wot-design-uni@1.2.13(vue@3.4.19):
resolution: {integrity: sha512-B0h1aCFPqX8BK08Y2m1Qs5RdbJZB3JZDrQHyjEuFA1Ck2Ltkdf9N9CTNdxSQYY4SOLA5cwZ43G0MaJJzU8uh5Q==}
engines: {HBuilderX: ^3.8.7}
peerDependencies:
vue: ^3.2.0