Merge branch 'base' into i18n
This commit is contained in:
commit
fe58db4cb2
@ -22,7 +22,8 @@
|
|||||||
"pnpm": ">=7.30"
|
"pnpm": ">=7.30"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"uvm": "npx @dcloudio/uvm@latest && node ./scripts/postupgrade.js",
|
"uvm": "npx @dcloudio/uvm@latest",
|
||||||
|
"uvm-rm": "node ./scripts/postupgrade.js",
|
||||||
"postuvm": "echo upgrade uni-app success!",
|
"postuvm": "echo upgrade uni-app success!",
|
||||||
"dev:app": "uni -p app",
|
"dev:app": "uni -p app",
|
||||||
"dev:app-android": "uni -p app-android",
|
"dev:app-android": "uni -p app-android",
|
||||||
@ -92,7 +93,6 @@
|
|||||||
"pinia-plugin-persistedstate": "3.2.1",
|
"pinia-plugin-persistedstate": "3.2.1",
|
||||||
"qs": "6.5.3",
|
"qs": "6.5.3",
|
||||||
"vue": "3.4.21",
|
"vue": "3.4.21",
|
||||||
"vue-i18n": "^9.13.1",
|
|
||||||
"wot-design-uni": "^1.2.26",
|
"wot-design-uni": "^1.2.26",
|
||||||
"z-paging": "^2.7.10"
|
"z-paging": "^2.7.10"
|
||||||
},
|
},
|
||||||
|
36
pnpm-lock.yaml
generated
36
pnpm-lock.yaml
generated
@ -41,9 +41,6 @@ dependencies:
|
|||||||
vue:
|
vue:
|
||||||
specifier: 3.4.21
|
specifier: 3.4.21
|
||||||
version: 3.4.21(typescript@4.9.5)
|
version: 3.4.21(typescript@4.9.5)
|
||||||
vue-i18n:
|
|
||||||
specifier: ^9.13.1
|
|
||||||
version: 9.13.1(vue@3.4.21)
|
|
||||||
wot-design-uni:
|
wot-design-uni:
|
||||||
specifier: ^1.2.26
|
specifier: ^1.2.26
|
||||||
version: 1.2.26(vue@3.4.21)
|
version: 1.2.26(vue@3.4.21)
|
||||||
@ -2455,14 +2452,6 @@ packages:
|
|||||||
'@intlify/shared': 9.1.9
|
'@intlify/shared': 9.1.9
|
||||||
'@intlify/vue-devtools': 9.1.9
|
'@intlify/vue-devtools': 9.1.9
|
||||||
|
|
||||||
/@intlify/core-base@9.13.1:
|
|
||||||
resolution: {integrity: sha512-+bcQRkJO9pcX8d0gel9ZNfrzU22sZFSA0WVhfXrf5jdJOS24a+Bp8pozuS9sBI9Hk/tGz83pgKfmqcn/Ci7/8w==}
|
|
||||||
engines: {node: '>= 16'}
|
|
||||||
dependencies:
|
|
||||||
'@intlify/message-compiler': 9.13.1
|
|
||||||
'@intlify/shared': 9.13.1
|
|
||||||
dev: false
|
|
||||||
|
|
||||||
/@intlify/devtools-if@9.1.9:
|
/@intlify/devtools-if@9.1.9:
|
||||||
resolution: {integrity: sha512-oKSMKjttG3Ut/1UGEZjSdghuP3fwA15zpDPcjkf/1FjlOIm6uIBGMNS5jXzsZy593u+P/YcnrZD6cD3IVFz9vQ==}
|
resolution: {integrity: sha512-oKSMKjttG3Ut/1UGEZjSdghuP3fwA15zpDPcjkf/1FjlOIm6uIBGMNS5jXzsZy593u+P/YcnrZD6cD3IVFz9vQ==}
|
||||||
engines: {node: '>= 10'}
|
engines: {node: '>= 10'}
|
||||||
@ -2477,14 +2466,6 @@ packages:
|
|||||||
'@intlify/shared': 9.1.9
|
'@intlify/shared': 9.1.9
|
||||||
source-map: 0.6.1
|
source-map: 0.6.1
|
||||||
|
|
||||||
/@intlify/message-compiler@9.13.1:
|
|
||||||
resolution: {integrity: sha512-SKsVa4ajYGBVm7sHMXd5qX70O2XXjm55zdZB3VeMFCvQyvLew/dLvq3MqnaIsTMF1VkkOb9Ttr6tHcMlyPDL9w==}
|
|
||||||
engines: {node: '>= 16'}
|
|
||||||
dependencies:
|
|
||||||
'@intlify/shared': 9.13.1
|
|
||||||
source-map-js: 1.2.0
|
|
||||||
dev: false
|
|
||||||
|
|
||||||
/@intlify/message-resolver@9.1.9:
|
/@intlify/message-resolver@9.1.9:
|
||||||
resolution: {integrity: sha512-Lx/DBpigeK0sz2BBbzv5mu9/dAlt98HxwbG7xLawC3O2xMF9MNWU5FtOziwYG6TDIjNq0O/3ZbOJAxwITIWXEA==}
|
resolution: {integrity: sha512-Lx/DBpigeK0sz2BBbzv5mu9/dAlt98HxwbG7xLawC3O2xMF9MNWU5FtOziwYG6TDIjNq0O/3ZbOJAxwITIWXEA==}
|
||||||
engines: {node: '>= 10'}
|
engines: {node: '>= 10'}
|
||||||
@ -2501,11 +2482,6 @@ packages:
|
|||||||
resolution: {integrity: sha512-xKGM1d0EAxdDFCWedcYXOm6V5Pfw/TMudd6/qCdEb4tv0hk9EKeg7lwQF1azE0dP2phvx0yXxrt7UQK+IZjNdw==}
|
resolution: {integrity: sha512-xKGM1d0EAxdDFCWedcYXOm6V5Pfw/TMudd6/qCdEb4tv0hk9EKeg7lwQF1azE0dP2phvx0yXxrt7UQK+IZjNdw==}
|
||||||
engines: {node: '>= 10'}
|
engines: {node: '>= 10'}
|
||||||
|
|
||||||
/@intlify/shared@9.13.1:
|
|
||||||
resolution: {integrity: sha512-u3b6BKGhE6j/JeRU6C/RL2FgyJfy6LakbtfeVF8fJXURpZZTzfh3e05J0bu0XPw447Q6/WUp3C4ajv4TMS4YsQ==}
|
|
||||||
engines: {node: '>= 16'}
|
|
||||||
dev: false
|
|
||||||
|
|
||||||
/@intlify/vue-devtools@9.1.9:
|
/@intlify/vue-devtools@9.1.9:
|
||||||
resolution: {integrity: sha512-YPehH9uL4vZcGXky4Ev5qQIITnHKIvsD2GKGXgqf+05osMUI6WSEQHaN9USRa318Rs8RyyPCiDfmA0hRu3k7og==}
|
resolution: {integrity: sha512-YPehH9uL4vZcGXky4Ev5qQIITnHKIvsD2GKGXgqf+05osMUI6WSEQHaN9USRa318Rs8RyyPCiDfmA0hRu3k7og==}
|
||||||
engines: {node: '>= 10'}
|
engines: {node: '>= 10'}
|
||||||
@ -10085,18 +10061,6 @@ packages:
|
|||||||
- supports-color
|
- supports-color
|
||||||
dev: true
|
dev: true
|
||||||
|
|
||||||
/vue-i18n@9.13.1(vue@3.4.21):
|
|
||||||
resolution: {integrity: sha512-mh0GIxx0wPtPlcB1q4k277y0iKgo25xmDPWioVVYanjPufDBpvu5ySTjP5wOrSvlYQ2m1xI+CFhGdauv/61uQg==}
|
|
||||||
engines: {node: '>= 16'}
|
|
||||||
peerDependencies:
|
|
||||||
vue: ^3.0.0
|
|
||||||
dependencies:
|
|
||||||
'@intlify/core-base': 9.13.1
|
|
||||||
'@intlify/shared': 9.13.1
|
|
||||||
'@vue/devtools-api': 6.6.3
|
|
||||||
vue: 3.4.21(typescript@4.9.5)
|
|
||||||
dev: false
|
|
||||||
|
|
||||||
/vue-router@4.3.3(vue@3.4.21):
|
/vue-router@4.3.3(vue@3.4.21):
|
||||||
resolution: {integrity: sha512-8Q+u+WP4N2SXY38FDcF2H1dUEbYVHVPtPCPZj/GTZx8RCbiB8AtJP9+YIxn4Vs0svMTNQcLIzka4GH7Utkx9xQ==}
|
resolution: {integrity: sha512-8Q+u+WP4N2SXY38FDcF2H1dUEbYVHVPtPCPZj/GTZx8RCbiB8AtJP9+YIxn4Vs0svMTNQcLIzka4GH7Utkx9xQ==}
|
||||||
peerDependencies:
|
peerDependencies:
|
||||||
|
@ -18,7 +18,8 @@ const dependencies = [
|
|||||||
'@dcloudio/uni-mp-toutiao',
|
'@dcloudio/uni-mp-toutiao',
|
||||||
'@dcloudio/uni-mp-xhs',
|
'@dcloudio/uni-mp-xhs',
|
||||||
'@dcloudio/uni-quickapp-webview',
|
'@dcloudio/uni-quickapp-webview',
|
||||||
// 'vue-i18n',
|
// i18n模板要注释掉下面的
|
||||||
|
'vue-i18n',
|
||||||
]
|
]
|
||||||
|
|
||||||
// 使用exec执行命令
|
// 使用exec执行命令
|
||||||
|
Loading…
x
Reference in New Issue
Block a user