Skip to content

Commit 87b0d5d

Browse files
yyx990803yyx990803
committed
[build] 2.3.0
1 parent d8315c4 commit 87b0d5d

File tree

14 files changed

+1547
-1079
lines changed

14 files changed

+1547
-1079
lines changed

‎dist/vue.common.js‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.3.0-beta.1
2+
* Vue.js v2.3.0
33
* (c) 2014-2017 Evan You
44
* Released under the MIT License.
55
*/
@@ -4384,7 +4384,7 @@ Object.defineProperty(Vue$3.prototype, '$isServer', {
43844384
get: isServerRendering
43854385
});
43864386

4387-
Vue$3.version = '2.3.0-beta.1';
4387+
Vue$3.version = '2.3.0';
43884388

43894389
/* */
43904390

@@ -8170,7 +8170,7 @@ function parse (
81708170
}
81718171
var children = currentParent.children;
81728172
text = inPre || text.trim()
8173-
? decodeHTMLCached(text)
8173+
? isTextTag(currentParent) ? text : decodeHTMLCached(text)
81748174
// only preserve whitespace if its not right after a starting tag
81758175
: preserveWhitespace && children.length ? ' ' : '';
81768176
if (text) {
@@ -8462,6 +8462,11 @@ function makeAttrsMap (attrs) {
84628462
return map
84638463
}
84648464

8465+
// for script (e.g. type="x/template") or style, do not decode content
8466+
function isTextTag (el) {
8467+
return el.tag === 'script' || el.tag === 'style'
8468+
}
8469+
84658470
function isForbiddenTag (el) {
84668471
return (
84678472
el.tag === 'style' ||

‎dist/vue.esm.js‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.3.0-beta.1
2+
* Vue.js v2.3.0
33
* (c) 2014-2017 Evan You
44
* Released under the MIT License.
55
*/
@@ -4382,7 +4382,7 @@ Object.defineProperty(Vue$3.prototype, '$isServer', {
43824382
get: isServerRendering
43834383
});
43844384

4385-
Vue$3.version = '2.3.0-beta.1';
4385+
Vue$3.version = '2.3.0';
43864386

43874387
/* */
43884388

@@ -8168,7 +8168,7 @@ function parse (
81688168
}
81698169
var children = currentParent.children;
81708170
text = inPre || text.trim()
8171-
? decodeHTMLCached(text)
8171+
? isTextTag(currentParent) ? text : decodeHTMLCached(text)
81728172
// only preserve whitespace if its not right after a starting tag
81738173
: preserveWhitespace && children.length ? ' ' : '';
81748174
if (text) {
@@ -8460,6 +8460,11 @@ function makeAttrsMap (attrs) {
84608460
return map
84618461
}
84628462

8463+
// for script (e.g. type="x/template") or style, do not decode content
8464+
function isTextTag (el) {
8465+
return el.tag === 'script' || el.tag === 'style'
8466+
}
8467+
84638468
function isForbiddenTag (el) {
84648469
return (
84658470
el.tag === 'style' ||

‎dist/vue.js‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.3.0-beta.1
2+
* Vue.js v2.3.0
33
* (c) 2014-2017 Evan You
44
* Released under the MIT License.
55
*/
@@ -4376,7 +4376,7 @@ Object.defineProperty(Vue$3.prototype, '$isServer', {
43764376
get: isServerRendering
43774377
});
43784378

4379-
Vue$3.version = '2.3.0-beta.1';
4379+
Vue$3.version = '2.3.0';
43804380

43814381
/* */
43824382

@@ -8162,7 +8162,7 @@ function parse (
81628162
}
81638163
var children = currentParent.children;
81648164
text = inPre || text.trim()
8165-
? decodeHTMLCached(text)
8165+
? isTextTag(currentParent) ? text : decodeHTMLCached(text)
81668166
// only preserve whitespace if its not right after a starting tag
81678167
: preserveWhitespace && children.length ? ' ' : '';
81688168
if (text) {
@@ -8454,6 +8454,11 @@ function makeAttrsMap (attrs) {
84548454
return map
84558455
}
84568456

8457+
// for script (e.g. type="x/template") or style, do not decode content
8458+
function isTextTag (el) {
8459+
return el.tag === 'script' || el.tag === 'style'
8460+
}
8461+
84578462
function isForbiddenTag (el) {
84588463
return (
84598464
el.tag === 'style' ||

‎dist/vue.min.js‎

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

‎dist/vue.runtime.common.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.3.0-beta.1
2+
* Vue.js v2.3.0
33
* (c) 2014-2017 Evan You
44
* Released under the MIT License.
55
*/
@@ -4380,7 +4380,7 @@ Object.defineProperty(Vue$3.prototype, '$isServer', {
43804380
get: isServerRendering
43814381
});
43824382

4383-
Vue$3.version = '2.3.0-beta.1';
4383+
Vue$3.version = '2.3.0';
43844384

43854385
/* */
43864386

‎dist/vue.runtime.esm.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.3.0-beta.1
2+
* Vue.js v2.3.0
33
* (c) 2014-2017 Evan You
44
* Released under the MIT License.
55
*/
@@ -4378,7 +4378,7 @@ Object.defineProperty(Vue$3.prototype, '$isServer', {
43784378
get: isServerRendering
43794379
});
43804380

4381-
Vue$3.version = '2.3.0-beta.1';
4381+
Vue$3.version = '2.3.0';
43824382

43834383
/* */
43844384

‎dist/vue.runtime.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.3.0-beta.1
2+
* Vue.js v2.3.0
33
* (c) 2014-2017 Evan You
44
* Released under the MIT License.
55
*/
@@ -4372,7 +4372,7 @@ Object.defineProperty(Vue$3.prototype, '$isServer', {
43724372
get: isServerRendering
43734373
});
43744374

4375-
Vue$3.version = '2.3.0-beta.1';
4375+
Vue$3.version = '2.3.0';
43764376

43774377
/* */
43784378

‎dist/vue.runtime.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.

‎packages/vue-server-renderer/build.js‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3156,7 +3156,7 @@ function parse (
31563156
}
31573157
var children = currentParent.children;
31583158
text = inPre || text.trim()
3159-
? decodeHTMLCached(text)
3159+
? isTextTag(currentParent) ? text : decodeHTMLCached(text)
31603160
// only preserve whitespace if its not right after a starting tag
31613161
: preserveWhitespace && children.length ? ' ' : '';
31623162
if (text) {
@@ -3448,6 +3448,11 @@ function makeAttrsMap (attrs) {
34483448
return map
34493449
}
34503450

3451+
// for script (e.g. type="x/template") or style, do not decode content
3452+
function isTextTag (el) {
3453+
return el.tag === 'script' || el.tag === 'style'
3454+
}
3455+
34513456
function isForbiddenTag (el) {
34523457
return (
34533458
el.tag === 'style' ||

‎packages/vue-server-renderer/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "vue-server-renderer",
3-
"version": "2.3.0-beta.1",
3+
"version": "2.3.0",
44
"description": "server renderer for Vue 2.0",
55
"main": "index.js",
66
"repository": {

0 commit comments

Comments
 (0)