Merge branch 'dev' of github.com:vuejs/vue into extend-inject

Author: jkzing

.eslintrc

@@ -1,14 +1,13 @@
 {
   "root": true,
-  "parser": "babel-eslint",
-  "extends": "vue",
-  "plugins": ["flowtype"],
+  "plugins": [
+    "flowtype"
+  ],
+  "extends": [
+    "plugin:vue-libs/recommended",
+    "plugin:flowtype/recommended"
+  ],
   "globals": {
     "__WEEX__": true
-  },
-  "rules": {
-    "no-useless-escape": 0,
-    "flowtype/define-flow-type": 1,
-    "flowtype/use-flow-type": 1
   }
 }

.github/ISSUE_TEMPLATE.md

@@ -4,4 +4,7 @@ IMPORTANT: Please use the following link to create a new issue:
   https://new-issue.vuejs.org/
 
 If your issue was not created using the app above, it will be closed immediately.
+
+中文用户请注意：
+请使用上面的链接来创建新的 issue。如果不是用上述工具创建的 issue 会被自动关闭。
 -->

package.json

@@ -71,11 +71,10 @@
     "de-indent": "^1.0.2",
     "es6-promise": "^4.0.5",
     "eslint": "^3.10.1",
-    "eslint-config-vue": "^2.0.1",
     "eslint-loader": "^1.3.0",
     "eslint-plugin-flowtype": "^2.16.0",
     "eslint-plugin-jasmine": "^2.1.0",
-    "eslint-plugin-vue": "^2.0.0",
+    "eslint-plugin-vue-libs": "^1.2.0",
     "file-loader": "^0.10.1",
     "flow-bin": "^0.45.0",
     "hash-sum": "^1.0.2",

src/core/global-api/use.js

@@ -4,8 +4,11 @@ import { toArray } from '../util/index'
 
 export function initUse (Vue: GlobalAPI) {
   Vue.use = function (plugin: Function | Object) {
-    /* istanbul ignore if */
-    if (plugin.installed) {
+    const cid = this.cid
+    if (!plugin._installed) {
+      plugin._installed = {}
+    }
+    if (plugin._installed[cid]) {
       return this
     }
     // additional parameters
@@ -16,7 +19,7 @@ export function initUse (Vue: GlobalAPI) {
     } else if (typeof plugin === 'function') {
       plugin.apply(null, args)
     }
-    plugin.installed = true
+    plugin._installed[cid] = true
     return this
   }
 }

src/core/observer/index.js

@@ -198,7 +198,7 @@ export function set (target: Array<any> | Object, key: any, val: any): any {
     target[key] = val
     return val
   }
-  const ob = (target : any).__ob__
+  const ob = (target: any).__ob__
   if (target._isVue || (ob && ob.vmCount)) {
     process.env.NODE_ENV !== 'production' && warn(
       'Avoid adding reactive properties to a Vue instance or its root $data ' +
@@ -223,7 +223,7 @@ export function del (target: Array<any> | Object, key: any) {
     target.splice(key, 1)
     return
   }
-  const ob = (target : any).__ob__
+  const ob = (target: any).__ob__
   if (target._isVue || (ob && ob.vmCount)) {
     process.env.NODE_ENV !== 'production' && warn(
       'Avoid deleting properties on a Vue instance or its root $data ' +

src/core/util/env.js

@@ -26,7 +26,7 @@ if (inBrowser) {
         /* istanbul ignore next */
         supportsPassive = true
       }
-    } : Object)) // https://github.com/facebook/flow/issues/285
+    }: Object)) // https://github.com/facebook/flow/issues/285
     window.addEventListener('test-passive', null, opts)
   } catch (e) {}
 }

src/platforms/web/runtime/components/transition.js

@@ -72,19 +72,23 @@ function isSameChild (child: VNode, oldChild: VNode): boolean {
   return oldChild.key === child.key && oldChild.tag === child.tag
 }
 
+function isAsyncPlaceholder (node: VNode): boolean {
+  return node.isComment && node.asyncFactory
+}
+
 export default {
   name: 'transition',
   props: transitionProps,
   abstract: true,
 
   render (h: Function) {
-    let children: ?Array<VNode> = this.$slots.default
+    let children: ?Array<VNode> = this.$options._renderChildren
     if (!children) {
       return
     }
 
     // filter out text nodes (possible whitespaces)
-    children = children.filter((c: VNode) => c.tag)
+    children = children.filter((c: VNode) => c.tag || isAsyncPlaceholder(c))
     /* istanbul ignore if */
     if (!children.length) {
       return
@@ -151,7 +155,12 @@ export default {
       child.data.show = true
     }
 
-    if (oldChild && oldChild.data && !isSameChild(child, oldChild)) {
+    if (
+      oldChild &&
+      oldChild.data &&
+      !isSameChild(child, oldChild) &&
+      !isAsyncPlaceholder(oldChild)
+    ) {
       // replace old child transition data with fresh one
       // important for dynamic transitions!
       const oldData: Object = oldChild && (oldChild.data.transition = extend({}, data))
@@ -165,6 +174,9 @@ export default {
         })
         return placeholder(h, rawChild)
       } else if (mode === 'in-out') {
+        if (isAsyncPlaceholder(child)) {
+          return oldRawChild
+        }
         let delayedLeave
         const performLeave = () => { delayedLeave() }
         mergeVNodeHook(data, 'afterEnter', performLeave)

src/platforms/web/util/element.js

@@ -19,7 +19,7 @@ export const isHTMLTag = makeMap(
   'button,datalist,fieldset,form,input,label,legend,meter,optgroup,option,' +
   'output,progress,select,textarea,' +
   'details,dialog,menu,menuitem,summary,' +
-  'content,element,shadow,template'
+  'content,element,shadow,template,blockquote,iframe,tfoot'
 )
 
 // this map is intentionally selective, only covering SVG elements that may

src/platforms/weex/compiler/modules/props.js

@@ -4,7 +4,7 @@ import { cached, camelize } from 'shared/util'
 
 const normalize = cached(camelize)
 
-function normalizeKeyName (str: string) : string {
+function normalizeKeyName (str: string): string {
   if (str.match(/^v\-/)) {
     return str.replace(/(v-[a-z\-]+\:)([a-z\-]+)$/i, ($, directive, prop) => {
       return directive + normalize(prop)

test/helpers/test-object-option.js

@@ -1,6 +1,6 @@
 import Vue from 'vue'
 
-export default function testObjectOption (name: string) {
+export default function testObjectOption (name) {
   it('should warn non object', () => {
     const options = {}
     options[name] = () => {}