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.

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

feat(runtime-core): app.onUnmount() for registering cleanup functions (close: #4516) #4619

Merged
merged 8 commits into from
Apr 29, 2024
30 changes: 30 additions & 0 deletions packages/runtime-core/__tests__/apiCreateApp.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,36 @@ describe('api: createApp', () => {
).toHaveBeenWarnedTimes(1)
})

test('onUnmount', () => {
const cleanup = vi.fn().mockName('plugin cleanup')
const PluginA: Plugin = app => {
app.provide('foo', 1)
app.onUnmount(cleanup)
}
const PluginB: Plugin = {
install: (app, arg1, arg2) => {
app.provide('bar', arg1 + arg2)
app.onUnmount(cleanup)
},
}

const app = createApp({
render: () => `Test`,
})
app.use(PluginA)
app.use(PluginB)

const root = nodeOps.createElement('div')
app.mount(root)

//also can be added after mount
app.onUnmount(cleanup)

app.unmount()

expect(cleanup).toHaveBeenCalledTimes(3)
})

test('config.errorHandler', () => {
const error = new Error()
const count = ref(0)
Expand Down
18 changes: 18 additions & 0 deletions packages/runtime-core/src/apiCreateApp.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import { version } from '.'
import { installAppCompatProperties } from './compat/global'
import type { NormalizedPropsOptions } from './componentProps'
import type { ObjectEmitsOptions } from './componentEmits'
import { ErrorCodes, callWithAsyncErrorHandling } from './errorHandling'
import type { DefineComponent } from './apiDefineComponent'

export interface App<HostElement = any> {
Expand All @@ -50,6 +51,7 @@ export interface App<HostElement = any> {
namespace?: boolean | ElementNamespace,
): ComponentPublicInstance
unmount(): void
onUnmount(cb: () => void): void
provide<T>(key: InjectionKey<T> | string, value: T): this

/**
Expand Down Expand Up @@ -214,6 +216,7 @@ export function createAppAPI<HostElement>(

const context = createAppContext()
const installedPlugins = new WeakSet()
const pluginCleanupFns: Array<() => any> = []

let isMounted = false

Expand Down Expand Up @@ -366,8 +369,23 @@ export function createAppAPI<HostElement>(
}
},

onUnmount(cleanupFn: () => void) {
if (__DEV__ && typeof cleanupFn !== 'function') {
warn(
`Expected function as first argument to app.onUnmount(), ` +
`but got ${typeof cleanupFn}`,
)
}
pluginCleanupFns.push(cleanupFn)
},
LinusBorg marked this conversation as resolved.
Show resolved Hide resolved

unmount() {
if (isMounted) {
callWithAsyncErrorHandling(
pluginCleanupFns,
app._instance,
ErrorCodes.APP_UNMOUNT_CLEANUP,
)
render(null, app._container)
if (__DEV__ || __FEATURE_PROD_DEVTOOLS__) {
app._instance = null
Expand Down
2 changes: 2 additions & 0 deletions packages/runtime-core/src/errorHandling.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ export enum ErrorCodes {
FUNCTION_REF,
ASYNC_COMPONENT_LOADER,
SCHEDULER,
APP_UNMOUNT_CLEANUP,
}

export const ErrorTypeStrings: Record<LifecycleHooks | ErrorCodes, string> = {
Expand Down Expand Up @@ -57,6 +58,7 @@ export const ErrorTypeStrings: Record<LifecycleHooks | ErrorCodes, string> = {
[ErrorCodes.SCHEDULER]:
'scheduler flush. This is likely a Vue internals bug. ' +
'Please open an issue at https://github.com/vuejs/core .',
[ErrorCodes.APP_UNMOUNT_CLEANUP]: 'app unmount cleanup function',
}

export type ErrorTypes = LifecycleHooks | ErrorCodes
Expand Down