chore: merge branch '2.6' into dev

Author: yyx990803

.circleci/config.yml

@@ -93,6 +93,7 @@ workflows:
           filters:
             branches:
               only:
+                - "2.6"
                 - regression-test
           requires:
             - test-cover

BACKERS.md

@@ -21,7 +21,7 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu
     <img width="260px" src="https://raw.githubusercontent.com/vuejs/vuejs.org/master/themes/vue/source/images/stdlib.png">
   </a>
 </p>
-  
+
 <!--special end-->
 
 <h2 align="center">Platinum via Patreon</h2>
@@ -320,12 +320,12 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu
 
 <!--50 start-->
 - Wasim Khamlichi
-- errorrik 
+- errorrik
 - Alex Balashov
 - Konstantin Levinski
 - Ernest Sim
 - Blaise Laflamme
-- Dilettant 
+- Dilettant
 <!--50 end-->
 
 <h2 align="center">Backers via Patreon</h2>
@@ -344,10 +344,10 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu
 - Kirk Lewis
 - Karol F
 - Miljan Aleksic
-- 叶解 
+- 叶解
 - Jake Ingman
 - Barbara Liau
-- 4 
+- 4
 - Jarek Tkaczyk
 - Niannian Modisette
 - Ivan Sieder
@@ -396,12 +396,12 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu
 - Jere Sjöroos
 - Wakana Seki
 - David Ang
-- Dom 
+- Dom
 - Ben Hong
 - David Kaplan
 - John Cleveland
 - Jaeyoung Lee
-- Amor 
+- Amor
 - Tom Ootes
 - Andy Foster
 - Joe Cochran
@@ -428,10 +428,10 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu
 - Yusuke Kawabata
 - Nick Dandakis
 - JI CAI
-- 龙腾道 
+- 龙腾道
 - Milos Stojanovic
 - Matkovsky Peter
-- shimbaco 
+- shimbaco
 - Princeyesuraj Edward
 - Kenneth Crawford
 <!--10 end-->

README.md

@@ -31,7 +31,7 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu
     <img width="260px" src="https://raw.githubusercontent.com/vuejs/vuejs.org/master/themes/vue/source/images/stdlib.png">
   </a>
 </p>
-  
+
 <!--special end-->
 
 <h3 align="center">Platinum Sponsors</h3>

benchmarks/ssr/common.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const self = (global || root)
+const self = (global || root) // eslint-disable-line
 
 self.performance = {
   now: function () {
@@ -35,11 +35,11 @@ module.exports = {
         }
       },
       // template: '<table><tr v-for="row in grid"><th>123</th><td v-for="item in row.items">{{ item.id }}</td></tr></table>',
-      template: '<table width="100%" cellspacing="2"><row v-for="row in grid" :row="row"></row></table>',
+      template: '<table width="100%" cellspacing="2"><row v-for="row in grid" :key="row.id" :row="row"></row></table>',
       components: {
         row: {
           props: ['row'],
-          template: '<tr><th>{{ Math.random() }}</th><column v-for="item in row.items"></column></tr>',
+          template: '<tr><th>{{ Math.random() }}</th><column v-for="item in row.items" :key="item.id"></column></tr>',
           components: {
             column: {
               template: '<td class="item">' +

dist/vue.common.js

@@ -1927,7 +1927,7 @@ function withMacroTask (fn) {
     try {
       return fn.apply(null, arguments)
     } finally {
-      useMacroTask = false;    
+      useMacroTask = false;
     }
   })
 }
@@ -11078,7 +11078,3 @@ function getOuterHTML (el) {
     return container.innerHTML
   }
 }
-
-Vue.compile = compileToFunctions;
-
-module.exports = Vue;

dist/vue.min.js

@@ -1918,7 +1918,7 @@ function withMacroTask (fn) {
     try {
       return fn.apply(null, arguments)
     } finally {
-      useMacroTask = false;    
+      useMacroTask = false;
     }
   })
 }
@@ -8103,7 +8103,3 @@ if (inBrowser) {
     }
   }, 0);
 }
-
-/*  */
-
-module.exports = Vue;

dist/vue.runtime.common.js

@@ -6,7 +6,8 @@ declare type CompilerOptions = {
   isUnaryTag?: (tag: string) => ?boolean; // check if a tag is unary for the platform
   canBeLeftOpenTag?: (tag: string) => ?boolean; // check if a tag can be left opened
   isReservedTag?: (tag: string) => ?boolean; // check if a tag is a native for the platform
-  preserveWhitespace?: boolean; // preserve whitespace between elements?
+  preserveWhitespace?: boolean; // preserve whitespace between elements? (Deprecated)
+  whitespace?: 'preserve' | 'condense'; // whitespace handling strategy
   optimize?: boolean; // optimize static content?
 
   // web specific
@@ -18,6 +19,7 @@ declare type CompilerOptions = {
   shouldDecodeTags?: boolean;
   shouldDecodeNewlines?:  boolean;
   shouldDecodeNewlinesForHref?: boolean;
+  outputSourceRange?: boolean;
 
   // runtime user-configurable
   delimiters?: [string, string]; // template delimiters
@@ -27,13 +29,19 @@ declare type CompilerOptions = {
   scopeId?: string;
 };
 
+declare type WarningMessage = {
+  msg: string;
+  start?: number;
+  end?: number;
+};
+
 declare type CompiledResult = {
   ast: ?ASTElement;
   render: string;
   staticRenderFns: Array<string>;
   stringRenderFns?: Array<string>;
-  errors?: Array<string>;
-  tips?: Array<string>;
+  errors?: Array<string | WarningMessage>;
+  tips?: Array<string | WarningMessage>;
 };
 
 declare type ModuleOptions = {
@@ -53,11 +61,14 @@ declare type ModuleOptions = {
 declare type ASTModifiers = { [key: string]: boolean };
 declare type ASTIfCondition = { exp: ?string; block: ASTElement };
 declare type ASTIfConditions = Array<ASTIfCondition>;
+declare type ASTAttr = { name: string; value: any; start?: number; end?: number };
 
 declare type ASTElementHandler = {
   value: string;
   params?: Array<any>;
   modifiers: ?ASTModifiers;
+  start?: number;
+  end?: number;
 };
 
 declare type ASTElementHandlers = {
@@ -70,18 +81,24 @@ declare type ASTDirective = {
   value: string;
   arg: ?string;
   modifiers: ?ASTModifiers;
+  start?: number;
+  end?: number;
 };
 
-declare type ASTNode = ASTElement | ASTText | ASTExpression;
+declare type ASTNode = ASTElement | ASTText | ASTExpression
 
 declare type ASTElement = {
   type: 1;
   tag: string;
-  attrsList: Array<{ name: string; value: any }>;
+  attrsList: Array<ASTAttr>;
   attrsMap: { [key: string]: any };
+  rawAttrsMap: { [key: string]: ASTAttr };
   parent: ASTElement | void;
   children: Array<ASTNode>;
 
+  start?: number;
+  end?: number;
+
   processed?: true;
 
   static?: boolean;
@@ -91,8 +108,8 @@ declare type ASTElement = {
   hasBindings?: boolean;
 
   text?: string;
-  attrs?: Array<{ name: string; value: any }>;
-  props?: Array<{ name: string; value: string }>;
+  attrs?: Array<ASTAttr>;
+  props?: Array<ASTAttr>;
   plain?: boolean;
   pre?: true;
   ns?: string;
@@ -150,6 +167,9 @@ declare type ASTElement = {
 
   // weex specific
   appendAsTree?: boolean;
+
+  // 2.6 $slot check
+  has$Slot?: boolean
 };
 
 declare type ASTExpression = {
@@ -160,6 +180,10 @@ declare type ASTExpression = {
   static?: boolean;
   // 2.4 ssr optimization
   ssrOptimizability?: number;
+  start?: number;
+  end?: number;
+  // 2.6 $slot check
+  has$Slot?: boolean
 };
 
 declare type ASTText = {
@@ -169,6 +193,10 @@ declare type ASTText = {
   isComment?: boolean;
   // 2.4 ssr optimization
   ssrOptimizability?: number;
+  start?: number;
+  end?: number;
+  // 2.6 $slot check
+  has$Slot?: boolean
 };
 
 // SFC-parser related declarations
@@ -179,7 +207,8 @@ declare type SFCDescriptor = {
   script: ?SFCBlock;
   styles: Array<SFCBlock>;
   customBlocks: Array<SFCBlock>;
-};
+  errors: Array<string | WarningMessage>;
+}
 
 declare type SFCBlock = {
   type: string;

flow/compiler.js

@@ -16,6 +16,8 @@ declare interface GlobalAPI {
   component: (id: string, def?: Class<Component> | Object) => Class<Component>;
   filter: (id: string, def?: Function) => Function | void;
 
+  observable: <T>(value: T) => T;
+
   // allow dynamic method registration
   [key: string]: any
 };

flow/global-api.js

@@ -44,6 +44,7 @@ declare type ComponentOptions = {
   beforeDestroy?: Function;
   destroyed?: Function;
   errorCaptured?: () => boolean | void;
+  ssrPrefetch?: Function;
 
   // assets
   directives?: { [key: string]: Object };