Skip to content

Commit 7f31ec9

Browse files
yyx990803yyx990803
committed
build: build 2.5.6
1 parent 59dea37 commit 7f31ec9

File tree

14 files changed

+109
-123
lines changed

14 files changed

+109
-123
lines changed

Diff for: ‎dist/vue.common.js

+15-17
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.5.5
2+
* Vue.js v2.5.6
33
* (c) 2014-2017 Evan You
44
* Released under the MIT License.
55
*/
@@ -4968,7 +4968,7 @@ Object.defineProperty(Vue$3.prototype, '$ssrContext', {
49684968
}
49694969
});
49704970

4971-
Vue$3.version = '2.5.5';
4971+
Vue$3.version = '2.5.6';
49724972

49734973
/* */
49744974

@@ -6675,7 +6675,6 @@ function model (
66756675
var modifiers = dir.modifiers;
66766676
var tag = el.tag;
66776677
var type = el.attrsMap.type;
6678-
var attrsMap = el.attrsMap;
66796678

66806679
if (process.env.NODE_ENV !== 'production') {
66816680
// inputs with type="file" are read only and setting the input's
@@ -6686,20 +6685,6 @@ function model (
66866685
"File inputs are read only. Use a v-on:change listener instead."
66876686
);
66886687
}
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-
}
67036688
}
67046689

67056690
if (el.component) {
@@ -6797,6 +6782,19 @@ function genDefaultModel (
67976782
modifiers
67986783
) {
67996784
var type = el.attrsMap.type;
6785+
6786+
// warn if v-bind:value conflicts with v-model
6787+
if (process.env.NODE_ENV !== 'production') {
6788+
var value$1 = el.attrsMap['v-bind:value'] || el.attrsMap[':value'];
6789+
if (value$1) {
6790+
var binding = el.attrsMap['v-bind:value'] ? 'v-bind:value' : ':value';
6791+
warn$1(
6792+
binding + "=\"" + value$1 + "\" conflicts with v-model on the same element " +
6793+
'because the latter already expands to a value binding internally'
6794+
);
6795+
}
6796+
}
6797+
68006798
var ref = modifiers || {};
68016799
var lazy = ref.lazy;
68026800
var number = ref.number;

Diff for: ‎dist/vue.esm.js

+15-17
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.5.5
2+
* Vue.js v2.5.6
33
* (c) 2014-2017 Evan You
44
* Released under the MIT License.
55
*/
@@ -4966,7 +4966,7 @@ Object.defineProperty(Vue$3.prototype, '$ssrContext', {
49664966
}
49674967
});
49684968

4969-
Vue$3.version = '2.5.5';
4969+
Vue$3.version = '2.5.6';
49704970

49714971
/* */
49724972

@@ -6673,7 +6673,6 @@ function model (
66736673
var modifiers = dir.modifiers;
66746674
var tag = el.tag;
66756675
var type = el.attrsMap.type;
6676-
var attrsMap = el.attrsMap;
66776676

66786677
if (process.env.NODE_ENV !== 'production') {
66796678
// inputs with type="file" are read only and setting the input's
@@ -6684,20 +6683,6 @@ function model (
66846683
"File inputs are read only. Use a v-on:change listener instead."
66856684
);
66866685
}
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-
}
67016686
}
67026687

67036688
if (el.component) {
@@ -6795,6 +6780,19 @@ function genDefaultModel (
67956780
modifiers
67966781
) {
67976782
var type = el.attrsMap.type;
6783+
6784+
// warn if v-bind:value conflicts with v-model
6785+
if (process.env.NODE_ENV !== 'production') {
6786+
var value$1 = el.attrsMap['v-bind:value'] || el.attrsMap[':value'];
6787+
if (value$1) {
6788+
var binding = el.attrsMap['v-bind:value'] ? 'v-bind:value' : ':value';
6789+
warn$1(
6790+
binding + "=\"" + value$1 + "\" conflicts with v-model on the same element " +
6791+
'because the latter already expands to a value binding internally'
6792+
);
6793+
}
6794+
}
6795+
67986796
var ref = modifiers || {};
67996797
var lazy = ref.lazy;
68006798
var number = ref.number;

Diff for: ‎dist/vue.js

+15-17
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.5.5
2+
* Vue.js v2.5.6
33
* (c) 2014-2017 Evan You
44
* Released under the MIT License.
55
*/
@@ -4957,7 +4957,7 @@ Object.defineProperty(Vue$3.prototype, '$ssrContext', {
49574957
}
49584958
});
49594959

4960-
Vue$3.version = '2.5.5';
4960+
Vue$3.version = '2.5.6';
49614961

49624962
/* */
49634963

@@ -6664,7 +6664,6 @@ function model (
66646664
var modifiers = dir.modifiers;
66656665
var tag = el.tag;
66666666
var type = el.attrsMap.type;
6667-
var attrsMap = el.attrsMap;
66686667

66696668
{
66706669
// inputs with type="file" are read only and setting the input's
@@ -6675,20 +6674,6 @@ function model (
66756674
"File inputs are read only. Use a v-on:change listener instead."
66766675
);
66776676
}
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-
}
66926677
}
66936678

66946679
if (el.component) {
@@ -6786,6 +6771,19 @@ function genDefaultModel (
67866771
modifiers
67876772
) {
67886773
var type = el.attrsMap.type;
6774+
6775+
// warn if v-bind:value conflicts with v-model
6776+
{
6777+
var value$1 = el.attrsMap['v-bind:value'] || el.attrsMap[':value'];
6778+
if (value$1) {
6779+
var binding = el.attrsMap['v-bind:value'] ? 'v-bind:value' : ':value';
6780+
warn$1(
6781+
binding + "=\"" + value$1 + "\" conflicts with v-model on the same element " +
6782+
'because the latter already expands to a value binding internally'
6783+
);
6784+
}
6785+
}
6786+
67896787
var ref = modifiers || {};
67906788
var lazy = ref.lazy;
67916789
var number = ref.number;

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.5.5
2+
* Vue.js v2.5.6
33
* (c) 2014-2017 Evan You
44
* Released under the MIT License.
55
*/
@@ -4964,7 +4964,7 @@ Object.defineProperty(Vue$3.prototype, '$ssrContext', {
49644964
}
49654965
});
49664966

4967-
Vue$3.version = '2.5.5';
4967+
Vue$3.version = '2.5.6';
49684968

49694969
/* */
49704970

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.5.5
2+
* Vue.js v2.5.6
33
* (c) 2014-2017 Evan You
44
* Released under the MIT License.
55
*/
@@ -4962,7 +4962,7 @@ Object.defineProperty(Vue$3.prototype, '$ssrContext', {
49624962
}
49634963
});
49644964

4965-
Vue$3.version = '2.5.5';
4965+
Vue$3.version = '2.5.6';
49664966

49674967
/* */
49684968

Diff for: ‎dist/vue.runtime.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.5.5
2+
* Vue.js v2.5.6
33
* (c) 2014-2017 Evan You
44
* Released under the MIT License.
55
*/
@@ -4953,7 +4953,7 @@ Object.defineProperty(Vue$3.prototype, '$ssrContext', {
49534953
}
49544954
});
49554955

4956-
Vue$3.version = '2.5.5';
4956+
Vue$3.version = '2.5.6';
49574957

49584958
/* */
49594959

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

+13-15
Original file line numberDiff line numberDiff line change
@@ -4316,7 +4316,6 @@ function model$2 (
43164316
var modifiers = dir.modifiers;
43174317
var tag = el.tag;
43184318
var type = el.attrsMap.type;
4319-
var attrsMap = el.attrsMap;
43204319

43214320
{
43224321
// inputs with type="file" are read only and setting the input's
@@ -4327,20 +4326,6 @@ function model$2 (
43274326
"File inputs are read only. Use a v-on:change listener instead."
43284327
);
43294328
}
4330-
4331-
// warn if v-bind:value conflicts with v-model
4332-
if (
4333-
(attrsMap['v-bind:value'] || attrsMap[':value']) &&
4334-
type !== 'checkbox' &&
4335-
type !== 'radio' &&
4336-
tag !== 'select'
4337-
) {
4338-
var vBindValue = attrsMap['v-bind:value'] ? 'v-bind:value' : ':value';
4339-
warn$2(
4340-
vBindValue + " conflicts with v-model on the same element " +
4341-
'because the latter already expands to a value binding internally'
4342-
);
4343-
}
43444329
}
43454330

43464331
if (el.component) {
@@ -4438,6 +4423,19 @@ function genDefaultModel (
44384423
modifiers
44394424
) {
44404425
var type = el.attrsMap.type;
4426+
4427+
// warn if v-bind:value conflicts with v-model
4428+
{
4429+
var value$1 = el.attrsMap['v-bind:value'] || el.attrsMap[':value'];
4430+
if (value$1) {
4431+
var binding = el.attrsMap['v-bind:value'] ? 'v-bind:value' : ':value';
4432+
warn$2(
4433+
binding + "=\"" + value$1 + "\" conflicts with v-model on the same element " +
4434+
'because the latter already expands to a value binding internally'
4435+
);
4436+
}
4437+
}
4438+
44414439
var ref = modifiers || {};
44424440
var lazy = ref.lazy;
44434441
var number = ref.number;

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

+13-15
Original file line numberDiff line numberDiff line change
@@ -4055,7 +4055,6 @@ function model$2 (
40554055
var modifiers = dir.modifiers;
40564056
var tag = el.tag;
40574057
var type = el.attrsMap.type;
4058-
var attrsMap = el.attrsMap;
40594058

40604059
if (process.env.NODE_ENV !== 'production') {
40614060
// inputs with type="file" are read only and setting the input's
@@ -4066,20 +4065,6 @@ function model$2 (
40664065
"File inputs are read only. Use a v-on:change listener instead."
40674066
);
40684067
}
4069-
4070-
// warn if v-bind:value conflicts with v-model
4071-
if (
4072-
(attrsMap['v-bind:value'] || attrsMap[':value']) &&
4073-
type !== 'checkbox' &&
4074-
type !== 'radio' &&
4075-
tag !== 'select'
4076-
) {
4077-
var vBindValue = attrsMap['v-bind:value'] ? 'v-bind:value' : ':value';
4078-
warn$2(
4079-
vBindValue + " conflicts with v-model on the same element " +
4080-
'because the latter already expands to a value binding internally'
4081-
);
4082-
}
40834068
}
40844069

40854070
if (el.component) {
@@ -4177,6 +4162,19 @@ function genDefaultModel (
41774162
modifiers
41784163
) {
41794164
var type = el.attrsMap.type;
4165+
4166+
// warn if v-bind:value conflicts with v-model
4167+
if (process.env.NODE_ENV !== 'production') {
4168+
var value$1 = el.attrsMap['v-bind:value'] || el.attrsMap[':value'];
4169+
if (value$1) {
4170+
var binding = el.attrsMap['v-bind:value'] ? 'v-bind:value' : ':value';
4171+
warn$2(
4172+
binding + "=\"" + value$1 + "\" conflicts with v-model on the same element " +
4173+
'because the latter already expands to a value binding internally'
4174+
);
4175+
}
4176+
}
4177+
41804178
var ref = modifiers || {};
41814179
var lazy = ref.lazy;
41824180
var number = ref.number;

Diff for: ‎packages/vue-server-renderer/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "vue-server-renderer",
3-
"version": "2.5.5",
3+
"version": "2.5.6",
44
"description": "server renderer for Vue 2.0",
55
"main": "index.js",
66
"types": "types/index.d.ts",

Diff for: ‎packages/vue-template-compiler/browser.js

+13-15
Original file line numberDiff line numberDiff line change
@@ -3386,7 +3386,6 @@ function model$1 (
33863386
var modifiers = dir.modifiers;
33873387
var tag = el.tag;
33883388
var type = el.attrsMap.type;
3389-
var attrsMap = el.attrsMap;
33903389

33913390
{
33923391
// inputs with type="file" are read only and setting the input's
@@ -3397,20 +3396,6 @@ function model$1 (
33973396
"File inputs are read only. Use a v-on:change listener instead."
33983397
);
33993398
}
3400-
3401-
// warn if v-bind:value conflicts with v-model
3402-
if (
3403-
(attrsMap['v-bind:value'] || attrsMap[':value']) &&
3404-
type !== 'checkbox' &&
3405-
type !== 'radio' &&
3406-
tag !== 'select'
3407-
) {
3408-
var vBindValue = attrsMap['v-bind:value'] ? 'v-bind:value' : ':value';
3409-
warn$2(
3410-
vBindValue + " conflicts with v-model on the same element " +
3411-
'because the latter already expands to a value binding internally'
3412-
);
3413-
}
34143399
}
34153400

34163401
if (el.component) {
@@ -3508,6 +3493,19 @@ function genDefaultModel (
35083493
modifiers
35093494
) {
35103495
var type = el.attrsMap.type;
3496+
3497+
// warn if v-bind:value conflicts with v-model
3498+
{
3499+
var value$1 = el.attrsMap['v-bind:value'] || el.attrsMap[':value'];
3500+
if (value$1) {
3501+
var binding = el.attrsMap['v-bind:value'] ? 'v-bind:value' : ':value';
3502+
warn$2(
3503+
binding + "=\"" + value$1 + "\" conflicts with v-model on the same element " +
3504+
'because the latter already expands to a value binding internally'
3505+
);
3506+
}
3507+
}
3508+
35113509
var ref = modifiers || {};
35123510
var lazy = ref.lazy;
35133511
var number = ref.number;

0 commit comments

Comments
 (0)