Skip to content

improvement: tweaks interface for devtools #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 2, 2020
Merged

improvement: tweaks interface for devtools #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 26 additions & 4 deletions src/i18n.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,13 @@ import { isEmptyObject, warn } from './utils'
import { devtoolsRegisterI18n } from './devtools'
import { VERSION } from './misc'

declare module '@vue/runtime-core' {
// eslint-disable-next-line
interface App<HostElement = any> {
__VUE_I18N__?: I18n & I18nInternal
}
}

/**
* I18n Options for `createI18n`
*
Expand Down Expand Up @@ -89,6 +96,7 @@ export interface I18n<Messages = {}, DateTimeFormats = {}, NumberFormats = {}> {
* @internal
*/
export interface I18nInternal {
__instances: Map<ComponentInternalInstance, VueI18n | Composer>
__getInstance<
Messages,
DateTimeFormats,
Expand Down Expand Up @@ -248,7 +256,11 @@ export function createI18n<
get mode(): I18nMode {
return __legacyMode ? 'legacy' : 'composable'
},
// install plugin
install(app: App, ...options: unknown[]): void {
if (__DEV__ || __FEATURE_PROD_DEVTOOLS__) {
app.__VUE_I18N__ = i18n as I18n & I18nInternal
}
apply<Messages, DateTimeFormats, NumberFormats>(app, i18n, ...options)
if (__legacyMode) {
app.mixin(
Expand All @@ -264,6 +276,7 @@ export function createI18n<
)
}
},
// global composer accsessor
get global(): Composer<Messages, DateTimeFormats, NumberFormats> {
return __legacyMode
? (((__global as unknown) as VueI18nInternal<
Expand All @@ -273,18 +286,23 @@ export function createI18n<
>).__composer as Composer<Messages, DateTimeFormats, NumberFormats>)
: (__global as Composer<Messages, DateTimeFormats, NumberFormats>)
},
// @internal
__instances,
// @internal
__getInstance<
M extends Messages,
Instance extends VueI18n<M> | Composer<M>
>(component: ComponentInternalInstance): Instance | null {
return ((__instances.get(component) as unknown) as Instance) || null
},
// @internal
__setInstance<
M extends Messages,
Instance extends VueI18n<M> | Composer<M>
>(component: ComponentInternalInstance, instance: Instance): void {
__instances.set(component, instance)
},
// @internal
__deleteInstance(component: ComponentInternalInstance): void {
__instances.delete(component)
}
Expand Down Expand Up @@ -504,15 +522,19 @@ function setupLifeCycle<Messages, DateTimeFormats, NumberFormats>(
): void {
onMounted(() => {
// inject composer instance to DOM for intlify-devtools
if (target.vnode.el) {
target.vnode.el.__intlify__ = composer
if ((__DEV__ || __FEATURE_PROD_DEVTOOLS__) && target.vnode.el) {
target.vnode.el.__INTLIFY__ = composer
}
}, target)

onUnmounted(() => {
// remove composer instance from DOM for intlify-devtools
if (target.vnode.el && target.vnode.el.__INTLIFY__) {
delete target.vnode.el.__intlify__
if (
(__DEV__ || __FEATURE_PROD_DEVTOOLS__) &&
target.vnode.el &&
target.vnode.el.__INTLIFY__
) {
delete target.vnode.el.__INTLIFY__
}
i18n.__deleteInstance(target)
}, target)
Expand Down
8 changes: 6 additions & 2 deletions src/mixin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,9 @@ export function defineMixin<Messages, DateTimeFormats, NumberFormats>(
},

mounted(): void {
this.$el.__INTLIFY__ = this.$i18n.__composer
if (__DEV__ || __FEATURE_PROD_DEVTOOLS__) {
this.$el.__INTLIFY__ = this.$i18n.__composer
}
},

beforeDestroy(): void {
Expand All @@ -240,7 +242,9 @@ export function defineMixin<Messages, DateTimeFormats, NumberFormats>(
throw createI18nError(I18nErrorCodes.UNEXPECTED_ERROR)
}

delete this.$el.__INTLIFY__
if (__DEV__ || __FEATURE_PROD_DEVTOOLS__) {
delete this.$el.__INTLIFY__
}

delete this.$t
delete this.$tc
Expand Down