build: build 2.6.2

dist/vue.common.dev.js

@@ -1,5 +1,5 @@
 /*!
- * Vue.js v2.6.1
+ * Vue.js v2.6.2
  * (c) 2014-2019 Evan You
  * Released under the MIT License.
  */
@@ -3888,7 +3888,7 @@ function normalizeScopedSlots (
     res = {};
     for (var key in slots) {
       if (slots[key] && key[0] !== '$') {
-        res[key] = normalizeScopedSlot(slots[key]);
+        res[key] = normalizeScopedSlot(normalSlots, key, slots[key]);
       }
     }
   }
@@ -3903,13 +3903,22 @@ function normalizeScopedSlots (
   return res
 }
 
-function normalizeScopedSlot(fn) {
-  return function (scope) {
+function normalizeScopedSlot(normalSlots, key, fn) {
+  var normalized = function (scope) {
+    if ( scope === void 0 ) scope = {};
+
     var res = fn(scope);
     return res && typeof res === 'object' && !Array.isArray(res)
       ? [res] // single vnode
       : normalizeChildren(res)
+  };
+  // proxy scoped slots on normal $slots
+  if (!hasOwn(normalSlots, key)) {
+    Object.defineProperty(normalSlots, key, {
+      get: normalized
+    });
   }
+  return normalized
 }
 
 function proxyNormalSlot(slots, key) {
@@ -4572,9 +4581,8 @@ function mergeHook$1 (f1, f2) {
 // prop and event handler respectively.
 function transformModel (options, data) {
   var prop = (options.model && options.model.prop) || 'value';
-  var event = (options.model && options.model.event) || 'input';
-  var addTo = (options.props && prop in options.props) ? 'props' : 'attrs'
-  ;(data[addTo] || (data[addTo] = {}))[prop] = data.model.value;
+  var event = (options.model && options.model.event) || 'input'
+  ;(data.attrs || (data.attrs = {}))[prop] = data.model.value;
   var on = data.on || (data.on = {});
   var existing = on[event];
   var callback = data.model.callback;
@@ -5320,7 +5328,7 @@ Object.defineProperty(Vue, 'FunctionalRenderContext', {
   value: FunctionalRenderContext
 });
 
-Vue.version = '2.6.1';
+Vue.version = '2.6.2';
 
 /*  */
 
@@ -11076,7 +11084,8 @@ function genScopedSlot (
   el,
   state
 ) {
-  if (el.if && !el.ifProcessed) {
+  var isLegacySyntax = el.attrsMap['slot-scope'];
+  if (el.if && !el.ifProcessed && !isLegacySyntax) {
     return genIf(el, state, genScopedSlot, "null")
   }
   if (el.for && !el.forProcessed) {
@@ -11084,7 +11093,9 @@ function genScopedSlot (
   }
   var fn = "function(" + (String(el.slotScope)) + "){" +
     "return " + (el.tag === 'template'
-      ? genChildren(el, state) || 'undefined'
+      ? el.if && isLegacySyntax
+        ? ("(" + (el.if) + ")?" + (genChildren(el, state) || 'undefined') + ":undefined")
+        : genChildren(el, state) || 'undefined'
       : genElement(el, state)) + "}";
   return ("{key:" + (el.slotTarget || "\"default\"") + ",fn:" + fn + "}")
 }

dist/vue.esm.browser.js

@@ -1,5 +1,5 @@
 /*!
- * Vue.js v2.6.1
+ * Vue.js v2.6.2
  * (c) 2014-2019 Evan You
  * Released under the MIT License.
  */
@@ -3934,7 +3934,7 @@ function normalizeScopedSlots (
     res = {};
     for (const key in slots) {
       if (slots[key] && key[0] !== '$') {
-        res[key] = normalizeScopedSlot(slots[key]);
+        res[key] = normalizeScopedSlot(normalSlots, key, slots[key]);
       }
     }
   }
@@ -3949,13 +3949,20 @@ function normalizeScopedSlots (
   return res
 }
 
-function normalizeScopedSlot(fn) {
-  return scope => {
+function normalizeScopedSlot(normalSlots, key, fn) {
+  const normalized = (scope = {}) => {
     const res = fn(scope);
     return res && typeof res === 'object' && !Array.isArray(res)
       ? [res] // single vnode
       : normalizeChildren(res)
+  };
+  // proxy scoped slots on normal $slots
+  if (!hasOwn(normalSlots, key)) {
+    Object.defineProperty(normalSlots, key, {
+      get: normalized
+    });
   }
+  return normalized
 }
 
 function proxyNormalSlot(slots, key) {
@@ -4615,9 +4622,8 @@ function mergeHook$1 (f1, f2) {
 // prop and event handler respectively.
 function transformModel (options, data) {
   const prop = (options.model && options.model.prop) || 'value';
-  const event = (options.model && options.model.event) || 'input';
-  const addTo = (options.props && prop in options.props) ? 'props' : 'attrs'
-  ;(data[addTo] || (data[addTo] = {}))[prop] = data.model.value;
+  const event = (options.model && options.model.event) || 'input'
+  ;(data.attrs || (data.attrs = {}))[prop] = data.model.value;
   const on = data.on || (data.on = {});
   const existing = on[event];
   const callback = data.model.callback;
@@ -5353,7 +5359,7 @@ Object.defineProperty(Vue, 'FunctionalRenderContext', {
   value: FunctionalRenderContext
 });
 
-Vue.version = '2.6.1';
+Vue.version = '2.6.2';
 
 /*  */
 
@@ -11139,7 +11145,8 @@ function genScopedSlot (
   el,
   state
 ) {
-  if (el.if && !el.ifProcessed) {
+  const isLegacySyntax = el.attrsMap['slot-scope'];
+  if (el.if && !el.ifProcessed && !isLegacySyntax) {
     return genIf(el, state, genScopedSlot, `null`)
   }
   if (el.for && !el.forProcessed) {
@@ -11147,7 +11154,9 @@ function genScopedSlot (
   }
   const fn = `function(${String(el.slotScope)}){` +
     `return ${el.tag === 'template'
-      ? genChildren(el, state) || 'undefined'
+      ? el.if && isLegacySyntax
+        ? `(${el.if})?${genChildren(el, state) || 'undefined'}:undefined`
+        : genChildren(el, state) || 'undefined'
       : genElement(el, state)
     }}`;
   return `{key:${el.slotTarget || `"default"`},fn:${fn}}`

dist/vue.esm.js

@@ -1,5 +1,5 @@
 /*!
- * Vue.js v2.6.1
+ * Vue.js v2.6.2
  * (c) 2014-2019 Evan You
  * Released under the MIT License.
  */
@@ -3901,7 +3901,7 @@ function normalizeScopedSlots (
     res = {};
     for (var key in slots) {
       if (slots[key] && key[0] !== '$') {
-        res[key] = normalizeScopedSlot(slots[key]);
+        res[key] = normalizeScopedSlot(normalSlots, key, slots[key]);
       }
     }
   }
@@ -3916,13 +3916,22 @@ function normalizeScopedSlots (
   return res
 }
 
-function normalizeScopedSlot(fn) {
-  return function (scope) {
+function normalizeScopedSlot(normalSlots, key, fn) {
+  var normalized = function (scope) {
+    if ( scope === void 0 ) scope = {};
+
     var res = fn(scope);
     return res && typeof res === 'object' && !Array.isArray(res)
       ? [res] // single vnode
       : normalizeChildren(res)
+  };
+  // proxy scoped slots on normal $slots
+  if (!hasOwn(normalSlots, key)) {
+    Object.defineProperty(normalSlots, key, {
+      get: normalized
+    });
   }
+  return normalized
 }
 
 function proxyNormalSlot(slots, key) {
@@ -4585,9 +4594,8 @@ function mergeHook$1 (f1, f2) {
 // prop and event handler respectively.
 function transformModel (options, data) {
   var prop = (options.model && options.model.prop) || 'value';
-  var event = (options.model && options.model.event) || 'input';
-  var addTo = (options.props && prop in options.props) ? 'props' : 'attrs'
-  ;(data[addTo] || (data[addTo] = {}))[prop] = data.model.value;
+  var event = (options.model && options.model.event) || 'input'
+  ;(data.attrs || (data.attrs = {}))[prop] = data.model.value;
   var on = data.on || (data.on = {});
   var existing = on[event];
   var callback = data.model.callback;
@@ -5340,7 +5348,7 @@ Object.defineProperty(Vue, 'FunctionalRenderContext', {
   value: FunctionalRenderContext
 });
 
-Vue.version = '2.6.1';
+Vue.version = '2.6.2';
 
 /*  */
 
@@ -11110,7 +11118,8 @@ function genScopedSlot (
   el,
   state
 ) {
-  if (el.if && !el.ifProcessed) {
+  var isLegacySyntax = el.attrsMap['slot-scope'];
+  if (el.if && !el.ifProcessed && !isLegacySyntax) {
     return genIf(el, state, genScopedSlot, "null")
   }
   if (el.for && !el.forProcessed) {
@@ -11118,7 +11127,9 @@ function genScopedSlot (
   }
   var fn = "function(" + (String(el.slotScope)) + "){" +
     "return " + (el.tag === 'template'
-      ? genChildren(el, state) || 'undefined'
+      ? el.if && isLegacySyntax
+        ? ("(" + (el.if) + ")?" + (genChildren(el, state) || 'undefined') + ":undefined")
+        : genChildren(el, state) || 'undefined'
       : genElement(el, state)) + "}";
   return ("{key:" + (el.slotTarget || "\"default\"") + ",fn:" + fn + "}")
 }

dist/vue.js

@@ -1,5 +1,5 @@
 /*!
- * Vue.js v2.6.1
+ * Vue.js v2.6.2
  * (c) 2014-2019 Evan You
  * Released under the MIT License.
  */
@@ -3892,7 +3892,7 @@
       res = {};
       for (var key in slots) {
         if (slots[key] && key[0] !== '$') {
-          res[key] = normalizeScopedSlot(slots[key]);
+          res[key] = normalizeScopedSlot(normalSlots, key, slots[key]);
         }
       }
     }
@@ -3907,13 +3907,22 @@
     return res
   }
 
-  function normalizeScopedSlot(fn) {
-    return function (scope) {
+  function normalizeScopedSlot(normalSlots, key, fn) {
+    var normalized = function (scope) {
+      if ( scope === void 0 ) scope = {};
+
       var res = fn(scope);
       return res && typeof res === 'object' && !Array.isArray(res)
         ? [res] // single vnode
         : normalizeChildren(res)
+    };
+    // proxy scoped slots on normal $slots
+    if (!hasOwn(normalSlots, key)) {
+      Object.defineProperty(normalSlots, key, {
+        get: normalized
+      });
     }
+    return normalized
   }
 
   function proxyNormalSlot(slots, key) {
@@ -4576,9 +4585,8 @@
   // prop and event handler respectively.
   function transformModel (options, data) {
     var prop = (options.model && options.model.prop) || 'value';
-    var event = (options.model && options.model.event) || 'input';
-    var addTo = (options.props && prop in options.props) ? 'props' : 'attrs'
-    ;(data[addTo] || (data[addTo] = {}))[prop] = data.model.value;
+    var event = (options.model && options.model.event) || 'input'
+    ;(data.attrs || (data.attrs = {}))[prop] = data.model.value;
     var on = data.on || (data.on = {});
     var existing = on[event];
     var callback = data.model.callback;
@@ -5324,7 +5332,7 @@
     value: FunctionalRenderContext
   });
 
-  Vue.version = '2.6.1';
+  Vue.version = '2.6.2';
 
   /*  */
 
@@ -11080,7 +11088,8 @@
     el,
     state
   ) {
-    if (el.if && !el.ifProcessed) {
+    var isLegacySyntax = el.attrsMap['slot-scope'];
+    if (el.if && !el.ifProcessed && !isLegacySyntax) {
       return genIf(el, state, genScopedSlot, "null")
     }
     if (el.for && !el.forProcessed) {
@@ -11088,7 +11097,9 @@
     }
     var fn = "function(" + (String(el.slotScope)) + "){" +
       "return " + (el.tag === 'template'
-        ? genChildren(el, state) || 'undefined'
+        ? el.if && isLegacySyntax
+          ? ("(" + (el.if) + ")?" + (genChildren(el, state) || 'undefined') + ":undefined")
+          : genChildren(el, state) || 'undefined'
         : genElement(el, state)) + "}";
     return ("{key:" + (el.slotTarget || "\"default\"") + ",fn:" + fn + "}")
   }

dist/vue.runtime.common.dev.js

@@ -1,5 +1,5 @@
 /*!
- * Vue.js v2.6.1
+ * Vue.js v2.6.2
  * (c) 2014-2019 Evan You
  * Released under the MIT License.
  */
@@ -3879,7 +3879,7 @@ function normalizeScopedSlots (
     res = {};
     for (var key in slots) {
       if (slots[key] && key[0] !== '$') {
-        res[key] = normalizeScopedSlot(slots[key]);
+        res[key] = normalizeScopedSlot(normalSlots, key, slots[key]);
       }
     }
   }
@@ -3894,13 +3894,22 @@ function normalizeScopedSlots (
   return res
 }
 
-function normalizeScopedSlot(fn) {
-  return function (scope) {
+function normalizeScopedSlot(normalSlots, key, fn) {
+  var normalized = function (scope) {
+    if ( scope === void 0 ) scope = {};
+
     var res = fn(scope);
     return res && typeof res === 'object' && !Array.isArray(res)
       ? [res] // single vnode
       : normalizeChildren(res)
+  };
+  // proxy scoped slots on normal $slots
+  if (!hasOwn(normalSlots, key)) {
+    Object.defineProperty(normalSlots, key, {
+      get: normalized
+    });
   }
+  return normalized
 }
 
 function proxyNormalSlot(slots, key) {
@@ -4563,9 +4572,8 @@ function mergeHook$1 (f1, f2) {
 // prop and event handler respectively.
 function transformModel (options, data) {
   var prop = (options.model && options.model.prop) || 'value';
-  var event = (options.model && options.model.event) || 'input';
-  var addTo = (options.props && prop in options.props) ? 'props' : 'attrs'
-  ;(data[addTo] || (data[addTo] = {}))[prop] = data.model.value;
+  var event = (options.model && options.model.event) || 'input'
+  ;(data.attrs || (data.attrs = {}))[prop] = data.model.value;
   var on = data.on || (data.on = {});
   var existing = on[event];
   var callback = data.model.callback;
@@ -5311,7 +5319,7 @@ Object.defineProperty(Vue, 'FunctionalRenderContext', {
   value: FunctionalRenderContext
 });
 
-Vue.version = '2.6.1';
+Vue.version = '2.6.2';
 
 /*  */
 

dist/vue.runtime.esm.js

@@ -1,5 +1,5 @@
 /*!
- * Vue.js v2.6.1
+ * Vue.js v2.6.2
  * (c) 2014-2019 Evan You
  * Released under the MIT License.
  */
@@ -3892,7 +3892,7 @@ function normalizeScopedSlots (
     res = {};
     for (var key in slots) {
       if (slots[key] && key[0] !== '$') {
-        res[key] = normalizeScopedSlot(slots[key]);
+        res[key] = normalizeScopedSlot(normalSlots, key, slots[key]);
       }
     }
   }
@@ -3907,13 +3907,22 @@ function normalizeScopedSlots (
   return res
 }
 
-function normalizeScopedSlot(fn) {
-  return function (scope) {
+function normalizeScopedSlot(normalSlots, key, fn) {
+  var normalized = function (scope) {
+    if ( scope === void 0 ) scope = {};
+
     var res = fn(scope);
     return res && typeof res === 'object' && !Array.isArray(res)
       ? [res] // single vnode
       : normalizeChildren(res)
+  };
+  // proxy scoped slots on normal $slots
+  if (!hasOwn(normalSlots, key)) {
+    Object.defineProperty(normalSlots, key, {
+      get: normalized
+    });
   }
+  return normalized
 }
 
 function proxyNormalSlot(slots, key) {
@@ -4576,9 +4585,8 @@ function mergeHook$1 (f1, f2) {
 // prop and event handler respectively.
 function transformModel (options, data) {
   var prop = (options.model && options.model.prop) || 'value';
-  var event = (options.model && options.model.event) || 'input';
-  var addTo = (options.props && prop in options.props) ? 'props' : 'attrs'
-  ;(data[addTo] || (data[addTo] = {}))[prop] = data.model.value;
+  var event = (options.model && options.model.event) || 'input'
+  ;(data.attrs || (data.attrs = {}))[prop] = data.model.value;
   var on = data.on || (data.on = {});
   var existing = on[event];
   var callback = data.model.callback;
@@ -5331,7 +5339,7 @@ Object.defineProperty(Vue, 'FunctionalRenderContext', {
   value: FunctionalRenderContext
 });
 
-Vue.version = '2.6.1';
+Vue.version = '2.6.2';
 
 /*  */
 

dist/vue.runtime.js

@@ -1,5 +1,5 @@
 /*!
- * Vue.js v2.6.1
+ * Vue.js v2.6.2
  * (c) 2014-2019 Evan You
  * Released under the MIT License.
  */
@@ -3883,7 +3883,7 @@
       res = {};
       for (var key in slots) {
         if (slots[key] && key[0] !== '$') {
-          res[key] = normalizeScopedSlot(slots[key]);
+          res[key] = normalizeScopedSlot(normalSlots, key, slots[key]);
         }
       }
     }
@@ -3898,13 +3898,22 @@
     return res
   }
 
-  function normalizeScopedSlot(fn) {
-    return function (scope) {
+  function normalizeScopedSlot(normalSlots, key, fn) {
+    var normalized = function (scope) {
+      if ( scope === void 0 ) scope = {};
+
       var res = fn(scope);
       return res && typeof res === 'object' && !Array.isArray(res)
         ? [res] // single vnode
         : normalizeChildren(res)
+    };
+    // proxy scoped slots on normal $slots
+    if (!hasOwn(normalSlots, key)) {
+      Object.defineProperty(normalSlots, key, {
+        get: normalized
+      });
     }
+    return normalized
   }
 
   function proxyNormalSlot(slots, key) {
@@ -4567,9 +4576,8 @@
   // prop and event handler respectively.
   function transformModel (options, data) {
     var prop = (options.model && options.model.prop) || 'value';
-    var event = (options.model && options.model.event) || 'input';
-    var addTo = (options.props && prop in options.props) ? 'props' : 'attrs'
-    ;(data[addTo] || (data[addTo] = {}))[prop] = data.model.value;
+    var event = (options.model && options.model.event) || 'input'
+    ;(data.attrs || (data.attrs = {}))[prop] = data.model.value;
     var on = data.on || (data.on = {});
     var existing = on[event];
     var callback = data.model.callback;
@@ -5315,7 +5323,7 @@
     value: FunctionalRenderContext
   });
 
-  Vue.version = '2.6.1';
+  Vue.version = '2.6.2';
 
   /*  */
 

packages/vue-server-renderer/basic.js

@@ -5517,7 +5517,8 @@
     el,
     state
   ) {
-    if (el.if && !el.ifProcessed) {
+    var isLegacySyntax = el.attrsMap['slot-scope'];
+    if (el.if && !el.ifProcessed && !isLegacySyntax) {
       return genIf(el, state, genScopedSlot, "null")
     }
     if (el.for && !el.forProcessed) {
@@ -5525,7 +5526,9 @@
     }
     var fn = "function(" + (String(el.slotScope)) + "){" +
       "return " + (el.tag === 'template'
-        ? genChildren(el, state) || 'undefined'
+        ? el.if && isLegacySyntax
+          ? ("(" + (el.if) + ")?" + (genChildren(el, state) || 'undefined') + ":undefined")
+          : genChildren(el, state) || 'undefined'
         : genElement(el, state)) + "}";
     return ("{key:" + (el.slotTarget || "\"default\"") + ",fn:" + fn + "}")
   }
@@ -7795,7 +7798,7 @@
       res = {};
       for (var key in slots) {
         if (slots[key] && key[0] !== '$') {
-          res[key] = normalizeScopedSlot(slots[key]);
+          res[key] = normalizeScopedSlot(normalSlots, key, slots[key]);
         }
       }
     }
@@ -7810,13 +7813,22 @@
     return res
   }
 
-  function normalizeScopedSlot(fn) {
-    return function (scope) {
+  function normalizeScopedSlot(normalSlots, key, fn) {
+    var normalized = function (scope) {
+      if ( scope === void 0 ) scope = {};
+
       var res = fn(scope);
       return res && typeof res === 'object' && !Array.isArray(res)
         ? [res] // single vnode
         : normalizeChildren(res)
+    };
+    // proxy scoped slots on normal $slots
+    if (!hasOwn(normalSlots, key)) {
+      Object.defineProperty(normalSlots, key, {
+        get: normalized
+      });
     }
+    return normalized
   }
 
   function proxyNormalSlot(slots, key) {
@@ -8251,9 +8263,8 @@
   // prop and event handler respectively.
   function transformModel (options, data) {
     var prop = (options.model && options.model.prop) || 'value';
-    var event = (options.model && options.model.event) || 'input';
-    var addTo = (options.props && prop in options.props) ? 'props' : 'attrs'
-    ;(data[addTo] || (data[addTo] = {}))[prop] = data.model.value;
+    var event = (options.model && options.model.event) || 'input'
+    ;(data.attrs || (data.attrs = {}))[prop] = data.model.value;
     var on = data.on || (data.on = {});
     var existing = on[event];
     var callback = data.model.callback;

packages/vue-server-renderer/build.dev.js

@@ -5267,7 +5267,8 @@ function genScopedSlot (
   el,
   state
 ) {
-  if (el.if && !el.ifProcessed) {
+  var isLegacySyntax = el.attrsMap['slot-scope'];
+  if (el.if && !el.ifProcessed && !isLegacySyntax) {
     return genIf(el, state, genScopedSlot, "null")
   }
   if (el.for && !el.forProcessed) {
@@ -5275,7 +5276,9 @@ function genScopedSlot (
   }
   var fn = "function(" + (String(el.slotScope)) + "){" +
     "return " + (el.tag === 'template'
-      ? genChildren(el, state) || 'undefined'
+      ? el.if && isLegacySyntax
+        ? ("(" + (el.if) + ")?" + (genChildren(el, state) || 'undefined') + ":undefined")
+        : genChildren(el, state) || 'undefined'
       : genElement(el, state)) + "}";
   return ("{key:" + (el.slotTarget || "\"default\"") + ",fn:" + fn + "}")
 }
@@ -7545,7 +7548,7 @@ function normalizeScopedSlots (
     res = {};
     for (var key in slots) {
       if (slots[key] && key[0] !== '$') {
-        res[key] = normalizeScopedSlot(slots[key]);
+        res[key] = normalizeScopedSlot(normalSlots, key, slots[key]);
       }
     }
   }
@@ -7560,13 +7563,22 @@ function normalizeScopedSlots (
   return res
 }
 
-function normalizeScopedSlot(fn) {
-  return function (scope) {
+function normalizeScopedSlot(normalSlots, key, fn) {
+  var normalized = function (scope) {
+    if ( scope === void 0 ) scope = {};
+
     var res = fn(scope);
     return res && typeof res === 'object' && !Array.isArray(res)
       ? [res] // single vnode
       : normalizeChildren(res)
+  };
+  // proxy scoped slots on normal $slots
+  if (!hasOwn(normalSlots, key)) {
+    Object.defineProperty(normalSlots, key, {
+      get: normalized
+    });
   }
+  return normalized
 }
 
 function proxyNormalSlot(slots, key) {
@@ -8001,9 +8013,8 @@ function mergeHook$1 (f1, f2) {
 // prop and event handler respectively.
 function transformModel (options, data) {
   var prop = (options.model && options.model.prop) || 'value';
-  var event = (options.model && options.model.event) || 'input';
-  var addTo = (options.props && prop in options.props) ? 'props' : 'attrs'
-  ;(data[addTo] || (data[addTo] = {}))[prop] = data.model.value;
+  var event = (options.model && options.model.event) || 'input'
+  ;(data.attrs || (data.attrs = {}))[prop] = data.model.value;
   var on = data.on || (data.on = {});
   var existing = on[event];
   var callback = data.model.callback;

packages/vue-server-renderer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-server-renderer",
-  "version": "2.6.1",
+  "version": "2.6.2",
   "description": "server renderer for Vue 2.0",
   "main": "index.js",
   "types": "types/index.d.ts",

packages/vue-template-compiler/browser.js

@@ -4577,7 +4577,8 @@
     el,
     state
   ) {
-    if (el.if && !el.ifProcessed) {
+    var isLegacySyntax = el.attrsMap['slot-scope'];
+    if (el.if && !el.ifProcessed && !isLegacySyntax) {
       return genIf(el, state, genScopedSlot, "null")
     }
     if (el.for && !el.forProcessed) {
@@ -4585,7 +4586,9 @@
     }
     var fn = "function(" + (String(el.slotScope)) + "){" +
       "return " + (el.tag === 'template'
-        ? genChildren(el, state) || 'undefined'
+        ? el.if && isLegacySyntax
+          ? ("(" + (el.if) + ")?" + (genChildren(el, state) || 'undefined') + ":undefined")
+          : genChildren(el, state) || 'undefined'
         : genElement(el, state)) + "}";
     return ("{key:" + (el.slotTarget || "\"default\"") + ",fn:" + fn + "}")
   }

packages/vue-template-compiler/build.js

@@ -4210,7 +4210,8 @@ function genScopedSlot (
   el,
   state
 ) {
-  if (el.if && !el.ifProcessed) {
+  var isLegacySyntax = el.attrsMap['slot-scope'];
+  if (el.if && !el.ifProcessed && !isLegacySyntax) {
     return genIf(el, state, genScopedSlot, "null")
   }
   if (el.for && !el.forProcessed) {
@@ -4218,7 +4219,9 @@ function genScopedSlot (
   }
   var fn = "function(" + (String(el.slotScope)) + "){" +
     "return " + (el.tag === 'template'
-      ? genChildren(el, state) || 'undefined'
+      ? el.if && isLegacySyntax
+        ? ("(" + (el.if) + ")?" + (genChildren(el, state) || 'undefined') + ":undefined")
+        : genChildren(el, state) || 'undefined'
       : genElement(el, state)) + "}";
   return ("{key:" + (el.slotTarget || "\"default\"") + ",fn:" + fn + "}")
 }

packages/vue-template-compiler/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-template-compiler",
-  "version": "2.6.1",
+  "version": "2.6.2",
   "description": "template compiler for Vue 2.0",
   "main": "index.js",
   "unpkg": "browser.js",