test/vue
1
0
Fork 0
mirror of https://gitee.com/vuejs/vue.git synced 2024-11-29 18:47:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

build: build 2.6.2

Browse Source
This commit is contained in:
Evan You 2019-02-04 22:52:39 -05:00
parent 44a4ca33b9
commit 2279509456
19 changed files with 191 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
dist/vue.common.dev.js vendored
View File

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

4
dist/vue.common.prod.js vendored
View File

File diff suppressed because one or more lines are too long

29
dist/vue.esm.browser.js vendored
View File

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

4
dist/vue.esm.browser.min.js vendored
View File

File diff suppressed because one or more lines are too long

31
dist/vue.esm.js vendored
View File

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

31
dist/vue.js vendored
View File

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

4
dist/vue.min.js vendored
View File

File diff suppressed because one or more lines are too long

24
dist/vue.runtime.common.dev.js vendored
View File

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

4
dist/vue.runtime.common.prod.js vendored
View File

File diff suppressed because one or more lines are too long

24
dist/vue.runtime.esm.js vendored
View File

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

24
dist/vue.runtime.js vendored
View File

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

4
dist/vue.runtime.min.js vendored
View File

File diff suppressed because one or more lines are too long

27
packages/vue-server-renderer/basic.js
View File

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

27
packages/vue-server-renderer/build.dev.js
View File

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

2
packages/vue-server-renderer/build.prod.js
View File

File diff suppressed because one or more lines are too long

2
packages/vue-server-renderer/package.json
View File

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

7
packages/vue-template-compiler/browser.js
View File

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

7
packages/vue-template-compiler/build.js
View File

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

2
packages/vue-template-compiler/package.json
View File

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