Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: vuejs/vue
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v2.0.3
Choose a base ref
...
head repository: vuejs/vue
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v2.0.4
Choose a head ref
Loading
Showing with 9,956 additions and 2,069 deletions.
  1. +1 −0 .github/CONTRIBUTING.md
  2. +15 −8 BACKERS.md
  3. +8 −4 README.md
  4. +11 −4 build/config.js
  5. +156 −100 dist/vue.common.js
  6. +393 −152 dist/vue.js
  7. +4 −3 dist/vue.min.js
  8. +5,675 −0 dist/vue.runtime.js
  9. +7 −0 dist/vue.runtime.min.js
  10. +2 −1 examples/commits/index.html
  11. +2 −1 examples/elastic-header/index.html
  12. +2 −1 examples/firebase/index.html
  13. +4 −2 examples/grid/index.html
  14. +2 −1 examples/markdown/index.html
  15. +2 −1 examples/modal/index.html
  16. +2 −1 examples/move-animations/index.html
  17. +2 −1 examples/select2/index.html
  18. +2 −1 examples/svg/index.html
  19. +65 −64 examples/todomvc/index.html
  20. +2 −1 examples/tree/index.html
  21. +6 −2 flow/compiler.js
  22. +2 −0 flow/component.js
  23. +3 −1 flow/options.js
  24. +21 −0 flow/ssr.js
  25. +1 −1 flow/vnode.js
  26. +7 −5 package.json
  27. +1,280 −722 packages/vue-server-renderer/build.js
  28. +1 −1 packages/vue-server-renderer/package.json
  29. +3 −3 packages/vue-template-compiler/README.md
  30. +1,115 −636 packages/vue-template-compiler/build.js
  31. +1 −1 packages/vue-template-compiler/package.json
  32. +1 −1 src/compiler/codegen/events.js
  33. +49 −16 src/compiler/codegen/index.js
  34. +2 −2 src/compiler/helpers.js
  35. +5 −3 src/compiler/optimizer.js
  36. +33 −9 src/compiler/parser/html-parser.js
  37. +9 −6 src/compiler/parser/index.js
  38. +1 −1 src/compiler/parser/text-parser.js
  39. +1 −2 src/core/global-api/extend.js
  40. +1 −1 src/core/index.js
  41. +30 −28 src/core/instance/init.js
  42. +24 −6 src/core/instance/render.js
  43. +8 −2 src/core/instance/state.js
  44. +1 −0 src/core/observer/index.js
  45. +23 −23 src/core/observer/watcher.js
  46. +1 −1 src/core/util/lang.js
  47. +2 −3 src/core/util/options.js
  48. +1 −1 src/core/util/props.js
  49. +6 −1 src/core/vdom/create-component.js
  50. +5 −2 src/core/vdom/patch.js
  51. +3 −1 src/core/vdom/vnode.js
  52. +50 −16 src/platforms/web/compiler/directives/model.js
  53. +3 −2 src/platforms/web/compiler/modules/class.js
  54. +12 −2 src/platforms/web/runtime/class-util.js
  55. +1 −1 src/platforms/web/runtime/components/transition.js
  56. +2 −2 src/platforms/web/runtime/directives/model.js
  57. +1 −1 src/platforms/web/runtime/modules/dom-props.js
  58. +12 −2 src/platforms/web/runtime/modules/style.js
  59. +5 −0 src/platforms/web/runtime/transition-util.js
  60. +12 −6 src/platforms/web/server/modules/attrs.js
  61. +24 −13 src/platforms/web/server/modules/dom-props.js
  62. +34 −15 src/platforms/web/server/modules/style.js
  63. +85 −0 src/platforms/web/util/model.js
  64. +1 −1 src/server/create-renderer.js
  65. +2 −4 src/server/render-stream.js
  66. +197 −155 src/server/render.js
  67. +1 −1 src/server/write.js
  68. +5 −1 src/sfc/parser.js
  69. +6 −0 test/e2e/specs/grid.js
  70. +1 −1 test/ssr/ssr-env.spec.js
  71. +24 −0 test/ssr/ssr-stream.spec.js
  72. +117 −0 test/ssr/ssr-string.spec.js
  73. +26 −0 test/unit/features/directives/model-checkbox.spec.js
  74. +8 −3 test/unit/features/directives/model-component.spec.js
  75. +21 −0 test/unit/features/directives/model-parse.spec.js
  76. +61 −0 test/unit/features/directives/model-radio.spec.js
  77. +56 −0 test/unit/features/directives/model-select.spec.js
  78. +41 −0 test/unit/features/directives/model-text.spec.js
  79. +56 −0 test/unit/features/directives/once.spec.js
  80. +15 −0 test/unit/features/directives/style.spec.js
  81. +33 −0 test/unit/features/global-api/mixin.spec.js
  82. +10 −0 test/unit/features/options/methods.spec.js
  83. +0 −8 test/unit/features/options/name.spec.js
  84. +11 −2 test/unit/modules/compiler/parser.spec.js
  85. +15 −1 test/unit/modules/sfc/sfc-parser.spec.js
  86. +1 −1 test/unit/modules/vdom/modules/class.spec.js
  87. +1 −1 test/unit/modules/vdom/modules/dom-props.spec.js
  88. +1 −1 types/options.d.ts
  89. +1 −1 types/test/options-test.ts
  90. +1 −1 types/vue.d.ts
1 change: 1 addition & 0 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -45,6 +45,7 @@ Hi! I’m really excited that you are interested in contributing to Vue.js. Befo
- Provide convincing reason to add this feature. Ideally you should open a suggestion issue first and have it greenlighted before working on it.

- If fixing a bug:
- If you are resolving a special issue, add `(fix #xxxx[,#xxx])` (#xxxx is the issue id) in your PR title for a better release log, e.g. `update entities encoding/decoding (fix #3899)`.
- Provide detailed description of the bug in the PR. Live demo preferred.
- Add appropriate test coverage if applicable.

23 changes: 15 additions & 8 deletions BACKERS.md
Original file line number Diff line number Diff line change
@@ -12,10 +12,6 @@ You can join them in supporting Vue.js development by [pledging on Patreon](htt

### $500

<a href="http://www.itunescn.com/">
<img width="240px" src="https://www.zymmm.com/content/images/2016/05/itunescn-logo-4.png">
</a>

<a href="https://jsfiddle.net/">
<img width="240px" src="https://raw.githubusercontent.com/vuejs/vuejs.org/master/themes/vue/source/images/jsfiddle.png">
</a>
@@ -48,6 +44,14 @@ You can join them in supporting Vue.js development by [pledging on Patreon](htt
<img width="240px" src="https://raw.githubusercontent.com/vuejs/vuejs.org/master/themes/vue/source/images/trisoft.png">
</a>

<a href="https://www.2mhost.com/" target="_blank">
<img width="240px" src="https://raw.githubusercontent.com/vuejs/vuejs.org/master/themes/vue/source/images/2mhost.png">
</a>

<a href="https://vuejsjob.com/?ref=vuejs" target="_blank">
<img width="240px" src="https://raw.githubusercontent.com/vuejs/vuejs.org/master/themes/vue/source/images/vuejobs.png">
</a>

---

### $250
@@ -70,14 +74,11 @@ It could be you!
<img width="240px" src="http://i.imgur.com/MRIkKgp.png">
</a>

<a href="http://nodividestudio.com/">
<img width="100px" src="https://cloud.githubusercontent.com/assets/499550/16464256/552c2306-3e07-11e6-867f-e4f5ac64bace.png"> No Divide Studio
</a>

---

### $50+

- No Divide Studio
- James Kyle
- Blake Newman
- Lee Smith
@@ -86,6 +87,7 @@ It could be you!
- Yoshiya Hinosawa
- Wasim Khamlichi
- Jivan Roquet
- errorrik

---

@@ -176,3 +178,8 @@ It could be you!
- Isaac Sant
- Milos Stojanovic
- Matsumoto Takamasa
- Douglas Lowder
- Bess Brooks
- Christian Griffith
- Matt Rockwell
- Jarek Tkaczyk
12 changes: 8 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -21,10 +21,6 @@ Vue.js is an MIT-licensed open source project. Its ongoing development is made p
<img width="300px" src="https://raw.githubusercontent.com/vuejs/vuejs.org/master/themes/vue/source/images/tde.png">
</a>
<br><br>
<a href="http://www.itunescn.com/" style="">
<img width="120px" src="https://www.zymmm.com/content/images/2016/05/itunescn-logo-4.png">
</a>
<br><br>
<a href="https://jsfiddle.net/">
<img width="120px" src="https://raw.githubusercontent.com/vuejs/vuejs.org/master/themes/vue/source/images/jsfiddle.png">
</a>
@@ -56,6 +52,14 @@ Vue.js is an MIT-licensed open source project. Its ongoing development is made p
<a href="https://www.trisoft.ro/" target="_blank">
<img width="120px" src="https://raw.githubusercontent.com/vuejs/vuejs.org/master/themes/vue/source/images/trisoft.png">
</a>
<br><br>
<a href="https://www.2mhost.com/" target="_blank">
<img width="120px" src="https://raw.githubusercontent.com/vuejs/vuejs.org/master/themes/vue/source/images/2mhost.png">
</a>
<br><br>
<a href="https://vuejsjob.com/?ref=vuejs" target="_blank">
<img width="120px" src="https://raw.githubusercontent.com/vuejs/vuejs.org/master/themes/vue/source/images/vuejobs.png">
</a>
</p>

## Intro
15 changes: 11 additions & 4 deletions build/config.js
Original file line number Diff line number Diff line change
@@ -22,15 +22,22 @@ const builds = {
format: 'cjs',
banner
},
// Minified runtime, only for filze size monitoring
'web-runtime-prod': {
// runtime-only build for CDN
'web-runtime-cdn-dev': {
entry: path.resolve(__dirname, '../src/entries/web-runtime.js'),
dest: path.resolve(__dirname, '../dist/vue.common.min.js'),
dest: path.resolve(__dirname, '../dist/vue.runtime.js'),
format: 'umd',
banner
},
// runtime-only production build for CDN
'web-runtime-cdn-prod': {
entry: path.resolve(__dirname, '../src/entries/web-runtime.js'),
dest: path.resolve(__dirname, '../dist/vue.runtime.min.js'),
format: 'umd',
env: 'production',
banner
},
// Runtime+compiler standalone developement build.
// Runtime+compiler standalone development build.
'web-standalone-dev': {
entry: path.resolve(__dirname, '../src/entries/web-runtime-with-compiler.js'),
dest: path.resolve(__dirname, '../dist/vue.js'),
Loading