feat: 支持Taro.render写法

NervJS · May 8, 2018 · 6d154c3 · 6d154c3
1 parent d0a09b0
commit 6d154c3
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 26 deletions.
diff --git a/packages/taro-cli/src/h5.js b/packages/taro-cli/src/h5.js
@@ -67,10 +67,10 @@ const FILE_TYPE = {
 function processEntry (code) {
   const ast = babylon.parse(code, babylonConfig)
   let taroImportDefaultName
-  let componentClassName
   let providorImportName
   let storeName
   let hasAddNervJsImportDefaultName = false
+  let renderCallCode
 
   traverse(ast, {
     enter (astPath) {
@@ -93,9 +93,6 @@ function processEntry (code) {
                   node.decorators || []
                 )
               )
-              componentClassName = renameComponentClassName
-            } else {
-              componentClassName = node.id.name
             }
           } else if (node.superClass.name === 'Component') {
             if (node.id === null) {
@@ -108,9 +105,6 @@ function processEntry (code) {
                   node.decorators || []
                 )
               )
-              componentClassName = renameComponentClassName
-            } else {
-              componentClassName = node.id.name
             }
           }
         },
@@ -187,22 +181,31 @@ function processEntry (code) {
         },
         CallExpression (astPath) {
           const node = astPath.node
-          const calleeName = node.callee.name
+          const callee = node.callee
+          const calleeName = callee.name
           const parentPath = astPath.parentPath
 
-          if (calleeName === configStoreFuncName) {
-            if (parentPath.isAssignmentExpression()) {
-              storeName = parentPath.node.left.name
-            } else if (parentPath.isVariableDeclarator()) {
-              storeName = parentPath.node.id.name
-            } else {
-              storeName = 'store'
+          if (t.isMemberExpression(callee)) {
+            if (callee.object.name === taroImportDefaultName && callee.property.name === 'render') {
+              callee.object.name = nervJsImportDefaultName
+              renderCallCode = generate(astPath.node).code
+              astPath.remove()
             }
-          } else if (calleeName === setStoreFuncName) {
-            if (parentPath.isAssignmentExpression() ||
-              parentPath.isExpressionStatement() ||
-              parentPath.isVariableDeclarator()) {
-              parentPath.remove()
+          } else {
+            if (calleeName === configStoreFuncName) {
+              if (parentPath.isAssignmentExpression()) {
+                storeName = parentPath.node.left.name
+              } else if (parentPath.isVariableDeclarator()) {
+                storeName = parentPath.node.id.name
+              } else {
+                storeName = 'store'
+              }
+            } else if (calleeName === setStoreFuncName) {
+              if (parentPath.isAssignmentExpression() ||
+                parentPath.isExpressionStatement() ||
+                parentPath.isVariableDeclarator()) {
+                parentPath.remove()
+              }
             }
           }
         }
@@ -275,17 +278,13 @@ function processEntry (code) {
           `${taroImportDefaultName}.initNativeApi(${taroImportDefaultName})`,
           babylonConfig
         )()
-        const renderApp = template(
-          `${nervJsImportDefaultName}.render(<${componentClassName} />, document.getElementById('app'))`,
-          babylonConfig
-        )()
 
         node.body.unshift(importTaro)
         node.body.unshift(importTaroRouter)
         tabBar && node.body.unshift(importComponents)
         node.body.push(initNativeApi)
         node.body.push(initRouter)
-        node.body.push(renderApp)
+        node.body.push(template(renderCallCode, babylonConfig)())
       }
     }
   })

diff --git a/packages/taro-cli/src/weapp.js b/packages/taro-cli/src/weapp.js
@@ -345,6 +345,16 @@ function parseAst (type, ast, sourceFilePath, filePath) {
       }
     },
 
+    CallExpression (astPath) {
+      const node = astPath.node
+      const callee = node.callee
+      if (t.isMemberExpression(callee)) {
+        if (callee.object.name === taroImportDefaultName && callee.property.name === 'render') {
+          astPath.remove()
+        }
+      }
+    },
+
     ExportDefaultDeclaration (astPath) {
       const node = astPath.node
       const declaration = node.declaration

diff --git a/packages/taro-h5/src/index.js b/packages/taro-h5/src/index.js
@@ -4,8 +4,10 @@ import {
   ENV_TYPE,
   Events,
   eventCenter,
+  render,
   internal_safe_get,
-  internal_dynamic_recursive } from '@tarojs/taro'
+  internal_dynamic_recursive
+} from '@tarojs/taro'
 
 import initNativeApi from './native-api'
 
@@ -15,6 +17,7 @@ export {
   ENV_TYPE,
   Events,
   eventCenter,
+  render,
   internal_safe_get,
   internal_dynamic_recursive
 }
@@ -25,6 +28,7 @@ export default {
   ENV_TYPE,
   Events,
   eventCenter,
+  render,
   internal_safe_get,
   internal_dynamic_recursive
 }
diff --git a/packages/taro-weapp/src/index.js b/packages/taro-weapp/src/index.js
@@ -4,6 +4,7 @@ import {
   Events,
   eventCenter,
   ENV_TYPE,
+  render,
   internal_safe_get,
   internal_dynamic_recursive
 } from '@tarojs/taro'
@@ -21,6 +22,7 @@ export {
   Events,
   eventCenter,
   getEnv,
+  render,
   ENV_TYPE,
   internal_safe_get,
   internal_dynamic_recursive
@@ -34,6 +36,7 @@ export default {
   Events,
   eventCenter,
   getEnv,
+  render,
   ENV_TYPE,
   internal_safe_get,
   internal_dynamic_recursive

diff --git a/packages/taro/src/index.js b/packages/taro/src/index.js
@@ -4,6 +4,7 @@ import { get as internal_safe_get } from './internal/safe-get'
 import { dynamicRecursive as internal_dynamic_recursive } from './internal/dynamic-recursive'
 import { getEnv, ENV_TYPE } from './env'
 import Events from './events'
+import render from './render'
 
 const eventCenter = new Events()
 
@@ -13,6 +14,7 @@ export {
   eventCenter,
   getEnv,
   ENV_TYPE,
+  render,
   internal_safe_get,
   internal_dynamic_recursive
 }
@@ -23,6 +25,7 @@ export default {
   eventCenter,
   getEnv,
   ENV_TYPE,
+  render,
   internal_safe_get,
   internal_dynamic_recursive
 }
diff --git a/packages/taro/src/render.js b/packages/taro/src/render.js
@@ -0,0 +1 @@
+export default function render () {}