Skip to content

fix: avoid undefined read #907

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 2 commits into from
Jan 27, 2022
Merged

fix: avoid undefined read #907

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f8afeb1
fix: avoid undefined read
kazupon Jan 27, 2022
c61869f
fix: remove
kazupon Jan 27, 2022
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
75 changes: 37 additions & 38 deletions packages/vue-i18n-core/src/mixins/next.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { getCurrentInstance, nextTick } from 'vue'
import { getCurrentInstance } from 'vue'
import { createVueI18n } from '../legacy'
import { createI18nError, I18nErrorCodes } from '../errors'
import { SetPluralRulesSymbol } from '../symbols'
Expand Down Expand Up @@ -100,21 +100,20 @@ export function defineMixin(
},

mounted(): void {
nextTick(() => {
/* istanbul ignore if */
if (
(__DEV__ || __FEATURE_PROD_VUE_DEVTOOLS__) &&
!__NODE_JS__ &&
this.$el
) {
this.$el.__VUE_I18N__ = this.$i18n.__composer
const emitter: VueDevToolsEmitter = (this.__v_emitter =
createEmitter<VueDevToolsEmitterEvents>())
const _vueI18n = this.$i18n as unknown as VueI18nInternal
_vueI18n.__enableEmitter && _vueI18n.__enableEmitter(emitter)
emitter.on('*', addTimelineEvent)
}
})
/* istanbul ignore if */
if (
(__DEV__ || __FEATURE_PROD_VUE_DEVTOOLS__) &&
!__NODE_JS__ &&
this.$el &&
this.$i18n
) {
this.$el.__VUE_I18N__ = this.$i18n.__composer
const emitter: VueDevToolsEmitter = (this.__v_emitter =
createEmitter<VueDevToolsEmitterEvents>())
const _vueI18n = this.$i18n as unknown as VueI18nInternal
_vueI18n.__enableEmitter && _vueI18n.__enableEmitter(emitter)
emitter.on('*', addTimelineEvent)
}
},

unmounted(): void {
Expand All @@ -124,34 +123,34 @@ export function defineMixin(
throw createI18nError(I18nErrorCodes.UNEXPECTED_ERROR)
}

nextTick(() => {
/* istanbul ignore if */
if (
(__DEV__ || __FEATURE_PROD_VUE_DEVTOOLS__) &&
!__NODE_JS__ &&
this.$el &&
this.$el.__VUE_I18N__
) {
if (this.__v_emitter) {
this.__v_emitter.off('*', addTimelineEvent)
delete this.__v_emitter
}
/* istanbul ignore if */
if (
(__DEV__ || __FEATURE_PROD_VUE_DEVTOOLS__) &&
!__NODE_JS__ &&
this.$el &&
this.$el.__VUE_I18N__
) {
if (this.__v_emitter) {
this.__v_emitter.off('*', addTimelineEvent)
delete this.__v_emitter
}
if (this.$i18n) {
const _vueI18n = this.$i18n as unknown as VueI18nInternal
_vueI18n.__disableEmitter && _vueI18n.__disableEmitter()
delete this.$el.__VUE_I18N__
}
}

delete this.$t
delete this.$rt
delete this.$tc
delete this.$te
delete this.$d
delete this.$n
delete this.$tm
delete this.$t
delete this.$rt
delete this.$tc
delete this.$te
delete this.$d
delete this.$n
delete this.$tm

i18n.__deleteInstance(instance)
delete this.$i18n
})
i18n.__deleteInstance(instance)
delete this.$i18n
}
}
}
Expand Down