Skip to content

Commit 25a17f9

Browse files
yyx990803hefeng
authored and
hefeng
committed
build: build 2.5.19
1 parent da4ae58 commit 25a17f9

14 files changed

+24
-74
lines changed

dist/vue.common.js

+2-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.5.18
2+
* Vue.js v2.5.19
33
* (c) 2014-2018 Evan You
44
* Released under the MIT License.
55
*/
@@ -5188,7 +5188,7 @@ Object.defineProperty(Vue, 'FunctionalRenderContext', {
51885188
value: FunctionalRenderContext
51895189
});
51905190

5191-
Vue.version = '2.5.18';
5191+
Vue.version = '2.5.19';
51925192

51935193
/* */
51945194

@@ -5541,20 +5541,13 @@ var emptyNode = new VNode('', {}, []);
55415541

55425542
var hooks = ['create', 'activate', 'update', 'remove', 'destroy'];
55435543

5544-
function childrenIgnored (vnode) {
5545-
return vnode && vnode.data && vnode.data.domProps && (
5546-
vnode.data.domProps.innerHTML || vnode.data.domProps.textContent
5547-
)
5548-
}
5549-
55505544
function sameVnode (a, b) {
55515545
return (
55525546
a.key === b.key && (
55535547
(
55545548
a.tag === b.tag &&
55555549
a.isComment === b.isComment &&
55565550
isDef(a.data) === isDef(b.data) &&
5557-
!childrenIgnored(a) && !childrenIgnored(b) &&
55585551
sameInputType(a, b)
55595552
) || (
55605553
isTrue(a.isAsyncPlaceholder) &&

dist/vue.esm.js

+2-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.5.18
2+
* Vue.js v2.5.19
33
* (c) 2014-2018 Evan You
44
* Released under the MIT License.
55
*/
@@ -5186,7 +5186,7 @@ Object.defineProperty(Vue, 'FunctionalRenderContext', {
51865186
value: FunctionalRenderContext
51875187
});
51885188

5189-
Vue.version = '2.5.18';
5189+
Vue.version = '2.5.19';
51905190

51915191
/* */
51925192

@@ -5539,20 +5539,13 @@ var emptyNode = new VNode('', {}, []);
55395539

55405540
var hooks = ['create', 'activate', 'update', 'remove', 'destroy'];
55415541

5542-
function childrenIgnored (vnode) {
5543-
return vnode && vnode.data && vnode.data.domProps && (
5544-
vnode.data.domProps.innerHTML || vnode.data.domProps.textContent
5545-
)
5546-
}
5547-
55485542
function sameVnode (a, b) {
55495543
return (
55505544
a.key === b.key && (
55515545
(
55525546
a.tag === b.tag &&
55535547
a.isComment === b.isComment &&
55545548
isDef(a.data) === isDef(b.data) &&
5555-
!childrenIgnored(a) && !childrenIgnored(b) &&
55565549
sameInputType(a, b)
55575550
) || (
55585551
isTrue(a.isAsyncPlaceholder) &&

dist/vue.js

+2-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.5.18
2+
* Vue.js v2.5.19
33
* (c) 2014-2018 Evan You
44
* Released under the MIT License.
55
*/
@@ -5170,7 +5170,7 @@
51705170
value: FunctionalRenderContext
51715171
});
51725172

5173-
Vue.version = '2.5.18';
5173+
Vue.version = '2.5.19';
51745174

51755175
/* */
51765176

@@ -5523,20 +5523,13 @@
55235523

55245524
var hooks = ['create', 'activate', 'update', 'remove', 'destroy'];
55255525

5526-
function childrenIgnored (vnode) {
5527-
return vnode && vnode.data && vnode.data.domProps && (
5528-
vnode.data.domProps.innerHTML || vnode.data.domProps.textContent
5529-
)
5530-
}
5531-
55325526
function sameVnode (a, b) {
55335527
return (
55345528
a.key === b.key && (
55355529
(
55365530
a.tag === b.tag &&
55375531
a.isComment === b.isComment &&
55385532
isDef(a.data) === isDef(b.data) &&
5539-
!childrenIgnored(a) && !childrenIgnored(b) &&
55405533
sameInputType(a, b)
55415534
) || (
55425535
isTrue(a.isAsyncPlaceholder) &&

dist/vue.min.js

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

dist/vue.runtime.common.js

+2-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.5.18
2+
* Vue.js v2.5.19
33
* (c) 2014-2018 Evan You
44
* Released under the MIT License.
55
*/
@@ -5179,7 +5179,7 @@ Object.defineProperty(Vue, 'FunctionalRenderContext', {
51795179
value: FunctionalRenderContext
51805180
});
51815181

5182-
Vue.version = '2.5.18';
5182+
Vue.version = '2.5.19';
51835183

51845184
/* */
51855185

@@ -5530,20 +5530,13 @@ var emptyNode = new VNode('', {}, []);
55305530

55315531
var hooks = ['create', 'activate', 'update', 'remove', 'destroy'];
55325532

5533-
function childrenIgnored (vnode) {
5534-
return vnode && vnode.data && vnode.data.domProps && (
5535-
vnode.data.domProps.innerHTML || vnode.data.domProps.textContent
5536-
)
5537-
}
5538-
55395533
function sameVnode (a, b) {
55405534
return (
55415535
a.key === b.key && (
55425536
(
55435537
a.tag === b.tag &&
55445538
a.isComment === b.isComment &&
55455539
isDef(a.data) === isDef(b.data) &&
5546-
!childrenIgnored(a) && !childrenIgnored(b) &&
55475540
sameInputType(a, b)
55485541
) || (
55495542
isTrue(a.isAsyncPlaceholder) &&

dist/vue.runtime.esm.js

+2-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.5.18
2+
* Vue.js v2.5.19
33
* (c) 2014-2018 Evan You
44
* Released under the MIT License.
55
*/
@@ -5177,7 +5177,7 @@ Object.defineProperty(Vue, 'FunctionalRenderContext', {
51775177
value: FunctionalRenderContext
51785178
});
51795179

5180-
Vue.version = '2.5.18';
5180+
Vue.version = '2.5.19';
51815181

51825182
/* */
51835183

@@ -5528,20 +5528,13 @@ var emptyNode = new VNode('', {}, []);
55285528

55295529
var hooks = ['create', 'activate', 'update', 'remove', 'destroy'];
55305530

5531-
function childrenIgnored (vnode) {
5532-
return vnode && vnode.data && vnode.data.domProps && (
5533-
vnode.data.domProps.innerHTML || vnode.data.domProps.textContent
5534-
)
5535-
}
5536-
55375531
function sameVnode (a, b) {
55385532
return (
55395533
a.key === b.key && (
55405534
(
55415535
a.tag === b.tag &&
55425536
a.isComment === b.isComment &&
55435537
isDef(a.data) === isDef(b.data) &&
5544-
!childrenIgnored(a) && !childrenIgnored(b) &&
55455538
sameInputType(a, b)
55465539
) || (
55475540
isTrue(a.isAsyncPlaceholder) &&

dist/vue.runtime.js

+2-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.5.18
2+
* Vue.js v2.5.19
33
* (c) 2014-2018 Evan You
44
* Released under the MIT License.
55
*/
@@ -5161,7 +5161,7 @@
51615161
value: FunctionalRenderContext
51625162
});
51635163

5164-
Vue.version = '2.5.18';
5164+
Vue.version = '2.5.19';
51655165

51665166
/* */
51675167

@@ -5512,20 +5512,13 @@
55125512

55135513
var hooks = ['create', 'activate', 'update', 'remove', 'destroy'];
55145514

5515-
function childrenIgnored (vnode) {
5516-
return vnode && vnode.data && vnode.data.domProps && (
5517-
vnode.data.domProps.innerHTML || vnode.data.domProps.textContent
5518-
)
5519-
}
5520-
55215515
function sameVnode (a, b) {
55225516
return (
55235517
a.key === b.key && (
55245518
(
55255519
a.tag === b.tag &&
55265520
a.isComment === b.isComment &&
55275521
isDef(a.data) === isDef(b.data) &&
5528-
!childrenIgnored(a) && !childrenIgnored(b) &&
55295522
sameInputType(a, b)
55305523
) || (
55315524
isTrue(a.isAsyncPlaceholder) &&

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.

packages/vue-server-renderer/basic.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -7906,7 +7906,7 @@
79067906
for (var i = 0; i < dirs.length; i++) {
79077907
var name = dirs[i].name;
79087908
if (name !== 'show') {
7909-
var dirRenderer = resolveAsset(context, 'directives', name, true);
7909+
var dirRenderer = resolveAsset(context, 'directives', name);
79107910
if (dirRenderer) {
79117911
// directives mutate the node's data
79127912
// which then gets rendered by modules

packages/vue-server-renderer/build.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -7678,7 +7678,7 @@ function renderStartingTag (node, context) {
76787678
for (var i = 0; i < dirs.length; i++) {
76797679
var name = dirs[i].name;
76807680
if (name !== 'show') {
7681-
var dirRenderer = resolveAsset(context, 'directives', name, true);
7681+
var dirRenderer = resolveAsset(context, 'directives', name);
76827682
if (dirRenderer) {
76837683
// directives mutate the node's data
76847684
// which then gets rendered by modules

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.18",
3+
"version": "2.5.19",
44
"description": "server renderer for Vue 2.0",
55
"main": "index.js",
66
"types": "types/index.d.ts",

packages/vue-template-compiler/browser.js

+2-6
Original file line numberDiff line numberDiff line change
@@ -637,15 +637,11 @@
637637
function end (tag, start) {
638638
if (depth === 1 && currentBlock) {
639639
currentBlock.end = start;
640-
var text = content.slice(currentBlock.start, currentBlock.end);
640+
var text = deIndent(content.slice(currentBlock.start, currentBlock.end));
641641
// pad content so that linters and pre-processors can output correct
642642
// line numbers in errors and warnings
643-
if (options.pad) {
643+
if (currentBlock.type !== 'template' && options.pad) {
644644
text = padContent(currentBlock, options.pad) + text;
645-
} else {
646-
// avoid to deindent if pad option is specified
647-
// to retain original source position.
648-
text = deIndent(text);
649645
}
650646
currentBlock.content = text;
651647
currentBlock = null;

packages/vue-template-compiler/build.js

+2-6
Original file line numberDiff line numberDiff line change
@@ -595,15 +595,11 @@ function parseComponent (
595595
function end (tag, start) {
596596
if (depth === 1 && currentBlock) {
597597
currentBlock.end = start;
598-
var text = content.slice(currentBlock.start, currentBlock.end);
598+
var text = deindent(content.slice(currentBlock.start, currentBlock.end));
599599
// pad content so that linters and pre-processors can output correct
600600
// line numbers in errors and warnings
601-
if (options.pad) {
601+
if (currentBlock.type !== 'template' && options.pad) {
602602
text = padContent(currentBlock, options.pad) + text;
603-
} else {
604-
// avoid to deindent if pad option is specified
605-
// to retain original source position.
606-
text = deindent(text);
607603
}
608604
currentBlock.content = text;
609605
currentBlock = null;

packages/vue-template-compiler/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "vue-template-compiler",
3-
"version": "2.5.18",
3+
"version": "2.5.19",
44
"description": "template compiler for Vue 2.0",
55
"main": "index.js",
66
"unpkg": "browser.js",

0 commit comments

Comments
 (0)