Skip to content

Commit

Permalink
fix: fallback generated locale type to string (#3107)
Browse files Browse the repository at this point in the history
  • Loading branch information
BobbieGoede authored Sep 17, 2024
1 parent f8b1df8 commit b2d4916
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions src/gen.ts
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,8 @@ export function generateI18nTypes(nuxt: Nuxt, options: NuxtI18nOptions) {
const vueI18nTypes = options.types === 'legacy' ? ['VueI18n'] : ['ExportedGlobalComposer', 'Composer']
const generatedLocales = simplifyLocaleOptions(nuxt, options)
const resolvedLocaleType = typeof generatedLocales === 'string' ? 'Locale[]' : 'LocaleObject[]'
const localeCodeStrings = getNormalizedLocales(options.locales).map(x => x.code)
const localeCodeStrings = getNormalizedLocales(options.locales).map(x => JSON.stringify(x.code))
const narrowedLocaleType = localeCodeStrings.join(' | ') || 'string'

const i18nType = `${vueI18nTypes.join(' & ')} & NuxtI18nRoutingCustomProperties<${resolvedLocaleType}>`

Expand Down Expand Up @@ -191,7 +192,7 @@ declare module 'vue-i18n' {
declare module '@intlify/core-base' {
// generated based on configured locales
interface GeneratedTypeConfig {
locale: ${localeCodeStrings.map(x => JSON.stringify(x)).join(' | ')}
locale: ${narrowedLocaleType}
}
}
Expand Down

0 comments on commit b2d4916

Please sign in to comment.