fix(cli): 调整 taro-page 插入逻辑，close #4357

luckyadam · luckyadam · commit d03d23c9e4fc · 2019-09-02T10:48:31.000+08:00
diff --git a/packages/taro-cli/src/mini/astProcess.ts b/packages/taro-cli/src/mini/astProcess.ts
@@ -461,9 +461,6 @@ export function parseAst (
               }
             })
           }
-          if (type === PARSE_AST_TYPE.PAGE) {
-            taroSelfComponents.add('taro-page')
-          }
           astPath.remove()
         } else {
           let isDepComponent = false
@@ -976,6 +973,11 @@ export function parseAst (
       }
     }
   })
+
+  if (isQuickApp && type === PARSE_AST_TYPE.PAGE) {
+    taroSelfComponents.add('taro-page')
+  }
+
   return {
     code: generate(ast).code,
     styleFiles,

Original file line number	Diff line number	Diff line change
`@@ -461,9 +461,6 @@ export function parseAst (`
`461`	`461`	`}`
`462`	`462`	`})`
`463`	`463`	`}`
`464`		`- if (type === PARSE_AST_TYPE.PAGE) {`
`465`		`- taroSelfComponents.add('taro-page')`
`466`		`- }`
`467`	`464`	`astPath.remove()`
`468`	`465`	`} else {`
`469`	`466`	`let isDepComponent = false`
`@@ -976,6 +973,11 @@ export function parseAst (`
`976`	`973`	`}`
`977`	`974`	`}`
`978`	`975`	`})`
	`976`	`+`
	`977`	`+ if (isQuickApp && type === PARSE_AST_TYPE.PAGE) {`
	`978`	`+ taroSelfComponents.add('taro-page')`
	`979`	`+ }`
	`980`	`+`
`979`	`981`	`return {`
`980`	`982`	`code: generate(ast).code,`
`981`	`983`	`styleFiles,`