Merge branch 'dev' of https://github.com/dcloudio/uni-app into alpha

packages/vue-cli-plugin-hbuilderx/build/vue-loader.conf.js

@@ -17,10 +17,10 @@ const deprecated = {
   }
 }
 
-if (process.env.UNI_USING_NVUE_COMPILER) {
+if (process.env.UNI_USING_NVUE_COMPILER) {
   const wrapperTextTag = function (el, options) {
     const tag = el.tag
-    if (tag === 'text' || tag === 'button') {
+    if (tag === 'text' || tag === 'u-text' || tag === 'button') {
       return
     }
     const children = el.children
@@ -41,7 +41,7 @@ if (process.env.UNI_USING_NVUE_COMPILER) {
   }
 
   modules.push({
-    postTransformNode (el, options) {
+    postTransformNode (el, options) {
       wrapperTextTag(el, options)
 
       if (TAGS.includes(el.tag)) {