Skip to content

Commit

Permalink
build: build 2.6.2
Browse files Browse the repository at this point in the history
  • Loading branch information
yyx990803 committed Feb 5, 2019
1 parent 44a4ca3 commit 2279509
Show file tree
Hide file tree
Showing 19 changed files with 191 additions and 97 deletions.
31 changes: 21 additions & 10 deletions 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.
*/
Expand Down Expand Up @@ -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]);
}
}
}
Expand All @@ -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) {
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -5320,7 +5328,7 @@ Object.defineProperty(Vue, 'FunctionalRenderContext', {
value: FunctionalRenderContext
});

Vue.version = '2.6.1';
Vue.version = '2.6.2';

/* */

Expand Down Expand Up @@ -11076,15 +11084,18 @@ 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) {
return genFor(el, state, 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 + "}")
}
Expand Down
4 changes: 2 additions & 2 deletions dist/vue.common.prod.js

Large diffs are not rendered by default.

29 changes: 19 additions & 10 deletions 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.
*/
Expand Down Expand Up @@ -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]);
}
}
}
Expand All @@ -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) {
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -5353,7 +5359,7 @@ Object.defineProperty(Vue, 'FunctionalRenderContext', {
value: FunctionalRenderContext
});

Vue.version = '2.6.1';
Vue.version = '2.6.2';

/* */

Expand Down Expand Up @@ -11139,15 +11145,18 @@ 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) {
return genFor(el, state, 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}}`
Expand Down
4 changes: 2 additions & 2 deletions dist/vue.esm.browser.min.js

Large diffs are not rendered by default.

31 changes: 21 additions & 10 deletions 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.
*/
Expand Down Expand Up @@ -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]);
}
}
}
Expand All @@ -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) {
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -5340,7 +5348,7 @@ Object.defineProperty(Vue, 'FunctionalRenderContext', {
value: FunctionalRenderContext
});

Vue.version = '2.6.1';
Vue.version = '2.6.2';

/* */

Expand Down Expand Up @@ -11110,15 +11118,18 @@ 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) {
return genFor(el, state, 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 + "}")
}
Expand Down
31 changes: 21 additions & 10 deletions 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.
*/
Expand Down Expand Up @@ -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]);
}
}
}
Expand All @@ -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) {
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -5324,7 +5332,7 @@
value: FunctionalRenderContext
});

Vue.version = '2.6.1';
Vue.version = '2.6.2';

/* */

Expand Down Expand Up @@ -11080,15 +11088,18 @@
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) {
return genFor(el, state, 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 + "}")
}
Expand Down
4 changes: 2 additions & 2 deletions dist/vue.min.js

Large diffs are not rendered by default.

24 changes: 16 additions & 8 deletions 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.
*/
Expand Down Expand Up @@ -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]);
}
}
}
Expand All @@ -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) {
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -5311,7 +5319,7 @@ Object.defineProperty(Vue, 'FunctionalRenderContext', {
value: FunctionalRenderContext
});

Vue.version = '2.6.1';
Vue.version = '2.6.2';

/* */

Expand Down
4 changes: 2 additions & 2 deletions dist/vue.runtime.common.prod.js

Large diffs are not rendered by default.

0 comments on commit 2279509

Please sign in to comment.