Skip to content

fix(devtools): use cleanupBuffer instead of modifying _buffer #6812

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 3 commits into from
Oct 3, 2022
Merged

fix(devtools): use cleanupBuffer instead of modifying _buffer #6812

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
29b86eb
fix(devtools): check _buffer existance
posva Oct 3, 2022
fb80ebe
Update packages/runtime-core/src/devtools.ts
posva Oct 3, 2022
e85443e
refactor: us cleanupBuffer
posva Oct 3, 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
24 changes: 12 additions & 12 deletions packages/runtime-core/src/devtools.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,11 @@ interface DevtoolsHook {
once: (event: string, handler: Function) => void
off: (event: string, handler: Function) => void
appRecords: AppRecord[]
_buffer: any[][]
/**
* Added at https://github.com/vuejs/devtools/commit/f2ad51eea789006ab66942e5a27c0f0986a257f9
* Returns wether the arg was buffered or not
*/
cleanupBuffer?: (matchArg: unknown) => boolean
}

export let devtools: DevtoolsHook
Expand Down Expand Up @@ -109,18 +113,14 @@ const _devtoolsComponentRemoved = /*#__PURE__*/ createDevtoolsComponentHook(
export const devtoolsComponentRemoved = (
component: ComponentInternalInstance
) => {
if (devtools && devtools._buffer.length) {
let wasBuffered = false
devtools._buffer = devtools._buffer.filter(item => {
if (item.some(arg => arg === component)) {
wasBuffered = true
return false
}
return true
})
if (wasBuffered) return
if (
devtools &&
typeof devtools.cleanupBuffer === 'function' &&
// remove the component if it wasn't buffered
!devtools.cleanupBuffer(component)
) {
_devtoolsComponentRemoved(component)
}
_devtoolsComponentRemoved(component)
}

function createDevtoolsComponentHook(hook: DevtoolsHooks) {
Expand Down