提交 591ae53b 作者: 方治民

fix: 修复 i18n 配置以及 qs 依赖在微信小程序下的 bug

上级 309de051
......@@ -80,9 +80,9 @@
"lodash-es": "^4.17.21",
"mockjs": "^1.1.0",
"pinia": "^2.0.13",
"qs": "^6.10.3",
"qs": "~6.9.7",
"vue": "^3.2.33",
"vue-i18n": "^9.2.0-beta.35",
"vue-i18n": "^9.1.10",
"vue-types": "^4.1.1"
},
"devDependencies": {
......
......@@ -49,7 +49,7 @@ specifiers:
postcss-html: ^1.4.1
postcss-less: ^6.0.0
prettier: ^2.6.2
qs: ^6.10.3
qs: ~6.9.7
rimraf: ^3.0.2
sort-package-json: ^1.57.0
stylelint: ^14.8.2
......@@ -64,7 +64,7 @@ specifiers:
vite: ^2.9.8
vue: ^3.2.33
vue-eslint-parser: ^8.3.0
vue-i18n: ^9.2.0-beta.35
vue-i18n: ^9.1.10
vue-types: ^4.1.1
dependencies:
......@@ -86,9 +86,9 @@ dependencies:
lodash-es: 4.17.21
mockjs: 1.1.0
pinia: 2.0.13_typescript@4.6.4+vue@3.2.33
qs: 6.10.3
qs: 6.9.7
vue: 3.2.33
vue-i18n: 9.2.0-beta.35_vue@3.2.33
vue-i18n: 9.1.10_vue@3.2.33
vue-types: 4.1.1_vue@3.2.33
devDependencies:
......@@ -623,7 +623,7 @@ packages:
debug: 4.3.4
fs-extra: 10.1.0
picocolors: 1.0.0
rollup: 2.71.1
rollup: 2.72.0
transitivePeerDependencies:
- postcss
- supports-color
......@@ -1079,6 +1079,18 @@ packages:
engines: {node: '>=6.9.0'}
dev: true
/@intlify/core-base/9.1.10:
resolution: {integrity: sha512-So9CNUavB/IsZ+zBmk2Cv6McQp6vc2wbGi1S0XQmJ8Vz+UFcNn9MFXAe9gY67PreIHrbLsLxDD0cwo1qsxM1Nw==}
engines: {node: '>= 10'}
dependencies:
'@intlify/devtools-if': 9.1.10
'@intlify/message-compiler': 9.1.10
'@intlify/message-resolver': 9.1.10
'@intlify/runtime': 9.1.10
'@intlify/shared': 9.1.10
'@intlify/vue-devtools': 9.1.10
dev: false
/@intlify/core-base/9.1.9:
resolution: {integrity: sha512-x5T0p/Ja0S8hs5xs+ImKyYckVkL4CzcEXykVYYV6rcbXxJTe2o58IquSqX9bdncVKbRZP7GlBU1EcRaQEEJ+vw==}
engines: {node: '>= 10'}
......@@ -1090,14 +1102,11 @@ packages:
'@intlify/shared': 9.1.9
'@intlify/vue-devtools': 9.1.9
/@intlify/core-base/9.2.0-beta.35:
resolution: {integrity: sha512-53yuCpo2ov5OKdvBTvE5zKMo2clLVqNORwkcY9TUu0B+yrOeDwLWQnbPJnOoDu5KkRdbdXlMxnHNCpJ5vlGZ1g==}
engines: {node: '>= 12'}
/@intlify/devtools-if/9.1.10:
resolution: {integrity: sha512-SHaKoYu6sog3+Q8js1y3oXLywuogbH1sKuc7NSYkN3GElvXSBaMoCzW+we0ZSFqj/6c7vTNLg9nQ6rxhKqYwnQ==}
engines: {node: '>= 10'}
dependencies:
'@intlify/devtools-if': 9.2.0-beta.35
'@intlify/message-compiler': 9.2.0-beta.35
'@intlify/shared': 9.2.0-beta.35
'@intlify/vue-devtools': 9.2.0-beta.35
'@intlify/shared': 9.1.10
dev: false
/@intlify/devtools-if/9.1.9:
......@@ -1106,11 +1115,13 @@ packages:
dependencies:
'@intlify/shared': 9.1.9
/@intlify/devtools-if/9.2.0-beta.35:
resolution: {integrity: sha512-y3+7M+eS9mqeXTBa1QWAvt4nsjwWJ5G4xT+G3IFtd7Vb2CQHwli229n0avD+VdlDGwWCDWpLkny8QWtdNEYpOA==}
engines: {node: '>= 12'}
/@intlify/message-compiler/9.1.10:
resolution: {integrity: sha512-+JiJpXff/XTb0EadYwdxOyRTB0hXNd4n1HaJ/a4yuV960uRmPXaklJsedW0LNdcptd/hYUZtCkI7Lc9J5C1gxg==}
engines: {node: '>= 10'}
dependencies:
'@intlify/shared': 9.2.0-beta.35
'@intlify/message-resolver': 9.1.10
'@intlify/shared': 9.1.10
source-map: 0.6.1
dev: false
/@intlify/message-compiler/9.1.9:
......@@ -1121,18 +1132,24 @@ packages:
'@intlify/shared': 9.1.9
source-map: 0.6.1
/@intlify/message-compiler/9.2.0-beta.35:
resolution: {integrity: sha512-wYQCgnRtyJ40HK3bJTrszHDaxqDXZH+9Ps7RsXNuNwZ9hIb1cVkLiUNIbuJS/XSJ1kATJXA6K+4if6ZLb0Ozxw==}
engines: {node: '>= 12'}
dependencies:
'@intlify/shared': 9.2.0-beta.35
source-map: 0.6.1
/@intlify/message-resolver/9.1.10:
resolution: {integrity: sha512-5YixMG/M05m0cn9+gOzd4EZQTFRUu8RGhzxJbR1DWN21x/Z3bJ8QpDYj6hC4FwBj5uKsRfKpJQ3Xqg98KWoA+w==}
engines: {node: '>= 10'}
dev: false
/@intlify/message-resolver/9.1.9:
resolution: {integrity: sha512-Lx/DBpigeK0sz2BBbzv5mu9/dAlt98HxwbG7xLawC3O2xMF9MNWU5FtOziwYG6TDIjNq0O/3ZbOJAxwITIWXEA==}
engines: {node: '>= 10'}
/@intlify/runtime/9.1.10:
resolution: {integrity: sha512-7QsuByNzpe3Gfmhwq6hzgXcMPpxz8Zxb/XFI6s9lQdPLPe5Lgw4U1ovRPZTOs6Y2hwitR3j/HD8BJNGWpJnOFA==}
engines: {node: '>= 10'}
dependencies:
'@intlify/message-compiler': 9.1.10
'@intlify/message-resolver': 9.1.10
'@intlify/shared': 9.1.10
dev: false
/@intlify/runtime/9.1.9:
resolution: {integrity: sha512-XgPw8+UlHCiie3fI41HPVa/VDJb3/aSH7bLhY1hJvlvNV713PFtb4p4Jo+rlE0gAoMsMCGcsiT982fImolSltg==}
engines: {node: '>= 10'}
......@@ -1141,13 +1158,22 @@ packages:
'@intlify/message-resolver': 9.1.9
'@intlify/shared': 9.1.9
/@intlify/shared/9.1.10:
resolution: {integrity: sha512-Om54xJeo1Vw+K1+wHYyXngE8cAbrxZHpWjYzMR9wCkqbhGtRV5VLhVc214Ze2YatPrWlS2WSMOWXR8JktX/IgA==}
engines: {node: '>= 10'}
dev: false
/@intlify/shared/9.1.9:
resolution: {integrity: sha512-xKGM1d0EAxdDFCWedcYXOm6V5Pfw/TMudd6/qCdEb4tv0hk9EKeg7lwQF1azE0dP2phvx0yXxrt7UQK+IZjNdw==}
engines: {node: '>= 10'}
/@intlify/shared/9.2.0-beta.35:
resolution: {integrity: sha512-DXf7xrwf08GKhr93XPQ8EgaEN0CIELl+mAS6SlRhi/aLtZv5HSGSMkz4M/ICwoWzFLSgOx/ZdBSasex19MMogg==}
engines: {node: '>= 12'}
/@intlify/vue-devtools/9.1.10:
resolution: {integrity: sha512-5l3qYARVbkWAkagLu1XbDUWRJSL8br1Dj60wgMaKB0+HswVsrR6LloYZTg7ozyvM621V6+zsmwzbQxbVQyrytQ==}
engines: {node: '>= 10'}
dependencies:
'@intlify/message-resolver': 9.1.10
'@intlify/runtime': 9.1.10
'@intlify/shared': 9.1.10
dev: false
/@intlify/vue-devtools/9.1.9:
......@@ -1158,14 +1184,6 @@ packages:
'@intlify/runtime': 9.1.9
'@intlify/shared': 9.1.9
/@intlify/vue-devtools/9.2.0-beta.35:
resolution: {integrity: sha512-h7nf5F7AV4uKrr7zKTIyv8EOaIv4yAXuo7tvnFsp5uF8FO+kpBwWDm5csw9v9neyz42hiINJSP0Amou9M2ShEA==}
engines: {node: '>= 12'}
dependencies:
'@intlify/core-base': 9.2.0-beta.35
'@intlify/shared': 9.2.0-beta.35
dev: false
/@jridgewell/gen-mapping/0.1.1:
resolution: {integrity: sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==}
engines: {node: '>=6.0.0'}
......@@ -1765,7 +1783,7 @@ packages:
postcss: ^8.1.0
dependencies:
browserslist: 4.20.3
caniuse-lite: 1.0.30001335
caniuse-lite: 1.0.30001336
fraction.js: 4.2.0
normalize-range: 0.1.2
picocolors: 1.0.0
......@@ -1840,7 +1858,7 @@ packages:
engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
hasBin: true
dependencies:
caniuse-lite: 1.0.30001335
caniuse-lite: 1.0.30001336
electron-to-chromium: 1.4.134
escalade: 3.1.1
node-releases: 2.0.4
......@@ -1866,6 +1884,7 @@ packages:
dependencies:
function-bind: 1.1.1
get-intrinsic: 1.1.1
dev: true
/callsites/3.1.0:
resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==}
......@@ -1891,8 +1910,8 @@ packages:
engines: {node: '>=10'}
dev: true
/caniuse-lite/1.0.30001335:
resolution: {integrity: sha512-ddP1Tgm7z2iIxu6QTtbZUv6HJxSaV/PZeSrWFZtbY4JZ69tOeNhBCl3HyRQgeNZKE5AOn1kpV7fhljigy0Ty3w==}
/caniuse-lite/1.0.30001336:
resolution: {integrity: sha512-/YxSlBmL7iKXTbIJ48IQTnAOBk7XmWsxhBF1PZLOko5Dt9qc4Pl+84lfqG3Tc4EuavurRn1QLoVJGxY2iSycfw==}
/chalk/2.4.2:
resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==}
......@@ -3338,6 +3357,7 @@ packages:
function-bind: 1.1.1
has: 1.0.3
has-symbols: 1.0.3
dev: true
/get-pkg-repo/4.2.1:
resolution: {integrity: sha512-2+QbHjFRfGB74v/pYWjd5OhU3TDIC2Gv/YKUTk/tCvAz0pkn/Mz6P3uByuBimLOcPvN2jYdScl3xGFSrx0jEcA==}
......@@ -3569,6 +3589,7 @@ packages:
/has-symbols/1.0.3:
resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==}
engines: {node: '>= 0.4'}
dev: true
/has-tostringtag/1.0.0:
resolution: {integrity: sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==}
......@@ -4505,6 +4526,7 @@ packages:
/object-inspect/1.12.0:
resolution: {integrity: sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==}
dev: true
/object-keys/1.1.1:
resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==}
......@@ -4988,6 +5010,12 @@ packages:
engines: {node: '>=0.6'}
dependencies:
side-channel: 1.0.4
dev: true
/qs/6.9.7:
resolution: {integrity: sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==}
engines: {node: '>=0.6'}
dev: false
/queue-microtask/1.2.3:
resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}
......@@ -5171,8 +5199,8 @@ packages:
glob: 7.2.0
dev: true
/rollup/2.71.1:
resolution: {integrity: sha512-lMZk3XfUBGjrrZQpvPSoXcZSfKcJ2Bgn+Z0L1MoW2V8Wh7BVM+LOBJTPo16yul2MwL59cXedzW1ruq3rCjSRgw==}
/rollup/2.72.0:
resolution: {integrity: sha512-KqtR2YcO35/KKijg4nx4STO3569aqCUeGRkKWnJ6r+AvBBrVY9L4pmf4NHVrQr4mTOq6msbohflxr2kpihhaOA==}
engines: {node: '>=10.0.0'}
hasBin: true
optionalDependencies:
......@@ -5304,6 +5332,7 @@ packages:
call-bind: 1.0.2
get-intrinsic: 1.1.1
object-inspect: 1.12.0
dev: true
/signal-exit/3.0.7:
resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==}
......@@ -6045,7 +6074,7 @@ packages:
less: 4.1.2
postcss: 8.4.13
resolve: 1.22.0
rollup: 2.71.1
rollup: 2.72.0
stylus: 0.56.0
optionalDependencies:
fsevents: 2.3.2
......@@ -6084,15 +6113,15 @@ packages:
- supports-color
dev: true
/vue-i18n/9.2.0-beta.35_vue@3.2.33:
resolution: {integrity: sha512-kTYzZSB3B/ar3M9RfQ0KAyTGfvRw544qVzY++/sNV4stOKG6NxIDOdHdYTfVEXTSkczFwoZHTKXTWNVpx+GuHA==}
engines: {node: '>= 12'}
/vue-i18n/9.1.10_vue@3.2.33:
resolution: {integrity: sha512-jpr7gV5KPk4n+sSPdpZT8Qx3XzTcNDWffRlHV/cT2NUyEf+sEgTTmLvnBAibjOFJ0zsUyZlVTAWH5DDnYep+1g==}
engines: {node: '>= 10'}
peerDependencies:
vue: ^3.0.0
dependencies:
'@intlify/core-base': 9.2.0-beta.35
'@intlify/shared': 9.2.0-beta.35
'@intlify/vue-devtools': 9.2.0-beta.35
'@intlify/core-base': 9.1.10
'@intlify/shared': 9.1.10
'@intlify/vue-devtools': 9.1.10
'@vue/devtools-api': 6.1.4
vue: 3.2.33
dev: false
......
import type { App } from 'vue'
import type { I18n, I18nOptions } from 'vue-i18n'
import { createI18n } from 'vue-i18n'
import langs from './lang'
export let i18n: ReturnType<typeof createI18n>
async function createI18nOptions(): Promise<I18nOptions> {
function createI18nOptions(): I18nOptions {
const locale = uni.getLocale() || 'zh-Hans'
const defaultLocal = await import(`./lang/${locale}.ts`)
const message = defaultLocal.default?.message ?? {}
const defaultLocal = langs[locale]
const message = defaultLocal?.message ?? {}
return {
locale,
......@@ -24,8 +25,8 @@ async function createI18nOptions(): Promise<I18nOptions> {
}
// setup i18n instance with glob
export async function setupI18n(app: App) {
const options = await createI18nOptions()
export function setupI18n(app: App) {
const options = createI18nOptions()
i18n = createI18n(options) as I18n
app.use(i18n)
}
import zhHans from './zh-Hans'
export default {
en: zhHans,
zh_CN: zhHans,
'zh-Hans': zhHans,
}
......@@ -5,6 +5,7 @@
"versionName" : "1.0.0",
"versionCode" : "100",
"transformPx" : false,
"locale": "zh-Hans",
/* 5+App特有相关 */
"app-plus" : {
"usingComponents" : true,
......
......@@ -31,6 +31,7 @@ export default ({ mode }: ConfigEnv): UserConfig => {
include: ['lodash-es', '@vueuse/core'],
},
build: {
target: 'es2015',
sourcemap: isDevFn(mode) ? true : false,
},
define: {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论