Merge branch 'origin/main' into 'next-release/main'

This commit is contained in:
oauth 2024-11-30 07:34:19 +00:00
commit 250d6ec293
2 changed files with 37 additions and 33 deletions

View file

@ -21,7 +21,7 @@
"@intlify/unplugin-vue-i18n": "^6.0.0",
"@kyvg/vue3-notification": "^3.2.1",
"@mdi/js": "^7.4.47",
"@vueuse/core": "^11.0.0",
"@vueuse/core": "^12.0.0",
"ansi_up": "^6.0.2",
"dayjs": "^1.11.12",
"dompurify": "^3.2.0",

View file

@ -21,8 +21,8 @@ importers:
specifier: ^7.4.47
version: 7.4.47
'@vueuse/core':
specifier: ^11.0.0
version: 11.3.0(vue@3.5.13(typescript@5.6.3))
specifier: ^12.0.0
version: 12.0.0(typescript@5.6.3)
ansi_up:
specifier: ^6.0.2
version: 6.0.2
@ -543,8 +543,8 @@ packages:
resolution: {integrity: sha512-AFbhEo10DP095/45EauinQJ5hJ3rJUmuuqltGguvc3WsvezZN+g8qNHLGWKu60FHQVizMrQY7VJ+zVlBXlQQkQ==}
engines: {node: '>= 16'}
'@intlify/message-compiler@11.0.0-beta.1':
resolution: {integrity: sha512-yMXfN4hg/EeSdtWfmoMrwB9X4TXwkBoZlTIpNydQaW9y0tSJHGnUPRoahtkbsyACCm9leSJINLY4jQ0rK6BK0Q==}
'@intlify/message-compiler@11.0.0-beta.2':
resolution: {integrity: sha512-/cJHP1n45Zlf9tbm/hudLrUwXzJZngR9OMTQk32H1S4lBjM2996wzKTHuLbaJJlJZNTTjnfWZUHPb+F6sE6p1Q==}
engines: {node: '>= 16'}
'@intlify/message-compiler@9.14.1':
@ -555,8 +555,12 @@ packages:
resolution: {integrity: sha512-ukFn0I01HsSgr3VYhYcvkTCLS7rGa0gw4A4AMpcy/A9xx/zRJy7PS2BElMXLwUazVFMAr5zuiTk3MQeoeGXaJg==}
engines: {node: '>= 16'}
'@intlify/shared@11.0.0-beta.1':
resolution: {integrity: sha512-Md/4T/QOx7wZ7zqVzSsMx2M/9Mx/1nsgsjXS5SFIowFKydqUhMz7K+y7pMFh781aNYz+rGXYwad8E9/+InK9SA==}
'@intlify/shared@10.0.5':
resolution: {integrity: sha512-bmsP4L2HqBF6i6uaMqJMcFBONVjKt+siGluRq4Ca4C0q7W2eMaVZr8iCgF9dKbcVXutftkC7D6z2SaSMmLiDyA==}
engines: {node: '>= 16'}
'@intlify/shared@11.0.0-beta.2':
resolution: {integrity: sha512-N6ngJfFaVA0l2iLtx/SymgHOBW4wiS5Pyue7YmY/G+mrGjesi+S+U+u/Xlv6pZa/YIBfeM4QB07lI7rz1YqKLg==}
engines: {node: '>= 16'}
'@intlify/shared@9.14.1':
@ -974,14 +978,14 @@ packages:
'@vue/test-utils@2.4.6':
resolution: {integrity: sha512-FMxEjOpYNYiFe0GkaHsnJPXFHxQ6m4t8vI/ElPGpMWxZKpmRvQ33OIrvRXemy6yha03RxhOlQuy+gZMC3CQSow==}
'@vueuse/core@11.3.0':
resolution: {integrity: sha512-7OC4Rl1f9G8IT6rUfi9JrKiXy4bfmHhZ5x2Ceojy0jnd3mHNEvV4JaRygH362ror6/NZ+Nl+n13LPzGiPN8cKA==}
'@vueuse/core@12.0.0':
resolution: {integrity: sha512-C12RukhXiJCbx4MGhjmd/gH52TjJsc3G0E0kQj/kb19H3Nt6n1CA4DRWuTdWWcaFRdlTe0npWDS942mvacvNBw==}
'@vueuse/metadata@11.3.0':
resolution: {integrity: sha512-pwDnDspTqtTo2HwfLw4Rp6yywuuBdYnPYDq+mO38ZYKGebCUQC/nVj/PXSiK9HX5otxLz8Fn7ECPbjiRz2CC3g==}
'@vueuse/metadata@12.0.0':
resolution: {integrity: sha512-Yzimd1D3sjxTDOlF05HekU5aSGdKjxhuhRFHA7gDWLn57PRbBIh+SF5NmjhJ0WRgF3my7T8LBucyxdFJjIfRJQ==}
'@vueuse/shared@11.3.0':
resolution: {integrity: sha512-P8gSSWQeucH5821ek2mn/ciCk+MS/zoRKqdQIM3bHq6p7GXDAJLmnRRKmF5F65sAVJIfzQlwR3aDzwCn10s8hA==}
'@vueuse/shared@12.0.0':
resolution: {integrity: sha512-3i6qtcq2PIio5i/vVYidkkcgvmTjCqrf26u+Fd4LhnbBmIT6FN8y6q/GJERp8lfcB9zVEfjdV0Br0443qZuJpw==}
'@windicss/config@1.9.3':
resolution: {integrity: sha512-u8GUjsfC9r5X1AGYhzb1lX3zZj8wqk6SH1DYex8XUGmZ1M2UpvnUPOFi63XFViduspQ6l2xTX84QtG+lUzhEoQ==}
@ -3156,8 +3160,8 @@ snapshots:
'@intlify/bundle-utils@10.0.0(vue-i18n@10.0.4(vue@3.5.13(typescript@5.6.3)))':
dependencies:
'@intlify/message-compiler': 11.0.0-beta.1
'@intlify/shared': 11.0.0-beta.1
'@intlify/message-compiler': 11.0.0-beta.2
'@intlify/shared': 11.0.0-beta.2
acorn: 8.14.0
escodegen: 2.1.0
estree-walker: 2.0.2
@ -3208,9 +3212,9 @@ snapshots:
'@intlify/shared': 10.0.4
source-map-js: 1.2.1
'@intlify/message-compiler@11.0.0-beta.1':
'@intlify/message-compiler@11.0.0-beta.2':
dependencies:
'@intlify/shared': 11.0.0-beta.1
'@intlify/shared': 11.0.0-beta.2
source-map-js: 1.2.1
'@intlify/message-compiler@9.14.1':
@ -3220,7 +3224,9 @@ snapshots:
'@intlify/shared@10.0.4': {}
'@intlify/shared@11.0.0-beta.1': {}
'@intlify/shared@10.0.5': {}
'@intlify/shared@11.0.0-beta.2': {}
'@intlify/shared@9.14.1': {}
@ -3228,8 +3234,8 @@ snapshots:
dependencies:
'@eslint-community/eslint-utils': 4.4.1(eslint@9.15.0(jiti@1.21.6))
'@intlify/bundle-utils': 10.0.0(vue-i18n@10.0.4(vue@3.5.13(typescript@5.6.3)))
'@intlify/shared': 10.0.4
'@intlify/vue-i18n-extensions': 7.0.0(@intlify/shared@10.0.4)(@vue/compiler-dom@3.5.13)(vue-i18n@10.0.4(vue@3.5.13(typescript@5.6.3)))(vue@3.5.13(typescript@5.6.3))
'@intlify/shared': 10.0.5
'@intlify/vue-i18n-extensions': 7.0.0(@intlify/shared@10.0.5)(@vue/compiler-dom@3.5.13)(vue-i18n@10.0.4(vue@3.5.13(typescript@5.6.3)))(vue@3.5.13(typescript@5.6.3))
'@rollup/pluginutils': 5.1.3(rollup@4.27.4)
'@typescript-eslint/scope-manager': 8.15.0
'@typescript-eslint/typescript-estree': 8.15.0(typescript@5.6.3)
@ -3251,11 +3257,11 @@ snapshots:
- supports-color
- typescript
'@intlify/vue-i18n-extensions@7.0.0(@intlify/shared@10.0.4)(@vue/compiler-dom@3.5.13)(vue-i18n@10.0.4(vue@3.5.13(typescript@5.6.3)))(vue@3.5.13(typescript@5.6.3))':
'@intlify/vue-i18n-extensions@7.0.0(@intlify/shared@10.0.5)(@vue/compiler-dom@3.5.13)(vue-i18n@10.0.4(vue@3.5.13(typescript@5.6.3)))(vue@3.5.13(typescript@5.6.3))':
dependencies:
'@babel/parser': 7.26.2
optionalDependencies:
'@intlify/shared': 10.0.4
'@intlify/shared': 10.0.5
'@vue/compiler-dom': 3.5.13
vue: 3.5.13(typescript@5.6.3)
vue-i18n: 10.0.4(vue@3.5.13(typescript@5.6.3))
@ -3659,24 +3665,22 @@ snapshots:
js-beautify: 1.15.1
vue-component-type-helpers: 2.1.10
'@vueuse/core@11.3.0(vue@3.5.13(typescript@5.6.3))':
'@vueuse/core@12.0.0(typescript@5.6.3)':
dependencies:
'@types/web-bluetooth': 0.0.20
'@vueuse/metadata': 11.3.0
'@vueuse/shared': 11.3.0(vue@3.5.13(typescript@5.6.3))
vue-demi: 0.14.10(vue@3.5.13(typescript@5.6.3))
'@vueuse/metadata': 12.0.0
'@vueuse/shared': 12.0.0(typescript@5.6.3)
vue: 3.5.13(typescript@5.6.3)
transitivePeerDependencies:
- '@vue/composition-api'
- vue
- typescript
'@vueuse/metadata@11.3.0': {}
'@vueuse/metadata@12.0.0': {}
'@vueuse/shared@11.3.0(vue@3.5.13(typescript@5.6.3))':
'@vueuse/shared@12.0.0(typescript@5.6.3)':
dependencies:
vue-demi: 0.14.10(vue@3.5.13(typescript@5.6.3))
vue: 3.5.13(typescript@5.6.3)
transitivePeerDependencies:
- '@vue/composition-api'
- vue
- typescript
'@windicss/config@1.9.3':
dependencies: