Merge branch 'master' into fix-rn-elif

Author: hiyuki

packages/api-proxy/src/platform/api/create-intersection-observer/rnIntersectionObserver.js

@@ -201,6 +201,9 @@ class RNIntersectionObserver {
 
   // 计算节点的rect信息
   _measureTarget (isInit = false) {
+    if (!this.observerRefs || !this.relativeRef) {
+      return
+    }
     Promise.all([
       this._getReferenceRect(this.observerRefs),
       this._getReferenceRect(this.relativeRef)

packages/webpack-plugin/lib/template-compiler/compiler.js

@@ -764,9 +764,7 @@ function parse (template, options) {
 
       const children = currentParent.children
 
-      const isTextLikeParent = currentParent.tag === 'text' || currentParent.tag === 'mpx-text' || currentParent.tag === 'Text' || currentParent.tag === 'mpx-simple-text'
-
-      if (!isTextLikeParent) {
+      if (currentParent.tag !== 'text') {
         text = text.trim()
       } else {
         text = text.trim() ? text : ''