Skip to content

Commit 6fb3a22

Browse files
yyx990803yyx990803
committed
build: build 2.6.1
1 parent 66fd3c8 commit 6fb3a22

19 files changed

+221
-172
lines changed

‎dist/vue.common.dev.js‎

Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.6.0
2+
* Vue.js v2.6.1
33
* (c) 2014-2019 Evan You
44
* Released under the MIT License.
55
*/
@@ -1849,7 +1849,7 @@ function invokeWithErrorHandling (
18491849
var res;
18501850
try {
18511851
res = args ? handler.apply(context, args) : handler.call(context);
1852-
if (isPromise(res)) {
1852+
if (res && !res._isVue && isPromise(res)) {
18531853
res.catch(function (e) { return handleError(e, vm, info + " (Promise/async)"); });
18541854
}
18551855
} catch (e) {
@@ -4572,8 +4572,9 @@ function mergeHook$1 (f1, f2) {
45724572
// prop and event handler respectively.
45734573
function transformModel (options, data) {
45744574
var prop = (options.model && options.model.prop) || 'value';
4575-
var event = (options.model && options.model.event) || 'input'
4576-
;(data.props || (data.props = {}))[prop] = data.model.value;
4575+
var event = (options.model && options.model.event) || 'input';
4576+
var addTo = (options.props && prop in options.props) ? 'props' : 'attrs'
4577+
;(data[addTo] || (data[addTo] = {}))[prop] = data.model.value;
45774578
var on = data.on || (data.on = {});
45784579
var existing = on[event];
45794580
var callback = data.model.callback;
@@ -5319,7 +5320,7 @@ Object.defineProperty(Vue, 'FunctionalRenderContext', {
53195320
value: FunctionalRenderContext
53205321
});
53215322

5322-
Vue.version = '2.6.0';
5323+
Vue.version = '2.6.1';
53235324

53245325
/* */
53255326

@@ -6640,8 +6641,8 @@ function baseSetAttr (el, key, value) {
66406641
/* istanbul ignore if */
66416642
if (
66426643
isIE && !isIE9 &&
6643-
(el.tagName === 'TEXTAREA' || el.tagName === 'INPUT') &&
6644-
key === 'placeholder' && !el.__ieph
6644+
el.tagName === 'TEXTAREA' &&
6645+
key === 'placeholder' && value !== '' && !el.__ieph
66456646
) {
66466647
var blocker = function (e) {
66476648
e.stopImmediatePropagation();
@@ -9121,10 +9122,11 @@ var decodingMap = {
91219122
'"': '"',
91229123
'&': '&',
91239124
'
': '\n',
9124-
'	': '\t'
9125+
'	': '\t',
9126+
''': "'"
91259127
};
9126-
var encodedAttr = /&(?:lt|gt|quot|amp);/g;
9127-
var encodedAttrWithNewLines = /&(?:lt|gt|quot|amp|#10|#9);/g;
9128+
var encodedAttr = /&(?:lt|gt|quot|amp|#39);/g;
9129+
var encodedAttrWithNewLines = /&(?:lt|gt|quot|amp|#39|#10|#9);/g;
91289130

91299131
// #5992
91309132
var isIgnoreNewlineTag = makeMap('pre,textarea', true);
@@ -9743,16 +9745,20 @@ function parse (
97439745
}
97449746
},
97459747
comment: function comment (text, start, end) {
9746-
var child = {
9747-
type: 3,
9748-
text: text,
9749-
isComment: true
9750-
};
9751-
if (options.outputSourceRange) {
9752-
child.start = start;
9753-
child.end = end;
9748+
// adding anyting as a sibling to the root node is forbidden
9749+
// comments should still be allowed, but ignored
9750+
if (currentParent) {
9751+
var child = {
9752+
type: 3,
9753+
text: text,
9754+
isComment: true
9755+
};
9756+
if (options.outputSourceRange) {
9757+
child.start = start;
9758+
child.end = end;
9759+
}
9760+
currentParent.children.push(child);
97549761
}
9755-
currentParent.children.push(child);
97569762
}
97579763
});
97589764
return root
@@ -11047,7 +11053,7 @@ function genInlineTemplate (el, state) {
1104711053
{ start: el.start }
1104811054
);
1104911055
}
11050-
if (ast.type === 1) {
11056+
if (ast && ast.type === 1) {
1105111057
var inlineRenderFns = generate(ast, state.options);
1105211058
return ("inlineTemplate:{render:function(){" + (inlineRenderFns.render) + "},staticRenderFns:[" + (inlineRenderFns.staticRenderFns.map(function (code) { return ("function(){" + code + "}"); }).join(',')) + "]}")
1105311059
}

‎dist/vue.common.prod.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/vue.esm.browser.js‎

Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.6.0
2+
* Vue.js v2.6.1
33
* (c) 2014-2019 Evan You
44
* Released under the MIT License.
55
*/
@@ -1880,7 +1880,7 @@ function invokeWithErrorHandling (
18801880
let res;
18811881
try {
18821882
res = args ? handler.apply(context, args) : handler.call(context);
1883-
if (isPromise(res)) {
1883+
if (res && !res._isVue && isPromise(res)) {
18841884
res.catch(e => handleError(e, vm, info + ` (Promise/async)`));
18851885
}
18861886
} catch (e) {
@@ -4615,8 +4615,9 @@ function mergeHook$1 (f1, f2) {
46154615
// prop and event handler respectively.
46164616
function transformModel (options, data) {
46174617
const prop = (options.model && options.model.prop) || 'value';
4618-
const event = (options.model && options.model.event) || 'input'
4619-
;(data.props || (data.props = {}))[prop] = data.model.value;
4618+
const event = (options.model && options.model.event) || 'input';
4619+
const addTo = (options.props && prop in options.props) ? 'props' : 'attrs'
4620+
;(data[addTo] || (data[addTo] = {}))[prop] = data.model.value;
46204621
const on = data.on || (data.on = {});
46214622
const existing = on[event];
46224623
const callback = data.model.callback;
@@ -5352,7 +5353,7 @@ Object.defineProperty(Vue, 'FunctionalRenderContext', {
53525353
value: FunctionalRenderContext
53535354
});
53545355

5355-
Vue.version = '2.6.0';
5356+
Vue.version = '2.6.1';
53565357

53575358
/* */
53585359

@@ -6670,8 +6671,8 @@ function baseSetAttr (el, key, value) {
66706671
/* istanbul ignore if */
66716672
if (
66726673
isIE && !isIE9 &&
6673-
(el.tagName === 'TEXTAREA' || el.tagName === 'INPUT') &&
6674-
key === 'placeholder' && !el.__ieph
6674+
el.tagName === 'TEXTAREA' &&
6675+
key === 'placeholder' && value !== '' && !el.__ieph
66756676
) {
66766677
const blocker = e => {
66776678
e.stopImmediatePropagation();
@@ -9140,10 +9141,11 @@ const decodingMap = {
91409141
'"': '"',
91419142
'&': '&',
91429143
'
': '\n',
9143-
'	': '\t'
9144+
'	': '\t',
9145+
''': "'"
91449146
};
9145-
const encodedAttr = /&(?:lt|gt|quot|amp);/g;
9146-
const encodedAttrWithNewLines = /&(?:lt|gt|quot|amp|#10|#9);/g;
9147+
const encodedAttr = /&(?:lt|gt|quot|amp|#39);/g;
9148+
const encodedAttrWithNewLines = /&(?:lt|gt|quot|amp|#39|#10|#9);/g;
91479149

91489150
// #5992
91499151
const isIgnoreNewlineTag = makeMap('pre,textarea', true);
@@ -9762,16 +9764,20 @@ function parse (
97629764
}
97639765
},
97649766
comment (text, start, end) {
9765-
const child = {
9766-
type: 3,
9767-
text,
9768-
isComment: true
9769-
};
9770-
if (options.outputSourceRange) {
9771-
child.start = start;
9772-
child.end = end;
9767+
// adding anyting as a sibling to the root node is forbidden
9768+
// comments should still be allowed, but ignored
9769+
if (currentParent) {
9770+
const child = {
9771+
type: 3,
9772+
text,
9773+
isComment: true
9774+
};
9775+
if (options.outputSourceRange) {
9776+
child.start = start;
9777+
child.end = end;
9778+
}
9779+
currentParent.children.push(child);
97739780
}
9774-
currentParent.children.push(child);
97759781
}
97769782
});
97779783
return root
@@ -11104,7 +11110,7 @@ function genInlineTemplate (el, state) {
1110411110
{ start: el.start }
1110511111
);
1110611112
}
11107-
if (ast.type === 1) {
11113+
if (ast && ast.type === 1) {
1110811114
const inlineRenderFns = generate(ast, state.options);
1110911115
return `inlineTemplate:{render:function(){${
1111011116
inlineRenderFns.render

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

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/vue.esm.js‎

Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.6.0
2+
* Vue.js v2.6.1
33
* (c) 2014-2019 Evan You
44
* Released under the MIT License.
55
*/
@@ -1853,7 +1853,7 @@ function invokeWithErrorHandling (
18531853
var res;
18541854
try {
18551855
res = args ? handler.apply(context, args) : handler.call(context);
1856-
if (isPromise(res)) {
1856+
if (res && !res._isVue && isPromise(res)) {
18571857
res.catch(function (e) { return handleError(e, vm, info + " (Promise/async)"); });
18581858
}
18591859
} catch (e) {
@@ -4585,8 +4585,9 @@ function mergeHook$1 (f1, f2) {
45854585
// prop and event handler respectively.
45864586
function transformModel (options, data) {
45874587
var prop = (options.model && options.model.prop) || 'value';
4588-
var event = (options.model && options.model.event) || 'input'
4589-
;(data.props || (data.props = {}))[prop] = data.model.value;
4588+
var event = (options.model && options.model.event) || 'input';
4589+
var addTo = (options.props && prop in options.props) ? 'props' : 'attrs'
4590+
;(data[addTo] || (data[addTo] = {}))[prop] = data.model.value;
45904591
var on = data.on || (data.on = {});
45914592
var existing = on[event];
45924593
var callback = data.model.callback;
@@ -5339,7 +5340,7 @@ Object.defineProperty(Vue, 'FunctionalRenderContext', {
53395340
value: FunctionalRenderContext
53405341
});
53415342

5342-
Vue.version = '2.6.0';
5343+
Vue.version = '2.6.1';
53435344

53445345
/* */
53455346

@@ -6662,8 +6663,8 @@ function baseSetAttr (el, key, value) {
66626663
/* istanbul ignore if */
66636664
if (
66646665
isIE && !isIE9 &&
6665-
(el.tagName === 'TEXTAREA' || el.tagName === 'INPUT') &&
6666-
key === 'placeholder' && !el.__ieph
6666+
el.tagName === 'TEXTAREA' &&
6667+
key === 'placeholder' && value !== '' && !el.__ieph
66676668
) {
66686669
var blocker = function (e) {
66696670
e.stopImmediatePropagation();
@@ -9149,10 +9150,11 @@ var decodingMap = {
91499150
'"': '"',
91509151
'&': '&',
91519152
'
': '\n',
9152-
'	': '\t'
9153+
'	': '\t',
9154+
''': "'"
91539155
};
9154-
var encodedAttr = /&(?:lt|gt|quot|amp);/g;
9155-
var encodedAttrWithNewLines = /&(?:lt|gt|quot|amp|#10|#9);/g;
9156+
var encodedAttr = /&(?:lt|gt|quot|amp|#39);/g;
9157+
var encodedAttrWithNewLines = /&(?:lt|gt|quot|amp|#39|#10|#9);/g;
91569158

91579159
// #5992
91589160
var isIgnoreNewlineTag = makeMap('pre,textarea', true);
@@ -9772,16 +9774,20 @@ function parse (
97729774
}
97739775
},
97749776
comment: function comment (text, start, end) {
9775-
var child = {
9776-
type: 3,
9777-
text: text,
9778-
isComment: true
9779-
};
9780-
if (process.env.NODE_ENV !== 'production' && options.outputSourceRange) {
9781-
child.start = start;
9782-
child.end = end;
9777+
// adding anyting as a sibling to the root node is forbidden
9778+
// comments should still be allowed, but ignored
9779+
if (currentParent) {
9780+
var child = {
9781+
type: 3,
9782+
text: text,
9783+
isComment: true
9784+
};
9785+
if (process.env.NODE_ENV !== 'production' && options.outputSourceRange) {
9786+
child.start = start;
9787+
child.end = end;
9788+
}
9789+
currentParent.children.push(child);
97839790
}
9784-
currentParent.children.push(child);
97859791
}
97869792
});
97879793
return root
@@ -11081,7 +11087,7 @@ function genInlineTemplate (el, state) {
1108111087
{ start: el.start }
1108211088
);
1108311089
}
11084-
if (ast.type === 1) {
11090+
if (ast && ast.type === 1) {
1108511091
var inlineRenderFns = generate(ast, state.options);
1108611092
return ("inlineTemplate:{render:function(){" + (inlineRenderFns.render) + "},staticRenderFns:[" + (inlineRenderFns.staticRenderFns.map(function (code) { return ("function(){" + code + "}"); }).join(',')) + "]}")
1108711093
}

0 commit comments

Comments
 (0)