Skip to content

Commit 2279509

Browse files
yyx990803yyx990803
committed
build: build 2.6.2
1 parent 44a4ca3 commit 2279509

19 files changed

+191
-97
lines changed

‎dist/vue.common.dev.js

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.6.1
2+
* Vue.js v2.6.2
33
* (c) 2014-2019 Evan You
44
* Released under the MIT License.
55
*/
@@ -3888,7 +3888,7 @@ function normalizeScopedSlots (
38883888
res = {};
38893889
for (var key in slots) {
38903890
if (slots[key] && key[0] !== '$') {
3891-
res[key] = normalizeScopedSlot(slots[key]);
3891+
res[key] = normalizeScopedSlot(normalSlots, key, slots[key]);
38923892
}
38933893
}
38943894
}
@@ -3903,13 +3903,22 @@ function normalizeScopedSlots (
39033903
return res
39043904
}
39053905

3906-
function normalizeScopedSlot(fn) {
3907-
return function (scope) {
3906+
function normalizeScopedSlot(normalSlots, key, fn) {
3907+
var normalized = function (scope) {
3908+
if ( scope === void 0 ) scope = {};
3909+
39083910
var res = fn(scope);
39093911
return res && typeof res === 'object' && !Array.isArray(res)
39103912
? [res] // single vnode
39113913
: normalizeChildren(res)
3914+
};
3915+
// proxy scoped slots on normal $slots
3916+
if (!hasOwn(normalSlots, key)) {
3917+
Object.defineProperty(normalSlots, key, {
3918+
get: normalized
3919+
});
39123920
}
3921+
return normalized
39133922
}
39143923

39153924
function proxyNormalSlot(slots, key) {
@@ -4572,9 +4581,8 @@ function mergeHook$1 (f1, f2) {
45724581
// prop and event handler respectively.
45734582
function transformModel (options, data) {
45744583
var prop = (options.model && options.model.prop) || 'value';
4575-
var event = (options.model && options.model.event) || 'input';
4576-
var addTo = (options.props && prop in options.props) ? 'props' : 'attrs'
4577-
;(data[addTo] || (data[addTo] = {}))[prop] = data.model.value;
4584+
var event = (options.model && options.model.event) || 'input'
4585+
;(data.attrs || (data.attrs = {}))[prop] = data.model.value;
45784586
var on = data.on || (data.on = {});
45794587
var existing = on[event];
45804588
var callback = data.model.callback;
@@ -5320,7 +5328,7 @@ Object.defineProperty(Vue, 'FunctionalRenderContext', {
53205328
value: FunctionalRenderContext
53215329
});
53225330

5323-
Vue.version = '2.6.1';
5331+
Vue.version = '2.6.2';
53245332

53255333
/* */
53265334

@@ -11076,15 +11084,18 @@ function genScopedSlot (
1107611084
el,
1107711085
state
1107811086
) {
11079-
if (el.if && !el.ifProcessed) {
11087+
var isLegacySyntax = el.attrsMap['slot-scope'];
11088+
if (el.if && !el.ifProcessed && !isLegacySyntax) {
1108011089
return genIf(el, state, genScopedSlot, "null")
1108111090
}
1108211091
if (el.for && !el.forProcessed) {
1108311092
return genFor(el, state, genScopedSlot)
1108411093
}
1108511094
var fn = "function(" + (String(el.slotScope)) + "){" +
1108611095
"return " + (el.tag === 'template'
11087-
? genChildren(el, state) || 'undefined'
11096+
? el.if && isLegacySyntax
11097+
? ("(" + (el.if) + ")?" + (genChildren(el, state) || 'undefined') + ":undefined")
11098+
: genChildren(el, state) || 'undefined'
1108811099
: genElement(el, state)) + "}";
1108911100
return ("{key:" + (el.slotTarget || "\"default\"") + ",fn:" + fn + "}")
1109011101
}

‎dist/vue.common.prod.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/vue.esm.browser.js

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.6.1
2+
* Vue.js v2.6.2
33
* (c) 2014-2019 Evan You
44
* Released under the MIT License.
55
*/
@@ -3934,7 +3934,7 @@ function normalizeScopedSlots (
39343934
res = {};
39353935
for (const key in slots) {
39363936
if (slots[key] && key[0] !== '$') {
3937-
res[key] = normalizeScopedSlot(slots[key]);
3937+
res[key] = normalizeScopedSlot(normalSlots, key, slots[key]);
39383938
}
39393939
}
39403940
}
@@ -3949,13 +3949,20 @@ function normalizeScopedSlots (
39493949
return res
39503950
}
39513951

3952-
function normalizeScopedSlot(fn) {
3953-
return scope => {
3952+
function normalizeScopedSlot(normalSlots, key, fn) {
3953+
const normalized = (scope = {}) => {
39543954
const res = fn(scope);
39553955
return res && typeof res === 'object' && !Array.isArray(res)
39563956
? [res] // single vnode
39573957
: normalizeChildren(res)
3958+
};
3959+
// proxy scoped slots on normal $slots
3960+
if (!hasOwn(normalSlots, key)) {
3961+
Object.defineProperty(normalSlots, key, {
3962+
get: normalized
3963+
});
39583964
}
3965+
return normalized
39593966
}
39603967

39613968
function proxyNormalSlot(slots, key) {
@@ -4615,9 +4622,8 @@ function mergeHook$1 (f1, f2) {
46154622
// prop and event handler respectively.
46164623
function transformModel (options, data) {
46174624
const prop = (options.model && options.model.prop) || 'value';
4618-
const event = (options.model && options.model.event) || 'input';
4619-
const addTo = (options.props && prop in options.props) ? 'props' : 'attrs'
4620-
;(data[addTo] || (data[addTo] = {}))[prop] = data.model.value;
4625+
const event = (options.model && options.model.event) || 'input'
4626+
;(data.attrs || (data.attrs = {}))[prop] = data.model.value;
46214627
const on = data.on || (data.on = {});
46224628
const existing = on[event];
46234629
const callback = data.model.callback;
@@ -5353,7 +5359,7 @@ Object.defineProperty(Vue, 'FunctionalRenderContext', {
53535359
value: FunctionalRenderContext
53545360
});
53555361

5356-
Vue.version = '2.6.1';
5362+
Vue.version = '2.6.2';
53575363

53585364
/* */
53595365

@@ -11139,15 +11145,18 @@ function genScopedSlot (
1113911145
el,
1114011146
state
1114111147
) {
11142-
if (el.if && !el.ifProcessed) {
11148+
const isLegacySyntax = el.attrsMap['slot-scope'];
11149+
if (el.if && !el.ifProcessed && !isLegacySyntax) {
1114311150
return genIf(el, state, genScopedSlot, `null`)
1114411151
}
1114511152
if (el.for && !el.forProcessed) {
1114611153
return genFor(el, state, genScopedSlot)
1114711154
}
1114811155
const fn = `function(${String(el.slotScope)}){` +
1114911156
`return ${el.tag === 'template'
11150-
? genChildren(el, state) || 'undefined'
11157+
? el.if && isLegacySyntax
11158+
? `(${el.if})?${genChildren(el, state) || 'undefined'}:undefined`
11159+
: genChildren(el, state) || 'undefined'
1115111160
: genElement(el, state)
1115211161
}}`;
1115311162
return `{key:${el.slotTarget || `"default"`},fn:${fn}}`

‎dist/vue.esm.browser.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/vue.esm.js

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.6.1
2+
* Vue.js v2.6.2
33
* (c) 2014-2019 Evan You
44
* Released under the MIT License.
55
*/
@@ -3901,7 +3901,7 @@ function normalizeScopedSlots (
39013901
res = {};
39023902
for (var key in slots) {
39033903
if (slots[key] && key[0] !== '$') {
3904-
res[key] = normalizeScopedSlot(slots[key]);
3904+
res[key] = normalizeScopedSlot(normalSlots, key, slots[key]);
39053905
}
39063906
}
39073907
}
@@ -3916,13 +3916,22 @@ function normalizeScopedSlots (
39163916
return res
39173917
}
39183918

3919-
function normalizeScopedSlot(fn) {
3920-
return function (scope) {
3919+
function normalizeScopedSlot(normalSlots, key, fn) {
3920+
var normalized = function (scope) {
3921+
if ( scope === void 0 ) scope = {};
3922+
39213923
var res = fn(scope);
39223924
return res && typeof res === 'object' && !Array.isArray(res)
39233925
? [res] // single vnode
39243926
: normalizeChildren(res)
3927+
};
3928+
// proxy scoped slots on normal $slots
3929+
if (!hasOwn(normalSlots, key)) {
3930+
Object.defineProperty(normalSlots, key, {
3931+
get: normalized
3932+
});
39253933
}
3934+
return normalized
39263935
}
39273936

39283937
function proxyNormalSlot(slots, key) {
@@ -4585,9 +4594,8 @@ function mergeHook$1 (f1, f2) {
45854594
// prop and event handler respectively.
45864595
function transformModel (options, data) {
45874596
var prop = (options.model && options.model.prop) || 'value';
4588-
var event = (options.model && options.model.event) || 'input';
4589-
var addTo = (options.props && prop in options.props) ? 'props' : 'attrs'
4590-
;(data[addTo] || (data[addTo] = {}))[prop] = data.model.value;
4597+
var event = (options.model && options.model.event) || 'input'
4598+
;(data.attrs || (data.attrs = {}))[prop] = data.model.value;
45914599
var on = data.on || (data.on = {});
45924600
var existing = on[event];
45934601
var callback = data.model.callback;
@@ -5340,7 +5348,7 @@ Object.defineProperty(Vue, 'FunctionalRenderContext', {
53405348
value: FunctionalRenderContext
53415349
});
53425350

5343-
Vue.version = '2.6.1';
5351+
Vue.version = '2.6.2';
53445352

53455353
/* */
53465354

@@ -11110,15 +11118,18 @@ function genScopedSlot (
1111011118
el,
1111111119
state
1111211120
) {
11113-
if (el.if && !el.ifProcessed) {
11121+
var isLegacySyntax = el.attrsMap['slot-scope'];
11122+
if (el.if && !el.ifProcessed && !isLegacySyntax) {
1111411123
return genIf(el, state, genScopedSlot, "null")
1111511124
}
1111611125
if (el.for && !el.forProcessed) {
1111711126
return genFor(el, state, genScopedSlot)
1111811127
}
1111911128
var fn = "function(" + (String(el.slotScope)) + "){" +
1112011129
"return " + (el.tag === 'template'
11121-
? genChildren(el, state) || 'undefined'
11130+
? el.if && isLegacySyntax
11131+
? ("(" + (el.if) + ")?" + (genChildren(el, state) || 'undefined') + ":undefined")
11132+
: genChildren(el, state) || 'undefined'
1112211133
: genElement(el, state)) + "}";
1112311134
return ("{key:" + (el.slotTarget || "\"default\"") + ",fn:" + fn + "}")
1112411135
}

‎dist/vue.js

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.6.1
2+
* Vue.js v2.6.2
33
* (c) 2014-2019 Evan You
44
* Released under the MIT License.
55
*/
@@ -3892,7 +3892,7 @@
38923892
res = {};
38933893
for (var key in slots) {
38943894
if (slots[key] && key[0] !== '$') {
3895-
res[key] = normalizeScopedSlot(slots[key]);
3895+
res[key] = normalizeScopedSlot(normalSlots, key, slots[key]);
38963896
}
38973897
}
38983898
}
@@ -3907,13 +3907,22 @@
39073907
return res
39083908
}
39093909

3910-
function normalizeScopedSlot(fn) {
3911-
return function (scope) {
3910+
function normalizeScopedSlot(normalSlots, key, fn) {
3911+
var normalized = function (scope) {
3912+
if ( scope === void 0 ) scope = {};
3913+
39123914
var res = fn(scope);
39133915
return res && typeof res === 'object' && !Array.isArray(res)
39143916
? [res] // single vnode
39153917
: normalizeChildren(res)
3918+
};
3919+
// proxy scoped slots on normal $slots
3920+
if (!hasOwn(normalSlots, key)) {
3921+
Object.defineProperty(normalSlots, key, {
3922+
get: normalized
3923+
});
39163924
}
3925+
return normalized
39173926
}
39183927

39193928
function proxyNormalSlot(slots, key) {
@@ -4576,9 +4585,8 @@
45764585
// prop and event handler respectively.
45774586
function transformModel (options, data) {
45784587
var prop = (options.model && options.model.prop) || 'value';
4579-
var event = (options.model && options.model.event) || 'input';
4580-
var addTo = (options.props && prop in options.props) ? 'props' : 'attrs'
4581-
;(data[addTo] || (data[addTo] = {}))[prop] = data.model.value;
4588+
var event = (options.model && options.model.event) || 'input'
4589+
;(data.attrs || (data.attrs = {}))[prop] = data.model.value;
45824590
var on = data.on || (data.on = {});
45834591
var existing = on[event];
45844592
var callback = data.model.callback;
@@ -5324,7 +5332,7 @@
53245332
value: FunctionalRenderContext
53255333
});
53265334

5327-
Vue.version = '2.6.1';
5335+
Vue.version = '2.6.2';
53285336

53295337
/* */
53305338

@@ -11080,15 +11088,18 @@
1108011088
el,
1108111089
state
1108211090
) {
11083-
if (el.if && !el.ifProcessed) {
11091+
var isLegacySyntax = el.attrsMap['slot-scope'];
11092+
if (el.if && !el.ifProcessed && !isLegacySyntax) {
1108411093
return genIf(el, state, genScopedSlot, "null")
1108511094
}
1108611095
if (el.for && !el.forProcessed) {
1108711096
return genFor(el, state, genScopedSlot)
1108811097
}
1108911098
var fn = "function(" + (String(el.slotScope)) + "){" +
1109011099
"return " + (el.tag === 'template'
11091-
? genChildren(el, state) || 'undefined'
11100+
? el.if && isLegacySyntax
11101+
? ("(" + (el.if) + ")?" + (genChildren(el, state) || 'undefined') + ":undefined")
11102+
: genChildren(el, state) || 'undefined'
1109211103
: genElement(el, state)) + "}";
1109311104
return ("{key:" + (el.slotTarget || "\"default\"") + ",fn:" + fn + "}")
1109411105
}

‎dist/vue.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/vue.runtime.common.dev.js

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.6.1
2+
* Vue.js v2.6.2
33
* (c) 2014-2019 Evan You
44
* Released under the MIT License.
55
*/
@@ -3879,7 +3879,7 @@ function normalizeScopedSlots (
38793879
res = {};
38803880
for (var key in slots) {
38813881
if (slots[key] && key[0] !== '$') {
3882-
res[key] = normalizeScopedSlot(slots[key]);
3882+
res[key] = normalizeScopedSlot(normalSlots, key, slots[key]);
38833883
}
38843884
}
38853885
}
@@ -3894,13 +3894,22 @@ function normalizeScopedSlots (
38943894
return res
38953895
}
38963896

3897-
function normalizeScopedSlot(fn) {
3898-
return function (scope) {
3897+
function normalizeScopedSlot(normalSlots, key, fn) {
3898+
var normalized = function (scope) {
3899+
if ( scope === void 0 ) scope = {};
3900+
38993901
var res = fn(scope);
39003902
return res && typeof res === 'object' && !Array.isArray(res)
39013903
? [res] // single vnode
39023904
: normalizeChildren(res)
3905+
};
3906+
// proxy scoped slots on normal $slots
3907+
if (!hasOwn(normalSlots, key)) {
3908+
Object.defineProperty(normalSlots, key, {
3909+
get: normalized
3910+
});
39033911
}
3912+
return normalized
39043913
}
39053914

39063915
function proxyNormalSlot(slots, key) {
@@ -4563,9 +4572,8 @@ function mergeHook$1 (f1, f2) {
45634572
// prop and event handler respectively.
45644573
function transformModel (options, data) {
45654574
var prop = (options.model && options.model.prop) || 'value';
4566-
var event = (options.model && options.model.event) || 'input';
4567-
var addTo = (options.props && prop in options.props) ? 'props' : 'attrs'
4568-
;(data[addTo] || (data[addTo] = {}))[prop] = data.model.value;
4575+
var event = (options.model && options.model.event) || 'input'
4576+
;(data.attrs || (data.attrs = {}))[prop] = data.model.value;
45694577
var on = data.on || (data.on = {});
45704578
var existing = on[event];
45714579
var callback = data.model.callback;
@@ -5311,7 +5319,7 @@ Object.defineProperty(Vue, 'FunctionalRenderContext', {
53115319
value: FunctionalRenderContext
53125320
});
53135321

5314-
Vue.version = '2.6.1';
5322+
Vue.version = '2.6.2';
53155323

53165324
/* */
53175325

‎dist/vue.runtime.common.prod.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)