Merge pull request #11534 from ckittelmann/master

vue: fixed definition for activate() in ComponentOption

vue/vue-tests.ts

@@ -88,6 +88,11 @@ namespace TestGlobalAPI {
     },
     init: function() {}
   });
+  Vue.component("component", {
+    activate: function(callback: Function) {
+      callback();
+    }
+  });
   var transition = Vue.transition("transition");
   Vue.transition("transition", transition);
   Vue.transition("transition", {

vue/vue.d.ts

@@ -96,7 +96,7 @@ declare namespace vuejs {
         detached?(): void;
         beforeDestroy?(): void;
         destroyed?(): void;
-        activate?(): void;
+        activate?: (done: () => void) => void;
         directives?: { [key: string]: (DirectiveOption | Function) };
         elementDirectives?: { [key: string]: (DirectiveOption | Function) };
         filters?: { [key: string]: (Function | FilterOption) };