diff --git a/packages/console/src/include.d/react-i18next.d.ts b/packages/console/src/include.d/react-i18next.d.ts index 555d2cc15..f2c0f694b 100644 --- a/packages/console/src/include.d/react-i18next.d.ts +++ b/packages/console/src/include.d/react-i18next.d.ts @@ -1,10 +1,10 @@ // https://react.i18next.com/latest/typescript#create-a-declaration-file -import type { LocalPhrase } from '@logto/phrases'; +import type { LocalePhrase } from '@logto/phrases'; declare module 'react-i18next' { interface CustomTypeOptions { allowObjectInHTMLChildren: true; - resources: LocalPhrase; + resources: LocalePhrase; } } diff --git a/packages/core/src/__mocks__/custom-phrase.ts b/packages/core/src/__mocks__/custom-phrase.ts index 755dca3f4..792f05e2b 100644 --- a/packages/core/src/__mocks__/custom-phrase.ts +++ b/packages/core/src/__mocks__/custom-phrase.ts @@ -1,4 +1,4 @@ -import en from '@logto/phrases-ui/lib/locales/en.js'; +import en from '@logto/phrases-ui/lib/locales/en/index.js'; import { type CustomPhrase } from '@logto/schemas'; import { mockId } from '#src/test-utils/nanoid.js'; diff --git a/packages/core/src/routes/custom-phrase.test.ts b/packages/core/src/routes/custom-phrase.test.ts index 200372452..c35bcc14e 100644 --- a/packages/core/src/routes/custom-phrase.test.ts +++ b/packages/core/src/routes/custom-phrase.test.ts @@ -1,4 +1,4 @@ -import en from '@logto/phrases-ui/lib/locales/en.js'; +import en from '@logto/phrases-ui/lib/locales/en/index.js'; import { type CustomPhrase, type SignInExperience } from '@logto/schemas'; import { pickDefault, createMockUtils } from '@logto/shared/esm'; diff --git a/packages/core/src/routes/well-known.phrases.content-language.test.ts b/packages/core/src/routes/well-known.phrases.content-language.test.ts index 19cf525bc..a681d79d2 100644 --- a/packages/core/src/routes/well-known.phrases.content-language.test.ts +++ b/packages/core/src/routes/well-known.phrases.content-language.test.ts @@ -1,4 +1,4 @@ -import en from '@logto/phrases-ui/lib/locales/en.js'; +import en from '@logto/phrases-ui/lib/locales/en/index.js'; import type { SignInExperience } from '@logto/schemas'; import { pickDefault } from '@logto/shared/esm'; diff --git a/packages/core/src/utils/translation.test.ts b/packages/core/src/utils/translation.test.ts index 59b5018ad..3fbdbf3fb 100644 --- a/packages/core/src/utils/translation.test.ts +++ b/packages/core/src/utils/translation.test.ts @@ -1,4 +1,4 @@ -import en from '@logto/phrases-ui/lib/locales/en.js'; +import en from '@logto/phrases-ui/lib/locales/en/index.js'; import fr from '@logto/phrases-ui/lib/locales/fr.js'; import { isStrictlyPartial } from '#src/utils/translation.js'; diff --git a/packages/demo-app/src/include.d/react-i18next.d.ts b/packages/demo-app/src/include.d/react-i18next.d.ts index 738817fc7..8ff6903fc 100644 --- a/packages/demo-app/src/include.d/react-i18next.d.ts +++ b/packages/demo-app/src/include.d/react-i18next.d.ts @@ -1,12 +1,12 @@ // https://react.i18next.com/latest/typescript#create-a-declaration-file -import type { LocalPhrase } from '@logto/phrases'; +import type { LocalePhrase } from '@logto/phrases'; // eslint-disable-next-line unused-imports/no-unused-imports import { CustomTypeOptions } from 'react-i18next'; declare module 'react-i18next' { interface CustomTypeOptions { allowObjectInHTMLChildren: true; - resources: LocalPhrase; + resources: LocalePhrase; } } diff --git a/packages/phrases/src/index.ts b/packages/phrases/src/index.ts index 1f062a64e..e529ebb10 100644 --- a/packages/phrases/src/index.ts +++ b/packages/phrases/src/index.ts @@ -12,9 +12,9 @@ import ptBR from './locales/pt-br/index.js'; import ptPT from './locales/pt-pt/index.js'; import trTR from './locales/tr-tr/index.js'; import zhCN from './locales/zh-cn/index.js'; -import type { LocalPhrase } from './types.js'; +import type { LocalePhrase } from './types.js'; -export type { LocalPhrase } from './types.js'; +export type { LocalePhrase } from './types.js'; export type I18nKey = NormalizeKeyPaths; @@ -51,7 +51,7 @@ export const getDefaultLanguageTag = (languages: string): LanguageTag => export const isBuiltInLanguageTag = (language: string): language is BuiltInLanguageTag => builtInLanguageTagGuard.safeParse(language).success; -export type Resource = Record; +export type Resource = Record; const resource: Resource = { de, diff --git a/packages/phrases/src/locales/de/index.ts b/packages/phrases/src/locales/de/index.ts index ec52f1140..3c9e36cc2 100644 --- a/packages/phrases/src/locales/de/index.ts +++ b/packages/phrases/src/locales/de/index.ts @@ -1,9 +1,9 @@ -import type { LocalPhrase } from '../../types.js'; +import type { LocalePhrase } from '../../types.js'; import errors from './errors.js'; import translation from './translation/index.js'; -const de: LocalPhrase = Object.freeze({ +const de: LocalePhrase = Object.freeze({ translation, errors, }); diff --git a/packages/phrases/src/locales/fr/index.ts b/packages/phrases/src/locales/fr/index.ts index 8bd57b482..32a4cb4f8 100644 --- a/packages/phrases/src/locales/fr/index.ts +++ b/packages/phrases/src/locales/fr/index.ts @@ -1,9 +1,9 @@ -import type { LocalPhrase } from '../../types.js'; +import type { LocalePhrase } from '../../types.js'; import errors from './errors.js'; import translation from './translation/index.js'; -const fr: LocalPhrase = Object.freeze({ +const fr: LocalePhrase = Object.freeze({ translation, errors, }); diff --git a/packages/phrases/src/locales/ko/index.ts b/packages/phrases/src/locales/ko/index.ts index 2e138f26f..1a004415f 100644 --- a/packages/phrases/src/locales/ko/index.ts +++ b/packages/phrases/src/locales/ko/index.ts @@ -1,9 +1,9 @@ -import type { LocalPhrase } from '../../types.js'; +import type { LocalePhrase } from '../../types.js'; import errors from './errors.js'; import translation from './translation/index.js'; -const ko: LocalPhrase = Object.freeze({ +const ko: LocalePhrase = Object.freeze({ translation, errors, }); diff --git a/packages/phrases/src/locales/pt-br/index.ts b/packages/phrases/src/locales/pt-br/index.ts index 306c93011..d77ad8218 100644 --- a/packages/phrases/src/locales/pt-br/index.ts +++ b/packages/phrases/src/locales/pt-br/index.ts @@ -1,9 +1,9 @@ -import type { LocalPhrase } from '../../types.js'; +import type { LocalePhrase } from '../../types.js'; import errors from './errors.js'; import translation from './translation/index.js'; -const ptBR: LocalPhrase = Object.freeze({ +const ptBR: LocalePhrase = Object.freeze({ translation, errors, }); diff --git a/packages/phrases/src/locales/pt-pt/index.ts b/packages/phrases/src/locales/pt-pt/index.ts index 0892f3bab..ee4ae5bd7 100644 --- a/packages/phrases/src/locales/pt-pt/index.ts +++ b/packages/phrases/src/locales/pt-pt/index.ts @@ -1,9 +1,9 @@ -import type { LocalPhrase } from '../../types.js'; +import type { LocalePhrase } from '../../types.js'; import errors from './errors.js'; import translation from './translation/index.js'; -const ptPT: LocalPhrase = Object.freeze({ +const ptPT: LocalePhrase = Object.freeze({ translation, errors, }); diff --git a/packages/phrases/src/locales/tr-tr/index.ts b/packages/phrases/src/locales/tr-tr/index.ts index 285639c70..de0515e61 100644 --- a/packages/phrases/src/locales/tr-tr/index.ts +++ b/packages/phrases/src/locales/tr-tr/index.ts @@ -1,9 +1,9 @@ -import type { LocalPhrase } from '../../types.js'; +import type { LocalePhrase } from '../../types.js'; import errors from './errors.js'; import translation from './translation/index.js'; -const trTR: LocalPhrase = Object.freeze({ +const trTR: LocalePhrase = Object.freeze({ translation, errors, }); diff --git a/packages/phrases/src/locales/zh-cn/index.ts b/packages/phrases/src/locales/zh-cn/index.ts index 0dc555841..5003a7a44 100644 --- a/packages/phrases/src/locales/zh-cn/index.ts +++ b/packages/phrases/src/locales/zh-cn/index.ts @@ -1,9 +1,9 @@ -import type { LocalPhrase } from '../../types.js'; +import type { LocalePhrase } from '../../types.js'; import errors from './errors.js'; import translation from './translation/index.js'; -const zhCN: LocalPhrase = Object.freeze({ +const zhCN: LocalePhrase = Object.freeze({ translation, errors, }); diff --git a/packages/phrases/src/types.ts b/packages/phrases/src/types.ts index 5c0a77aa1..2b12ac9e1 100644 --- a/packages/phrases/src/types.ts +++ b/packages/phrases/src/types.ts @@ -1,3 +1,3 @@ import type en from './locales/en/index.js'; -export type LocalPhrase = typeof en; +export type LocalePhrase = typeof en; diff --git a/packages/ui/src/include.d/react-i18next.d.ts b/packages/ui/src/include.d/react-i18next.d.ts index 427faa7a7..b8cf81fd5 100644 --- a/packages/ui/src/include.d/react-i18next.d.ts +++ b/packages/ui/src/include.d/react-i18next.d.ts @@ -1,12 +1,10 @@ // https://react.i18next.com/latest/typescript#create-a-declaration-file -// eslint-disable-next-line import/no-unassigned-import -import 'react-i18next'; -import type en from '@logto/phrases-ui/lib/locales/en.js'; +import type { LocalePhrase } from '@logto/phrases-ui'; declare module 'react-i18next' { interface CustomTypeOptions { allowObjectInHTMLChildren: true; - resources: typeof en; + resources: LocalePhrase; } }