adapt index.d.ts for end users (#3582)

* adapt index.d.ts for end users

* fix extend return type

package.json

@@ -3,7 +3,7 @@
   "version": "2.0.0-rc.4",
   "description": "Reactive, component-oriented view layer for modern web interfaces.",
   "main": "dist/vue.common.js",
-  "typings": "index.d.ts",
+  "typings": "types/index.d.ts",
   "files": [
     "dist/vue.common.js",
     "dist/vue.js",

types/index.d.ts

@@ -1,2 +1,6 @@
-import {Vue} from "./vue.d";
+import {Vue as _Vue} from "./vue.d";
+// `Vue` in `export = Vue` must be a namespace
+declare namespace Vue {}
+// TS cannot merge imported class with namespace, declare a subclass to bypass
+declare class Vue extends _Vue {}
 export = Vue;

types/test/options-test.ts

@@ -1,4 +1,4 @@
-import { Vue } from "../vue.d";
+import Vue = require("../index.d");
 import { ComponentOptions } from "../options.d";
 
 interface Component extends Vue {

types/test/plugin-test.ts

@@ -1,4 +1,4 @@
-import { Vue } from "../vue.d";
+import Vue = require("../index.d");
 import { PluginFunction, PluginObject } from "../plugin.d";
 
 class Option {

types/test/vue-test.ts

@@ -1,4 +1,4 @@
-import { Vue } from "../vue.d";
+import Vue = require("../index.d");
 
 class Test extends Vue {
   testProperties() {

types/vue.d.ts

@@ -53,7 +53,7 @@ export declare class Vue {
     keyCodes: { [key: string]: number };
   }
 
-  static extend(options: ComponentOptions): Vue;
+  static extend(options: ComponentOptions): typeof Vue;
   static nextTick(callback: () => void, context?: any[]): void;
   static set<T>(object: Object, key: string, value: T): T;
   static set<T>(array: T[], key: number, value: T): T;