[build] 2.3.0

yyx990803 · yyx990803 · commit 87b0d5d5a46f · 2017-04-27T14:22:08.000+08:00
diff --git a/dist/vue.common.js b/dist/vue.common.js
@@ -1,5 +1,5 @@
 /*!
- * Vue.js v2.3.0-beta.1
+ * Vue.js v2.3.0
  * (c) 2014-2017 Evan You
  * Released under the MIT License.
  */
@@ -4384,7 +4384,7 @@ Object.defineProperty(Vue$3.prototype, '$isServer', {
   get: isServerRendering
 });
 
-Vue$3.version = '2.3.0-beta.1';
+Vue$3.version = '2.3.0';
 
 /*  */
 
@@ -8170,7 +8170,7 @@ function parse (
       }
       var children = currentParent.children;
       text = inPre || text.trim()
-        ? decodeHTMLCached(text)
+        ? isTextTag(currentParent) ? text : decodeHTMLCached(text)
         // only preserve whitespace if its not right after a starting tag
         : preserveWhitespace && children.length ? ' ' : '';
       if (text) {
@@ -8462,6 +8462,11 @@ function makeAttrsMap (attrs) {
   return map
 }
 
+// for script (e.g. type="x/template") or style, do not decode content
+function isTextTag (el) {
+  return el.tag === 'script' || el.tag === 'style'
+}
+
 function isForbiddenTag (el) {
   return (
     el.tag === 'style' ||
diff --git a/dist/vue.esm.js b/dist/vue.esm.js
@@ -1,5 +1,5 @@
 /*!
- * Vue.js v2.3.0-beta.1
+ * Vue.js v2.3.0
  * (c) 2014-2017 Evan You
  * Released under the MIT License.
  */
@@ -4382,7 +4382,7 @@ Object.defineProperty(Vue$3.prototype, '$isServer', {
   get: isServerRendering
 });
 
-Vue$3.version = '2.3.0-beta.1';
+Vue$3.version = '2.3.0';
 
 /*  */
 
@@ -8168,7 +8168,7 @@ function parse (
       }
       var children = currentParent.children;
       text = inPre || text.trim()
-        ? decodeHTMLCached(text)
+        ? isTextTag(currentParent) ? text : decodeHTMLCached(text)
         // only preserve whitespace if its not right after a starting tag
         : preserveWhitespace && children.length ? ' ' : '';
       if (text) {
@@ -8460,6 +8460,11 @@ function makeAttrsMap (attrs) {
   return map
 }
 
+// for script (e.g. type="x/template") or style, do not decode content
+function isTextTag (el) {
+  return el.tag === 'script' || el.tag === 'style'
+}
+
 function isForbiddenTag (el) {
   return (
     el.tag === 'style' ||
diff --git a/dist/vue.js b/dist/vue.js
@@ -1,5 +1,5 @@
 /*!
- * Vue.js v2.3.0-beta.1
+ * Vue.js v2.3.0
  * (c) 2014-2017 Evan You
  * Released under the MIT License.
  */
@@ -4376,7 +4376,7 @@ Object.defineProperty(Vue$3.prototype, '$isServer', {
   get: isServerRendering
 });
 
-Vue$3.version = '2.3.0-beta.1';
+Vue$3.version = '2.3.0';
 
 /*  */
 
@@ -8162,7 +8162,7 @@ function parse (
       }
       var children = currentParent.children;
       text = inPre || text.trim()
-        ? decodeHTMLCached(text)
+        ? isTextTag(currentParent) ? text : decodeHTMLCached(text)
         // only preserve whitespace if its not right after a starting tag
         : preserveWhitespace && children.length ? ' ' : '';
       if (text) {
@@ -8454,6 +8454,11 @@ function makeAttrsMap (attrs) {
   return map
 }
 
+// for script (e.g. type="x/template") or style, do not decode content
+function isTextTag (el) {
+  return el.tag === 'script' || el.tag === 'style'
+}
+
 function isForbiddenTag (el) {
   return (
     el.tag === 'style' ||
diff --git a/dist/vue.min.js b/dist/vue.min.js
diff --git a/dist/vue.runtime.common.js b/dist/vue.runtime.common.js
@@ -1,5 +1,5 @@
 /*!
- * Vue.js v2.3.0-beta.1
+ * Vue.js v2.3.0
  * (c) 2014-2017 Evan You
  * Released under the MIT License.
  */
@@ -4380,7 +4380,7 @@ Object.defineProperty(Vue$3.prototype, '$isServer', {
   get: isServerRendering
 });
 
-Vue$3.version = '2.3.0-beta.1';
+Vue$3.version = '2.3.0';
 
 /*  */
 
diff --git a/dist/vue.runtime.esm.js b/dist/vue.runtime.esm.js
@@ -1,5 +1,5 @@
 /*!
- * Vue.js v2.3.0-beta.1
+ * Vue.js v2.3.0
  * (c) 2014-2017 Evan You
  * Released under the MIT License.
  */
@@ -4378,7 +4378,7 @@ Object.defineProperty(Vue$3.prototype, '$isServer', {
   get: isServerRendering
 });
 
-Vue$3.version = '2.3.0-beta.1';
+Vue$3.version = '2.3.0';
 
 /*  */
 
diff --git a/dist/vue.runtime.js b/dist/vue.runtime.js
@@ -1,5 +1,5 @@
 /*!
- * Vue.js v2.3.0-beta.1
+ * Vue.js v2.3.0
  * (c) 2014-2017 Evan You
  * Released under the MIT License.
  */
@@ -4372,7 +4372,7 @@ Object.defineProperty(Vue$3.prototype, '$isServer', {
   get: isServerRendering
 });
 
-Vue$3.version = '2.3.0-beta.1';
+Vue$3.version = '2.3.0';
 
 /*  */
 
diff --git a/dist/vue.runtime.min.js b/dist/vue.runtime.min.js
diff --git a/packages/vue-server-renderer/build.js b/packages/vue-server-renderer/build.js
@@ -3156,7 +3156,7 @@ function parse (
       }
       var children = currentParent.children;
       text = inPre || text.trim()
-        ? decodeHTMLCached(text)
+        ? isTextTag(currentParent) ? text : decodeHTMLCached(text)
         // only preserve whitespace if its not right after a starting tag
         : preserveWhitespace && children.length ? ' ' : '';
       if (text) {
@@ -3448,6 +3448,11 @@ function makeAttrsMap (attrs) {
   return map
 }
 
+// for script (e.g. type="x/template") or style, do not decode content
+function isTextTag (el) {
+  return el.tag === 'script' || el.tag === 'style'
+}
+
 function isForbiddenTag (el) {
   return (
     el.tag === 'style' ||
diff --git a/packages/vue-server-renderer/package.json b/packages/vue-server-renderer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-server-renderer",
-  "version": "2.3.0-beta.1",
+  "version": "2.3.0",
   "description": "server renderer for Vue 2.0",
   "main": "index.js",
   "repository": {
diff --git a/packages/vue-template-compiler/build.js b/packages/vue-template-compiler/build.js
@@ -1638,7 +1638,7 @@ function parse (
       }
       var children = currentParent.children;
       text = inPre || text.trim()
-        ? decodeHTMLCached(text)
+        ? isTextTag(currentParent) ? text : decodeHTMLCached(text)
         // only preserve whitespace if its not right after a starting tag
         : preserveWhitespace && children.length ? ' ' : '';
       if (text) {
@@ -1930,6 +1930,11 @@ function makeAttrsMap (attrs) {
   return map
 }
 
+// for script (e.g. type="x/template") or style, do not decode content
+function isTextTag (el) {
+  return el.tag === 'script' || el.tag === 'style'
+}
+
 function isForbiddenTag (el) {
   return (
     el.tag === 'style' ||
diff --git a/packages/vue-template-compiler/package.json b/packages/vue-template-compiler/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-template-compiler",
-  "version": "2.3.0-beta.1",
+  "version": "2.3.0",
   "description": "template compiler for Vue 2.0",
   "main": "index.js",
   "repository": {
diff --git a/packages/weex-template-compiler/build.js b/packages/weex-template-compiler/build.js
diff --git a/packages/weex-vue-framework/factory.js b/packages/weex-vue-framework/factory.js

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "vue-server-renderer",`
`3`		`- "version": "2.3.0-beta.1",`
	`3`	`+ "version": "2.3.0",`
`4`	`4`	`"description": "server renderer for Vue 2.0",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"repository": {`