Skip to content

Commit 9ae75e5

Browse files
yyx990803yyx990803
committed
build: build 2.5.5
1 parent 4d8226f commit 9ae75e5

14 files changed

+153
-36
lines changed

Diff for: ‎dist/vue.common.js

+22-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.5.4
2+
* Vue.js v2.5.5
33
* (c) 2014-2017 Evan You
44
* Released under the MIT License.
55
*/
@@ -4358,6 +4358,7 @@ function applyNS (vnode, ns, force) {
43584358

43594359
function initRender (vm) {
43604360
vm._vnode = null; // the root of the child tree
4361+
vm._staticTrees = null; // v-once cached trees
43614362
var options = vm.$options;
43624363
var parentVnode = vm.$vnode = options._parentVnode; // the placeholder node in parent tree
43634364
var renderContext = parentVnode && parentVnode.context;
@@ -4863,12 +4864,13 @@ var KeepAlive = {
48634864
},
48644865

48654866
render: function render () {
4866-
var vnode = getFirstComponentChild(this.$slots.default);
4867+
var slot = this.$slots.default;
4868+
var vnode = getFirstComponentChild(slot);
48674869
var componentOptions = vnode && vnode.componentOptions;
48684870
if (componentOptions) {
48694871
// check pattern
48704872
var name = getComponentName(componentOptions);
4871-
if (name && (
4873+
if (!name || (
48724874
(this.exclude && matches(this.exclude, name)) ||
48734875
(this.include && !matches(this.include, name))
48744876
)) {
@@ -4899,7 +4901,7 @@ var KeepAlive = {
48994901

49004902
vnode.data.keepAlive = true;
49014903
}
4902-
return vnode
4904+
return vnode || (slot && slot[0])
49034905
}
49044906
};
49054907

@@ -4966,7 +4968,7 @@ Object.defineProperty(Vue$3.prototype, '$ssrContext', {
49664968
}
49674969
});
49684970

4969-
Vue$3.version = '2.5.4';
4971+
Vue$3.version = '2.5.5';
49704972

49714973
/* */
49724974

@@ -6673,6 +6675,7 @@ function model (
66736675
var modifiers = dir.modifiers;
66746676
var tag = el.tag;
66756677
var type = el.attrsMap.type;
6678+
var attrsMap = el.attrsMap;
66766679

66776680
if (process.env.NODE_ENV !== 'production') {
66786681
// inputs with type="file" are read only and setting the input's
@@ -6683,6 +6686,20 @@ function model (
66836686
"File inputs are read only. Use a v-on:change listener instead."
66846687
);
66856688
}
6689+
6690+
// warn if v-bind:value conflicts with v-model
6691+
if (
6692+
(attrsMap['v-bind:value'] || attrsMap[':value']) &&
6693+
type !== 'checkbox' &&
6694+
type !== 'radio' &&
6695+
tag !== 'select'
6696+
) {
6697+
var vBindValue = attrsMap['v-bind:value'] ? 'v-bind:value' : ':value';
6698+
warn$1(
6699+
vBindValue + " conflicts with v-model on the same element " +
6700+
'because the latter already expands to a value binding internally'
6701+
);
6702+
}
66866703
}
66876704

66886705
if (el.component) {

Diff for: ‎dist/vue.esm.js

+22-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.5.4
2+
* Vue.js v2.5.5
33
* (c) 2014-2017 Evan You
44
* Released under the MIT License.
55
*/
@@ -4356,6 +4356,7 @@ function applyNS (vnode, ns, force) {
43564356

43574357
function initRender (vm) {
43584358
vm._vnode = null; // the root of the child tree
4359+
vm._staticTrees = null; // v-once cached trees
43594360
var options = vm.$options;
43604361
var parentVnode = vm.$vnode = options._parentVnode; // the placeholder node in parent tree
43614362
var renderContext = parentVnode && parentVnode.context;
@@ -4861,12 +4862,13 @@ var KeepAlive = {
48614862
},
48624863

48634864
render: function render () {
4864-
var vnode = getFirstComponentChild(this.$slots.default);
4865+
var slot = this.$slots.default;
4866+
var vnode = getFirstComponentChild(slot);
48654867
var componentOptions = vnode && vnode.componentOptions;
48664868
if (componentOptions) {
48674869
// check pattern
48684870
var name = getComponentName(componentOptions);
4869-
if (name && (
4871+
if (!name || (
48704872
(this.exclude && matches(this.exclude, name)) ||
48714873
(this.include && !matches(this.include, name))
48724874
)) {
@@ -4897,7 +4899,7 @@ var KeepAlive = {
48974899

48984900
vnode.data.keepAlive = true;
48994901
}
4900-
return vnode
4902+
return vnode || (slot && slot[0])
49014903
}
49024904
};
49034905

@@ -4964,7 +4966,7 @@ Object.defineProperty(Vue$3.prototype, '$ssrContext', {
49644966
}
49654967
});
49664968

4967-
Vue$3.version = '2.5.4';
4969+
Vue$3.version = '2.5.5';
49684970

49694971
/* */
49704972

@@ -6671,6 +6673,7 @@ function model (
66716673
var modifiers = dir.modifiers;
66726674
var tag = el.tag;
66736675
var type = el.attrsMap.type;
6676+
var attrsMap = el.attrsMap;
66746677

66756678
if (process.env.NODE_ENV !== 'production') {
66766679
// inputs with type="file" are read only and setting the input's
@@ -6681,6 +6684,20 @@ function model (
66816684
"File inputs are read only. Use a v-on:change listener instead."
66826685
);
66836686
}
6687+
6688+
// warn if v-bind:value conflicts with v-model
6689+
if (
6690+
(attrsMap['v-bind:value'] || attrsMap[':value']) &&
6691+
type !== 'checkbox' &&
6692+
type !== 'radio' &&
6693+
tag !== 'select'
6694+
) {
6695+
var vBindValue = attrsMap['v-bind:value'] ? 'v-bind:value' : ':value';
6696+
warn$1(
6697+
vBindValue + " conflicts with v-model on the same element " +
6698+
'because the latter already expands to a value binding internally'
6699+
);
6700+
}
66846701
}
66856702

66866703
if (el.component) {

Diff for: ‎dist/vue.js

+22-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.5.4
2+
* Vue.js v2.5.5
33
* (c) 2014-2017 Evan You
44
* Released under the MIT License.
55
*/
@@ -4354,6 +4354,7 @@ function applyNS (vnode, ns, force) {
43544354

43554355
function initRender (vm) {
43564356
vm._vnode = null; // the root of the child tree
4357+
vm._staticTrees = null; // v-once cached trees
43574358
var options = vm.$options;
43584359
var parentVnode = vm.$vnode = options._parentVnode; // the placeholder node in parent tree
43594360
var renderContext = parentVnode && parentVnode.context;
@@ -4852,12 +4853,13 @@ var KeepAlive = {
48524853
},
48534854

48544855
render: function render () {
4855-
var vnode = getFirstComponentChild(this.$slots.default);
4856+
var slot = this.$slots.default;
4857+
var vnode = getFirstComponentChild(slot);
48564858
var componentOptions = vnode && vnode.componentOptions;
48574859
if (componentOptions) {
48584860
// check pattern
48594861
var name = getComponentName(componentOptions);
4860-
if (name && (
4862+
if (!name || (
48614863
(this.exclude && matches(this.exclude, name)) ||
48624864
(this.include && !matches(this.include, name))
48634865
)) {
@@ -4888,7 +4890,7 @@ var KeepAlive = {
48884890

48894891
vnode.data.keepAlive = true;
48904892
}
4891-
return vnode
4893+
return vnode || (slot && slot[0])
48924894
}
48934895
};
48944896

@@ -4955,7 +4957,7 @@ Object.defineProperty(Vue$3.prototype, '$ssrContext', {
49554957
}
49564958
});
49574959

4958-
Vue$3.version = '2.5.4';
4960+
Vue$3.version = '2.5.5';
49594961

49604962
/* */
49614963

@@ -6662,6 +6664,7 @@ function model (
66626664
var modifiers = dir.modifiers;
66636665
var tag = el.tag;
66646666
var type = el.attrsMap.type;
6667+
var attrsMap = el.attrsMap;
66656668

66666669
{
66676670
// inputs with type="file" are read only and setting the input's
@@ -6672,6 +6675,20 @@ function model (
66726675
"File inputs are read only. Use a v-on:change listener instead."
66736676
);
66746677
}
6678+
6679+
// warn if v-bind:value conflicts with v-model
6680+
if (
6681+
(attrsMap['v-bind:value'] || attrsMap[':value']) &&
6682+
type !== 'checkbox' &&
6683+
type !== 'radio' &&
6684+
tag !== 'select'
6685+
) {
6686+
var vBindValue = attrsMap['v-bind:value'] ? 'v-bind:value' : ':value';
6687+
warn$1(
6688+
vBindValue + " conflicts with v-model on the same element " +
6689+
'because the latter already expands to a value binding internally'
6690+
);
6691+
}
66756692
}
66766693

66776694
if (el.component) {

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

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.5.4
2+
* Vue.js v2.5.5
33
* (c) 2014-2017 Evan You
44
* Released under the MIT License.
55
*/
@@ -4354,6 +4354,7 @@ function applyNS (vnode, ns, force) {
43544354

43554355
function initRender (vm) {
43564356
vm._vnode = null; // the root of the child tree
4357+
vm._staticTrees = null; // v-once cached trees
43574358
var options = vm.$options;
43584359
var parentVnode = vm.$vnode = options._parentVnode; // the placeholder node in parent tree
43594360
var renderContext = parentVnode && parentVnode.context;
@@ -4859,12 +4860,13 @@ var KeepAlive = {
48594860
},
48604861

48614862
render: function render () {
4862-
var vnode = getFirstComponentChild(this.$slots.default);
4863+
var slot = this.$slots.default;
4864+
var vnode = getFirstComponentChild(slot);
48634865
var componentOptions = vnode && vnode.componentOptions;
48644866
if (componentOptions) {
48654867
// check pattern
48664868
var name = getComponentName(componentOptions);
4867-
if (name && (
4869+
if (!name || (
48684870
(this.exclude && matches(this.exclude, name)) ||
48694871
(this.include && !matches(this.include, name))
48704872
)) {
@@ -4895,7 +4897,7 @@ var KeepAlive = {
48954897

48964898
vnode.data.keepAlive = true;
48974899
}
4898-
return vnode
4900+
return vnode || (slot && slot[0])
48994901
}
49004902
};
49014903

@@ -4962,7 +4964,7 @@ Object.defineProperty(Vue$3.prototype, '$ssrContext', {
49624964
}
49634965
});
49644966

4965-
Vue$3.version = '2.5.4';
4967+
Vue$3.version = '2.5.5';
49664968

49674969
/* */
49684970

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

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.5.4
2+
* Vue.js v2.5.5
33
* (c) 2014-2017 Evan You
44
* Released under the MIT License.
55
*/
@@ -4352,6 +4352,7 @@ function applyNS (vnode, ns, force) {
43524352

43534353
function initRender (vm) {
43544354
vm._vnode = null; // the root of the child tree
4355+
vm._staticTrees = null; // v-once cached trees
43554356
var options = vm.$options;
43564357
var parentVnode = vm.$vnode = options._parentVnode; // the placeholder node in parent tree
43574358
var renderContext = parentVnode && parentVnode.context;
@@ -4857,12 +4858,13 @@ var KeepAlive = {
48574858
},
48584859

48594860
render: function render () {
4860-
var vnode = getFirstComponentChild(this.$slots.default);
4861+
var slot = this.$slots.default;
4862+
var vnode = getFirstComponentChild(slot);
48614863
var componentOptions = vnode && vnode.componentOptions;
48624864
if (componentOptions) {
48634865
// check pattern
48644866
var name = getComponentName(componentOptions);
4865-
if (name && (
4867+
if (!name || (
48664868
(this.exclude && matches(this.exclude, name)) ||
48674869
(this.include && !matches(this.include, name))
48684870
)) {
@@ -4893,7 +4895,7 @@ var KeepAlive = {
48934895

48944896
vnode.data.keepAlive = true;
48954897
}
4896-
return vnode
4898+
return vnode || (slot && slot[0])
48974899
}
48984900
};
48994901

@@ -4960,7 +4962,7 @@ Object.defineProperty(Vue$3.prototype, '$ssrContext', {
49604962
}
49614963
});
49624964

4963-
Vue$3.version = '2.5.4';
4965+
Vue$3.version = '2.5.5';
49644966

49654967
/* */
49664968

Diff for: ‎dist/vue.runtime.js

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.5.4
2+
* Vue.js v2.5.5
33
* (c) 2014-2017 Evan You
44
* Released under the MIT License.
55
*/
@@ -4350,6 +4350,7 @@ function applyNS (vnode, ns, force) {
43504350

43514351
function initRender (vm) {
43524352
vm._vnode = null; // the root of the child tree
4353+
vm._staticTrees = null; // v-once cached trees
43534354
var options = vm.$options;
43544355
var parentVnode = vm.$vnode = options._parentVnode; // the placeholder node in parent tree
43554356
var renderContext = parentVnode && parentVnode.context;
@@ -4848,12 +4849,13 @@ var KeepAlive = {
48484849
},
48494850

48504851
render: function render () {
4851-
var vnode = getFirstComponentChild(this.$slots.default);
4852+
var slot = this.$slots.default;
4853+
var vnode = getFirstComponentChild(slot);
48524854
var componentOptions = vnode && vnode.componentOptions;
48534855
if (componentOptions) {
48544856
// check pattern
48554857
var name = getComponentName(componentOptions);
4856-
if (name && (
4858+
if (!name || (
48574859
(this.exclude && matches(this.exclude, name)) ||
48584860
(this.include && !matches(this.include, name))
48594861
)) {
@@ -4884,7 +4886,7 @@ var KeepAlive = {
48844886

48854887
vnode.data.keepAlive = true;
48864888
}
4887-
return vnode
4889+
return vnode || (slot && slot[0])
48884890
}
48894891
};
48904892

@@ -4951,7 +4953,7 @@ Object.defineProperty(Vue$3.prototype, '$ssrContext', {
49514953
}
49524954
});
49534955

4954-
Vue$3.version = '2.5.4';
4956+
Vue$3.version = '2.5.5';
49554957

49564958
/* */
49574959

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.

0 commit comments

Comments
 (0)