Skip to content

Commit e7b912a

Browse files
yyx990803yyx990803
committed
build: build 2.6.10
1 parent f11449d commit e7b912a

19 files changed

+336
-160
lines changed

‎dist/vue.common.dev.js

+36-18
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.6.9
2+
* Vue.js v2.6.10
33
* (c) 2014-2019 Evan You
44
* Released under the MIT License.
55
*/
@@ -2544,8 +2544,8 @@ function normalizeScopedSlots (
25442544
prevSlots
25452545
) {
25462546
var res;
2547-
var isStable = slots ? !!slots.$stable : true;
25482547
var hasNormalSlots = Object.keys(normalSlots).length > 0;
2548+
var isStable = slots ? !!slots.$stable : !hasNormalSlots;
25492549
var key = slots && slots.$key;
25502550
if (!slots) {
25512551
res = {};
@@ -3629,7 +3629,9 @@ function resolveAsyncComponent (
36293629

36303630
if (owner && !isDef(factory.owners)) {
36313631
var owners = factory.owners = [owner];
3632-
var sync = true
3632+
var sync = true;
3633+
var timerLoading = null;
3634+
var timerTimeout = null
36333635

36343636
;(owner).$on('hook:destroyed', function () { return remove(owners, owner); });
36353637

@@ -3640,6 +3642,14 @@ function resolveAsyncComponent (
36403642

36413643
if (renderCompleted) {
36423644
owners.length = 0;
3645+
if (timerLoading !== null) {
3646+
clearTimeout(timerLoading);
3647+
timerLoading = null;
3648+
}
3649+
if (timerTimeout !== null) {
3650+
clearTimeout(timerTimeout);
3651+
timerTimeout = null;
3652+
}
36433653
}
36443654
};
36453655

@@ -3686,7 +3696,8 @@ function resolveAsyncComponent (
36863696
if (res.delay === 0) {
36873697
factory.loading = true;
36883698
} else {
3689-
setTimeout(function () {
3699+
timerLoading = setTimeout(function () {
3700+
timerLoading = null;
36903701
if (isUndef(factory.resolved) && isUndef(factory.error)) {
36913702
factory.loading = true;
36923703
forceRender(false);
@@ -3696,7 +3707,8 @@ function resolveAsyncComponent (
36963707
}
36973708

36983709
if (isDef(res.timeout)) {
3699-
setTimeout(function () {
3710+
timerTimeout = setTimeout(function () {
3711+
timerTimeout = null;
37003712
if (isUndef(factory.resolved)) {
37013713
reject(
37023714
"timeout (" + (res.timeout) + "ms)"
@@ -4242,16 +4254,21 @@ var getNow = Date.now;
42424254
// timestamp can either be hi-res (relative to page load) or low-res
42434255
// (relative to UNIX epoch), so in order to compare time we have to use the
42444256
// same timestamp type when saving the flush timestamp.
4245-
if (
4246-
inBrowser &&
4247-
window.performance &&
4248-
typeof performance.now === 'function' &&
4249-
document.createEvent('Event').timeStamp <= performance.now()
4250-
) {
4251-
// if the event timestamp is bigger than the hi-res timestamp
4252-
// (which is evaluated AFTER) it means the event is using a lo-res timestamp,
4253-
// and we need to use the lo-res version for event listeners as well.
4254-
getNow = function () { return performance.now(); };
4257+
// All IE versions use low-res event timestamps, and have problematic clock
4258+
// implementations (#9632)
4259+
if (inBrowser && !isIE) {
4260+
var performance = window.performance;
4261+
if (
4262+
performance &&
4263+
typeof performance.now === 'function' &&
4264+
getNow() > document.createEvent('Event').timeStamp
4265+
) {
4266+
// if the event timestamp, although evaluated AFTER the Date.now(), is
4267+
// smaller than it, it means the event is using a hi-res timestamp,
4268+
// and we need to use the hi-res version for event listener timestamps as
4269+
// well.
4270+
getNow = function () { return performance.now(); };
4271+
}
42554272
}
42564273

42574274
/**
@@ -5416,7 +5433,7 @@ Object.defineProperty(Vue, 'FunctionalRenderContext', {
54165433
value: FunctionalRenderContext
54175434
});
54185435

5419-
Vue.version = '2.6.9';
5436+
Vue.version = '2.6.10';
54205437

54215438
/* */
54225439

@@ -7578,10 +7595,11 @@ function updateDOMProps (oldVnode, vnode) {
75787595
}
75797596

75807597
for (key in oldProps) {
7581-
if (isUndef(props[key])) {
7598+
if (!(key in props)) {
75827599
elm[key] = '';
75837600
}
75847601
}
7602+
75857603
for (key in props) {
75867604
cur = props[key];
75877605
// ignore children if the node has textContent or innerHTML,
@@ -10698,7 +10716,7 @@ function isDirectChildOfTemplateFor (node) {
1069810716

1069910717
/* */
1070010718

10701-
var fnExpRE = /^([\w$_]+|\([^)]*?\))\s*=>|^function\s*\(/;
10719+
var fnExpRE = /^([\w$_]+|\([^)]*?\))\s*=>|^function\s*(?:[\w$]+)?\s*\(/;
1070210720
var fnInvokeRE = /\([^)]*?\);*$/;
1070310721
var simplePathRE = /^[A-Za-z_$][\w$]*(?:\.[A-Za-z_$][\w$]*|\['[^']*?']|\["[^"]*?"]|\[\d+]|\[[A-Za-z_$][\w$]*])*$/;
1070410722

‎dist/vue.common.prod.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/vue.esm.browser.js

+36-18
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.6.9
2+
* Vue.js v2.6.10
33
* (c) 2014-2019 Evan You
44
* Released under the MIT License.
55
*/
@@ -2572,8 +2572,8 @@ function normalizeScopedSlots (
25722572
prevSlots
25732573
) {
25742574
let res;
2575-
const isStable = slots ? !!slots.$stable : true;
25762575
const hasNormalSlots = Object.keys(normalSlots).length > 0;
2576+
const isStable = slots ? !!slots.$stable : !hasNormalSlots;
25772577
const key = slots && slots.$key;
25782578
if (!slots) {
25792579
res = {};
@@ -3650,7 +3650,9 @@ function resolveAsyncComponent (
36503650

36513651
if (owner && !isDef(factory.owners)) {
36523652
const owners = factory.owners = [owner];
3653-
let sync = true
3653+
let sync = true;
3654+
let timerLoading = null;
3655+
let timerTimeout = null
36543656

36553657
;(owner).$on('hook:destroyed', () => remove(owners, owner));
36563658

@@ -3661,6 +3663,14 @@ function resolveAsyncComponent (
36613663

36623664
if (renderCompleted) {
36633665
owners.length = 0;
3666+
if (timerLoading !== null) {
3667+
clearTimeout(timerLoading);
3668+
timerLoading = null;
3669+
}
3670+
if (timerTimeout !== null) {
3671+
clearTimeout(timerTimeout);
3672+
timerTimeout = null;
3673+
}
36643674
}
36653675
};
36663676

@@ -3707,7 +3717,8 @@ function resolveAsyncComponent (
37073717
if (res.delay === 0) {
37083718
factory.loading = true;
37093719
} else {
3710-
setTimeout(() => {
3720+
timerLoading = setTimeout(() => {
3721+
timerLoading = null;
37113722
if (isUndef(factory.resolved) && isUndef(factory.error)) {
37123723
factory.loading = true;
37133724
forceRender(false);
@@ -3717,7 +3728,8 @@ function resolveAsyncComponent (
37173728
}
37183729

37193730
if (isDef(res.timeout)) {
3720-
setTimeout(() => {
3731+
timerTimeout = setTimeout(() => {
3732+
timerTimeout = null;
37213733
if (isUndef(factory.resolved)) {
37223734
reject(
37233735
`timeout (${res.timeout}ms)`
@@ -4263,16 +4275,21 @@ let getNow = Date.now;
42634275
// timestamp can either be hi-res (relative to page load) or low-res
42644276
// (relative to UNIX epoch), so in order to compare time we have to use the
42654277
// same timestamp type when saving the flush timestamp.
4266-
if (
4267-
inBrowser &&
4268-
window.performance &&
4269-
typeof performance.now === 'function' &&
4270-
document.createEvent('Event').timeStamp <= performance.now()
4271-
) {
4272-
// if the event timestamp is bigger than the hi-res timestamp
4273-
// (which is evaluated AFTER) it means the event is using a lo-res timestamp,
4274-
// and we need to use the lo-res version for event listeners as well.
4275-
getNow = () => performance.now();
4278+
// All IE versions use low-res event timestamps, and have problematic clock
4279+
// implementations (#9632)
4280+
if (inBrowser && !isIE) {
4281+
const performance = window.performance;
4282+
if (
4283+
performance &&
4284+
typeof performance.now === 'function' &&
4285+
getNow() > document.createEvent('Event').timeStamp
4286+
) {
4287+
// if the event timestamp, although evaluated AFTER the Date.now(), is
4288+
// smaller than it, it means the event is using a hi-res timestamp,
4289+
// and we need to use the hi-res version for event listener timestamps as
4290+
// well.
4291+
getNow = () => performance.now();
4292+
}
42764293
}
42774294

42784295
/**
@@ -5447,7 +5464,7 @@ Object.defineProperty(Vue, 'FunctionalRenderContext', {
54475464
value: FunctionalRenderContext
54485465
});
54495466

5450-
Vue.version = '2.6.9';
5467+
Vue.version = '2.6.10';
54515468

54525469
/* */
54535470

@@ -7601,10 +7618,11 @@ function updateDOMProps (oldVnode, vnode) {
76017618
}
76027619

76037620
for (key in oldProps) {
7604-
if (isUndef(props[key])) {
7621+
if (!(key in props)) {
76057622
elm[key] = '';
76067623
}
76077624
}
7625+
76087626
for (key in props) {
76097627
cur = props[key];
76107628
// ignore children if the node has textContent or innerHTML,
@@ -10711,7 +10729,7 @@ function isDirectChildOfTemplateFor (node) {
1071110729

1071210730
/* */
1071310731

10714-
const fnExpRE = /^([\w$_]+|\([^)]*?\))\s*=>|^function\s*\(/;
10732+
const fnExpRE = /^([\w$_]+|\([^)]*?\))\s*=>|^function\s*(?:[\w$]+)?\s*\(/;
1071510733
const fnInvokeRE = /\([^)]*?\);*$/;
1071610734
const simplePathRE = /^[A-Za-z_$][\w$]*(?:\.[A-Za-z_$][\w$]*|\['[^']*?']|\["[^"]*?"]|\[\d+]|\[[A-Za-z_$][\w$]*])*$/;
1071710735

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

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/vue.esm.js

+36-18
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.6.9
2+
* Vue.js v2.6.10
33
* (c) 2014-2019 Evan You
44
* Released under the MIT License.
55
*/
@@ -2550,8 +2550,8 @@ function normalizeScopedSlots (
25502550
prevSlots
25512551
) {
25522552
var res;
2553-
var isStable = slots ? !!slots.$stable : true;
25542553
var hasNormalSlots = Object.keys(normalSlots).length > 0;
2554+
var isStable = slots ? !!slots.$stable : !hasNormalSlots;
25552555
var key = slots && slots.$key;
25562556
if (!slots) {
25572557
res = {};
@@ -3639,7 +3639,9 @@ function resolveAsyncComponent (
36393639

36403640
if (owner && !isDef(factory.owners)) {
36413641
var owners = factory.owners = [owner];
3642-
var sync = true
3642+
var sync = true;
3643+
var timerLoading = null;
3644+
var timerTimeout = null
36433645

36443646
;(owner).$on('hook:destroyed', function () { return remove(owners, owner); });
36453647

@@ -3650,6 +3652,14 @@ function resolveAsyncComponent (
36503652

36513653
if (renderCompleted) {
36523654
owners.length = 0;
3655+
if (timerLoading !== null) {
3656+
clearTimeout(timerLoading);
3657+
timerLoading = null;
3658+
}
3659+
if (timerTimeout !== null) {
3660+
clearTimeout(timerTimeout);
3661+
timerTimeout = null;
3662+
}
36533663
}
36543664
};
36553665

@@ -3696,7 +3706,8 @@ function resolveAsyncComponent (
36963706
if (res.delay === 0) {
36973707
factory.loading = true;
36983708
} else {
3699-
setTimeout(function () {
3709+
timerLoading = setTimeout(function () {
3710+
timerLoading = null;
37003711
if (isUndef(factory.resolved) && isUndef(factory.error)) {
37013712
factory.loading = true;
37023713
forceRender(false);
@@ -3706,7 +3717,8 @@ function resolveAsyncComponent (
37063717
}
37073718

37083719
if (isDef(res.timeout)) {
3709-
setTimeout(function () {
3720+
timerTimeout = setTimeout(function () {
3721+
timerTimeout = null;
37103722
if (isUndef(factory.resolved)) {
37113723
reject(
37123724
process.env.NODE_ENV !== 'production'
@@ -4254,16 +4266,21 @@ var getNow = Date.now;
42544266
// timestamp can either be hi-res (relative to page load) or low-res
42554267
// (relative to UNIX epoch), so in order to compare time we have to use the
42564268
// same timestamp type when saving the flush timestamp.
4257-
if (
4258-
inBrowser &&
4259-
window.performance &&
4260-
typeof performance.now === 'function' &&
4261-
document.createEvent('Event').timeStamp <= performance.now()
4262-
) {
4263-
// if the event timestamp is bigger than the hi-res timestamp
4264-
// (which is evaluated AFTER) it means the event is using a lo-res timestamp,
4265-
// and we need to use the lo-res version for event listeners as well.
4266-
getNow = function () { return performance.now(); };
4269+
// All IE versions use low-res event timestamps, and have problematic clock
4270+
// implementations (#9632)
4271+
if (inBrowser && !isIE) {
4272+
var performance = window.performance;
4273+
if (
4274+
performance &&
4275+
typeof performance.now === 'function' &&
4276+
getNow() > document.createEvent('Event').timeStamp
4277+
) {
4278+
// if the event timestamp, although evaluated AFTER the Date.now(), is
4279+
// smaller than it, it means the event is using a hi-res timestamp,
4280+
// and we need to use the hi-res version for event listener timestamps as
4281+
// well.
4282+
getNow = function () { return performance.now(); };
4283+
}
42674284
}
42684285

42694286
/**
@@ -5436,7 +5453,7 @@ Object.defineProperty(Vue, 'FunctionalRenderContext', {
54365453
value: FunctionalRenderContext
54375454
});
54385455

5439-
Vue.version = '2.6.9';
5456+
Vue.version = '2.6.10';
54405457

54415458
/* */
54425459

@@ -7600,10 +7617,11 @@ function updateDOMProps (oldVnode, vnode) {
76007617
}
76017618

76027619
for (key in oldProps) {
7603-
if (isUndef(props[key])) {
7620+
if (!(key in props)) {
76047621
elm[key] = '';
76057622
}
76067623
}
7624+
76077625
for (key in props) {
76087626
cur = props[key];
76097627
// ignore children if the node has textContent or innerHTML,
@@ -10729,7 +10747,7 @@ function isDirectChildOfTemplateFor (node) {
1072910747

1073010748
/* */
1073110749

10732-
var fnExpRE = /^([\w$_]+|\([^)]*?\))\s*=>|^function\s*\(/;
10750+
var fnExpRE = /^([\w$_]+|\([^)]*?\))\s*=>|^function\s*(?:[\w$]+)?\s*\(/;
1073310751
var fnInvokeRE = /\([^)]*?\);*$/;
1073410752
var simplePathRE = /^[A-Za-z_$][\w$]*(?:\.[A-Za-z_$][\w$]*|\['[^']*?']|\["[^"]*?"]|\[\d+]|\[[A-Za-z_$][\w$]*])*$/;
1073510753

0 commit comments

Comments
 (0)