Skip to content

Commit 2b6fbba

Browse files
authored
fix: avoid transform to globalThis with bundler (#1413)
1 parent 67b8402 commit 2b6fbba

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

packages/vue-i18n-core/src/i18n.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -834,7 +834,7 @@ export function useI18n<
834834
}
835835

836836
const i18n = getI18nInstance(instance)
837-
const global = getGlobalComposer(i18n)
837+
const gl = getGlobalComposer(i18n)
838838
const componentOptions = getComponentOptions(instance)
839839
const scope = getScope(options, componentOptions)
840840

@@ -844,13 +844,13 @@ export function useI18n<
844844
if (!i18n.allowComposition) {
845845
throw createI18nError(I18nErrorCodes.NOT_AVAILABLE_IN_LEGACY_MODE)
846846
}
847-
return useI18nForLegacy(instance, scope, global, options)
847+
return useI18nForLegacy(instance, scope, gl, options)
848848
}
849849
}
850850

851851
if (scope === 'global') {
852-
adjustI18nResources(global, options, componentOptions)
853-
return global as unknown as Composer<
852+
adjustI18nResources(gl, options, componentOptions)
853+
return gl as unknown as Composer<
854854
Messages,
855855
DateTimeFormats,
856856
NumberFormats,
@@ -865,7 +865,7 @@ export function useI18n<
865865
if (__DEV__) {
866866
warn(getWarnMessage(I18nWarnCodes.NOT_FOUND_PARENT_SCOPE))
867867
}
868-
composer = global as unknown as Composer
868+
composer = gl as unknown as Composer
869869
}
870870
return composer as unknown as Composer<
871871
Messages,
@@ -885,8 +885,8 @@ export function useI18n<
885885
composerOptions.__i18n = componentOptions.__i18n
886886
}
887887

888-
if (global) {
889-
composerOptions.__root = global
888+
if (gl) {
889+
composerOptions.__root = gl
890890
}
891891

892892
composer = createComposer(composerOptions, _legacyVueI18n) as Composer

packages/vue-i18n-core/src/utils.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -162,13 +162,13 @@ export function getComponentOptions(instance: ComponentInternalInstance): any {
162162
}
163163

164164
export function adjustI18nResources(
165-
global: Composer,
165+
gl: Composer,
166166
options: ComposerOptions,
167167
componentOptions: any // eslint-disable-line @typescript-eslint/no-explicit-any
168168
): void {
169169
let messages = isObject(options.messages) ? options.messages : {}
170170
if ('__i18nGlobal' in componentOptions) {
171-
messages = getLocaleMessages(global.locale.value as Locale, {
171+
messages = getLocaleMessages(gl.locale.value as Locale, {
172172
messages,
173173
__i18n: componentOptions.__i18nGlobal
174174
})
@@ -177,7 +177,7 @@ export function adjustI18nResources(
177177
const locales = Object.keys(messages)
178178
if (locales.length) {
179179
locales.forEach(locale => {
180-
global.mergeLocaleMessage(locale, messages[locale])
180+
gl.mergeLocaleMessage(locale, messages[locale])
181181
})
182182
}
183183
if (!__LITE__) {
@@ -186,7 +186,7 @@ export function adjustI18nResources(
186186
const locales = Object.keys(options.datetimeFormats)
187187
if (locales.length) {
188188
locales.forEach(locale => {
189-
global.mergeDateTimeFormat(locale, options.datetimeFormats![locale])
189+
gl.mergeDateTimeFormat(locale, options.datetimeFormats![locale])
190190
})
191191
}
192192
}
@@ -195,7 +195,7 @@ export function adjustI18nResources(
195195
const locales = Object.keys(options.numberFormats)
196196
if (locales.length) {
197197
locales.forEach(locale => {
198-
global.mergeNumberFormat(locale, options.numberFormats![locale])
198+
gl.mergeNumberFormat(locale, options.numberFormats![locale])
199199
})
200200
}
201201
}

0 commit comments

Comments
 (0)