fix(types): support chain call for Vue.use and Vue.mixin (#8595)

vuejs · Dec 1, 2018 · c711ec1 · c711ec1
1 parent 613cb52
commit c711ec1
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 5 deletions.
diff --git a/flow/global-api.js b/flow/global-api.js
@@ -8,8 +8,8 @@ declare interface GlobalAPI {
   set: <T>(target: Object | Array<T>, key: string | number, value: T) => T;
   delete: <T>(target: Object| Array<T>, key: string | number) => void;
   nextTick: (fn: Function, context?: Object) => void | Promise<*>;
-  use: (plugin: Function | Object) => void;
-  mixin: (mixin: Object) => void;
+  use: (plugin: Function | Object) => GlobalAPI;
+  mixin: (mixin: Object) => GlobalAPI;
   compile: (template: string) => { render: Function, staticRenderFns: Array<Function> };
 
   directive: (id: string, def?: Function | Object) => Function | Object | void;

diff --git a/test/unit/features/global-api/mixin.spec.js b/test/unit/features/global-api/mixin.spec.js
@@ -162,4 +162,9 @@ describe('Global API: mixin', () => {
     expect(base).toHaveBeenCalled()
     expect(injected).toHaveBeenCalled()
   })
+
+  // #8595
+  it('chain call', () => {
+    expect(Vue.mixin({})).toBe(Vue)
+  })
 })
diff --git a/test/unit/features/global-api/use.spec.js b/test/unit/features/global-api/use.spec.js
@@ -49,4 +49,9 @@ describe('Global API: use', () => {
     expect(Vue.options.directives['plugin-test']).toBeUndefined()
     expect(Ctor2.options.directives['plugin-test']).toBe(def)
   })
+
+  // #8595
+  it('chain call', () => {
+    expect(Vue.use(() => {})).toBe(Vue)
+  })
 })
diff --git a/types/test/vue-test.ts b/types/test/vue-test.ts
@@ -97,6 +97,15 @@ class Test extends Vue {
     this.use;
     this.mixin(Test);
     this.compile("<div>{{ message }}</div>");
+    this
+      .use(() => {
+
+      })
+      .use(() => {
+
+      })
+      .mixin({})
+      .mixin({});
   }
 }
 

diff --git a/types/vue.d.ts b/types/vue.d.ts
@@ -111,9 +111,9 @@ export interface VueConstructor<V extends Vue = Vue> {
   component<Props>(id: string, definition: FunctionalComponentOptions<Props, RecordPropsDefinition<Props>>): ExtendedVue<V, {}, {}, {}, Props>;
   component(id: string, definition?: ComponentOptions<V>): ExtendedVue<V, {}, {}, {}, {}>;
 
-  use<T>(plugin: PluginObject<T> | PluginFunction<T>, options?: T): void;
-  use(plugin: PluginObject<any> | PluginFunction<any>, ...options: any[]): void;
-  mixin(mixin: VueConstructor | ComponentOptions<Vue>): void;
+  use<T>(plugin: PluginObject<T> | PluginFunction<T>, options?: T): this;
+  use(plugin: PluginObject<any> | PluginFunction<any>, ...options: any[]): this;
+  mixin(mixin: VueConstructor | ComponentOptions<Vue>): this;
   compile(template: string): {
     render(createElement: typeof Vue.prototype.$createElement): VNode;
     staticRenderFns: (() => VNode)[];