fix(cli, h5): 修复PureComponent中获取不到$router和$app的问题. fix #1857

NervJS · Mar 11, 2019 · b8b81f6 · b8b81f6
1 parent a95f600
commit b8b81f6
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 5 deletions.
diff --git a/packages/taro-cli/package.json b/packages/taro-cli/package.json
@@ -39,7 +39,7 @@
     "babel-types": "^6.26.0",
     "babylon": "^6.18.0",
     "better-babel-generator": "^6.26.1",
-    "chalk": "^2.3.2",
+    "chalk": "2.4.2",
     "chokidar": "^2.0.3",
     "commander": "^2.19.0",
     "cross-spawn": "^6.0.5",

diff --git a/packages/taro-cli/src/h5.js b/packages/taro-cli/src/h5.js
@@ -50,6 +50,7 @@ const PACKAGES = {
 
 const taroApis = [
   'Component',
+  'PureComponent',
   'getEnv',
   'ENV_TYPE',
   'eventCenter',
@@ -137,7 +138,9 @@ function processEntry (code, filePath) {
       if (!node.superClass) return
       if (
         node.superClass.type === 'MemberExpression' &&
-        node.superClass.object.name === taroImportDefaultName
+        node.superClass.object.name === taroImportDefaultName &&
+        (node.superClass.property.name === 'Component' ||
+        node.superClass.property.name === 'PureComponent')
       ) {
         node.superClass.object.name = taroImportDefaultName
         if (node.id === null) {
@@ -151,7 +154,8 @@ function processEntry (code, filePath) {
             )
           )
         }
-      } else if (node.superClass.name === 'Component') {
+      } else if (node.superClass.name === 'Component' ||
+        node.superClass.name === 'PureComponent') {
         resetTSClassProperty(node.body.body)
         if (node.id === null) {
           const renameComponentClassName = '_TaroComponentClass'
@@ -578,7 +582,9 @@ function processOthers (code, filePath, fileType) {
       if (!node.superClass) return
       if (
         node.superClass.type === 'MemberExpression' &&
-        node.superClass.object.name === taroImportDefaultName
+        node.superClass.object.name === taroImportDefaultName &&
+        (node.superClass.property.name === 'Component' ||
+        node.superClass.property.name === 'PureComponent')
       ) {
         node.superClass.object.name = taroImportDefaultName
         if (node.id === null) {
@@ -592,7 +598,8 @@ function processOthers (code, filePath, fileType) {
             )
           )
         }
-      } else if (node.superClass.name === 'Component') {
+      } else if (node.superClass.name === 'Component' ||
+        node.superClass.name === 'PureComponent') {
         resetTSClassProperty(node.body.body)
         if (node.id === null) {
           const renameComponentClassName = '_TaroComponentClass'

diff --git a/packages/taro-h5/src/taro/index.js b/packages/taro-h5/src/taro/index.js
@@ -41,6 +41,23 @@ class Component extends Nerv.Component {
   }
 }
 
+class PureComponent extends Nerv.PureComponent {
+  get $router () {
+    return taro.getRouter()
+  }
+  set $router (args) {
+    console.warn('Property "$router" is read-only.')
+  }
+
+  get $app () {
+    return taro.getApp()
+  }
+
+  set $app (app) {
+    console.warn('Property "$app" is read-only.')
+  }
+}
+
 const initPxTransform = originalInitPxTransform.bind(taro)
 const requirePlugin = permanentlyNotSupport('requirePlugin')
 const _set$app = function (app) {
@@ -65,6 +82,7 @@ const canIUseWebp = function () {
 }
 
 taro.Component = Component
+taro.PureComponent = PureComponent
 taro.initPxTransform = initPxTransform
 taro.requirePlugin = requirePlugin
 taro._set$app = _set$app