Skip to content

Commit b449e17

Browse files
yyx990803yyx990803
committed
build: build 2.5.21
1 parent 847e493 commit b449e17

14 files changed

+83
-61
lines changed

Diff for: ‎dist/vue.common.js

+11-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.5.20
2+
* Vue.js v2.5.21
33
* (c) 2014-2018 Evan You
44
* Released under the MIT License.
55
*/
@@ -2903,7 +2903,7 @@ function mountComponent (
29032903
// component's mounted hook), which relies on vm._watcher being already defined
29042904
new Watcher(vm, updateComponent, noop, {
29052905
before: function before () {
2906-
if (vm._isMounted) {
2906+
if (vm._isMounted && !vm._isDestroyed) {
29072907
callHook(vm, 'beforeUpdate');
29082908
}
29092909
}
@@ -3844,9 +3844,10 @@ function renderList (
38443844
ret[i] = render(val[key], key, i);
38453845
}
38463846
}
3847-
if (isDef(ret)) {
3848-
(ret)._isVList = true;
3847+
if (!isDef(ret)) {
3848+
ret = [];
38493849
}
3850+
(ret)._isVList = true;
38503851
return ret
38513852
}
38523853

@@ -5188,7 +5189,7 @@ Object.defineProperty(Vue, 'FunctionalRenderContext', {
51885189
value: FunctionalRenderContext
51895190
});
51905191

5191-
Vue.version = '2.5.20';
5192+
Vue.version = '2.5.21';
51925193

51935194
/* */
51945195

@@ -6846,7 +6847,7 @@ function genComponentModel (
68466847

68476848
el.model = {
68486849
value: ("(" + value + ")"),
6849-
expression: ("\"" + value + "\""),
6850+
expression: JSON.stringify(value),
68506851
callback: ("function (" + baseValueExpression + ") {" + assignment + "}")
68516852
};
68526853
}
@@ -9467,7 +9468,7 @@ function processKey (el) {
94679468
var parent = el.parent;
94689469
if (iterator && iterator === exp && parent && parent.tag === 'transition-group') {
94699470
warn$2(
9470-
"Do not use v-for index as key on <transtion-group> children, " +
9471+
"Do not use v-for index as key on <transition-group> children, " +
94719472
"this is the same as not using keys."
94729473
);
94739474
}
@@ -10584,7 +10585,9 @@ function genChildren (
1058410585
el$1.tag !== 'template' &&
1058510586
el$1.tag !== 'slot'
1058610587
) {
10587-
var normalizationType = checkSkip && state.maybeComponent(el$1) ? ",1" : "";
10588+
var normalizationType = checkSkip
10589+
? state.maybeComponent(el$1) ? ",1" : ",0"
10590+
: "";
1058810591
return ("" + ((altGenElement || genElement)(el$1, state)) + normalizationType)
1058910592
}
1059010593
var normalizationType$1 = checkSkip

Diff for: ‎dist/vue.esm.js

+11-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.5.20
2+
* Vue.js v2.5.21
33
* (c) 2014-2018 Evan You
44
* Released under the MIT License.
55
*/
@@ -2901,7 +2901,7 @@ function mountComponent (
29012901
// component's mounted hook), which relies on vm._watcher being already defined
29022902
new Watcher(vm, updateComponent, noop, {
29032903
before: function before () {
2904-
if (vm._isMounted) {
2904+
if (vm._isMounted && !vm._isDestroyed) {
29052905
callHook(vm, 'beforeUpdate');
29062906
}
29072907
}
@@ -3842,9 +3842,10 @@ function renderList (
38423842
ret[i] = render(val[key], key, i);
38433843
}
38443844
}
3845-
if (isDef(ret)) {
3846-
(ret)._isVList = true;
3845+
if (!isDef(ret)) {
3846+
ret = [];
38473847
}
3848+
(ret)._isVList = true;
38483849
return ret
38493850
}
38503851

@@ -5186,7 +5187,7 @@ Object.defineProperty(Vue, 'FunctionalRenderContext', {
51865187
value: FunctionalRenderContext
51875188
});
51885189

5189-
Vue.version = '2.5.20';
5190+
Vue.version = '2.5.21';
51905191

51915192
/* */
51925193

@@ -6844,7 +6845,7 @@ function genComponentModel (
68446845

68456846
el.model = {
68466847
value: ("(" + value + ")"),
6847-
expression: ("\"" + value + "\""),
6848+
expression: JSON.stringify(value),
68486849
callback: ("function (" + baseValueExpression + ") {" + assignment + "}")
68496850
};
68506851
}
@@ -9465,7 +9466,7 @@ function processKey (el) {
94659466
var parent = el.parent;
94669467
if (iterator && iterator === exp && parent && parent.tag === 'transition-group') {
94679468
warn$2(
9468-
"Do not use v-for index as key on <transtion-group> children, " +
9469+
"Do not use v-for index as key on <transition-group> children, " +
94699470
"this is the same as not using keys."
94709471
);
94719472
}
@@ -10582,7 +10583,9 @@ function genChildren (
1058210583
el$1.tag !== 'template' &&
1058310584
el$1.tag !== 'slot'
1058410585
) {
10585-
var normalizationType = checkSkip && state.maybeComponent(el$1) ? ",1" : "";
10586+
var normalizationType = checkSkip
10587+
? state.maybeComponent(el$1) ? ",1" : ",0"
10588+
: "";
1058610589
return ("" + ((altGenElement || genElement)(el$1, state)) + normalizationType)
1058710590
}
1058810591
var normalizationType$1 = checkSkip

Diff for: ‎dist/vue.js

+11-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.5.20
2+
* Vue.js v2.5.21
33
* (c) 2014-2018 Evan You
44
* Released under the MIT License.
55
*/
@@ -2899,7 +2899,7 @@
28992899
// component's mounted hook), which relies on vm._watcher being already defined
29002900
new Watcher(vm, updateComponent, noop, {
29012901
before: function before () {
2902-
if (vm._isMounted) {
2902+
if (vm._isMounted && !vm._isDestroyed) {
29032903
callHook(vm, 'beforeUpdate');
29042904
}
29052905
}
@@ -3833,9 +3833,10 @@
38333833
ret[i] = render(val[key], key, i);
38343834
}
38353835
}
3836-
if (isDef(ret)) {
3837-
(ret)._isVList = true;
3836+
if (!isDef(ret)) {
3837+
ret = [];
38383838
}
3839+
(ret)._isVList = true;
38393840
return ret
38403841
}
38413842

@@ -5170,7 +5171,7 @@
51705171
value: FunctionalRenderContext
51715172
});
51725173

5173-
Vue.version = '2.5.20';
5174+
Vue.version = '2.5.21';
51745175

51755176
/* */
51765177

@@ -6826,7 +6827,7 @@
68266827

68276828
el.model = {
68286829
value: ("(" + value + ")"),
6829-
expression: ("\"" + value + "\""),
6830+
expression: JSON.stringify(value),
68306831
callback: ("function (" + baseValueExpression + ") {" + assignment + "}")
68316832
};
68326833
}
@@ -9441,7 +9442,7 @@
94419442
var parent = el.parent;
94429443
if (iterator && iterator === exp && parent && parent.tag === 'transition-group') {
94439444
warn$2(
9444-
"Do not use v-for index as key on <transtion-group> children, " +
9445+
"Do not use v-for index as key on <transition-group> children, " +
94459446
"this is the same as not using keys."
94469447
);
94479448
}
@@ -10553,7 +10554,9 @@
1055310554
el$1.tag !== 'template' &&
1055410555
el$1.tag !== 'slot'
1055510556
) {
10556-
var normalizationType = checkSkip && state.maybeComponent(el$1) ? ",1" : "";
10557+
var normalizationType = checkSkip
10558+
? state.maybeComponent(el$1) ? ",1" : ",0"
10559+
: "";
1055710560
return ("" + ((altGenElement || genElement)(el$1, state)) + normalizationType)
1055810561
}
1055910562
var normalizationType$1 = checkSkip

Diff for: ‎dist/vue.min.js

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

Diff for: ‎dist/vue.runtime.common.js

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.5.20
2+
* Vue.js v2.5.21
33
* (c) 2014-2018 Evan You
44
* Released under the MIT License.
55
*/
@@ -2894,7 +2894,7 @@ function mountComponent (
28942894
// component's mounted hook), which relies on vm._watcher being already defined
28952895
new Watcher(vm, updateComponent, noop, {
28962896
before: function before () {
2897-
if (vm._isMounted) {
2897+
if (vm._isMounted && !vm._isDestroyed) {
28982898
callHook(vm, 'beforeUpdate');
28992899
}
29002900
}
@@ -3835,9 +3835,10 @@ function renderList (
38353835
ret[i] = render(val[key], key, i);
38363836
}
38373837
}
3838-
if (isDef(ret)) {
3839-
(ret)._isVList = true;
3838+
if (!isDef(ret)) {
3839+
ret = [];
38403840
}
3841+
(ret)._isVList = true;
38413842
return ret
38423843
}
38433844

@@ -5179,7 +5180,7 @@ Object.defineProperty(Vue, 'FunctionalRenderContext', {
51795180
value: FunctionalRenderContext
51805181
});
51815182

5182-
Vue.version = '2.5.20';
5183+
Vue.version = '2.5.21';
51835184

51845185
/* */
51855186

Diff for: ‎dist/vue.runtime.esm.js

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.5.20
2+
* Vue.js v2.5.21
33
* (c) 2014-2018 Evan You
44
* Released under the MIT License.
55
*/
@@ -2892,7 +2892,7 @@ function mountComponent (
28922892
// component's mounted hook), which relies on vm._watcher being already defined
28932893
new Watcher(vm, updateComponent, noop, {
28942894
before: function before () {
2895-
if (vm._isMounted) {
2895+
if (vm._isMounted && !vm._isDestroyed) {
28962896
callHook(vm, 'beforeUpdate');
28972897
}
28982898
}
@@ -3833,9 +3833,10 @@ function renderList (
38333833
ret[i] = render(val[key], key, i);
38343834
}
38353835
}
3836-
if (isDef(ret)) {
3837-
(ret)._isVList = true;
3836+
if (!isDef(ret)) {
3837+
ret = [];
38383838
}
3839+
(ret)._isVList = true;
38393840
return ret
38403841
}
38413842

@@ -5177,7 +5178,7 @@ Object.defineProperty(Vue, 'FunctionalRenderContext', {
51775178
value: FunctionalRenderContext
51785179
});
51795180

5180-
Vue.version = '2.5.20';
5181+
Vue.version = '2.5.21';
51815182

51825183
/* */
51835184

Diff for: ‎dist/vue.runtime.js

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.5.20
2+
* Vue.js v2.5.21
33
* (c) 2014-2018 Evan You
44
* Released under the MIT License.
55
*/
@@ -2890,7 +2890,7 @@
28902890
// component's mounted hook), which relies on vm._watcher being already defined
28912891
new Watcher(vm, updateComponent, noop, {
28922892
before: function before () {
2893-
if (vm._isMounted) {
2893+
if (vm._isMounted && !vm._isDestroyed) {
28942894
callHook(vm, 'beforeUpdate');
28952895
}
28962896
}
@@ -3824,9 +3824,10 @@
38243824
ret[i] = render(val[key], key, i);
38253825
}
38263826
}
3827-
if (isDef(ret)) {
3828-
(ret)._isVList = true;
3827+
if (!isDef(ret)) {
3828+
ret = [];
38293829
}
3830+
(ret)._isVList = true;
38303831
return ret
38313832
}
38323833

@@ -5161,7 +5162,7 @@
51615162
value: FunctionalRenderContext
51625163
});
51635164

5164-
Vue.version = '2.5.20';
5165+
Vue.version = '2.5.21';
51655166

51665167
/* */
51675168

Diff for: ‎dist/vue.runtime.min.js

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

Diff for: ‎packages/vue-server-renderer/basic.js

+8-5
Original file line numberDiff line numberDiff line change
@@ -3467,7 +3467,7 @@
34673467

34683468
el.model = {
34693469
value: ("(" + value + ")"),
3470-
expression: ("\"" + value + "\""),
3470+
expression: JSON.stringify(value),
34713471
callback: ("function (" + baseValueExpression + ") {" + assignment + "}")
34723472
};
34733473
}
@@ -3909,7 +3909,7 @@
39093909
var parent = el.parent;
39103910
if (iterator && iterator === exp && parent && parent.tag === 'transition-group') {
39113911
warn$1(
3912-
"Do not use v-for index as key on <transtion-group> children, " +
3912+
"Do not use v-for index as key on <transition-group> children, " +
39133913
"this is the same as not using keys."
39143914
);
39153915
}
@@ -5058,7 +5058,9 @@
50585058
el$1.tag !== 'template' &&
50595059
el$1.tag !== 'slot'
50605060
) {
5061-
var normalizationType = checkSkip && state.maybeComponent(el$1) ? ",1" : "";
5061+
var normalizationType = checkSkip
5062+
? state.maybeComponent(el$1) ? ",1" : ",0"
5063+
: "";
50625064
return ("" + ((altGenElement || genElement)(el$1, state)) + normalizationType)
50635065
}
50645066
var normalizationType$1 = checkSkip
@@ -6884,9 +6886,10 @@
68846886
ret[i] = render(val[key], key, i);
68856887
}
68866888
}
6887-
if (isDef(ret)) {
6888-
(ret)._isVList = true;
6889+
if (!isDef(ret)) {
6890+
ret = [];
68896891
}
6892+
(ret)._isVList = true;
68906893
return ret
68916894
}
68926895

Diff for: ‎packages/vue-server-renderer/build.js

+8-5
Original file line numberDiff line numberDiff line change
@@ -3228,7 +3228,7 @@ function genComponentModel (
32283228

32293229
el.model = {
32303230
value: ("(" + value + ")"),
3231-
expression: ("\"" + value + "\""),
3231+
expression: JSON.stringify(value),
32323232
callback: ("function (" + baseValueExpression + ") {" + assignment + "}")
32333233
};
32343234
}
@@ -3670,7 +3670,7 @@ function processKey (el) {
36703670
var parent = el.parent;
36713671
if (iterator && iterator === exp && parent && parent.tag === 'transition-group') {
36723672
warn$1(
3673-
"Do not use v-for index as key on <transtion-group> children, " +
3673+
"Do not use v-for index as key on <transition-group> children, " +
36743674
"this is the same as not using keys."
36753675
);
36763676
}
@@ -4824,7 +4824,9 @@ function genChildren (
48244824
el$1.tag !== 'template' &&
48254825
el$1.tag !== 'slot'
48264826
) {
4827-
var normalizationType = checkSkip && state.maybeComponent(el$1) ? ",1" : "";
4827+
var normalizationType = checkSkip
4828+
? state.maybeComponent(el$1) ? ",1" : ",0"
4829+
: "";
48284830
return ("" + ((altGenElement || genElement)(el$1, state)) + normalizationType)
48294831
}
48304832
var normalizationType$1 = checkSkip
@@ -6656,9 +6658,10 @@ function renderList (
66566658
ret[i] = render(val[key], key, i);
66576659
}
66586660
}
6659-
if (isDef(ret)) {
6660-
(ret)._isVList = true;
6661+
if (!isDef(ret)) {
6662+
ret = [];
66616663
}
6664+
(ret)._isVList = true;
66626665
return ret
66636666
}
66646667

0 commit comments

Comments
 (0)