Skip to content

Commit c0d03ab

Browse files
yyx990803yyx990803
committed
build: build 2.5.7
1 parent d891cd1 commit c0d03ab

File tree

14 files changed

+246
-111
lines changed

14 files changed

+246
-111
lines changed

Diff for: ‎dist/vue.common.js

+36-16
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.5.6
2+
* Vue.js v2.5.7
33
* (c) 2014-2017 Evan You
44
* Released under the MIT License.
55
*/
@@ -1933,7 +1933,7 @@ function traverse (val) {
19331933
function _traverse (val, seen) {
19341934
var i, keys;
19351935
var isA = Array.isArray(val);
1936-
if ((!isA && !isObject(val)) || !Object.isExtensible(val)) {
1936+
if ((!isA && !isObject(val)) || Object.isFrozen(val)) {
19371937
return
19381938
}
19391939
if (val.__ob__) {
@@ -4870,16 +4870,21 @@ var KeepAlive = {
48704870
if (componentOptions) {
48714871
// check pattern
48724872
var name = getComponentName(componentOptions);
4873-
if (!name || (
4874-
(this.exclude && matches(this.exclude, name)) ||
4875-
(this.include && !matches(this.include, name))
4876-
)) {
4873+
var ref = this;
4874+
var include = ref.include;
4875+
var exclude = ref.exclude;
4876+
if (
4877+
// not included
4878+
(include && (!name || !matches(include, name))) ||
4879+
// excluded
4880+
(exclude && name && matches(exclude, name))
4881+
) {
48774882
return vnode
48784883
}
48794884

4880-
var ref = this;
4881-
var cache = ref.cache;
4882-
var keys = ref.keys;
4885+
var ref$1 = this;
4886+
var cache = ref$1.cache;
4887+
var keys = ref$1.keys;
48834888
var key = vnode.key == null
48844889
// same constructor may get registered as different local components
48854890
// so cid alone is not enough (#3269)
@@ -4968,7 +4973,7 @@ Object.defineProperty(Vue$3.prototype, '$ssrContext', {
49684973
}
49694974
});
49704975

4971-
Vue$3.version = '2.5.6';
4976+
Vue$3.version = '2.5.7';
49724977

49734978
/* */
49744979

@@ -9262,6 +9267,15 @@ function processSlot (el) {
92629267
}
92639268
el.slotScope = slotScope || getAndRemoveAttr(el, 'slot-scope');
92649269
} else if ((slotScope = getAndRemoveAttr(el, 'slot-scope'))) {
9270+
/* istanbul ignore if */
9271+
if (process.env.NODE_ENV !== 'production' && el.attrsMap['v-for']) {
9272+
warn$2(
9273+
"Ambiguous combined usage of slot-scope and v-for on <" + (el.tag) + "> " +
9274+
"(v-for takes higher priority). Use a wrapper <template> for the " +
9275+
"scoped slot to make it clearer.",
9276+
true
9277+
);
9278+
}
92659279
el.slotScope = slotScope;
92669280
}
92679281
var slotTarget = getBindingAttr(el, 'slot');
@@ -10302,9 +10316,6 @@ var unaryOperatorsRE = new RegExp('\\b' + (
1030210316
'delete,typeof,void'
1030310317
).split(',').join('\\s*\\([^\\)]*\\)|\\b') + '\\s*\\([^\\)]*\\)');
1030410318

10305-
// check valid identifier for v-for
10306-
var identRE = /[A-Za-z_$][\w$]*/;
10307-
1030810319
// strip strings in expressions
1030910320
var stripStringRE = /'(?:[^'\\]|\\.)*'|"(?:[^"\\]|\\.)*"|`(?:[^`\\]|\\.)*\$\{|\}(?:[^`\\]|\\.)*`|`(?:[^`\\]|\\.)*`/g;
1031010321

@@ -10362,9 +10373,18 @@ function checkFor (node, text, errors) {
1036210373
checkIdentifier(node.iterator2, 'v-for iterator', text, errors);
1036310374
}
1036410375

10365-
function checkIdentifier (ident, type, text, errors) {
10366-
if (typeof ident === 'string' && !identRE.test(ident)) {
10367-
errors.push(("invalid " + type + " \"" + ident + "\" in expression: " + (text.trim())));
10376+
function checkIdentifier (
10377+
ident,
10378+
type,
10379+
text,
10380+
errors
10381+
) {
10382+
if (typeof ident === 'string') {
10383+
try {
10384+
new Function(("var " + ident));
10385+
} catch (e) {
10386+
errors.push(("invalid " + type + " \"" + ident + "\" in expression: " + (text.trim())));
10387+
}
1036810388
}
1036910389
}
1037010390

Diff for: ‎dist/vue.esm.js

+36-16
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.5.6
2+
* Vue.js v2.5.7
33
* (c) 2014-2017 Evan You
44
* Released under the MIT License.
55
*/
@@ -1931,7 +1931,7 @@ function traverse (val) {
19311931
function _traverse (val, seen) {
19321932
var i, keys;
19331933
var isA = Array.isArray(val);
1934-
if ((!isA && !isObject(val)) || !Object.isExtensible(val)) {
1934+
if ((!isA && !isObject(val)) || Object.isFrozen(val)) {
19351935
return
19361936
}
19371937
if (val.__ob__) {
@@ -4868,16 +4868,21 @@ var KeepAlive = {
48684868
if (componentOptions) {
48694869
// check pattern
48704870
var name = getComponentName(componentOptions);
4871-
if (!name || (
4872-
(this.exclude && matches(this.exclude, name)) ||
4873-
(this.include && !matches(this.include, name))
4874-
)) {
4871+
var ref = this;
4872+
var include = ref.include;
4873+
var exclude = ref.exclude;
4874+
if (
4875+
// not included
4876+
(include && (!name || !matches(include, name))) ||
4877+
// excluded
4878+
(exclude && name && matches(exclude, name))
4879+
) {
48754880
return vnode
48764881
}
48774882

4878-
var ref = this;
4879-
var cache = ref.cache;
4880-
var keys = ref.keys;
4883+
var ref$1 = this;
4884+
var cache = ref$1.cache;
4885+
var keys = ref$1.keys;
48814886
var key = vnode.key == null
48824887
// same constructor may get registered as different local components
48834888
// so cid alone is not enough (#3269)
@@ -4966,7 +4971,7 @@ Object.defineProperty(Vue$3.prototype, '$ssrContext', {
49664971
}
49674972
});
49684973

4969-
Vue$3.version = '2.5.6';
4974+
Vue$3.version = '2.5.7';
49704975

49714976
/* */
49724977

@@ -9260,6 +9265,15 @@ function processSlot (el) {
92609265
}
92619266
el.slotScope = slotScope || getAndRemoveAttr(el, 'slot-scope');
92629267
} else if ((slotScope = getAndRemoveAttr(el, 'slot-scope'))) {
9268+
/* istanbul ignore if */
9269+
if (process.env.NODE_ENV !== 'production' && el.attrsMap['v-for']) {
9270+
warn$2(
9271+
"Ambiguous combined usage of slot-scope and v-for on <" + (el.tag) + "> " +
9272+
"(v-for takes higher priority). Use a wrapper <template> for the " +
9273+
"scoped slot to make it clearer.",
9274+
true
9275+
);
9276+
}
92639277
el.slotScope = slotScope;
92649278
}
92659279
var slotTarget = getBindingAttr(el, 'slot');
@@ -10300,9 +10314,6 @@ var unaryOperatorsRE = new RegExp('\\b' + (
1030010314
'delete,typeof,void'
1030110315
).split(',').join('\\s*\\([^\\)]*\\)|\\b') + '\\s*\\([^\\)]*\\)');
1030210316

10303-
// check valid identifier for v-for
10304-
var identRE = /[A-Za-z_$][\w$]*/;
10305-
1030610317
// strip strings in expressions
1030710318
var stripStringRE = /'(?:[^'\\]|\\.)*'|"(?:[^"\\]|\\.)*"|`(?:[^`\\]|\\.)*\$\{|\}(?:[^`\\]|\\.)*`|`(?:[^`\\]|\\.)*`/g;
1030810319

@@ -10360,9 +10371,18 @@ function checkFor (node, text, errors) {
1036010371
checkIdentifier(node.iterator2, 'v-for iterator', text, errors);
1036110372
}
1036210373

10363-
function checkIdentifier (ident, type, text, errors) {
10364-
if (typeof ident === 'string' && !identRE.test(ident)) {
10365-
errors.push(("invalid " + type + " \"" + ident + "\" in expression: " + (text.trim())));
10374+
function checkIdentifier (
10375+
ident,
10376+
type,
10377+
text,
10378+
errors
10379+
) {
10380+
if (typeof ident === 'string') {
10381+
try {
10382+
new Function(("var " + ident));
10383+
} catch (e) {
10384+
errors.push(("invalid " + type + " \"" + ident + "\" in expression: " + (text.trim())));
10385+
}
1036610386
}
1036710387
}
1036810388

Diff for: ‎dist/vue.js

+36-16
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.5.6
2+
* Vue.js v2.5.7
33
* (c) 2014-2017 Evan You
44
* Released under the MIT License.
55
*/
@@ -1937,7 +1937,7 @@ function traverse (val) {
19371937
function _traverse (val, seen) {
19381938
var i, keys;
19391939
var isA = Array.isArray(val);
1940-
if ((!isA && !isObject(val)) || !Object.isExtensible(val)) {
1940+
if ((!isA && !isObject(val)) || Object.isFrozen(val)) {
19411941
return
19421942
}
19431943
if (val.__ob__) {
@@ -4859,16 +4859,21 @@ var KeepAlive = {
48594859
if (componentOptions) {
48604860
// check pattern
48614861
var name = getComponentName(componentOptions);
4862-
if (!name || (
4863-
(this.exclude && matches(this.exclude, name)) ||
4864-
(this.include && !matches(this.include, name))
4865-
)) {
4862+
var ref = this;
4863+
var include = ref.include;
4864+
var exclude = ref.exclude;
4865+
if (
4866+
// not included
4867+
(include && (!name || !matches(include, name))) ||
4868+
// excluded
4869+
(exclude && name && matches(exclude, name))
4870+
) {
48664871
return vnode
48674872
}
48684873

4869-
var ref = this;
4870-
var cache = ref.cache;
4871-
var keys = ref.keys;
4874+
var ref$1 = this;
4875+
var cache = ref$1.cache;
4876+
var keys = ref$1.keys;
48724877
var key = vnode.key == null
48734878
// same constructor may get registered as different local components
48744879
// so cid alone is not enough (#3269)
@@ -4957,7 +4962,7 @@ Object.defineProperty(Vue$3.prototype, '$ssrContext', {
49574962
}
49584963
});
49594964

4960-
Vue$3.version = '2.5.6';
4965+
Vue$3.version = '2.5.7';
49614966

49624967
/* */
49634968

@@ -9251,6 +9256,15 @@ function processSlot (el) {
92519256
}
92529257
el.slotScope = slotScope || getAndRemoveAttr(el, 'slot-scope');
92539258
} else if ((slotScope = getAndRemoveAttr(el, 'slot-scope'))) {
9259+
/* istanbul ignore if */
9260+
if ("development" !== 'production' && el.attrsMap['v-for']) {
9261+
warn$2(
9262+
"Ambiguous combined usage of slot-scope and v-for on <" + (el.tag) + "> " +
9263+
"(v-for takes higher priority). Use a wrapper <template> for the " +
9264+
"scoped slot to make it clearer.",
9265+
true
9266+
);
9267+
}
92549268
el.slotScope = slotScope;
92559269
}
92569270
var slotTarget = getBindingAttr(el, 'slot');
@@ -10291,9 +10305,6 @@ var unaryOperatorsRE = new RegExp('\\b' + (
1029110305
'delete,typeof,void'
1029210306
).split(',').join('\\s*\\([^\\)]*\\)|\\b') + '\\s*\\([^\\)]*\\)');
1029310307

10294-
// check valid identifier for v-for
10295-
var identRE = /[A-Za-z_$][\w$]*/;
10296-
1029710308
// strip strings in expressions
1029810309
var stripStringRE = /'(?:[^'\\]|\\.)*'|"(?:[^"\\]|\\.)*"|`(?:[^`\\]|\\.)*\$\{|\}(?:[^`\\]|\\.)*`|`(?:[^`\\]|\\.)*`/g;
1029910310

@@ -10351,9 +10362,18 @@ function checkFor (node, text, errors) {
1035110362
checkIdentifier(node.iterator2, 'v-for iterator', text, errors);
1035210363
}
1035310364

10354-
function checkIdentifier (ident, type, text, errors) {
10355-
if (typeof ident === 'string' && !identRE.test(ident)) {
10356-
errors.push(("invalid " + type + " \"" + ident + "\" in expression: " + (text.trim())));
10365+
function checkIdentifier (
10366+
ident,
10367+
type,
10368+
text,
10369+
errors
10370+
) {
10371+
if (typeof ident === 'string') {
10372+
try {
10373+
new Function(("var " + ident));
10374+
} catch (e) {
10375+
errors.push(("invalid " + type + " \"" + ident + "\" in expression: " + (text.trim())));
10376+
}
1035710377
}
1035810378
}
1035910379

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

+15-10
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.5.6
2+
* Vue.js v2.5.7
33
* (c) 2014-2017 Evan You
44
* Released under the MIT License.
55
*/
@@ -1906,7 +1906,7 @@ function traverse (val) {
19061906
function _traverse (val, seen) {
19071907
var i, keys;
19081908
var isA = Array.isArray(val);
1909-
if ((!isA && !isObject(val)) || !Object.isExtensible(val)) {
1909+
if ((!isA && !isObject(val)) || Object.isFrozen(val)) {
19101910
return
19111911
}
19121912
if (val.__ob__) {
@@ -4866,16 +4866,21 @@ var KeepAlive = {
48664866
if (componentOptions) {
48674867
// check pattern
48684868
var name = getComponentName(componentOptions);
4869-
if (!name || (
4870-
(this.exclude && matches(this.exclude, name)) ||
4871-
(this.include && !matches(this.include, name))
4872-
)) {
4869+
var ref = this;
4870+
var include = ref.include;
4871+
var exclude = ref.exclude;
4872+
if (
4873+
// not included
4874+
(include && (!name || !matches(include, name))) ||
4875+
// excluded
4876+
(exclude && name && matches(exclude, name))
4877+
) {
48734878
return vnode
48744879
}
48754880

4876-
var ref = this;
4877-
var cache = ref.cache;
4878-
var keys = ref.keys;
4881+
var ref$1 = this;
4882+
var cache = ref$1.cache;
4883+
var keys = ref$1.keys;
48794884
var key = vnode.key == null
48804885
// same constructor may get registered as different local components
48814886
// so cid alone is not enough (#3269)
@@ -4964,7 +4969,7 @@ Object.defineProperty(Vue$3.prototype, '$ssrContext', {
49644969
}
49654970
});
49664971

4967-
Vue$3.version = '2.5.6';
4972+
Vue$3.version = '2.5.7';
49684973

49694974
/* */
49704975

0 commit comments

Comments
 (0)