Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: fallback generated locale type to string #3107

Merged
merged 1 commit into from
Sep 17, 2024
Merged

fix: fallback generated locale type to string #3107

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/gen.ts
View file
Open in desktop
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