build: build 2.5.19

yyx990803 · yyx990803 · commit c38a81b84a52 · 2018-12-09T16:25:36.000-05:00
diff --git a/dist/vue.common.js b/dist/vue.common.js
@@ -1,5 +1,5 @@
 /*!
- * Vue.js v2.5.18
+ * Vue.js v2.5.19
  * (c) 2014-2018 Evan You
  * Released under the MIT License.
  */
@@ -5188,7 +5188,7 @@ Object.defineProperty(Vue, 'FunctionalRenderContext', {
   value: FunctionalRenderContext
 });
 
-Vue.version = '2.5.18';
+Vue.version = '2.5.19';
 
 /*  */
 
@@ -5541,20 +5541,13 @@ var emptyNode = new VNode('', {}, []);
 
 var hooks = ['create', 'activate', 'update', 'remove', 'destroy'];
 
-function childrenIgnored (vnode) {
-  return vnode && vnode.data && vnode.data.domProps && (
-    vnode.data.domProps.innerHTML || vnode.data.domProps.textContent
-  )
-}
-
 function sameVnode (a, b) {
   return (
     a.key === b.key && (
       (
         a.tag === b.tag &&
         a.isComment === b.isComment &&
         isDef(a.data) === isDef(b.data) &&
-        !childrenIgnored(a) && !childrenIgnored(b) &&
         sameInputType(a, b)
       ) || (
         isTrue(a.isAsyncPlaceholder) &&
diff --git a/dist/vue.esm.js b/dist/vue.esm.js
@@ -1,5 +1,5 @@
 /*!
- * Vue.js v2.5.18
+ * Vue.js v2.5.19
  * (c) 2014-2018 Evan You
  * Released under the MIT License.
  */
@@ -5186,7 +5186,7 @@ Object.defineProperty(Vue, 'FunctionalRenderContext', {
   value: FunctionalRenderContext
 });
 
-Vue.version = '2.5.18';
+Vue.version = '2.5.19';
 
 /*  */
 
@@ -5539,20 +5539,13 @@ var emptyNode = new VNode('', {}, []);
 
 var hooks = ['create', 'activate', 'update', 'remove', 'destroy'];
 
-function childrenIgnored (vnode) {
-  return vnode && vnode.data && vnode.data.domProps && (
-    vnode.data.domProps.innerHTML || vnode.data.domProps.textContent
-  )
-}
-
 function sameVnode (a, b) {
   return (
     a.key === b.key && (
       (
         a.tag === b.tag &&
         a.isComment === b.isComment &&
         isDef(a.data) === isDef(b.data) &&
-        !childrenIgnored(a) && !childrenIgnored(b) &&
         sameInputType(a, b)
       ) || (
         isTrue(a.isAsyncPlaceholder) &&
diff --git a/dist/vue.js b/dist/vue.js
@@ -1,5 +1,5 @@
 /*!
- * Vue.js v2.5.18
+ * Vue.js v2.5.19
  * (c) 2014-2018 Evan You
  * Released under the MIT License.
  */
@@ -5170,7 +5170,7 @@
     value: FunctionalRenderContext
   });
 
-  Vue.version = '2.5.18';
+  Vue.version = '2.5.19';
 
   /*  */
 
@@ -5523,20 +5523,13 @@
 
   var hooks = ['create', 'activate', 'update', 'remove', 'destroy'];
 
-  function childrenIgnored (vnode) {
-    return vnode && vnode.data && vnode.data.domProps && (
-      vnode.data.domProps.innerHTML || vnode.data.domProps.textContent
-    )
-  }
-
   function sameVnode (a, b) {
     return (
       a.key === b.key && (
         (
           a.tag === b.tag &&
           a.isComment === b.isComment &&
           isDef(a.data) === isDef(b.data) &&
-          !childrenIgnored(a) && !childrenIgnored(b) &&
           sameInputType(a, b)
         ) || (
           isTrue(a.isAsyncPlaceholder) &&
diff --git a/dist/vue.min.js b/dist/vue.min.js
diff --git a/dist/vue.runtime.common.js b/dist/vue.runtime.common.js
@@ -1,5 +1,5 @@
 /*!
- * Vue.js v2.5.18
+ * Vue.js v2.5.19
  * (c) 2014-2018 Evan You
  * Released under the MIT License.
  */
@@ -5179,7 +5179,7 @@ Object.defineProperty(Vue, 'FunctionalRenderContext', {
   value: FunctionalRenderContext
 });
 
-Vue.version = '2.5.18';
+Vue.version = '2.5.19';
 
 /*  */
 
@@ -5530,20 +5530,13 @@ var emptyNode = new VNode('', {}, []);
 
 var hooks = ['create', 'activate', 'update', 'remove', 'destroy'];
 
-function childrenIgnored (vnode) {
-  return vnode && vnode.data && vnode.data.domProps && (
-    vnode.data.domProps.innerHTML || vnode.data.domProps.textContent
-  )
-}
-
 function sameVnode (a, b) {
   return (
     a.key === b.key && (
       (
         a.tag === b.tag &&
         a.isComment === b.isComment &&
         isDef(a.data) === isDef(b.data) &&
-        !childrenIgnored(a) && !childrenIgnored(b) &&
         sameInputType(a, b)
       ) || (
         isTrue(a.isAsyncPlaceholder) &&
diff --git a/dist/vue.runtime.esm.js b/dist/vue.runtime.esm.js
@@ -1,5 +1,5 @@
 /*!
- * Vue.js v2.5.18
+ * Vue.js v2.5.19
  * (c) 2014-2018 Evan You
  * Released under the MIT License.
  */
@@ -5177,7 +5177,7 @@ Object.defineProperty(Vue, 'FunctionalRenderContext', {
   value: FunctionalRenderContext
 });
 
-Vue.version = '2.5.18';
+Vue.version = '2.5.19';
 
 /*  */
 
@@ -5528,20 +5528,13 @@ var emptyNode = new VNode('', {}, []);
 
 var hooks = ['create', 'activate', 'update', 'remove', 'destroy'];
 
-function childrenIgnored (vnode) {
-  return vnode && vnode.data && vnode.data.domProps && (
-    vnode.data.domProps.innerHTML || vnode.data.domProps.textContent
-  )
-}
-
 function sameVnode (a, b) {
   return (
     a.key === b.key && (
       (
         a.tag === b.tag &&
         a.isComment === b.isComment &&
         isDef(a.data) === isDef(b.data) &&
-        !childrenIgnored(a) && !childrenIgnored(b) &&
         sameInputType(a, b)
       ) || (
         isTrue(a.isAsyncPlaceholder) &&
diff --git a/dist/vue.runtime.js b/dist/vue.runtime.js
@@ -1,5 +1,5 @@
 /*!
- * Vue.js v2.5.18
+ * Vue.js v2.5.19
  * (c) 2014-2018 Evan You
  * Released under the MIT License.
  */
@@ -5161,7 +5161,7 @@
     value: FunctionalRenderContext
   });
 
-  Vue.version = '2.5.18';
+  Vue.version = '2.5.19';
 
   /*  */
 
@@ -5512,20 +5512,13 @@
 
   var hooks = ['create', 'activate', 'update', 'remove', 'destroy'];
 
-  function childrenIgnored (vnode) {
-    return vnode && vnode.data && vnode.data.domProps && (
-      vnode.data.domProps.innerHTML || vnode.data.domProps.textContent
-    )
-  }
-
   function sameVnode (a, b) {
     return (
       a.key === b.key && (
         (
           a.tag === b.tag &&
           a.isComment === b.isComment &&
           isDef(a.data) === isDef(b.data) &&
-          !childrenIgnored(a) && !childrenIgnored(b) &&
           sameInputType(a, b)
         ) || (
           isTrue(a.isAsyncPlaceholder) &&
diff --git a/dist/vue.runtime.min.js b/dist/vue.runtime.min.js
diff --git a/packages/vue-server-renderer/basic.js b/packages/vue-server-renderer/basic.js
@@ -7906,7 +7906,7 @@
         for (var i = 0; i < dirs.length; i++) {
           var name = dirs[i].name;
           if (name !== 'show') {
-            var dirRenderer = resolveAsset(context, 'directives', name, true);
+            var dirRenderer = resolveAsset(context, 'directives', name);
             if (dirRenderer) {
               // directives mutate the node's data
               // which then gets rendered by modules
diff --git a/packages/vue-server-renderer/build.js b/packages/vue-server-renderer/build.js
@@ -7678,7 +7678,7 @@ function renderStartingTag (node, context) {
       for (var i = 0; i < dirs.length; i++) {
         var name = dirs[i].name;
         if (name !== 'show') {
-          var dirRenderer = resolveAsset(context, 'directives', name, true);
+          var dirRenderer = resolveAsset(context, 'directives', name);
           if (dirRenderer) {
             // directives mutate the node's data
             // which then gets rendered by modules
diff --git a/packages/vue-server-renderer/package.json b/packages/vue-server-renderer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-server-renderer",
-  "version": "2.5.18",
+  "version": "2.5.19",
   "description": "server renderer for Vue 2.0",
   "main": "index.js",
   "types": "types/index.d.ts",
diff --git a/packages/vue-template-compiler/browser.js b/packages/vue-template-compiler/browser.js
@@ -637,15 +637,11 @@
     function end (tag, start) {
       if (depth === 1 && currentBlock) {
         currentBlock.end = start;
-        var text = content.slice(currentBlock.start, currentBlock.end);
+        var text = deIndent(content.slice(currentBlock.start, currentBlock.end));
         // pad content so that linters and pre-processors can output correct
         // line numbers in errors and warnings
-        if (options.pad) {
+        if (currentBlock.type !== 'template' && options.pad) {
           text = padContent(currentBlock, options.pad) + text;
-        } else {
-          // avoid to deindent if pad option is specified
-          // to retain original source position.
-          text = deIndent(text);
         }
         currentBlock.content = text;
         currentBlock = null;
diff --git a/packages/vue-template-compiler/build.js b/packages/vue-template-compiler/build.js
@@ -595,15 +595,11 @@ function parseComponent (
   function end (tag, start) {
     if (depth === 1 && currentBlock) {
       currentBlock.end = start;
-      var text = content.slice(currentBlock.start, currentBlock.end);
+      var text = deindent(content.slice(currentBlock.start, currentBlock.end));
       // pad content so that linters and pre-processors can output correct
       // line numbers in errors and warnings
-      if (options.pad) {
+      if (currentBlock.type !== 'template' && options.pad) {
         text = padContent(currentBlock, options.pad) + text;
-      } else {
-        // avoid to deindent if pad option is specified
-        // to retain original source position.
-        text = deindent(text);
       }
       currentBlock.content = text;
       currentBlock = null;
diff --git a/packages/vue-template-compiler/package.json b/packages/vue-template-compiler/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-template-compiler",
-  "version": "2.5.18",
+  "version": "2.5.19",
   "description": "template compiler for Vue 2.0",
   "main": "index.js",
   "unpkg": "browser.js",
