theluyuan/vue3-yuanma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(runtime-core): allow classes to be passed as plugins (#588)

Browse Source
This commit is contained in:
Kael 2020-01-09 04:40:24 +11:00 committed by Evan You
parent 453e6889da
commit 8f616a89c5
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/runtime-core/__tests__/apiApp.spec.ts
View File

@ -244,11 +244,18 @@ describe('api: createApp', () => {
const PluginB: Plugin = { const PluginB: Plugin = {
install: (app, arg1, arg2) => app.provide('bar', arg1 + arg2) install: (app, arg1, arg2) => app.provide('bar', arg1 + arg2)
} }
const PluginC: any = undefined class PluginC {
someProperty = {}
static install() {
app.provide('baz', 2)
}
}
const PluginD: any = undefined
const app = createApp() const app = createApp()
app.use(PluginA) app.use(PluginA)
app.use(PluginB, 1, 1) app.use(PluginB, 1, 1)
app.use(PluginC)
const Root = { const Root = {
setup() { setup() {
@ -266,7 +273,7 @@ describe('api: createApp', () => {
`Plugin has already been applied to target app` `Plugin has already been applied to target app`
).toHaveBeenWarnedTimes(1) ).toHaveBeenWarnedTimes(1)
app.use(PluginC) app.use(PluginD)
expect( expect(
`A plugin must either be a function or an object with an "install" ` + `A plugin must either be a function or an object with an "install" ` +
`function.` `function.`

8
packages/runtime-core/src/apiCreateApp.ts
View File

@ -56,7 +56,7 @@ export interface AppContext {
type PluginInstallFunction = (app: App, ...options: any[]) => any type PluginInstallFunction = (app: App, ...options: any[]) => any
export type Plugin = export type Plugin =
| PluginInstallFunction | PluginInstallFunction & { install?: PluginInstallFunction }
| { | {
install: PluginInstallFunction install: PluginInstallFunction
} }
@ -103,12 +103,12 @@ export function createAppAPI<HostNode, HostElement>(
use(plugin: Plugin, ...options: any[]) { use(plugin: Plugin, ...options: any[]) {
if (installedPlugins.has(plugin)) { if (installedPlugins.has(plugin)) {
__DEV__ && warn(`Plugin has already been applied to target app.`) __DEV__ && warn(`Plugin has already been applied to target app.`)
} else if (isFunction(plugin)) {
installedPlugins.add(plugin)
plugin(app, ...options)
} else if (plugin && isFunction(plugin.install)) { } else if (plugin && isFunction(plugin.install)) {
installedPlugins.add(plugin) installedPlugins.add(plugin)
plugin.install(app, ...options) plugin.install(app, ...options)
} else if (isFunction(plugin)) {
installedPlugins.add(plugin)
plugin(app, ...options)
} else if (__DEV__) { } else if (__DEV__) {
warn( warn(
`A plugin must either be a function or an object with an "install" ` + `A plugin must either be a function or an object with an "install" ` +