From e1ad09696a80a850e9af6b62e013a5c64eb59671 Mon Sep 17 00:00:00 2001 From: kazuya kawaguchi Date: Sun, 22 Sep 2024 18:11:35 +0900 Subject: [PATCH] fix(petite-vue-i18n): cannot resolve message resolver and locale fallbacker --- docs/guide/advanced/lite.md | 6 +- packages/petite-vue-i18n/src/index.ts | 124 ++++++++++++------------ packages/petite-vue-i18n/src/runtime.ts | 124 ++++++++++++------------ 3 files changed, 130 insertions(+), 124 deletions(-) diff --git a/docs/guide/advanced/lite.md b/docs/guide/advanced/lite.md index 63c817090..fa6443002 100644 --- a/docs/guide/advanced/lite.md +++ b/docs/guide/advanced/lite.md @@ -185,11 +185,13 @@ Then, at the entry point of the application, configure the message resolver and ```js import { createApp } from 'vue' -import { createI18n } from 'petite-vue-i18n' import { + createI18n, registerMessageResolver, // register the message resolver API - resolveValue, // message resolver of vue-i18n which is used by default registerLocaleFallbacker, // register the locale fallbacker API +} from 'petite-vue-i18n' +import { + resolveValue, // message resolver of vue-i18n which is used by default fallbackWithLocaleChain // locale fallbacker of vue-i18n which is used by default } from '@intlify/core-base' diff --git a/packages/petite-vue-i18n/src/index.ts b/packages/petite-vue-i18n/src/index.ts index 0b01eb2f8..9748c1296 100644 --- a/packages/petite-vue-i18n/src/index.ts +++ b/packages/petite-vue-i18n/src/index.ts @@ -1,9 +1,9 @@ -import { getGlobalThis } from '@intlify/shared' import { - setDevToolsHook, + compile, registerMessageCompiler, - compile + setDevToolsHook } from '@intlify/core-base' +import { getGlobalThis } from '@intlify/shared' import { initDev, initFeatureFlags } from '../../vue-i18n-core/src/misc' if (__ESM_BUNDLER__ && !__TEST__) { @@ -14,96 +14,98 @@ if (__ESM_BUNDLER__ && !__TEST__) { registerMessageCompiler(compile) export { - Path, - PathValue, - NamedValue, - Locale, + CompileError, + DateTimeOptions, FallbackLocale, - LocaleMessageValue, - LocaleMessageDictionary, - LocaleMessageType, - LocaleMessages, - NumberFormat as IntlNumberFormat, + GeneratedTypeConfig, DateTimeFormat as IntlDateTimeFormat, DateTimeFormats as IntlDateTimeFormats, - NumberFormats as IntlNumberFormats, - LocaleMatcher as IntlLocaleMatcher, FormatMatcher as IntlFormatMatcher, - MessageFunction, - MessageFunctions, - PluralizationRule, + LocaleMatcher as IntlLocaleMatcher, + NumberFormat as IntlNumberFormat, + NumberFormats as IntlNumberFormats, LinkedModifiers, - TranslateOptions, - DateTimeOptions, - NumberOptions, - PostTranslationHandler, - MessageResolver, + Locale, + LocaleMessageDictionary, + LocaleMessages, + LocaleMessageType, + LocaleMessageValue, MessageCompiler, MessageCompilerContext, - CompileError, MessageContext, + MessageFunction, + MessageFunctions, + MessageResolver, + NamedValue, + NumberOptions, + Path, + PathValue, + PluralizationRule, + PostTranslationHandler, + registerLocaleFallbacker, + registerMessageResolver, RemovedIndexResources, - GeneratedTypeConfig + TranslateOptions } from '@intlify/core-base' export { - VueMessageType, - DefineLocaleMessage, - DefaultLocaleMessageSchema, - DefineDateTimeFormat, - DefaultDateTimeFormatSchema, - DefineNumberFormat, - DefaultNumberFormatSchema, - MissingHandler, - ComposerOptions, Composer, ComposerCustom, - CustomBlock, - CustomBlocks, - ComposerTranslation, ComposerDateTimeFormatting, ComposerNumberFormatting, - ComposerResolveLocaleMessageTranslation + ComposerOptions, + ComposerResolveLocaleMessageTranslation, + ComposerTranslation, + CustomBlock, + CustomBlocks, + DefaultDateTimeFormatSchema, + DefaultLocaleMessageSchema, + DefaultNumberFormatSchema, + DefineDateTimeFormat, + DefineLocaleMessage, + DefineNumberFormat, + MissingHandler, + VueMessageType } from '../../vue-i18n-core/src/composer' export { - TranslateResult, + ComposerAdditionalOptions, + ComposerExtender, + createI18n, + ExportedGlobalComposer, + I18n, + I18nAdditionalOptions, + I18nMode, + I18nOptions, + I18nScope, + useI18n, + UseI18nOptions +} from '../../vue-i18n-core/src/i18n' +export { Choice, - LocaleMessageObject, - PluralizationRulesMap, - WarnHtmlInMessageLevel, DateTimeFormatResult, + LocaleMessageObject, NumberFormatResult, - VueI18nOptions, + PluralizationRulesMap, + TranslateResult, VueI18n, - VueI18nTranslation, - VueI18nTranslationChoice, VueI18nDateTimeFormatting, + VueI18nExtender, VueI18nNumberFormatting, + VueI18nOptions, VueI18nResolveLocaleMessageTranslation, - VueI18nExtender + VueI18nTranslation, + VueI18nTranslationChoice, + WarnHtmlInMessageLevel } from '../../vue-i18n-core/src/legacy' -export { - createI18n, - useI18n, - I18nOptions, - I18nAdditionalOptions, - I18n, - I18nMode, - I18nScope, - ComposerAdditionalOptions, - UseI18nOptions, - ExportedGlobalComposer, - ComposerExtender -} from '../../vue-i18n-core/src/i18n' export { I18nPluginOptions } from '../../vue-i18n-core/src/plugin' export { VERSION } from './../../vue-i18n-core/src/misc' export { Disposer } from './../../vue-i18n-core/src/types' export type { - IsNever, IsEmptyObject, - PickupPaths, + IsNever, + PickupFormatPathKeys, PickupKeys, - PickupFormatPathKeys + PickupPaths } from '@intlify/core-base' // NOTE: experimental !! diff --git a/packages/petite-vue-i18n/src/runtime.ts b/packages/petite-vue-i18n/src/runtime.ts index 235596f11..25d672017 100644 --- a/packages/petite-vue-i18n/src/runtime.ts +++ b/packages/petite-vue-i18n/src/runtime.ts @@ -1,9 +1,9 @@ -import { getGlobalThis } from '@intlify/shared' import { - setDevToolsHook, compile, - registerMessageCompiler + registerMessageCompiler, + setDevToolsHook } from '@intlify/core-base' +import { getGlobalThis } from '@intlify/shared' import { initDev, initFeatureFlags } from '../../vue-i18n-core/src/misc' if (__ESM_BUNDLER__ && !__TEST__) { @@ -14,95 +14,97 @@ if (__ESM_BUNDLER__ && !__TEST__) { registerMessageCompiler(compile) export { - Path, - PathValue, - NamedValue, - Locale, + CompileError, + DateTimeOptions, FallbackLocale, - LocaleMessageValue, - LocaleMessageDictionary, - LocaleMessageType, - LocaleMessages, - NumberFormat as IntlNumberFormat, DateTimeFormat as IntlDateTimeFormat, DateTimeFormats as IntlDateTimeFormats, - NumberFormats as IntlNumberFormats, - LocaleMatcher as IntlLocaleMatcher, FormatMatcher as IntlFormatMatcher, - MessageFunction, - MessageFunctions, - PluralizationRule, + LocaleMatcher as IntlLocaleMatcher, + NumberFormat as IntlNumberFormat, + NumberFormats as IntlNumberFormats, LinkedModifiers, - TranslateOptions, - DateTimeOptions, - NumberOptions, - PostTranslationHandler, - MessageResolver, + Locale, + LocaleMessageDictionary, + LocaleMessages, + LocaleMessageType, + LocaleMessageValue, MessageCompiler, MessageCompilerContext, - CompileError, MessageContext, - RemovedIndexResources + MessageFunction, + MessageFunctions, + MessageResolver, + NamedValue, + NumberOptions, + Path, + PathValue, + PluralizationRule, + PostTranslationHandler, + registerLocaleFallbacker, + registerMessageResolver, + RemovedIndexResources, + TranslateOptions } from '@intlify/core-base' export { - VueMessageType, - DefineLocaleMessage, - DefaultLocaleMessageSchema, - DefineDateTimeFormat, - DefaultDateTimeFormatSchema, - DefineNumberFormat, - DefaultNumberFormatSchema, - MissingHandler, - ComposerOptions, Composer, ComposerCustom, - CustomBlock, - CustomBlocks, - ComposerTranslation, ComposerDateTimeFormatting, ComposerNumberFormatting, - ComposerResolveLocaleMessageTranslation + ComposerOptions, + ComposerResolveLocaleMessageTranslation, + ComposerTranslation, + CustomBlock, + CustomBlocks, + DefaultDateTimeFormatSchema, + DefaultLocaleMessageSchema, + DefaultNumberFormatSchema, + DefineDateTimeFormat, + DefineLocaleMessage, + DefineNumberFormat, + MissingHandler, + VueMessageType } from '../../vue-i18n-core/src/composer' export { - TranslateResult, + ComposerAdditionalOptions, + ComposerExtender, + createI18n, + ExportedGlobalComposer, + I18n, + I18nAdditionalOptions, + I18nMode, + I18nOptions, + I18nScope, + useI18n, + UseI18nOptions +} from '../../vue-i18n-core/src/i18n' +export { Choice, - LocaleMessageObject, - PluralizationRulesMap, - WarnHtmlInMessageLevel, DateTimeFormatResult, + LocaleMessageObject, NumberFormatResult, - VueI18nOptions, + PluralizationRulesMap, + TranslateResult, VueI18n, - VueI18nTranslation, - VueI18nTranslationChoice, VueI18nDateTimeFormatting, + VueI18nExtender, VueI18nNumberFormatting, + VueI18nOptions, VueI18nResolveLocaleMessageTranslation, - VueI18nExtender + VueI18nTranslation, + VueI18nTranslationChoice, + WarnHtmlInMessageLevel } from '../../vue-i18n-core/src/legacy' -export { - createI18n, - useI18n, - I18nOptions, - I18nAdditionalOptions, - I18n, - I18nMode, - I18nScope, - ComposerAdditionalOptions, - UseI18nOptions, - ExportedGlobalComposer, - ComposerExtender -} from '../../vue-i18n-core/src/i18n' export { I18nPluginOptions } from '../../vue-i18n-core/src/plugin' export { VERSION } from './../../vue-i18n-core/src/misc' export { Disposer } from './../../vue-i18n-core/src/types' export type { - IsNever, IsEmptyObject, - PickupPaths, + IsNever, + PickupFormatPathKeys, PickupKeys, - PickupFormatPathKeys + PickupPaths } from '@intlify/core-base' // NOTE: experimental !!