Merge branch 'dev' of github.com:vuejs/vue into new-type

add ESModule interface

.github/CONTRIBUTING.md

@@ -49,7 +49,7 @@ The `setup` script links two git hooks:
 - `pre-commit`: runs ESLint on staged files.
 - `commit-msg`: validates commit message format (see below).
 
-### Commiting Changes
+### Committing Changes
 
 Commit messages should follow the [commit message convention](./COMMIT_CONVENTION.md) so that changelogs can be automatically generated. If git hooks have been properly linked, commit messages will be automatically validated upon commit. It is recommended to use `npm run commit` instead of `git commit`, which provides an interactive CLI for generating proper commit messages.
 

.gitignore

@@ -16,3 +16,4 @@ packages/vue-server-renderer/build.js
 packages/vue-server-renderer/server-plugin.js
 packages/vue-server-renderer/client-plugin.js
 packages/vue-template-compiler/build.js
+.vscode

BACKERS.md

@@ -12,8 +12,8 @@ You can join them in supporting  Vue.js development by [pledging on Patreon](htt
 
 ### $1000
 
-<a href="https://www.upyun.com/?utm_source=vue&utm_medium=ad&utm_content=github">
-  <img width="400px" src="https://raw.githubusercontent.com/vuejs/cn.vuejs.org/master/themes/vue/source/images/upyun-large.png">
+<a href="https://xiaozhuanlan.com">
+  <img width="400px" src="https://raw.githubusercontent.com/vuejs/cn.vuejs.org/master/themes/vue/source/images/xiaozhuanlan.png">
 </a>
 
 ---
@@ -48,10 +48,6 @@ 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/monterail.png">
 </a>
 <br><br>
-<a href="https://www.trisoft.ro/" target="_blank">
-  <img width="240px" 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="240px" src="https://raw.githubusercontent.com/vuejs/vuejs.org/master/themes/vue/source/images/2mhost.png">
 </a>
@@ -71,6 +67,16 @@ You can join them in supporting  Vue.js development by [pledging on Patreon](htt
 <a href="https://component.io/" target="_blank">
   <img width="260px" src="https://raw.githubusercontent.com/vuejs/vuejs.org/master/themes/vue/source/images/component_io.png">
 </a>
+<br><br>
+<a href="https://www.v2ex.com/t/379389" target="_blank">
+  <img width="260px" src="https://raw.githubusercontent.com/vuejs/vuejs.org/master/themes/vue/source/images/v2exer.png">
+</a>
+
+---
+
+### $250
+
+- Matt Mullenweg
 
 ---
 
@@ -114,6 +120,7 @@ You can join them in supporting  Vue.js development by [pledging on Patreon](htt
 - Wasim Khamlichi
 - errorrik
 - Alex Balashov
+- Konstantin Levinski
 
 ---
 
@@ -263,3 +270,21 @@ You can join them in supporting  Vue.js development by [pledging on Patreon](htt
 - Jon Hobbs-Smith
 - Chez Tschetter
 - Akiho Nagao
+- Alexander Karelas
+- Asaf Yishai
+- Diana Espino
+- Alexandre Madurell
+- alxs
+- Anthony Estebe
+- Haim Yulzari
+- Blake Campbell
+- David McGuigan
+- Niklas Wallentin
+- Jeremy Tan
+- Jim Raden
+- Luka Savic
+- IMGNRY
+- Pascal Germain
+- Raphaël Saunier
+- Kirk Lewis
+- Nicholas Reid

README.md

@@ -22,8 +22,8 @@ Vue.js is an MIT-licensed open source project. Its ongoing development is made p
     <img width="240px" src="https://raw.githubusercontent.com/vuejs/vuejs.org/master/themes/vue/source/images/stdlib.png">
   </a>
   <br><br>
-  <a href="https://www.upyun.com/?utm_source=vue&utm_medium=ad&utm_content=github">
-    <img width="160px" src="https://raw.githubusercontent.com/vuejs/cn.vuejs.org/master/themes/vue/source/images/upyun-small.png">
+  <a href="https://xiaozhuanlan.com">
+    <img width="160px" src="https://raw.githubusercontent.com/vuejs/cn.vuejs.org/master/themes/vue/source/images/xiaozhuanlan.png">
   </a>
   <br><br>
   <a href="https://deepstreamhub.com" target="_blank">
@@ -54,10 +54,6 @@ Vue.js is an MIT-licensed open source project. Its ongoing development is made p
     <img width="120px" src="https://raw.githubusercontent.com/vuejs/vuejs.org/master/themes/vue/source/images/monterail.png">
   </a>
   <br><br>
-  <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>
@@ -77,6 +73,10 @@ Vue.js is an MIT-licensed open source project. Its ongoing development is made p
   <a href="https://component.io/" target="_blank">
     <img width="130px" src="https://raw.githubusercontent.com/vuejs/vuejs.org/master/themes/vue/source/images/component_io.png">
   </a>
+  <br><br>
+  <a href="https://www.v2ex.com/t/379389" target="_blank">
+    <img width="130px" src="https://raw.githubusercontent.com/vuejs/vuejs.org/master/themes/vue/source/images/v2exer.png">
+  </a>
 </p>
 
 ## Intro

benchmarks/ssr/common.js

@@ -45,8 +45,8 @@ module.exports = {
               template: '<td class="item">' +
                 // 25 plain elements for each cell
                 '<ul class="yoyo">' +
-                  '<li class="hihi" v-for="i in 5">' +
-                    '<span v-for="i in 5">fsefs</span>' +
+                  `<li v-for="i in 5" :class="'hihi' + i">` +
+                    `<span :id="i + '_' + j" v-for="j in 5">fsefs</span>` +
                     '</li>' +
                 '</ul>' +
               '</td>'

build/git-hooks/commit-msg

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # Validate commit log
-commit_regex='^Merge.+|(feat|fix|docs|style|refactor|perf|test|build|ci|chore|revert)(\(.+\))?: .{1,50}'
+commit_regex='^Merge.+|(feat|fix|docs|style|refactor|perf|test|build|ci|chore|revert|types)(\(.+\))?: .{1,50}'
 
 if ! grep -iqE "$commit_regex" "$1"; then
     echo

flow/component.js

@@ -29,8 +29,8 @@ declare interface Component {
   $slots: { [key: string]: Array<VNode> };
   $scopedSlots: { [key: string]: () => VNodeChildren };
   $vnode: VNode; // the placeholder node for the component in parent's render tree
-  $attrs: ?{ [key: string] : string };
-  $listeners: ?{ [key: string]: Function | Array<Function> };
+  $attrs: { [key: string] : string };
+  $listeners: { [key: string]: Function | Array<Function> };
   $isServer: boolean;
 
   // public methods