提交 fad96793 作者: 方治民

Merge branch '3.x' of https://gitlab.yiring.com/basic/basic-uniapp-v3 into examples

...@@ -82,14 +82,14 @@ ...@@ -82,14 +82,14 @@
"@dcloudio/uni-ui": "^1.4.28", "@dcloudio/uni-ui": "^1.4.28",
"@faker-js/faker": "^8.1.0", "@faker-js/faker": "^8.1.0",
"@vue/runtime-core": "~3.2.47", "@vue/runtime-core": "~3.2.47",
"@vueuse/core": "^10.4.1", "@vueuse/core": "^10.5.0",
"axios": "^1.5.1", "axios": "^1.5.1",
"crypto-js": "^4.1.1", "crypto-js": "^4.1.1",
"dayjs": "^1.11.10", "dayjs": "^1.11.10",
"lodash-es": "^4.17.21", "lodash-es": "^4.17.21",
"nanoid": "^5.0.1", "nanoid": "^5.0.1",
"pinia": "~2.0.36", "pinia": "~2.0.36",
"pinyin-pro": "^3.16.2", "pinyin-pro": "^3.16.7",
"qs": "~6.9.7", "qs": "~6.9.7",
"stompjs": "^2.3.3", "stompjs": "^2.3.3",
"urijs": "^1.19.11", "urijs": "^1.19.11",
...@@ -132,7 +132,7 @@ ...@@ -132,7 +132,7 @@
"jest": "27.0.4", "jest": "27.0.4",
"jest-environment-node": "27.5.1", "jest-environment-node": "27.5.1",
"less": "^4.2.0", "less": "^4.2.0",
"lint-staged": "^13.2.3", "lint-staged": "^13.3.0",
"mapbox-gl": "^2.15.0", "mapbox-gl": "^2.15.0",
"npm-run-all": "^4.1.5", "npm-run-all": "^4.1.5",
"picocolors": "^1.0.0", "picocolors": "^1.0.0",
......
...@@ -54,8 +54,8 @@ dependencies: ...@@ -54,8 +54,8 @@ dependencies:
specifier: ~3.2.47 specifier: ~3.2.47
version: 3.2.47 version: 3.2.47
'@vueuse/core': '@vueuse/core':
specifier: ^10.4.1 specifier: ^10.5.0
version: 10.4.1(vue@3.2.47) version: 10.5.0(vue@3.2.47)
axios: axios:
specifier: ^1.5.1 specifier: ^1.5.1
version: 1.5.1 version: 1.5.1
...@@ -75,8 +75,8 @@ dependencies: ...@@ -75,8 +75,8 @@ dependencies:
specifier: ~2.0.36 specifier: ~2.0.36
version: 2.0.36(typescript@5.1.6)(vue@3.2.47) version: 2.0.36(typescript@5.1.6)(vue@3.2.47)
pinyin-pro: pinyin-pro:
specifier: ^3.16.2 specifier: ^3.16.7
version: 3.16.2 version: 3.16.7
qs: qs:
specifier: ~6.9.7 specifier: ~6.9.7
version: 6.9.7 version: 6.9.7
...@@ -200,7 +200,7 @@ devDependencies: ...@@ -200,7 +200,7 @@ devDependencies:
specifier: ^4.2.0 specifier: ^4.2.0
version: 4.2.0 version: 4.2.0
lint-staged: lint-staged:
specifier: ^13.2.3 specifier: ^13.3.0
version: 13.3.0 version: 13.3.0
mapbox-gl: mapbox-gl:
specifier: ^2.15.0 specifier: ^2.15.0
...@@ -261,7 +261,7 @@ devDependencies: ...@@ -261,7 +261,7 @@ devDependencies:
version: 0.56.0 version: 0.56.0
unplugin-auto-import: unplugin-auto-import:
specifier: ^0.16.6 specifier: ^0.16.6
version: 0.16.6(@vueuse/core@10.4.1) version: 0.16.6(@vueuse/core@10.5.0)
unplugin-vue-components: unplugin-vue-components:
specifier: ^0.25.2 specifier: ^0.25.2
version: 0.25.2(vue@3.2.47) version: 0.25.2(vue@3.2.47)
...@@ -3558,8 +3558,8 @@ packages: ...@@ -3558,8 +3558,8 @@ packages:
engines: {node: '>=6.0.0'} engines: {node: '>=6.0.0'}
dev: true dev: true
/@meoc/utils@0.2.5: /@meoc/utils@0.2.7:
resolution: {integrity: sha512-xRL8RKHjKj+IwTfWmyQFNngL2CuayGC3/d4kDuXNe0Iv1/VLs0cekrKZP1jDD79M3Eti4/lD9zhZYMBAOFIMDg==} resolution: {integrity: sha512-D8kyxVOwgN8fOkrKWkXtva8EmWDPYawXEdSwKy44jj/+jWlolpbJoMpajcmB695sujg5ApnIixaIZuTYdlawNg==}
dependencies: dependencies:
dayjs: 1.11.10 dayjs: 1.11.10
dev: true dev: true
...@@ -3736,8 +3736,8 @@ packages: ...@@ -3736,8 +3736,8 @@ packages:
resolution: {integrity: sha512-VeiPZ9MMwXjO32/Xu7+OwflfmeoRwkE/qzndw42gGtgJwZopBnzy2gD//NN1+go1mADzkDcqf/KnFRSjTJ8xJA==} resolution: {integrity: sha512-VeiPZ9MMwXjO32/Xu7+OwflfmeoRwkE/qzndw42gGtgJwZopBnzy2gD//NN1+go1mADzkDcqf/KnFRSjTJ8xJA==}
dev: true dev: true
/@types/graceful-fs@4.1.6: /@types/graceful-fs@4.1.7:
resolution: {integrity: sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw==} resolution: {integrity: sha512-MhzcwU8aUygZroVwL2jeYk6JisJrPl/oov/gsgGCue9mkgl9wjGbzReYQClxiUgFDnib9FuHqTndccKeZKxTRw==}
dependencies: dependencies:
'@types/node': 20.8.3 '@types/node': 20.8.3
dev: true dev: true
...@@ -3776,8 +3776,8 @@ packages: ...@@ -3776,8 +3776,8 @@ packages:
resolution: {integrity: sha512-Vrjz5N5Ia4SEzWWgIVwnHNEnb1UE1XMkvY5DGXrAeOGE9imk0hgTHh5GyDjLDJi9OTCn9oo9dXH1uToK1VRfrg==} resolution: {integrity: sha512-Vrjz5N5Ia4SEzWWgIVwnHNEnb1UE1XMkvY5DGXrAeOGE9imk0hgTHh5GyDjLDJi9OTCn9oo9dXH1uToK1VRfrg==}
dev: true dev: true
/@types/mdast@3.0.12: /@types/mdast@3.0.13:
resolution: {integrity: sha512-DT+iNIRNX884cx0/Q1ja7NyUPpZuv0KPyL5rGNxm1WC1OtHstl7n4Jb7nk+xacNShQMbczJjt8uFzznpp6kYBg==} resolution: {integrity: sha512-HjiGiWedR0DVFkeNljpa6Lv4/IZU1+30VY5d747K7lBudFc3R0Ibr6yJ9lN3BE28VnZyDfLF/VB1Ql1ZIbKrmg==}
dependencies: dependencies:
'@types/unist': 2.0.8 '@types/unist': 2.0.8
dev: true dev: true
...@@ -3831,8 +3831,8 @@ packages: ...@@ -3831,8 +3831,8 @@ packages:
resolution: {integrity: sha512-77Mq/2BeHU894J364dUv9tSwxxyCLtcX228Pc8TwZpP5bvOoMns+gZoftp3LYl3FBH8vChpWbuagKGiMki2c1A==} resolution: {integrity: sha512-77Mq/2BeHU894J364dUv9tSwxxyCLtcX228Pc8TwZpP5bvOoMns+gZoftp3LYl3FBH8vChpWbuagKGiMki2c1A==}
dev: true dev: true
/@types/web-bluetooth@0.0.17: /@types/web-bluetooth@0.0.18:
resolution: {integrity: sha512-4p9vcSmxAayx72yn70joFoL44c9MO/0+iVEBIQXe3v2h2SiAsEIo/G5v6ObFWvNKRFjbrVadNf9LqEEZeQPzdA==} resolution: {integrity: sha512-v/ZHEj9xh82usl8LMR3GarzFY1IrbXJw5L4QfQhokjRV91q+SelFqxQWSep1ucXEZ22+dSTwLFkXeur25sPIbw==}
/@types/yargs-parser@21.0.1: /@types/yargs-parser@21.0.1:
resolution: {integrity: sha512-axdPBuLuEJt0c4yI5OZssC19K2Mq1uKdrfZBzuxLvaztgqUtFYZUNw7lETExPYJR9jdEoIg4mb7RQKRQzOkeGQ==} resolution: {integrity: sha512-axdPBuLuEJt0c4yI5OZssC19K2Mq1uKdrfZBzuxLvaztgqUtFYZUNw7lETExPYJR9jdEoIg4mb7RQKRQzOkeGQ==}
...@@ -4401,24 +4401,24 @@ packages: ...@@ -4401,24 +4401,24 @@ packages:
/@vue/shared@3.2.47: /@vue/shared@3.2.47:
resolution: {integrity: sha512-BHGyyGN3Q97EZx0taMQ+OLNuZcW3d37ZEVmEAyeoA9ERdGvm9Irc/0Fua8SNyOtV1w6BS4q25wbMzJujO9HIfQ==} resolution: {integrity: sha512-BHGyyGN3Q97EZx0taMQ+OLNuZcW3d37ZEVmEAyeoA9ERdGvm9Irc/0Fua8SNyOtV1w6BS4q25wbMzJujO9HIfQ==}
/@vueuse/core@10.4.1(vue@3.2.47): /@vueuse/core@10.5.0(vue@3.2.47):
resolution: {integrity: sha512-DkHIfMIoSIBjMgRRvdIvxsyboRZQmImofLyOHADqiVbQVilP8VVHDhBX2ZqoItOgu7dWa8oXiNnScOdPLhdEXg==} resolution: {integrity: sha512-z/tI2eSvxwLRjOhDm0h/SXAjNm8N5ld6/SC/JQs6o6kpJ6Ya50LnEL8g5hoYu005i28L0zqB5L5yAl8Jl26K3A==}
dependencies: dependencies:
'@types/web-bluetooth': 0.0.17 '@types/web-bluetooth': 0.0.18
'@vueuse/metadata': 10.4.1 '@vueuse/metadata': 10.5.0
'@vueuse/shared': 10.4.1(vue@3.2.47) '@vueuse/shared': 10.5.0(vue@3.2.47)
vue-demi: 0.14.5(vue@3.2.47) vue-demi: 0.14.6(vue@3.2.47)
transitivePeerDependencies: transitivePeerDependencies:
- '@vue/composition-api' - '@vue/composition-api'
- vue - vue
/@vueuse/metadata@10.4.1: /@vueuse/metadata@10.5.0:
resolution: {integrity: sha512-2Sc8X+iVzeuMGHr6O2j4gv/zxvQGGOYETYXEc41h0iZXIRnRbJZGmY/QP8dvzqUelf8vg0p/yEA5VpCEu+WpZg==} resolution: {integrity: sha512-fEbElR+MaIYyCkeM0SzWkdoMtOpIwO72x8WsZHRE7IggiOlILttqttM69AS13nrDxosnDBYdyy3C5mR1LCxHsw==}
/@vueuse/shared@10.4.1(vue@3.2.47): /@vueuse/shared@10.5.0(vue@3.2.47):
resolution: {integrity: sha512-vz5hbAM4qA0lDKmcr2y3pPdU+2EVw/yzfRsBdu+6+USGa4PxqSQRYIUC9/NcT06y+ZgaTsyURw2I9qOFaaXHAg==} resolution: {integrity: sha512-18iyxbbHYLst9MqU1X1QNdMHIjks6wC7XTVf0KNOv5es/Ms6gjVFCAAWTVP2JStuGqydg3DT+ExpFORUEi9yhg==}
dependencies: dependencies:
vue-demi: 0.14.5(vue@3.2.47) vue-demi: 0.14.6(vue@3.2.47)
transitivePeerDependencies: transitivePeerDependencies:
- '@vue/composition-api' - '@vue/composition-api'
- vue - vue
...@@ -6919,7 +6919,7 @@ packages: ...@@ -6919,7 +6919,7 @@ packages:
engines: {node: '>=12.0.0'} engines: {node: '>=12.0.0'}
dependencies: dependencies:
flatted: 3.2.9 flatted: 3.2.9
keyv: 4.5.3 keyv: 4.5.4
rimraf: 3.0.2 rimraf: 3.0.2
dev: true dev: true
...@@ -8181,7 +8181,7 @@ packages: ...@@ -8181,7 +8181,7 @@ packages:
engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
dependencies: dependencies:
'@jest/types': 27.5.1 '@jest/types': 27.5.1
'@types/graceful-fs': 4.1.6 '@types/graceful-fs': 4.1.7
'@types/node': 20.8.3 '@types/node': 20.8.3
anymatch: 3.1.3 anymatch: 3.1.3
fb-watchman: 2.0.2 fb-watchman: 2.0.2
...@@ -8669,8 +8669,8 @@ packages: ...@@ -8669,8 +8669,8 @@ packages:
resolution: {integrity: sha512-WbCVYJ27Sz8zi9Q7Q0xHC+05iwkm3Znipc2XTlrnJbsHMYktW4hPhXUE8Ys1engBrvffoSCqbil1JQAa7clRpA==} resolution: {integrity: sha512-WbCVYJ27Sz8zi9Q7Q0xHC+05iwkm3Znipc2XTlrnJbsHMYktW4hPhXUE8Ys1engBrvffoSCqbil1JQAa7clRpA==}
dev: true dev: true
/keyv@4.5.3: /keyv@4.5.4:
resolution: {integrity: sha512-QCiSav9WaX1PgETJ+SpNnx2PRRapJ/oRSXM4VO5OGYGSjrxbKPVFVhB3l2OCbLCk329N8qyAtsJjSjvVBWzEug==} resolution: {integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==}
dependencies: dependencies:
json-buffer: 3.0.1 json-buffer: 3.0.1
dev: true dev: true
...@@ -9022,7 +9022,7 @@ packages: ...@@ -9022,7 +9022,7 @@ packages:
/mdast-util-from-markdown@0.8.5: /mdast-util-from-markdown@0.8.5:
resolution: {integrity: sha512-2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ==} resolution: {integrity: sha512-2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ==}
dependencies: dependencies:
'@types/mdast': 3.0.12 '@types/mdast': 3.0.13
mdast-util-to-string: 2.0.0 mdast-util-to-string: 2.0.0
micromark: 2.11.4 micromark: 2.11.4
parse-entities: 2.0.0 parse-entities: 2.0.0
...@@ -9803,11 +9803,11 @@ packages: ...@@ -9803,11 +9803,11 @@ packages:
'@vue/devtools-api': 6.5.0 '@vue/devtools-api': 6.5.0
typescript: 5.1.6 typescript: 5.1.6
vue: 3.2.47 vue: 3.2.47
vue-demi: 0.14.5(vue@3.2.47) vue-demi: 0.14.6(vue@3.2.47)
dev: false dev: false
/pinyin-pro@3.16.2: /pinyin-pro@3.16.7:
resolution: {integrity: sha512-0Q+boRY7u0X7NApcS8ZDLWUw0H8PoopaH4yN/KVqeAFsrRTwhKEbv0bG/ZYwLrQRSfGhWEm5wxl/l4qyVQTrnQ==} resolution: {integrity: sha512-E5LoVzx66aZEria1D99e0eYQJAxgHHysLvbPpMf58bcCuFFVAgbeYI4vysMrZbgEf3IOJ6RXgm4YD7ZGHqbWGQ==}
dev: false dev: false
/pirates@4.0.6: /pirates@4.0.6:
...@@ -10177,7 +10177,7 @@ packages: ...@@ -10177,7 +10177,7 @@ packages:
dependencies: dependencies:
find-up: 6.3.0 find-up: 6.3.0
read-pkg: 8.1.0 read-pkg: 8.1.0
type-fest: 4.3.3 type-fest: 4.4.0
dev: true dev: true
/read-pkg-up@7.0.1: /read-pkg-up@7.0.1:
...@@ -10234,7 +10234,7 @@ packages: ...@@ -10234,7 +10234,7 @@ packages:
'@types/normalize-package-data': 2.4.2 '@types/normalize-package-data': 2.4.2
normalize-package-data: 6.0.0 normalize-package-data: 6.0.0
parse-json: 7.1.0 parse-json: 7.1.0
type-fest: 4.3.3 type-fest: 4.4.0
dev: true dev: true
/readable-stream@3.6.2: /readable-stream@3.6.2:
...@@ -11458,8 +11458,8 @@ packages: ...@@ -11458,8 +11458,8 @@ packages:
engines: {node: '>=14.16'} engines: {node: '>=14.16'}
dev: true dev: true
/type-fest@4.3.3: /type-fest@4.4.0:
resolution: {integrity: sha512-bxhiFii6BBv6UiSDq7uKTMyADT9unXEl3ydGefndVLxFeB44LRbT4K7OJGDYSyDrKnklCC1Pre68qT2wbUl2Aw==} resolution: {integrity: sha512-HT3RRs7sTfY22KuPQJkD/XjbTbxgP2Je5HPt6H6JEGvcjHd5Lqru75EbrP3tb4FYjNJ+DjLp+MNQTFQU0mhXNw==}
engines: {node: '>=16'} engines: {node: '>=16'}
dev: true dev: true
...@@ -11695,7 +11695,7 @@ packages: ...@@ -11695,7 +11695,7 @@ packages:
- rollup - rollup
dev: true dev: true
/unplugin-auto-import@0.16.6(@vueuse/core@10.4.1): /unplugin-auto-import@0.16.6(@vueuse/core@10.5.0):
resolution: {integrity: sha512-M+YIITkx3C/Hg38hp8HmswP5mShUUyJOzpifv7RTlAbeFlO2Tyw0pwrogSSxnipHDPTtI8VHFBpkYkNKzYSuyA==} resolution: {integrity: sha512-M+YIITkx3C/Hg38hp8HmswP5mShUUyJOzpifv7RTlAbeFlO2Tyw0pwrogSSxnipHDPTtI8VHFBpkYkNKzYSuyA==}
engines: {node: '>=14'} engines: {node: '>=14'}
peerDependencies: peerDependencies:
...@@ -11709,7 +11709,7 @@ packages: ...@@ -11709,7 +11709,7 @@ packages:
dependencies: dependencies:
'@antfu/utils': 0.7.6 '@antfu/utils': 0.7.6
'@rollup/pluginutils': 5.0.5 '@rollup/pluginutils': 5.0.5
'@vueuse/core': 10.4.1(vue@3.2.47) '@vueuse/core': 10.5.0(vue@3.2.47)
fast-glob: 3.3.1 fast-glob: 3.3.1
local-pkg: 0.4.3 local-pkg: 0.4.3
magic-string: 0.30.4 magic-string: 0.30.4
...@@ -11723,7 +11723,7 @@ packages: ...@@ -11723,7 +11723,7 @@ packages:
/unplugin-transform-class@0.4.1: /unplugin-transform-class@0.4.1:
resolution: {integrity: sha512-0I8NmOxPcCftvzLJ5tzUaGKpfXHycdAgbEUT8AbxrCFO1bUSuAKKPSLQ3FYfp+ECOFvwPotII7OLaziCHzy9Vw==} resolution: {integrity: sha512-0I8NmOxPcCftvzLJ5tzUaGKpfXHycdAgbEUT8AbxrCFO1bUSuAKKPSLQ3FYfp+ECOFvwPotII7OLaziCHzy9Vw==}
dependencies: dependencies:
'@meoc/utils': 0.2.5 '@meoc/utils': 0.2.7
'@rollup/pluginutils': 5.0.5 '@rollup/pluginutils': 5.0.5
unplugin: 1.4.0 unplugin: 1.4.0
transitivePeerDependencies: transitivePeerDependencies:
...@@ -11733,7 +11733,7 @@ packages: ...@@ -11733,7 +11733,7 @@ packages:
/unplugin-transform-class@0.5.1: /unplugin-transform-class@0.5.1:
resolution: {integrity: sha512-v3TvmVFsosuq6GXyelcr1lPsgDVcAQiWE7NA6JezVjUUdiSjDvnZYQf8x6hCm1+Ouh5dg3QvCZ57o8la/svDNA==} resolution: {integrity: sha512-v3TvmVFsosuq6GXyelcr1lPsgDVcAQiWE7NA6JezVjUUdiSjDvnZYQf8x6hCm1+Ouh5dg3QvCZ57o8la/svDNA==}
dependencies: dependencies:
'@meoc/utils': 0.2.5 '@meoc/utils': 0.2.7
'@rollup/pluginutils': 5.0.5 '@rollup/pluginutils': 5.0.5
unplugin: 1.4.0 unplugin: 1.4.0
transitivePeerDependencies: transitivePeerDependencies:
...@@ -11938,20 +11938,6 @@ packages: ...@@ -11938,20 +11938,6 @@ packages:
pbf: 3.2.1 pbf: 3.2.1
dev: true dev: true
/vue-demi@0.14.5(vue@3.2.47):
resolution: {integrity: sha512-o9NUVpl/YlsGJ7t+xuqJKx8EBGf1quRhCiT6D/J0pfwmk9zUwYkC7yrF4SZCe6fETvSM3UNL2edcbYrSyc4QHA==}
engines: {node: '>=12'}
hasBin: true
requiresBuild: true
peerDependencies:
'@vue/composition-api': ^1.0.0-rc.1
vue: ^3.0.0-0 || ^2.6.0
peerDependenciesMeta:
'@vue/composition-api':
optional: true
dependencies:
vue: 3.2.47
/vue-demi@0.14.6(vue@3.2.47): /vue-demi@0.14.6(vue@3.2.47):
resolution: {integrity: sha512-8QA7wrYSHKaYgUxDA5ZC24w+eHm3sYCbp0EzcDwKqN3p6HqtTCGR/GVsPyZW92unff4UlcSh++lmqDWN3ZIq4w==} resolution: {integrity: sha512-8QA7wrYSHKaYgUxDA5ZC24w+eHm3sYCbp0EzcDwKqN3p6HqtTCGR/GVsPyZW92unff4UlcSh++lmqDWN3ZIq4w==}
engines: {node: '>=12'} engines: {node: '>=12'}
...@@ -11965,7 +11951,6 @@ packages: ...@@ -11965,7 +11951,6 @@ packages:
optional: true optional: true
dependencies: dependencies:
vue: 3.2.47 vue: 3.2.47
dev: false
/vue-eslint-parser@9.3.1(eslint@8.51.0): /vue-eslint-parser@9.3.1(eslint@8.51.0):
resolution: {integrity: sha512-Clr85iD2XFZ3lJ52/ppmUDG/spxQu6+MAeHXjjyI4I1NUYZ9xmenQp4N0oaHJhrA8OOxltCVxMRfANGa70vU0g==} resolution: {integrity: sha512-Clr85iD2XFZ3lJ52/ppmUDG/spxQu6+MAeHXjjyI4I1NUYZ9xmenQp4N0oaHJhrA8OOxltCVxMRfANGa70vU0g==}
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论