Merge branch 'dev' into alpha

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

@@ -38,7 +38,7 @@ function parseText (el) {
       }
     })
     el.children = [{ type: 2, expression: expression.join('+'), tokens: [] }]
-  } else if (children.length === 1) {
+  } else if (children.length === 1 && children[0].text) {
     children[0].text = children[0].text.replace(/\n/g, '').replace(/\\n/g, '\n')
   }
 }

src/platforms/app-plus/view/framework/plugins/vdom-sync.js

@@ -50,7 +50,7 @@ export class VDomSync {
     vm._$id = generateId(vm, findParent(vm), this.version)
     let vData = this.addBatchVData[vm._$id]
     if (!vData) {
-      console.error('cid unmatched', vm)
+      // console.error('cid unmatched', vm)
       vData = [{}, {}]
     } else {
       delete this.addBatchVData[vm._$id]