From 5e38a768c9da86f90195be4c5001cd3a6d90c827 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=89=E5=92=B2=E6=99=BA=E5=AD=90?= Date: Sat, 7 Jan 2023 05:18:22 +0800 Subject: [PATCH] fix: TS error in locales list upgrade jiti https://github.com/unjs/jiti/issues/106 is fixed --- config/i18n.ts | 5 ++--- pnpm-lock.yaml | 27 ++++++++++++++------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/config/i18n.ts b/config/i18n.ts index 22261a0e..132fa525 100644 --- a/config/i18n.ts +++ b/config/i18n.ts @@ -9,7 +9,6 @@ interface LocaleObjectData extends LocaleObject { pluralRule?: PluralizationRule } -// @ts-expect-error dir is there, ts complaining const locales: LocaleObjectData[] = [ { code: 'en-US', @@ -61,7 +60,7 @@ const locales: LocaleObjectData[] = [ file: 'cs-CZ.json', name: 'Česky', }, - { + ({ code: 'ar-EG', file: 'ar-EG.json', name: 'العربية', @@ -70,7 +69,7 @@ const locales: LocaleObjectData[] = [ const name = new Intl.PluralRules('ar-EG').select(choice) return { zero: 0, one: 1, two: 2, few: 3, many: 4, other: 5 }[name] }, - }, + } satisfies LocaleObjectData), ].sort((a, b) => a.code.localeCompare(b.code)) const datetimeFormats = Object.values(locales).reduce((acc, data) => { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d308f3d3..e04b15b4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -169,7 +169,7 @@ devDependencies: typescript: 4.9.4 unplugin-auto-import: 0.12.1_@vueuse+core@9.9.0 vite-plugin-inspect: 0.7.11 - vite-plugin-pwa: 0.14.1 + vite-plugin-pwa: 0.14.1_workbox-window@6.5.4 vitest: 0.26.2_jsdom@20.0.3 vue-tsc: 1.0.16_typescript@4.9.4 workbox-window: 6.5.4 @@ -1906,7 +1906,7 @@ packages: globby: 13.1.2 hash-sum: 2.0.0 ignore: 5.2.1 - jiti: 1.16.0 + jiti: 1.16.1 knitwork: 1.0.0 lodash.template: 4.5.0 mlly: 1.0.0 @@ -1932,7 +1932,7 @@ packages: globby: 13.1.2 hash-sum: 2.0.0 ignore: 5.2.1 - jiti: 1.16.0 + jiti: 1.16.1 knitwork: 1.0.0 lodash.template: 4.5.0 mlly: 1.0.0 @@ -1955,7 +1955,7 @@ packages: c12: 1.0.1 create-require: 1.1.1 defu: 6.1.1 - jiti: 1.16.0 + jiti: 1.16.1 pathe: 1.0.0 pkg-types: 1.0.1 postcss-import-resolver: 2.0.0 @@ -1975,7 +1975,7 @@ packages: c12: 1.0.1 create-require: 1.1.1 defu: 6.1.1 - jiti: 1.16.0 + jiti: 1.16.1 pathe: 1.0.0 pkg-types: 1.0.1 postcss-import-resolver: 2.0.0 @@ -2005,7 +2005,7 @@ packages: git-url-parse: 13.1.0 inquirer: 9.1.4 is-docker: 3.0.0 - jiti: 1.16.0 + jiti: 1.16.1 mri: 1.2.0 nanoid: 4.0.0 node-fetch: 3.3.0 @@ -2107,7 +2107,7 @@ packages: pathe: 1.0.0 pkg-types: 1.0.1 ufo: 1.0.1 - unplugin: 1.0.0 + unplugin: 1.0.1 vue-i18n: 9.3.0-beta.10 vue-i18n-routing: 0.10.1_vue-i18n@9.3.0-beta.10 transitivePeerDependencies: @@ -4198,7 +4198,7 @@ packages: defu: 6.1.1 dotenv: 16.0.3 gittar: 0.1.1 - jiti: 1.16.0 + jiti: 1.16.1 mlly: 1.0.0 pathe: 1.0.0 pkg-types: 1.0.1 @@ -6727,8 +6727,8 @@ packages: supports-color: 7.2.0 dev: true - /jiti/1.16.0: - resolution: {integrity: sha512-L3BJStEf5NAqNuzrpfbN71dp43mYIcBUlCRea/vdyv5dW/AYa1d4bpelko4SHdY3I6eN9Wzyasxirj1/vv5kmg==} + /jiti/1.16.1: + resolution: {integrity: sha512-kJUp4Bj44uTaZAwG6R2/GjbodOWHULn8Swue0B7tY8v5BpTkUvDR+zBM5tsbC4x/jCeYDZ+mAdrUIScwIo4oPw==} hasBin: true /js-cookie/3.0.1: @@ -7414,7 +7414,7 @@ packages: hookable: 5.4.2 http-proxy: 1.18.1 is-primitive: 3.0.1 - jiti: 1.16.0 + jiti: 1.16.1 klona: 2.0.5 knitwork: 1.0.0 listhen: 1.0.1 @@ -9551,7 +9551,7 @@ packages: dependencies: '@antfu/utils': 0.5.2 defu: 6.1.1 - jiti: 1.16.0 + jiti: 1.16.1 dev: true /unctx/2.1.1: @@ -10020,10 +10020,11 @@ packages: - supports-color dev: true - /vite-plugin-pwa/0.14.1: + /vite-plugin-pwa/0.14.1_workbox-window@6.5.4: resolution: {integrity: sha512-5zx7yhQ8RTLwV71+GA9YsQQ63ALKG8XXIMqRJDdZkR8ZYftFcRgnzM7wOWmQZ/DATspyhPih5wCdcZnAIsM+mA==} peerDependencies: vite: ^3.1.0 || ^4.0.0 + workbox-window: ^6.5.4 dependencies: '@rollup/plugin-replace': 5.0.1_rollup@3.9.1 debug: 4.3.4