Skip to content

Commit d8d6180

Browse files
kazuponkazupon
authored
fix(petite-vue-i18n): cannot resolve message resolver and locale fallbacker (#1967)
1 parent 9d97932 commit d8d6180

File tree

3 files changed

+130
-124
lines changed

3 files changed

+130
-124
lines changed

‎docs/guide/advanced/lite.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,11 +185,13 @@ Then, at the entry point of the application, configure the message resolver and
185185

186186
```js
187187
import { createApp } from 'vue'
188-
import { createI18n } from 'petite-vue-i18n'
189188
import {
189+
createI18n,
190190
registerMessageResolver, // register the message resolver API
191-
resolveValue, // message resolver of vue-i18n which is used by default
192191
registerLocaleFallbacker, // register the locale fallbacker API
192+
} from 'petite-vue-i18n'
193+
import {
194+
resolveValue, // message resolver of vue-i18n which is used by default
193195
fallbackWithLocaleChain // locale fallbacker of vue-i18n which is used by default
194196
} from '@intlify/core-base'
195197

‎packages/petite-vue-i18n/src/index.ts

Lines changed: 63 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import { getGlobalThis } from '@intlify/shared'
21
import {
3-
setDevToolsHook,
2+
compile,
43
registerMessageCompiler,
5-
compile
4+
setDevToolsHook
65
} from '@intlify/core-base'
6+
import { getGlobalThis } from '@intlify/shared'
77
import { initDev, initFeatureFlags } from '../../vue-i18n-core/src/misc'
88

99
if (__ESM_BUNDLER__ && !__TEST__) {
@@ -14,96 +14,98 @@ if (__ESM_BUNDLER__ && !__TEST__) {
1414
registerMessageCompiler(compile)
1515

1616
export {
17-
Path,
18-
PathValue,
19-
NamedValue,
20-
Locale,
17+
CompileError,
18+
DateTimeOptions,
2119
FallbackLocale,
22-
LocaleMessageValue,
23-
LocaleMessageDictionary,
24-
LocaleMessageType,
25-
LocaleMessages,
26-
NumberFormat as IntlNumberFormat,
20+
GeneratedTypeConfig,
2721
DateTimeFormat as IntlDateTimeFormat,
2822
DateTimeFormats as IntlDateTimeFormats,
29-
NumberFormats as IntlNumberFormats,
30-
LocaleMatcher as IntlLocaleMatcher,
3123
FormatMatcher as IntlFormatMatcher,
32-
MessageFunction,
33-
MessageFunctions,
34-
PluralizationRule,
24+
LocaleMatcher as IntlLocaleMatcher,
25+
NumberFormat as IntlNumberFormat,
26+
NumberFormats as IntlNumberFormats,
3527
LinkedModifiers,
36-
TranslateOptions,
37-
DateTimeOptions,
38-
NumberOptions,
39-
PostTranslationHandler,
40-
MessageResolver,
28+
Locale,
29+
LocaleMessageDictionary,
30+
LocaleMessages,
31+
LocaleMessageType,
32+
LocaleMessageValue,
4133
MessageCompiler,
4234
MessageCompilerContext,
43-
CompileError,
4435
MessageContext,
36+
MessageFunction,
37+
MessageFunctions,
38+
MessageResolver,
39+
NamedValue,
40+
NumberOptions,
41+
Path,
42+
PathValue,
43+
PluralizationRule,
44+
PostTranslationHandler,
45+
registerLocaleFallbacker,
46+
registerMessageResolver,
4547
RemovedIndexResources,
46-
GeneratedTypeConfig
48+
TranslateOptions
4749
} from '@intlify/core-base'
4850
export {
49-
VueMessageType,
50-
DefineLocaleMessage,
51-
DefaultLocaleMessageSchema,
52-
DefineDateTimeFormat,
53-
DefaultDateTimeFormatSchema,
54-
DefineNumberFormat,
55-
DefaultNumberFormatSchema,
56-
MissingHandler,
57-
ComposerOptions,
5851
Composer,
5952
ComposerCustom,
60-
CustomBlock,
61-
CustomBlocks,
62-
ComposerTranslation,
6353
ComposerDateTimeFormatting,
6454
ComposerNumberFormatting,
65-
ComposerResolveLocaleMessageTranslation
55+
ComposerOptions,
56+
ComposerResolveLocaleMessageTranslation,
57+
ComposerTranslation,
58+
CustomBlock,
59+
CustomBlocks,
60+
DefaultDateTimeFormatSchema,
61+
DefaultLocaleMessageSchema,
62+
DefaultNumberFormatSchema,
63+
DefineDateTimeFormat,
64+
DefineLocaleMessage,
65+
DefineNumberFormat,
66+
MissingHandler,
67+
VueMessageType
6668
} from '../../vue-i18n-core/src/composer'
6769
export {
68-
TranslateResult,
70+
ComposerAdditionalOptions,
71+
ComposerExtender,
72+
createI18n,
73+
ExportedGlobalComposer,
74+
I18n,
75+
I18nAdditionalOptions,
76+
I18nMode,
77+
I18nOptions,
78+
I18nScope,
79+
useI18n,
80+
UseI18nOptions
81+
} from '../../vue-i18n-core/src/i18n'
82+
export {
6983
Choice,
70-
LocaleMessageObject,
71-
PluralizationRulesMap,
72-
WarnHtmlInMessageLevel,
7384
DateTimeFormatResult,
85+
LocaleMessageObject,
7486
NumberFormatResult,
75-
VueI18nOptions,
87+
PluralizationRulesMap,
88+
TranslateResult,
7689
VueI18n,
77-
VueI18nTranslation,
78-
VueI18nTranslationChoice,
7990
VueI18nDateTimeFormatting,
91+
VueI18nExtender,
8092
VueI18nNumberFormatting,
93+
VueI18nOptions,
8194
VueI18nResolveLocaleMessageTranslation,
82-
VueI18nExtender
95+
VueI18nTranslation,
96+
VueI18nTranslationChoice,
97+
WarnHtmlInMessageLevel
8398
} from '../../vue-i18n-core/src/legacy'
84-
export {
85-
createI18n,
86-
useI18n,
87-
I18nOptions,
88-
I18nAdditionalOptions,
89-
I18n,
90-
I18nMode,
91-
I18nScope,
92-
ComposerAdditionalOptions,
93-
UseI18nOptions,
94-
ExportedGlobalComposer,
95-
ComposerExtender
96-
} from '../../vue-i18n-core/src/i18n'
9799
export { I18nPluginOptions } from '../../vue-i18n-core/src/plugin'
98100
export { VERSION } from './../../vue-i18n-core/src/misc'
99101
export { Disposer } from './../../vue-i18n-core/src/types'
100102

101103
export type {
102-
IsNever,
103104
IsEmptyObject,
104-
PickupPaths,
105+
IsNever,
106+
PickupFormatPathKeys,
105107
PickupKeys,
106-
PickupFormatPathKeys
108+
PickupPaths
107109
} from '@intlify/core-base'
108110

109111
// NOTE: experimental !!

‎packages/petite-vue-i18n/src/runtime.ts

Lines changed: 63 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import { getGlobalThis } from '@intlify/shared'
21
import {
3-
setDevToolsHook,
42
compile,
5-
registerMessageCompiler
3+
registerMessageCompiler,
4+
setDevToolsHook
65
} from '@intlify/core-base'
6+
import { getGlobalThis } from '@intlify/shared'
77
import { initDev, initFeatureFlags } from '../../vue-i18n-core/src/misc'
88

99
if (__ESM_BUNDLER__ && !__TEST__) {
@@ -14,95 +14,97 @@ if (__ESM_BUNDLER__ && !__TEST__) {
1414
registerMessageCompiler(compile)
1515

1616
export {
17-
Path,
18-
PathValue,
19-
NamedValue,
20-
Locale,
17+
CompileError,
18+
DateTimeOptions,
2119
FallbackLocale,
22-
LocaleMessageValue,
23-
LocaleMessageDictionary,
24-
LocaleMessageType,
25-
LocaleMessages,
26-
NumberFormat as IntlNumberFormat,
2720
DateTimeFormat as IntlDateTimeFormat,
2821
DateTimeFormats as IntlDateTimeFormats,
29-
NumberFormats as IntlNumberFormats,
30-
LocaleMatcher as IntlLocaleMatcher,
3122
FormatMatcher as IntlFormatMatcher,
32-
MessageFunction,
33-
MessageFunctions,
34-
PluralizationRule,
23+
LocaleMatcher as IntlLocaleMatcher,
24+
NumberFormat as IntlNumberFormat,
25+
NumberFormats as IntlNumberFormats,
3526
LinkedModifiers,
36-
TranslateOptions,
37-
DateTimeOptions,
38-
NumberOptions,
39-
PostTranslationHandler,
40-
MessageResolver,
27+
Locale,
28+
LocaleMessageDictionary,
29+
LocaleMessages,
30+
LocaleMessageType,
31+
LocaleMessageValue,
4132
MessageCompiler,
4233
MessageCompilerContext,
43-
CompileError,
4434
MessageContext,
45-
RemovedIndexResources
35+
MessageFunction,
36+
MessageFunctions,
37+
MessageResolver,
38+
NamedValue,
39+
NumberOptions,
40+
Path,
41+
PathValue,
42+
PluralizationRule,
43+
PostTranslationHandler,
44+
registerLocaleFallbacker,
45+
registerMessageResolver,
46+
RemovedIndexResources,
47+
TranslateOptions
4648
} from '@intlify/core-base'
4749
export {
48-
VueMessageType,
49-
DefineLocaleMessage,
50-
DefaultLocaleMessageSchema,
51-
DefineDateTimeFormat,
52-
DefaultDateTimeFormatSchema,
53-
DefineNumberFormat,
54-
DefaultNumberFormatSchema,
55-
MissingHandler,
56-
ComposerOptions,
5750
Composer,
5851
ComposerCustom,
59-
CustomBlock,
60-
CustomBlocks,
61-
ComposerTranslation,
6252
ComposerDateTimeFormatting,
6353
ComposerNumberFormatting,
64-
ComposerResolveLocaleMessageTranslation
54+
ComposerOptions,
55+
ComposerResolveLocaleMessageTranslation,
56+
ComposerTranslation,
57+
CustomBlock,
58+
CustomBlocks,
59+
DefaultDateTimeFormatSchema,
60+
DefaultLocaleMessageSchema,
61+
DefaultNumberFormatSchema,
62+
DefineDateTimeFormat,
63+
DefineLocaleMessage,
64+
DefineNumberFormat,
65+
MissingHandler,
66+
VueMessageType
6567
} from '../../vue-i18n-core/src/composer'
6668
export {
67-
TranslateResult,
69+
ComposerAdditionalOptions,
70+
ComposerExtender,
71+
createI18n,
72+
ExportedGlobalComposer,
73+
I18n,
74+
I18nAdditionalOptions,
75+
I18nMode,
76+
I18nOptions,
77+
I18nScope,
78+
useI18n,
79+
UseI18nOptions
80+
} from '../../vue-i18n-core/src/i18n'
81+
export {
6882
Choice,
69-
LocaleMessageObject,
70-
PluralizationRulesMap,
71-
WarnHtmlInMessageLevel,
7283
DateTimeFormatResult,
84+
LocaleMessageObject,
7385
NumberFormatResult,
74-
VueI18nOptions,
86+
PluralizationRulesMap,
87+
TranslateResult,
7588
VueI18n,
76-
VueI18nTranslation,
77-
VueI18nTranslationChoice,
7889
VueI18nDateTimeFormatting,
90+
VueI18nExtender,
7991
VueI18nNumberFormatting,
92+
VueI18nOptions,
8093
VueI18nResolveLocaleMessageTranslation,
81-
VueI18nExtender
94+
VueI18nTranslation,
95+
VueI18nTranslationChoice,
96+
WarnHtmlInMessageLevel
8297
} from '../../vue-i18n-core/src/legacy'
83-
export {
84-
createI18n,
85-
useI18n,
86-
I18nOptions,
87-
I18nAdditionalOptions,
88-
I18n,
89-
I18nMode,
90-
I18nScope,
91-
ComposerAdditionalOptions,
92-
UseI18nOptions,
93-
ExportedGlobalComposer,
94-
ComposerExtender
95-
} from '../../vue-i18n-core/src/i18n'
9698
export { I18nPluginOptions } from '../../vue-i18n-core/src/plugin'
9799
export { VERSION } from './../../vue-i18n-core/src/misc'
98100
export { Disposer } from './../../vue-i18n-core/src/types'
99101

100102
export type {
101-
IsNever,
102103
IsEmptyObject,
103-
PickupPaths,
104+
IsNever,
105+
PickupFormatPathKeys,
104106
PickupKeys,
105-
PickupFormatPathKeys
107+
PickupPaths
106108
} from '@intlify/core-base'
107109

108110
// NOTE: experimental !!

0 commit comments

Comments
 (0)