Skip to content
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

Jump to bottom

fix(kit): replay hook when devtools inject late #666

Merged
merged 1 commit into from
Oct 31, 2024
Merged

fix(kit): replay hook when devtools inject late #666

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
40 changes: 28 additions & 12 deletions packages/devtools-kit/src/core/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,20 +33,21 @@ export function initDevTools() {
if (target.__VUE_DEVTOOLS_GLOBAL_HOOK__ && isDevToolsNext)
return

if (!target.__VUE_DEVTOOLS_GLOBAL_HOOK__) {
target.__VUE_DEVTOOLS_GLOBAL_HOOK__ = createDevToolsHook()
}
else {
// respect old devtools hook in nuxt application
if (!isNuxtApp) {
// override devtools hook directly
Object.assign(__VUE_DEVTOOLS_GLOBAL_HOOK__, createDevToolsHook())
const _devtoolsHook = createDevToolsHook()

if (target.__VUE_DEVTOOLS_HOOK_REPLAY__) {
try {
target.__VUE_DEVTOOLS_HOOK_REPLAY__.forEach(cb => cb(_devtoolsHook))
target.__VUE_DEVTOOLS_HOOK_REPLAY__ = []
}
catch (e) {
console.error('[vue-devtools] Error during hook replay', e)
}
}

// @ts-expect-error skip type check
// Vue2 app detection
target.__VUE_DEVTOOLS_GLOBAL_HOOK__.once('init', (Vue) => {
_devtoolsHook.once('init', (Vue) => {
target.__VUE_DEVTOOLS_VUE2_APP_DETECTED__ = true

console.log('%c[_____Vue DevTools v7 log_____]', 'color: red; font-bold: 600; font-size: 16px;')
Expand Down Expand Up @@ -76,7 +77,7 @@ export function initDevTools() {
onLegacyDevToolsPluginApiAvailable(() => {
const normalizedPluginBuffer = devtoolsPluginBuffer.filter(([item]) => item.id !== 'components')
normalizedPluginBuffer.forEach(([pluginDescriptor, setupFn]) => {
target.__VUE_DEVTOOLS_GLOBAL_HOOK__.emit(DevToolsHooks.SETUP_DEVTOOLS_PLUGIN, pluginDescriptor, setupFn, { target: 'legacy' })
_devtoolsHook.emit(DevToolsHooks.SETUP_DEVTOOLS_PLUGIN, pluginDescriptor, setupFn, { target: 'legacy' })
})
})

Expand All @@ -102,7 +103,7 @@ export function initDevTools() {
connected: true,
})

target.__VUE_DEVTOOLS_GLOBAL_HOOK__.apps.push(app)
_devtoolsHook.apps.push(app)
})

hook.on.vueAppUnmount(async (app) => {
Expand All @@ -126,7 +127,22 @@ export function initDevTools() {
removeRegisteredPluginApp(app)
})

subscribeDevToolsHook()
subscribeDevToolsHook(_devtoolsHook)

if (!target.__VUE_DEVTOOLS_GLOBAL_HOOK__) {
Object.defineProperty(target, '__VUE_DEVTOOLS_GLOBAL_HOOK__', {
get() {
return _devtoolsHook
},
})
}
else {
// respect old devtools hook in nuxt application
if (!isNuxtApp) {
// override devtools hook directly
Object.assign(__VUE_DEVTOOLS_GLOBAL_HOOK__, _devtoolsHook)
}
}
}

export function onDevToolsClientConnected(fn: () => void) {
Expand Down
3 changes: 1 addition & 2 deletions packages/devtools-kit/src/hook/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,7 @@ export function createDevToolsHook(): DevToolsHook {
}
}

export function subscribeDevToolsHook() {
const hook = target.__VUE_DEVTOOLS_GLOBAL_HOOK__ as DevToolsHook
export function subscribeDevToolsHook(hook: DevToolsHook) {
// app init hook
hook.on<DevToolsEvent[DevToolsHooks.APP_INIT]>(DevToolsHooks.APP_INIT, (app, version, types) => {
if (app?._instance?.type?.devtools?.hide)
Expand Down