Skip to content

Commit 78f268c

Browse files
authored
fix: improve types for internal virtual files (#3565)
1 parent 1b786fc commit 78f268c

2 files changed

Lines changed: 12 additions & 29 deletions

File tree

internals.d.ts

Lines changed: 12 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,36 @@
11
declare module '#build/i18n.options.mjs' {
2-
import type { DeepRequired } from 'ts-essentials'
3-
import type { LocaleObject, NuxtI18nOptions, VueI18nConfig } from '@nuxtjs/i18n'
2+
import type { LocaleObject, VueI18nConfig } from '@nuxtjs/i18n'
43

54
export type { LocaleObject }
65

7-
type LocaleLoader = {
8-
key: string
9-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
10-
load: () => Promise<any>
11-
cache: boolean
12-
}
13-
6+
type LocaleLoader = { key: string; cache: boolean; load: () => Promise<never> }
147
export const localeLoaders: Record<string, LocaleLoader[]>
15-
168
export const vueI18nConfigs: VueI18nConfig[]
17-
189
export const localeCodes: string[]
19-
export const nuxtI18nOptions: DeepRequired<NuxtI18nOptions<Context>>
2010
export const normalizedLocales: LocaleObject[]
21-
export const isSSG = false
11+
export const isSSG: boolean
2212
export const hasPages: boolean
2313
export const parallelPlugin: boolean
2414

25-
export const NUXT_I18N_MODULE_ID = ''
15+
export const NUXT_I18N_MODULE_ID: string
2616
export const DYNAMIC_PARAMS_KEY: string
2717
export const DEFAULT_COOKIE_KEY: string
2818
export const SWITCH_LOCALE_PATH_LINK_IDENTIFIER: string
2919
}
3020

3121
declare module '#internal/i18n/options.mjs' {
32-
import type { DeepRequired } from 'ts-essentials'
33-
import type { LocaleObject, NuxtI18nOptions, VueI18nConfig } from '@nuxtjs/i18n'
34-
35-
type LocaleLoader = {
36-
key: string
37-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
38-
load: () => Promise<any>
39-
cache: boolean
40-
}
22+
import type { LocaleObject, VueI18nConfig } from '@nuxtjs/i18n'
4123

24+
type LocaleLoader = { key: string; cache: boolean; load: () => Promise<never> }
4225
export const localeLoaders: Record<string, LocaleLoader[]>
43-
4426
export const vueI18nConfigs: VueI18nConfig[]
45-
4627
export const localeCodes: string[]
47-
export const nuxtI18nOptions: DeepRequired<NuxtI18nOptions<Context>>
4828
export const normalizedLocales: LocaleObject[]
49-
export const isSSG = false
29+
export const isSSG: boolean
5030
export const hasPages: boolean
5131
export const parallelPlugin: boolean
5232

53-
export const NUXT_I18N_MODULE_ID = ''
33+
export const NUXT_I18N_MODULE_ID: string
5434
export const DYNAMIC_PARAMS_KEY: string
5535
export const DEFAULT_COOKIE_KEY: string
5636
export const SWITCH_LOCALE_PATH_LINK_IDENTIFIER: string
@@ -62,6 +42,10 @@ declare module '#internal/i18n/locale.detector.mjs' {
6242
export const localeDetector: LocaleDetector
6343
}
6444

45+
declare module '#internal/i18n-type-generation-options' {
46+
export const dtsFile: string
47+
}
48+
6549
declare module '#nuxt-i18n/logger' {
6650
import type { ConsolaInstance } from 'consola'
6751

src/runtime/server/type-generation.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { deepCopy, isArray, isFunction, isObject } from '@intlify/shared'
22
import { vueI18nConfigs, localeLoaders, normalizedLocales } from '#internal/i18n/options.mjs'
3-
// @ts-expect-error virtual file
43
import { dtsFile } from '#internal/i18n-type-generation-options'
54
import { loadLocale, loadVueI18nOptions } from '../messages'
65
import { nuxtMock } from './utils'

0 commit comments

Comments
 (0)