diff --git a/.gitignore b/.gitignore index f0579d0..c362bfc 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,5 @@ typings/ npm-debug.log **/test.build.js **/_book -.vscode \ No newline at end of file +.vscode +dist \ No newline at end of file diff --git a/.jshintrc b/.jshintrc deleted file mode 100644 index f3ac211..0000000 --- a/.jshintrc +++ /dev/null @@ -1,4 +0,0 @@ -{ - "esnext": true, - "-W032": true -} \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 08efb66..3c5d9a4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: node_js node_js: - - 6 + - 7 script: - - npm install vue + - npm install - npm test \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index 6d53924..d7ebce3 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -4,5 +4,7 @@ "esversion": "6" } , -"typescript.tsdk": "./node_modules/typescript/lib" +"typescript.tsdk": "./node_modules/typescript/lib", +"tslint.enable": true, +"jshint.enable": false } \ No newline at end of file diff --git a/README.md b/README.md index 98e6d36..b1dfa9a 100644 --- a/README.md +++ b/README.md @@ -107,9 +107,13 @@ $ npm start ## Compatibility -**Vue 2.0** +**Vue 2.0** or above + > For older Vue supports please refer to [VueTyped 2.0.1](https://github.com/vue-typed/vue-typed/tree/v2.0.1). +**Typescript 2.2.2** or above + + ## License diff --git a/appveyor.yml b/appveyor.yml index 4f3a692..2c8eaf5 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,6 @@ # Test against this version of Node.js environment: - nodejs_version: "6" + nodejs_version: "7" # Install scripts. (runs after repo cloning) install: @@ -8,7 +8,6 @@ install: - ps: Install-Product node $env:nodejs_version # install modules - npm install - - npm install vue # Post-install test scripts. test_script: diff --git a/bower.json b/bower.json index 7938d52..6cd753d 100644 --- a/bower.json +++ b/bower.json @@ -17,7 +17,7 @@ "type": "git", "url": "https://github.com/vue-typed/vue-typed.git" }, - "main": "index.js", + "main": "dist/index.js", "moduleType": [ "amd", "es6", "globals", "node" ], diff --git a/docs/SUMMARY.md b/docs/SUMMARY.md index cf6315e..1ea7496 100644 --- a/docs/SUMMARY.md +++ b/docs/SUMMARY.md @@ -4,9 +4,15 @@ * [Getting Started](getting-started.md) * Basic Usage * [Component](usage/component.md) + * [Options](usage/options.md) * [Methods and Computed Properties](usage/methods-and-computed-properties.md) * [Prop](usage/props.md) - * [Watch](usage/watch.md) + * [Watch](usage/watch.md) + * [Virtual](usage/virtual.md) + * Mixins + * [Single Mixin](usage/mixins/single.md) + * [Multiple Mixins](usage/mixins/multiple.md) + * [Global Mixins](usage/mixins/global.md) * Advanced Usage * [VueRouter](advanced/vue-router.md) * [Class Inheritance](advanced/class-inheritance.md) diff --git a/docs/advanced/class-inheritance.md b/docs/advanced/class-inheritance.md index cf6e9b7..c9f0cdb 100644 --- a/docs/advanced/class-inheritance.md +++ b/docs/advanced/class-inheritance.md @@ -35,4 +35,6 @@ class Child extends Parent { } ``` +Inheritance only works for `Component`. + See live demo [here](http://embed.plnkr.co/3o8enK/) or [here](http://embed.plnkr.co/S3XEbG/). \ No newline at end of file diff --git a/docs/advanced/vue-router.md b/docs/advanced/vue-router.md index 244c70d..3ffdf51 100644 --- a/docs/advanced/vue-router.md +++ b/docs/advanced/vue-router.md @@ -9,10 +9,18 @@ class Foo { } @Component({ template: '