From d8878a02c5bf69798d470abb5cbbc6e4be349fea Mon Sep 17 00:00:00 2001
From: haojie <394692633@qq.com>
Date: Wed, 2 Dec 2020 11:29:42 +0800
Subject: [PATCH 01/21] fix: remove useless console

---
 packages/babel-preset-taro/rn/index.js              | 1 -
 packages/taro-rn-runner/src/config/config-holder.ts | 1 -
 2 files changed, 2 deletions(-)

diff --git a/packages/babel-preset-taro/rn/index.js b/packages/babel-preset-taro/rn/index.js
index eb72d62a5ac3..31734c4e48a3 100644
--- a/packages/babel-preset-taro/rn/index.js
+++ b/packages/babel-preset-taro/rn/index.js
@@ -29,7 +29,6 @@ function getRNConfig () {
   if (config.rn) {
     rnConfig = config.rn
   } else {
-    console.warn('缺少RN基本配置')
     rnConfig = {}
   }
   return rnConfig
diff --git a/packages/taro-rn-runner/src/config/config-holder.ts b/packages/taro-rn-runner/src/config/config-holder.ts
index 53d329b3a8bf..04494ee3698b 100644
--- a/packages/taro-rn-runner/src/config/config-holder.ts
+++ b/packages/taro-rn-runner/src/config/config-holder.ts
@@ -25,7 +25,6 @@ const getRNConfig = () => {
   if (config.rn) {
     rnConfig = config.rn
   } else {
-    console.warn('缺少RN基本配置')
     rnConfig = {}
   }
   return rnConfig

From bc53f4bc8e5df252f33058b023f1825aaf0e39de Mon Sep 17 00:00:00 2001
From: yechunxi <yechunxi00@163.com>
Date: Thu, 3 Dec 2020 10:43:40 +0800
Subject: [PATCH 02/21] =?UTF-8?q?fix(rn-transformer):=20app=E5=85=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=85=AC=E5=85=B1=E6=A0=B7=E5=BC=8F=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=B8=8D=E7=94=9F=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/taro-rn-transformer/src/app.ts  | 51 ++++++++++++++++++++++--
 packages/taro-rn-transformer/src/page.ts |  9 +----
 2 files changed, 49 insertions(+), 11 deletions(-)

diff --git a/packages/taro-rn-transformer/src/app.ts b/packages/taro-rn-transformer/src/app.ts
index 418aa83980da..4a02c8294116 100644
--- a/packages/taro-rn-transformer/src/app.ts
+++ b/packages/taro-rn-transformer/src/app.ts
@@ -2,7 +2,7 @@ import * as path from 'path'
 import * as fs from 'fs'
 import { isEmptyObject } from '@tarojs/helper'
 import { camelCase } from 'lodash'
-import { getConfigContent, getConfigFilePath } from './utils'
+import { getConfigContent, getConfigFilePath, getStyleCode } from './utils'
 import { TransformEntry, AppConfig, globalAny } from './types/index'
 
 function getPagesResource (config: AppConfig, basePath: string, pathPrefix: string) {
@@ -69,6 +69,47 @@ function getAppConfig (appPath: string) {
   return appConfig
 }
 
+function getAppContent (fileName: string) {
+  let code = ''
+  if (!fs.existsSync(fileName)) return code
+  try {
+    code = fs.readFileSync(fileName, 'utf-8').toString()
+  } catch (error) {
+    code = ''
+  }
+  return code
+}
+
+function getCommonStyle (appPath: string, basePath: string) {
+  let styles: Record<string, string>[] = []
+  // 读取入口文件的内容
+  const jsExt: string[] = ['tsx', 'ts', 'jsx', 'js']
+  let codeStr = ''
+  // 先读带rn后缀的
+  for (let i = 0; i < jsExt.length; i++) {
+    const rnfilePath = `${appPath}.rn.${jsExt[i]}`
+    const rnFileContent: string = getAppContent(rnfilePath)
+    if (!rnFileContent) {
+      codeStr = rnFileContent
+      break
+    }
+  }
+  // 不带rn后缀的
+  if (!codeStr) {
+    for (let i = 0; i < jsExt.length; i++) {
+      const filePath = `${appPath}.${jsExt[i]}`
+      const fileContent: string = getAppContent(filePath)
+      if (fileContent) {
+        codeStr = fileContent
+        break
+      }
+    }
+  }
+  if (!codeStr) return styles
+  styles = getStyleCode(codeStr, basePath)
+  return styles
+}
+
 export default function generateEntry ({
   filename,
   projectRoot,
@@ -92,13 +133,15 @@ export default function generateEntry ({
   const importPageList = pages.importPages.join(';')
   const importPageConfig = pages.importConfigs.join(';')
   const routeList = pages.screenPages
+  const appComponentPath = `./${sourceDir}/${entryName}`
 
   // 所有页面存一下，用于判断是否页面文件
   globalAny.__taroAppPages = pages.screenPages.map(item => sourceDir + item)
 
-  // TODO transform 引用文件问题,默认为App
-  const appComponentPath = `./${sourceDir}/${entryName}`
-  //
+  // app入口公共样式文件读取
+  const styles: Record<string, string>[] = getCommonStyle(appPath, basePath)
+  globalAny.__taroCommonStyle = styles
+
   const code = `import 'react-native/Libraries/polyfills/error-guard'
   import { AppRegistry } from 'react-native'
   import { createReactNativeApp } from '@tarojs/runtime-rn'
diff --git a/packages/taro-rn-transformer/src/page.ts b/packages/taro-rn-transformer/src/page.ts
index 8093394bcde3..811abf6debb0 100644
--- a/packages/taro-rn-transformer/src/page.ts
+++ b/packages/taro-rn-transformer/src/page.ts
@@ -1,18 +1,13 @@
 import * as path from 'path'
 import { TransformPage, globalAny } from './types/index'
-import { getStyleCode } from './utils'
 
 export default function generatePage ({ sourceCode, filename, projectRoot, sourceDir }: TransformPage) {
   // 文件
   const extName = path.basename(filename).split('.')[0]
   const fileDir = path.dirname(filename)
   let result = sourceCode
-  const basePath = path.join(projectRoot, sourceDir)
-  if (fileDir === sourceDir && extName === 'app') { // 入口文件
-    const styles: Record<string, string>[] = getStyleCode(sourceCode, basePath)
-    globalAny.__taroCommonStyle = styles
-  } else { // 其他页面将公共css导入
-    const commonStyle = globalAny.__taroCommonStyle
+  if (!(fileDir === sourceDir && extName === 'app')) { // 非入口文件
+    const commonStyle = globalAny?.__taroCommonStyle || []
     if (commonStyle && commonStyle.length > 0) {
       const code: string[] = []
       const filePath = path.join(projectRoot, filename)

From d902c3f062386ce7114ee2b9e3de6242d3785f70 Mon Sep 17 00:00:00 2001
From: yechunxi <yechunxi00@163.com>
Date: Thu, 3 Dec 2020 16:31:18 +0800
Subject: [PATCH 03/21] =?UTF-8?q?fix(router-rn):=20api=20=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9Emsg=E4=B8=8D=E4=B8=80=E8=87=B4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/taro-router-rn/src/navigationBar.ts  | 4 ++--
 packages/taro-router-rn/src/rootNavigation.ts | 8 ++++----
 packages/taro-router-rn/src/tabBar.ts         | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/taro-router-rn/src/navigationBar.ts b/packages/taro-router-rn/src/navigationBar.ts
index 0e802f3c5c36..4382fc7c1ac4 100644
--- a/packages/taro-router-rn/src/navigationBar.ts
+++ b/packages/taro-router-rn/src/navigationBar.ts
@@ -34,7 +34,7 @@ export function setNavigationBarTitle (option: NavigateBarTitleOption): Promise<
     msg = error
     return errorHandler(fail, complete)({ errMsg: msg })
   }
-  msg = 'setNavigateBarTitle:ok'
+  msg = 'setNavigationBarTitle:ok'
   return successHandler(success, complete)({ errMsg: msg })
 }
 
@@ -58,7 +58,7 @@ export function setNavigationBarColor (option: NavigateBarColorOption): Promise<
     msg = error
     return errorHandler(fail, complete)({ errMsg: msg })
   }
-  msg = 'setNavigateBarColor:ok'
+  msg = 'setNavigationBarColor:ok'
   return successHandler(success, complete)({ errMsg: msg })
 }
 
diff --git a/packages/taro-router-rn/src/rootNavigation.ts b/packages/taro-router-rn/src/rootNavigation.ts
index 7e207f96666f..11b7095b1fcd 100644
--- a/packages/taro-router-rn/src/rootNavigation.ts
+++ b/packages/taro-router-rn/src/rootNavigation.ts
@@ -151,9 +151,9 @@ export function navigate (option: NavigateOption | NavigateBackOption, method: N
 
   return new Promise((resolve, reject) => {
     if (errMsg) {
-      fail && fail(errMsg)
-      complete && complete(errMsg)
-      reject(errMsg)
+      fail && fail({ errMsg })
+      complete && complete({ errMsg })
+      reject({ errMsg })
     } else {
       const msg: any = {
         errMsg: `${method}:ok`
@@ -163,7 +163,7 @@ export function navigate (option: NavigateOption | NavigateBackOption, method: N
       }
       success && success(msg)
       complete && complete(msg)
-      resolve()
+      resolve(msg)
     }
   })
 }
diff --git a/packages/taro-router-rn/src/tabBar.ts b/packages/taro-router-rn/src/tabBar.ts
index 41a0e583d9e4..d895a052d244 100644
--- a/packages/taro-router-rn/src/tabBar.ts
+++ b/packages/taro-router-rn/src/tabBar.ts
@@ -57,10 +57,10 @@ export function showTabBar (options: TabBarOptions = {}): Promise<CallbackResult
     })
   } catch (error) {
     msg = error
-    return errorHandler(fail, complete)(msg)
+    return errorHandler(fail, complete)({ errMsg: msg })
   }
   msg = 'showTabBar:ok'
-  return successHandler(success, complete)(msg)
+  return successHandler(success, complete)({ errMsg: msg })
 }
 
 export function hideTabBar (options: TabBarOptions = {}): Promise<CallbackResult> {
@@ -94,7 +94,7 @@ export function showTabBarRedDot (options: TabBarRedDot): Promise<CallbackResult
     msg = error
     return errorHandler(fail, complete)({ errMsg: msg })
   }
-  msg = 'hideTabBarRedDot:ok'
+  msg = 'showTabBarRedDot:ok'
   return successHandler(success, complete)({ errMsg: msg })
 }
 

From 4574f9eb5f9ef37d81b4e351d678fb3eb38ac129 Mon Sep 17 00:00:00 2001
From: zhiqingchen <zombieczq@gmail.com>
Date: Thu, 3 Dec 2020 22:44:32 +0800
Subject: [PATCH 04/21] =?UTF-8?q?fix(babel-preset-taro):=20babel=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E5=A2=9E=E5=8A=A0=E4=B8=A4=E4=B8=AA=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E8=A3=85=E9=A5=B0=E5=99=A8=E6=8F=92=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/babel-preset-taro/rn/index.js | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/packages/babel-preset-taro/rn/index.js b/packages/babel-preset-taro/rn/index.js
index 31734c4e48a3..cee4995c41f4 100644
--- a/packages/babel-preset-taro/rn/index.js
+++ b/packages/babel-preset-taro/rn/index.js
@@ -116,6 +116,11 @@ function getAlias () {
 const nativeApis = require('./nativeApis')
 
 module.exports = (_, options = {}) => {
+  const {
+    loose = false,
+    decoratorsBeforeExport,
+    decoratorsLegacy
+  } = options
   if (options.framework && options.framework !== 'react') {
     throw new Error(`Value "${options.framework}" of option "framework" is not supported for React-Native`)
   }
@@ -154,6 +159,14 @@ module.exports = (_, options = {}) => {
     }]
   )
 
+  // 添加两个默认 plugin, 与小程序/h5保持一致. todo: 3.1后采用拓展的方式
+  plugins.push(
+    [require('@babel/plugin-proposal-decorators'), {
+      decoratorsBeforeExport,
+      legacy: decoratorsLegacy !== false
+    }],
+    [require('@babel/plugin-proposal-class-properties'), { loose }]
+  )
   return {
     presets,
     plugins

From f8434e1eaae4571e306a376f8e67601ee01ec90d Mon Sep 17 00:00:00 2001
From: zhiqingchen <zombieczq@gmail.com>
Date: Thu, 3 Dec 2020 23:12:31 +0800
Subject: [PATCH 05/21] chore(taro-rn-runner): change react native to taro
 react native

---
 .../src/config/terminal-reporter.ts               | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/packages/taro-rn-runner/src/config/terminal-reporter.ts b/packages/taro-rn-runner/src/config/terminal-reporter.ts
index 834e30f36bea..230f55d83991 100644
--- a/packages/taro-rn-runner/src/config/terminal-reporter.ts
+++ b/packages/taro-rn-runner/src/config/terminal-reporter.ts
@@ -22,14 +22,13 @@ export class TerminalReporter {
     switch (args.type) {
       case 'initialize_started':
         this._reporter.terminal.log(`
-  ######                                         #     #
-  #     #  ######    ##     ####   #####         ##    #    ##    #####  #  #    #  ######
-  #     #  #        #  #   #    #    #           # #   #   #  #     #    #  #    #  #
-  ######   #####   #    #  #         #    #####  #  #  #  #    #    #    #  #    #  #####
-  #   #    #       ######  #         #           #   # #  ######    #    #  #    #  #
-  #    #   #       #    #  #    #    #           #    ##  #    #    #    #   #  #   #
-  #     #  ######  #    #   ####     #           #     #  #    #    #    #    ##    ######
-        `)
+  #####   ##   #####   ####     #####  ######   ##    ####  #####    #    #   ##   ##### # #    # ######
+    #    #  #  #    # #    #    #    # #       #  #  #    #   #      ##   #  #  #    #   # #    # #
+    #   #    # #    # #    #    #    # #####  #    # #        #      # #  # #    #   #   # #    # #####
+    #   ###### #####  #    #    #####  #      ###### #        #      #  # # ######   #   # #    # #
+    #   #    # #   #  #    #    #   #  #      #    # #    #   #      #   ## #    #   #   #  #  #  #
+    #   #    # #    #  ####     #    # ###### #    #  ####    #      #    # #    #   #   #   ##   ######
+`)
         break
       case 'bundle_build_started':
         args.bundleDetails.entryFile = './index'

From 6acc2323f7af95ba20572f1c9d3b7fc0fa8a0c40 Mon Sep 17 00:00:00 2001
From: zhiqingchen <zombieczq@gmail.com>
Date: Fri, 4 Dec 2020 10:48:12 +0800
Subject: [PATCH 06/21] chore(taro-router-rn): move getOpenerEventChannel

---
 .../src/getOpenerEventChannel.ts              | 59 ++++++++++++++++++
 packages/taro-router-rn/src/rootNavigation.ts | 60 +------------------
 2 files changed, 60 insertions(+), 59 deletions(-)
 create mode 100644 packages/taro-router-rn/src/getOpenerEventChannel.ts

diff --git a/packages/taro-router-rn/src/getOpenerEventChannel.ts b/packages/taro-router-rn/src/getOpenerEventChannel.ts
new file mode 100644
index 000000000000..2d721c5f9971
--- /dev/null
+++ b/packages/taro-router-rn/src/getOpenerEventChannel.ts
@@ -0,0 +1,59 @@
+import * as React from 'react'
+import { DeviceEventEmitter } from 'react-native'
+let emitterList: any[] = []
+
+export function getOpenerEventChannel () {
+  return {
+    emit (eventName, ...args) {
+      DeviceEventEmitter.emit(eventName, ...args)
+    },
+    on (eventName, callback) {
+      emitterList.push({
+        eventName,
+        cbName: callback.name,
+        once: false,
+        emitter: DeviceEventEmitter.addListener(eventName, res => callback(res))
+      })
+    },
+    once (eventName, callback) {
+      emitterList.push({
+        eventName,
+        cbName: callback.name,
+        once: true,
+        emitter: DeviceEventEmitter.addListener(eventName, res => {
+          callback(res)
+          emitterList.forEach(item => {
+            if (item.eventName === eventName && item.once && item.emitter) {
+              item.emitter.remove()
+              item.emitter = null
+            }
+          })
+        })
+      })
+    },
+    off (eventName, callback) {
+      if (callback && typeof callback === 'function') {
+        for (let i = 0; i < emitterList.length; i++) {
+          const item = emitterList[i]
+          if (item.emitter && eventName === item.eventName && callback.name && callback.name === item.cbName) {
+            item.emitter.remove()
+            item.emitter = null
+            break
+          }
+        }
+      } else {
+        emitterList.forEach((item) => {
+          if (eventName === item.eventName && item.emitter) {
+            item.emitter.remove()
+            item.emitter = null
+          }
+        })
+      }
+      emitterList = emitterList.filter(item => item.emitter)
+    }
+  }
+}
+// 挂载至原型，从而this.getOpenerEventChannel()方式使用,对标微信小程序相关方法
+Object.assign(React.Component.prototype, {
+  getOpenerEventChannel
+})
diff --git a/packages/taro-router-rn/src/rootNavigation.ts b/packages/taro-router-rn/src/rootNavigation.ts
index 11b7095b1fcd..b30c86db2149 100644
--- a/packages/taro-router-rn/src/rootNavigation.ts
+++ b/packages/taro-router-rn/src/rootNavigation.ts
@@ -1,11 +1,11 @@
 // RootNavigation.js
 import * as React from 'react'
-import { DeviceEventEmitter } from 'react-native'
 import { camelCase } from 'lodash'
 import { parseUrl } from 'query-string'
 import { StackActions, NavigationContainerRef } from '@react-navigation/native'
 import { getTabBarPages } from './utils/index'
 import { CallbackResult, BaseOption } from './utils/types'
+import { getOpenerEventChannel } from './getOpenerEventChannel'
 
 type NavigateMethod = 'navigateTo' | 'redirectTo' | 'navigateBack' | 'switchTab' | 'reLaunch'
 
@@ -21,64 +21,6 @@ interface NavigateRef extends NavigationContainerRef {
   setOptions: (obj: any) => void
 }
 
-let emitterList: any[] = []
-
-function getOpenerEventChannel () {
-  return {
-    emit (eventName, ...args) {
-      DeviceEventEmitter.emit(eventName, ...args)
-    },
-    on (eventName, callback) {
-      emitterList.push({
-        eventName,
-        cbName: callback.name,
-        once: false,
-        emitter: DeviceEventEmitter.addListener(eventName, res => callback(res))
-      })
-    },
-    once (eventName, callback) {
-      emitterList.push({
-        eventName,
-        cbName: callback.name,
-        once: true,
-        emitter: DeviceEventEmitter.addListener(eventName, res => {
-          callback(res)
-          emitterList.forEach(item => {
-            if (item.eventName === eventName && item.once && item.emitter) {
-              item.emitter.remove()
-              item.emitter = null
-            }
-          })
-        })
-      })
-    },
-    off (eventName, callback) {
-      if (callback && typeof callback === 'function') {
-        for (let i = 0; i < emitterList.length; i++) {
-          const item = emitterList[i]
-          if (item.emitter && eventName === item.eventName && callback.name && callback.name === item.cbName) {
-            item.emitter.remove()
-            item.emitter = null
-            break
-          }
-        }
-      } else {
-        emitterList.forEach((item) => {
-          if (eventName === item.eventName && item.emitter) {
-            item.emitter.remove()
-            item.emitter = null
-          }
-        })
-      }
-      emitterList = emitterList.filter(item => item.emitter)
-    }
-  }
-}
-// 挂载至原型，从而this.getOpenerEventChannel()方式使用,对标微信小程序相关方法
-Object.assign(React.Component.prototype, {
-  getOpenerEventChannel
-})
-
 export const isReadyRef = React.createRef()
 
 export const navigationRef = React.createRef<NavigateRef>()

From e35a1c1d74b53636d8a75381c75298341ccb004a Mon Sep 17 00:00:00 2001
From: zhiqingchen <zombieczq@gmail.com>
Date: Fri, 4 Dec 2020 10:52:40 +0800
Subject: [PATCH 07/21] chore(taro-router-rn): disable getOpenerEventChannel
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

该方法有些争议，暂时屏蔽
https://github.com/NervJS/taro/issues/7239
---
 packages/taro-router-rn/src/rootNavigation.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/taro-router-rn/src/rootNavigation.ts b/packages/taro-router-rn/src/rootNavigation.ts
index b30c86db2149..633c45cb2af9 100644
--- a/packages/taro-router-rn/src/rootNavigation.ts
+++ b/packages/taro-router-rn/src/rootNavigation.ts
@@ -5,7 +5,7 @@ import { parseUrl } from 'query-string'
 import { StackActions, NavigationContainerRef } from '@react-navigation/native'
 import { getTabBarPages } from './utils/index'
 import { CallbackResult, BaseOption } from './utils/types'
-import { getOpenerEventChannel } from './getOpenerEventChannel'
+// import { getOpenerEventChannel } from './getOpenerEventChannel'
 
 type NavigateMethod = 'navigateTo' | 'redirectTo' | 'navigateBack' | 'switchTab' | 'reLaunch'
 
@@ -100,9 +100,9 @@ export function navigate (option: NavigateOption | NavigateBackOption, method: N
       const msg: any = {
         errMsg: `${method}:ok`
       }
-      if (method === 'navigateTo') {
-        msg.eventChannel = getOpenerEventChannel()
-      }
+      // if (method === 'navigateTo') {
+      //   msg.eventChannel = getOpenerEventChannel()
+      // }
       success && success(msg)
       complete && complete(msg)
       resolve(msg)

From a0d446fd42209040f02ae184ee4fdc1145205cdb Mon Sep 17 00:00:00 2001
From: zhiqingchen <zombieczq@gmail.com>
Date: Fri, 4 Dec 2020 11:30:11 +0800
Subject: [PATCH 08/21] chore(taro-router-rn): update readme

---
 packages/taro-router-rn/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/taro-router-rn/README.md b/packages/taro-router-rn/README.md
index 4287ca861797..a9b8e54e7070 100644
--- a/packages/taro-router-rn/README.md
+++ b/packages/taro-router-rn/README.md
@@ -1 +1 @@
-#
\ No newline at end of file
+# taro router rn

From 3ff68b6e90319d63836e356279a4874d5870caa3 Mon Sep 17 00:00:00 2001
From: shinken008 <shinken008@gmail.com>
Date: Fri, 4 Dec 2020 16:08:21 +0800
Subject: [PATCH 09/21] =?UTF-8?q?feat(babel-preset-taro):=20=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=AF=B9=E8=84=9A=E6=9C=AC=E7=9C=81=E7=95=A5=E6=8B=93?=
 =?UTF-8?q?=E5=B1=95=E8=B7=A8=E7=AB=AF=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

chore(babel-preset-taro): 更新包 babel-plugin-rn-platform-specific-extensions
---
 packages/babel-preset-taro/package.json | 2 +-
 packages/babel-preset-taro/rn/index.js  | 8 +++++++-
 packages/babel-preset-taro/yarn.lock    | 8 ++++----
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/packages/babel-preset-taro/package.json b/packages/babel-preset-taro/package.json
index c9f141c58504..ebcffdc7c9a3 100644
--- a/packages/babel-preset-taro/package.json
+++ b/packages/babel-preset-taro/package.json
@@ -39,7 +39,7 @@
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-global-define": "^1.0.3",
     "babel-plugin-module-resolver": "^3.2.0",
-    "babel-plugin-rn-platform-specific-extensions": "^0.3.0",
+    "babel-plugin-rn-platform-specific-extensions": "^1.0.0",
     "babel-plugin-transform-imports": "^2.0.0",
     "babel-plugin-transform-react-jsx-to-rn-stylesheet": "3.2.0-canary.1",
     "babel-plugin-transform-taroapi": "3.2.0-canary.1",
diff --git a/packages/babel-preset-taro/rn/index.js b/packages/babel-preset-taro/rn/index.js
index cee4995c41f4..0f5f7a38a1fe 100644
--- a/packages/babel-preset-taro/rn/index.js
+++ b/packages/babel-preset-taro/rn/index.js
@@ -3,6 +3,7 @@ const reactNativeBabelPreset = require('metro-react-native-babel-preset')
 const helper = require('@tarojs/helper')
 const { merge } = require('lodash')
 const fs = require('fs')
+const path = require('path')
 /**
  *
  * 获取项目级配置
@@ -132,11 +133,16 @@ module.exports = (_, options = {}) => {
   const presets = []
   const plugins = []
   const extensions = [].concat(helper.JS_EXT, helper.TS_EXT, helper.CSS_EXT)
+  const omitExtensions = options.ts ? ['.tsx', '.ts', '.jsx', '.js'] : ['.jsx', '.js', '.tsx', '.ts']
+  const entryFilePath = 'node_modules/metro/src/node-haste/DependencyGraph/assets/empty-module.js'
+  const projectRoot = process.cwd()
   presets.push(reactNativeBabelPreset(_, options))
   plugins.push(
     require('babel-plugin-transform-react-jsx-to-rn-stylesheet'),
     [require('babel-plugin-rn-platform-specific-extensions'), {
-      extensions: extensions
+      extensions: extensions,
+      omitExtensions: omitExtensions,
+      include: [{ [path.resolve(projectRoot, entryFilePath)]: path.resolve(projectRoot, 'index.js') }]
     }],
     [require('babel-plugin-transform-imports'), {
       '^@tarojs/components(-rn)?$': {
diff --git a/packages/babel-preset-taro/yarn.lock b/packages/babel-preset-taro/yarn.lock
index 76b84f3fb016..d030373b5a2c 100644
--- a/packages/babel-preset-taro/yarn.lock
+++ b/packages/babel-preset-taro/yarn.lock
@@ -1059,10 +1059,10 @@ babel-plugin-module-resolver@^3.2.0:
     reselect "^3.0.1"
     resolve "^1.4.0"
 
-babel-plugin-rn-platform-specific-extensions@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-rn-platform-specific-extensions/-/babel-plugin-rn-platform-specific-extensions-0.3.0.tgz#83ff1bd88ff096b6bbd64f2224d92a20ecdd5d4f"
-  integrity sha512-JuZwgjRGWKcewc8/pRSpHMUzbpNkuJvxeC8SaOd5bIflmZu4wngKM2VqnMLBv09/ycuUJh5/F/m/QgSrjgIX5w==
+babel-plugin-rn-platform-specific-extensions@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-rn-platform-specific-extensions/-/babel-plugin-rn-platform-specific-extensions-1.0.0.tgz#1beb0dd1f2c76b2725b93839e51cf7dd0e56ea9c"
+  integrity sha512-uGyJqSIqylHrUjHLA/g31JcWrgVf8nhbi8ZR7XBVLoOiNPO5wMce4pa/grSS/LFBcsiENJbFsNaSt1CZCSzUdg==
   dependencies:
     "@babel/template" "^7.2.2"
     core-js "2"

From d8ce74c44736751a591404eaaea981a5d31806d4 Mon Sep 17 00:00:00 2001
From: yechunxi <yechunxi00@163.com>
Date: Sat, 5 Dec 2020 10:02:48 +0800
Subject: [PATCH 10/21] =?UTF-8?q?fix(rn-transformer):=20=E5=85=A5=E5=8F=A3?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E4=B8=8D=E5=B8=A6=E5=90=8E?=
 =?UTF-8?q?=E7=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/taro-rn-transformer/src/app.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/taro-rn-transformer/src/app.ts b/packages/taro-rn-transformer/src/app.ts
index 4a02c8294116..4439eac92bbf 100644
--- a/packages/taro-rn-transformer/src/app.ts
+++ b/packages/taro-rn-transformer/src/app.ts
@@ -148,7 +148,7 @@ export default function generateEntry ({
   import { createPageConfig } from '@tarojs/runtime-rn'
   import Component from '${appComponentPath}'
   ${importPageList}
-  ${process.env.NODE_ENV === 'development' ? `import '${appComponentPath}.config.ts';${importPageConfig};` : ''}
+  ${process.env.NODE_ENV === 'development' ? `import '${appComponentPath}.config';${importPageConfig};` : ''}
 
   var config = ${JSON.stringify({ appConfig: appConfig })}
   global.__taroAppConfig = config

From d868b31bb2c3b9f3a1983351e03735c247f5198e Mon Sep 17 00:00:00 2001
From: haojie <394692633@qq.com>
Date: Sat, 5 Dec 2020 12:17:50 +0800
Subject: [PATCH 11/21] =?UTF-8?q?feat(taro-rn):=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=8C=87=E4=BB=A4-p=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/taro-cli/src/cli.ts                    | 3 ++-
 packages/taro-cli/src/presets/commands/build.ts | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/taro-cli/src/cli.ts b/packages/taro-cli/src/cli.ts
index b9ace3d4ab23..27b5571e6b0e 100644
--- a/packages/taro-cli/src/cli.ts
+++ b/packages/taro-cli/src/cli.ts
@@ -23,7 +23,8 @@ export default class CLI {
     const args = minimist(process.argv.slice(2), {
       alias: {
         version: ['v'],
-        help: ['h']
+        help: ['h'],
+        port: ['p']
       },
       boolean: ['version', 'help']
     })
diff --git a/packages/taro-cli/src/presets/commands/build.ts b/packages/taro-cli/src/presets/commands/build.ts
index 811817148d5b..4475a9b8d7ed 100644
--- a/packages/taro-cli/src/presets/commands/build.ts
+++ b/packages/taro-cli/src/presets/commands/build.ts
@@ -15,7 +15,7 @@ export default (ctx: IPluginContext) => {
       '--ui': 'Build Taro UI library',
       '--ui-index [uiIndexPath]': 'Index file for build Taro UI library',
       '--plugin [typeName]': 'Build Taro plugin project, weapp',
-      '--port [port]': 'Specified port',
+      '-p, --port [port]': 'Specified port',
       '--release': 'Release quickapp'
     },
     async fn (opts) {

From 93442543f55660952c36da3ed8ab8d2b47fe7543 Mon Sep 17 00:00:00 2001
From: haojie <394692633@qq.com>
Date: Sat, 5 Dec 2020 12:30:12 +0800
Subject: [PATCH 12/21] =?UTF-8?q?feat(taro-rn):=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=8C=87=E4=BB=A4--reset-cache=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/taro-cli/src/cli.ts                    | 6 ++++--
 packages/taro-cli/src/commands/build.ts         | 9 ++++++---
 packages/taro-cli/src/presets/commands/build.ts | 4 +++-
 packages/taro-cli/src/presets/platforms/rn.ts   | 3 ++-
 packages/taro-rn-runner/src/index.ts            | 1 +
 5 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/packages/taro-cli/src/cli.ts b/packages/taro-cli/src/cli.ts
index 27b5571e6b0e..b81f8ac8adc2 100644
--- a/packages/taro-cli/src/cli.ts
+++ b/packages/taro-cli/src/cli.ts
@@ -24,7 +24,8 @@ export default class CLI {
       alias: {
         version: ['v'],
         help: ['h'],
-        port: ['p']
+        port: ['p'],
+        resetCache: ['reset-cache']
       },
       boolean: ['version', 'help']
     })
@@ -50,7 +51,8 @@ export default class CLI {
             page: args.page,
             component: args.component,
             plugin: args.plugin,
-            isHelp: args.h
+            isHelp: args.h,
+            resetCache: !!args.resetCache
           })
           break
         }
diff --git a/packages/taro-cli/src/commands/build.ts b/packages/taro-cli/src/commands/build.ts
index 274db5aa0ca0..6cf6ab966ea1 100644
--- a/packages/taro-cli/src/commands/build.ts
+++ b/packages/taro-cli/src/commands/build.ts
@@ -12,7 +12,8 @@ export default function build (kernel: Kernel, {
   component,
   envHasBeenSet = false,
   plugin,
-  isHelp
+  isHelp,
+  resetCache
 }: {
   platform: string,
   isWatch: boolean,
@@ -25,7 +26,8 @@ export default function build (kernel: Kernel, {
   component?: string
   envHasBeenSet?: boolean
   plugin?: string | boolean
-  isHelp?: boolean
+  isHelp?: boolean,
+  resetCache?: boolean
 }) {
   if (plugin) {
     if (typeof plugin === 'boolean') {
@@ -62,7 +64,8 @@ export default function build (kernel: Kernel, {
       component,
       envHasBeenSet,
       plugin,
-      isHelp
+      isHelp,
+      resetCache
     }
   })
 }
diff --git a/packages/taro-cli/src/presets/commands/build.ts b/packages/taro-cli/src/presets/commands/build.ts
index 4475a9b8d7ed..70dcdd324e10 100644
--- a/packages/taro-cli/src/presets/commands/build.ts
+++ b/packages/taro-cli/src/presets/commands/build.ts
@@ -16,7 +16,9 @@ export default (ctx: IPluginContext) => {
       '--ui-index [uiIndexPath]': 'Index file for build Taro UI library',
       '--plugin [typeName]': 'Build Taro plugin project, weapp',
       '-p, --port [port]': 'Specified port',
-      '--release': 'Release quickapp'
+      '--release': 'Release quickapp',
+      '--platform': 'Specific React-Native build target: android / ios, android is default value',
+      '--reset-cache': 'Clear transform cache just for React-Native'
     },
     async fn (opts) {
       const { platform, config } = opts
diff --git a/packages/taro-cli/src/presets/platforms/rn.ts b/packages/taro-cli/src/presets/platforms/rn.ts
index 0881f1b7a16f..e50b70882e62 100644
--- a/packages/taro-cli/src/presets/platforms/rn.ts
+++ b/packages/taro-cli/src/presets/platforms/rn.ts
@@ -57,7 +57,7 @@ export default (ctx: IPluginContext) => {
     useConfigName: 'rn',
     async fn ({ config }) {
       const { appPath, nodeModulesPath } = ctx.paths
-      const { deviceType, port } = ctx.runOpts
+      const { deviceType, port, resetCache } = ctx.runOpts
       const { npm } = ctx.helper
       printDevelopmentTip('rn')
 
@@ -67,6 +67,7 @@ export default (ctx: IPluginContext) => {
         nodeModulesPath,
         deviceType,
         port,
+        resetCache,
         buildAdapter: config.platform,
         globalObject: 'global' // TODO: 是否可以去掉？
       }
diff --git a/packages/taro-rn-runner/src/index.ts b/packages/taro-rn-runner/src/index.ts
index 9d264264bb0c..e3ff5d34f119 100644
--- a/packages/taro-rn-runner/src/index.ts
+++ b/packages/taro-rn-runner/src/index.ts
@@ -43,6 +43,7 @@ export default async function build (appPath: string, config: any): Promise<any>
     minify: process.env.NODE_ENV === 'production' || !config.isWatch,
     dev: config.isWatch
   }
+  metroConfig.resetCache = config.resetCache
   metroConfig.reporter = new TerminalReporter(config.entry, metroConfig.cacheStores[0])
   if (config.isWatch) {
     if (!metroConfig.server || (metroConfig.server.useGlobalHotkey === undefined)) {

From df171bc1df512bd4c642ffc38054d22b6671a8e9 Mon Sep 17 00:00:00 2001
From: yechunxi <yechunxi00@163.com>
Date: Sat, 5 Dec 2020 15:57:35 +0800
Subject: [PATCH 13/21] fix(router-rn): eslint error

---
 packages/taro-router-rn/src/rootNavigation.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/taro-router-rn/src/rootNavigation.ts b/packages/taro-router-rn/src/rootNavigation.ts
index 633c45cb2af9..012310c1436f 100644
--- a/packages/taro-router-rn/src/rootNavigation.ts
+++ b/packages/taro-router-rn/src/rootNavigation.ts
@@ -95,7 +95,7 @@ export function navigate (option: NavigateOption | NavigateBackOption, method: N
     if (errMsg) {
       fail && fail({ errMsg })
       complete && complete({ errMsg })
-      reject({ errMsg })
+      reject(new Error(errMsg))
     } else {
       const msg: any = {
         errMsg: `${method}:ok`

From 3d45909b10f5ebd13aef79e3ae8fafba14f9cad9 Mon Sep 17 00:00:00 2001
From: yechunxi <yechunxi00@163.com>
Date: Sat, 5 Dec 2020 15:58:24 +0800
Subject: [PATCH 14/21] =?UTF-8?q?fix(rn-transformer):=20=E5=85=A5=E5=8F=A3?=
 =?UTF-8?q?jsx=20=E8=A7=A3=E6=9E=90error?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/taro-rn-transformer/src/utils.ts | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/taro-rn-transformer/src/utils.ts b/packages/taro-rn-transformer/src/utils.ts
index 1941bf39f26e..831787b67ebb 100644
--- a/packages/taro-rn-transformer/src/utils.ts
+++ b/packages/taro-rn-transformer/src/utils.ts
@@ -18,7 +18,15 @@ export function getConfigContent (path: string) {
 }
 
 export function getStyleCode (code: string, basePath: string) {
-  const ast = parser.parse(code, { sourceType: 'module' })
+  const ast = parser.parse(code, {
+    sourceType: 'module',
+    plugins: [
+      'jsx',
+      'typescript',
+      'classProperties',
+      'decorators-legacy'
+    ]
+  })
 
   const styleTypes = RN_CSS_EXT
   const styleSource: Record<string, string>[] = []

From 2d566fcf0ca4d2ff2663b515e5cf036249698587 Mon Sep 17 00:00:00 2001
From: zhiqingchen <zombieczq@gmail.com>
Date: Sat, 5 Dec 2020 18:39:50 +0800
Subject: [PATCH 15/21] fix(babel-preset-taro): rm useless
 proposal-class-properties from rn preset

---
 packages/babel-preset-taro/rn/index.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/babel-preset-taro/rn/index.js b/packages/babel-preset-taro/rn/index.js
index 0f5f7a38a1fe..29d62c5d99a4 100644
--- a/packages/babel-preset-taro/rn/index.js
+++ b/packages/babel-preset-taro/rn/index.js
@@ -118,7 +118,6 @@ const nativeApis = require('./nativeApis')
 
 module.exports = (_, options = {}) => {
   const {
-    loose = false,
     decoratorsBeforeExport,
     decoratorsLegacy
   } = options
@@ -165,13 +164,12 @@ module.exports = (_, options = {}) => {
     }]
   )
 
-  // 添加两个默认 plugin, 与小程序/h5保持一致. todo: 3.1后采用拓展的方式
+  // 添加一个默认 plugin, 与小程序/h5保持一致. todo: 3.1后采用拓展的方式
   plugins.push(
     [require('@babel/plugin-proposal-decorators'), {
       decoratorsBeforeExport,
       legacy: decoratorsLegacy !== false
-    }],
-    [require('@babel/plugin-proposal-class-properties'), { loose }]
+    }]
   )
   return {
     presets,

From 74c794d54f290214bb67618b1e3459930dac87ea Mon Sep 17 00:00:00 2001
From: haojie <394692633@qq.com>
Date: Sat, 5 Dec 2020 19:11:31 +0800
Subject: [PATCH 16/21] =?UTF-8?q?fix(taro-rn-runner):=20=E5=A4=84=E7=90=86?=
 =?UTF-8?q?metro.config=E4=B8=ADresetCache=E4=B8=8D=E7=94=9F=E6=95=88?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/taro-rn-runner/src/index.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/taro-rn-runner/src/index.ts b/packages/taro-rn-runner/src/index.ts
index e3ff5d34f119..6d28cb35fb7a 100644
--- a/packages/taro-rn-runner/src/index.ts
+++ b/packages/taro-rn-runner/src/index.ts
@@ -43,7 +43,9 @@ export default async function build (appPath: string, config: any): Promise<any>
     minify: process.env.NODE_ENV === 'production' || !config.isWatch,
     dev: config.isWatch
   }
-  metroConfig.resetCache = config.resetCache
+  if (config.resetCache) {
+    metroConfig.resetCache = config.resetCache
+  }
   metroConfig.reporter = new TerminalReporter(config.entry, metroConfig.cacheStores[0])
   if (config.isWatch) {
     if (!metroConfig.server || (metroConfig.server.useGlobalHotkey === undefined)) {

From fa83580ce0f966d26bb42ea4191689b1f7fe366c Mon Sep 17 00:00:00 2001
From: yechunxi <yechunxi00@163.com>
Date: Sun, 6 Dec 2020 20:59:41 +0800
Subject: [PATCH 17/21] =?UTF-8?q?fix(rn-transformer):=20fix=E5=85=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=96=87=E4=BB=B6=E5=85=AC=E5=85=B1=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/taro-rn-transformer/src/app.ts   | 77 +++++++----------------
 packages/taro-rn-transformer/src/index.ts | 18 ++++--
 packages/taro-rn-transformer/src/utils.ts | 45 ++++++++++++-
 3 files changed, 79 insertions(+), 61 deletions(-)

diff --git a/packages/taro-rn-transformer/src/app.ts b/packages/taro-rn-transformer/src/app.ts
index 4439eac92bbf..8546bf77ca5c 100644
--- a/packages/taro-rn-transformer/src/app.ts
+++ b/packages/taro-rn-transformer/src/app.ts
@@ -1,25 +1,16 @@
 import * as path from 'path'
 import * as fs from 'fs'
-import { isEmptyObject } from '@tarojs/helper'
 import { camelCase } from 'lodash'
-import { getConfigContent, getConfigFilePath, getStyleCode } from './utils'
+import { isEmptyObject } from '@tarojs/helper'
+import { getConfigContent, getConfigFilePath, getCommonStyle } from './utils'
 import { TransformEntry, AppConfig, globalAny } from './types/index'
 
-function getPagesResource (config: AppConfig, basePath: string, pathPrefix: string) {
+function getPagesResource (appPath: string, basePath: string, pathPrefix: string) {
   const importPages: string[] = []
   const screenPages: string[] = []
   const importConfigs: string[] = []
-  const pages = config.pages || []
-  if (!config.pages) return { screenPages, importPages, importConfigs }
-  // 分包路由，也需要处理
-  const subPackages = config.subPackages || config.subpackages || []
-  subPackages.forEach(item => {
-    const subRoot = item.root.endsWith('/') ? item.root : `${item.root}/`
-    const subPages = item.pages
-    subPages.forEach(itm => {
-      pages.push(subRoot + itm)
-    })
-  })
+  const pages = getAppPages(appPath)
+
   pages.forEach(item => {
     const pagePath = item.startsWith('/') ? item : `/${item}`
     const screenName = camelCase(pagePath)
@@ -69,45 +60,20 @@ function getAppConfig (appPath: string) {
   return appConfig
 }
 
-function getAppContent (fileName: string) {
-  let code = ''
-  if (!fs.existsSync(fileName)) return code
-  try {
-    code = fs.readFileSync(fileName, 'utf-8').toString()
-  } catch (error) {
-    code = ''
-  }
-  return code
-}
-
-function getCommonStyle (appPath: string, basePath: string) {
-  let styles: Record<string, string>[] = []
-  // 读取入口文件的内容
-  const jsExt: string[] = ['tsx', 'ts', 'jsx', 'js']
-  let codeStr = ''
-  // 先读带rn后缀的
-  for (let i = 0; i < jsExt.length; i++) {
-    const rnfilePath = `${appPath}.rn.${jsExt[i]}`
-    const rnFileContent: string = getAppContent(rnfilePath)
-    if (!rnFileContent) {
-      codeStr = rnFileContent
-      break
-    }
-  }
-  // 不带rn后缀的
-  if (!codeStr) {
-    for (let i = 0; i < jsExt.length; i++) {
-      const filePath = `${appPath}.${jsExt[i]}`
-      const fileContent: string = getAppContent(filePath)
-      if (fileContent) {
-        codeStr = fileContent
-        break
-      }
-    }
-  }
-  if (!codeStr) return styles
-  styles = getStyleCode(codeStr, basePath)
-  return styles
+export function getAppPages (appPath: string) {
+  const config = getAppConfig(appPath)
+  const pages = config?.pages || []
+  // 分包路由，也需要处理
+  const subPackages = config.subPackages || config.subpackages || []
+  subPackages.forEach(item => {
+    const subRoot = item.root.endsWith('/') ? item.root : `${item.root}/`
+    const subPages = item.pages
+    subPages.forEach(itm => {
+      pages.push(subRoot + itm)
+    })
+  })
+  pages.map(item => { return item.startsWith('/') ? item : `/${item}` })
+  return pages
 }
 
 export default function generateEntry ({
@@ -129,7 +95,7 @@ export default function generateEntry ({
   appConfig.deviceRatio = deviceRatio
 
   const pathPrefix = filePath.indexOf(sourceDir) > -1 ? '' : `/${sourceDir}`
-  const pages = getPagesResource(appConfig, basePath, pathPrefix)
+  const pages = getPagesResource(appPath, basePath, pathPrefix)
   const importPageList = pages.importPages.join(';')
   const importPageConfig = pages.importConfigs.join(';')
   const routeList = pages.screenPages
@@ -139,8 +105,7 @@ export default function generateEntry ({
   globalAny.__taroAppPages = pages.screenPages.map(item => sourceDir + item)
 
   // app入口公共样式文件读取
-  const styles: Record<string, string>[] = getCommonStyle(appPath, basePath)
-  globalAny.__taroCommonStyle = styles
+  globalAny.__taroCommonStyle = getCommonStyle(appPath, basePath)
 
   const code = `import 'react-native/Libraries/polyfills/error-guard'
   import { AppRegistry } from 'react-native'
diff --git a/packages/taro-rn-transformer/src/index.ts b/packages/taro-rn-transformer/src/index.ts
index 47efe2ba8d5b..3598869c1084 100644
--- a/packages/taro-rn-transformer/src/index.ts
+++ b/packages/taro-rn-transformer/src/index.ts
@@ -1,19 +1,29 @@
-import appLoader from './app'
+import * as path from 'path'
+import appLoader, { getAppPages } from './app'
 import pageLoader from './page'
-import { TransformType } from './types/index'
-import { isPageFile } from './utils'
+import { TransformType, globalAny } from './types/index'
+import { isPageFile, getCommonStyle } from './utils'
 
 // eslint-disable-next-line import/no-commonjs
 module.exports.transform = function ({ src, filename, options }: TransformType) {
   let code = src
   const sourceDir = options?.sourceRoot || 'src'
+  const entryName = options?.entry || 'app'
+  if (!globalAny.__taroAppPages) {
+    const appPath = path.join(options.projectRoot, sourceDir, entryName)
+    const basePath = path.join(options.projectRoot, sourceDir)
+    const pages = getAppPages(appPath)
+    globalAny.__taroAppPages = pages.map(item => sourceDir + item)
+    globalAny.__taroCommonStyle = getCommonStyle(appPath, basePath)
+  }
+
   if (options.isEntryFile(filename)) {
     code = appLoader({
       filename: filename,
       projectRoot: options.projectRoot,
       sourceDir: sourceDir,
       appName: options.appName || 'taroDemo',
-      entryName: options?.entry || 'app',
+      entryName: entryName,
       designWidth: options?.designWidth || 750,
       deviceRatio: options?.deviceRatio || {
         640: 2.34 / 2,
diff --git a/packages/taro-rn-transformer/src/utils.ts b/packages/taro-rn-transformer/src/utils.ts
index 831787b67ebb..0c974ea77bf5 100644
--- a/packages/taro-rn-transformer/src/utils.ts
+++ b/packages/taro-rn-transformer/src/utils.ts
@@ -1,4 +1,5 @@
 import * as nodePath from 'path'
+import * as fs from 'fs'
 import * as parser from '@babel/parser'
 import traverse from '@babel/traverse'
 import { readConfig, resolveMainFilePath } from '@tarojs/helper'
@@ -59,5 +60,47 @@ export function isPageFile (file: string, sourceDir: string) {
   if ((/node_modules/.test(file)) || file.indexOf(sourceDir) === -1) return false
   const pagesList = globalAny.__taroAppPages || []
   const filePath = file.split('.')[0]
-  return pagesList.includes(filePath) || filePath === `${sourceDir}/app`
+  const filename = nodePath.basename(file).replace(nodePath.extname(file), '')
+  return pagesList.includes(filePath) && !(filename.endsWith('.config'))
+}
+
+export function getFileContent (fileName: string) {
+  let code = ''
+  if (!fs.existsSync(fileName)) return code
+  try {
+    code = fs.readFileSync(fileName, 'utf-8').toString()
+  } catch (error) {
+    code = ''
+  }
+  return code
+}
+
+export function getCommonStyle (appPath: string, basePath: string) {
+  let styles: Record<string, string>[] = []
+  // 读取入口文件的内容
+  const jsExt: string[] = ['tsx', 'ts', 'jsx', 'js']
+  let codeStr = ''
+  // 先读带rn后缀的
+  for (let i = 0; i < jsExt.length; i++) {
+    const rnfilePath = `${appPath}.rn.${jsExt[i]}`
+    const rnFileContent: string = getFileContent(rnfilePath)
+    if (!rnFileContent) {
+      codeStr = rnFileContent
+      break
+    }
+  }
+  // 不带rn后缀的
+  if (!codeStr) {
+    for (let i = 0; i < jsExt.length; i++) {
+      const filePath = `${appPath}.${jsExt[i]}`
+      const fileContent: string = getFileContent(filePath)
+      if (fileContent) {
+        codeStr = fileContent
+        break
+      }
+    }
+  }
+  if (!codeStr) return styles
+  styles = getStyleCode(codeStr, basePath)
+  return styles
 }

From 1bc774c57f4dca4c5500d021b8bec27ab64616d9 Mon Sep 17 00:00:00 2001
From: zhiqingchen <zombieczq@gmail.com>
Date: Mon, 7 Dec 2020 15:51:32 +0800
Subject: [PATCH 18/21] chore: update yarn lock

---
 yarn.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yarn.lock b/yarn.lock
index e1380f66d028..2624d4a517ff 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2830,7 +2830,7 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react@*", "@types/react@^16.9.56":
+"@types/react@*":
   version "16.9.56"
   resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.56.tgz#ea25847b53c5bec064933095fc366b1462e2adf0"
   integrity sha512-gIkl4J44G/qxbuC6r2Xh+D3CGZpJ+NdWTItAPmZbR5mUS+JQ8Zvzpl0ea5qT/ZT3ZNTUcDKUVqV3xBE8wv/DyQ==

From c4a51742ea11d8bda7f38a7c3917d04318983e6c Mon Sep 17 00:00:00 2001
From: zhiqingchen <zombieczq@gmail.com>
Date: Mon, 7 Dec 2020 15:57:05 +0800
Subject: [PATCH 19/21] chore(release): publish 3.2.0-canary.2

---
 lerna.json                                    |  2 +-
 .../package.json                              |  4 ++--
 .../package.json                              |  2 +-
 packages/babel-preset-taro/package.json       | 10 ++++----
 packages/css-to-react-native/package.json     |  2 +-
 packages/eslint-config-taro/package.json      |  2 +-
 packages/eslint-plugin-taro/package.json      |  2 +-
 .../postcss-plugin-constparse/package.json    |  2 +-
 packages/postcss-pxtransform/package.json     |  2 +-
 packages/shared/package.json                  |  2 +-
 .../stylelint-config-taro-rn/package.json     |  2 +-
 packages/stylelint-taro-rn/package.json       |  2 +-
 packages/taro-api/package.json                |  4 ++--
 packages/taro-cli/package.json                | 22 ++++++++---------
 packages/taro-components-rn/package.json      |  4 ++--
 packages/taro-components/package.json         |  4 ++--
 packages/taro-extend/package.json             |  2 +-
 packages/taro-h5/package.json                 |  8 +++----
 packages/taro-helper/package.json             |  4 ++--
 packages/taro-loader/package.json             |  4 ++--
 packages/taro-mini-runner/package.json        | 22 ++++++++---------
 packages/taro-react/package.json              |  4 ++--
 packages/taro-rn-runner/package.json          |  8 +++----
 .../taro-rn-style-transformer/package.json    | 12 +++++-----
 packages/taro-rn-transformer/package.json     |  4 ++--
 packages/taro-rn/package.json                 |  6 ++---
 packages/taro-router-rn/package.json          |  2 +-
 packages/taro-router/package.json             |  4 ++--
 packages/taro-runner-utils/package.json       |  4 ++--
 packages/taro-runtime-rn/package.json         |  6 ++---
 packages/taro-runtime/package.json            |  2 +-
 packages/taro-service/package.json            |  6 ++---
 packages/taro-webpack-runner/package.json     | 24 +++++++++----------
 packages/taro-with-weapp/package.json         |  6 ++---
 packages/taro/package.json                    |  8 +++----
 packages/taroize/package.json                 |  2 +-
 36 files changed, 103 insertions(+), 103 deletions(-)

diff --git a/lerna.json b/lerna.json
index 533a3c295246..898b2c830930 100644
--- a/lerna.json
+++ b/lerna.json
@@ -46,6 +46,6 @@
       "license": "MIT"
     }
   },
-  "version": "3.2.0-canary.1",
+  "version": "3.2.0-canary.2",
   "npmClient": "yarn"
 }
diff --git a/packages/babel-plugin-transform-react-jsx-to-rn-stylesheet/package.json b/packages/babel-plugin-transform-react-jsx-to-rn-stylesheet/package.json
index 7244ab9efe08..3d1e9a0cf7cc 100644
--- a/packages/babel-plugin-transform-react-jsx-to-rn-stylesheet/package.json
+++ b/packages/babel-plugin-transform-react-jsx-to-rn-stylesheet/package.json
@@ -1,6 +1,6 @@
 {
   "name": "babel-plugin-transform-react-jsx-to-rn-stylesheet",
-  "version": "3.2.0-canary.1",
+  "version": "3.2.0-canary.2",
   "description": "Transform stylesheet selector to style in JSX Elements.",
   "license": "MIT",
   "main": "dist/index.js",
@@ -24,6 +24,6 @@
   },
   "dependencies": {
     "camelize": "^1.0.0",
-    "taro-css-to-react-native": "3.2.0-canary.1"
+    "taro-css-to-react-native": "3.2.0-canary.2"
   }
 }
diff --git a/packages/babel-plugin-transform-taroapi/package.json b/packages/babel-plugin-transform-taroapi/package.json
index 70a487771a38..90361af85e60 100644
--- a/packages/babel-plugin-transform-taroapi/package.json
+++ b/packages/babel-plugin-transform-taroapi/package.json
@@ -1,6 +1,6 @@
 {
   "name": "babel-plugin-transform-taroapi",
-  "version": "3.2.0-canary.1",
+  "version": "3.2.0-canary.2",
   "main": "dist/index.js",
   "scripts": {
     "build": "tsc"
diff --git a/packages/babel-preset-taro/package.json b/packages/babel-preset-taro/package.json
index ebcffdc7c9a3..ffaa8ae308cb 100644
--- a/packages/babel-preset-taro/package.json
+++ b/packages/babel-preset-taro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "babel-preset-taro",
-  "version": "3.2.0-canary.1",
+  "version": "3.2.0-canary.2",
   "description": "> TODO: description",
   "author": "yuche <i@yuche.me>",
   "homepage": "https://github.com/nervjs/taro/tree/master/packages/babel-preset-taro#readme",
@@ -34,15 +34,15 @@
     "@babel/preset-react": "7.10.4",
     "@babel/preset-typescript": "7.10.4",
     "@babel/runtime": "^7.11.2",
-    "@tarojs/helper": "3.2.0-canary.1",
-    "@tarojs/taro-h5": "3.2.0-canary.1",
+    "@tarojs/helper": "3.2.0-canary.2",
+    "@tarojs/taro-h5": "3.2.0-canary.2",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-global-define": "^1.0.3",
     "babel-plugin-module-resolver": "^3.2.0",
     "babel-plugin-rn-platform-specific-extensions": "^1.0.0",
     "babel-plugin-transform-imports": "^2.0.0",
-    "babel-plugin-transform-react-jsx-to-rn-stylesheet": "3.2.0-canary.1",
-    "babel-plugin-transform-taroapi": "3.2.0-canary.1",
+    "babel-plugin-transform-react-jsx-to-rn-stylesheet": "3.2.0-canary.2",
+    "babel-plugin-transform-taroapi": "3.2.0-canary.2",
     "core-js": "^3.6.5",
     "metro-react-native-babel-preset": "^0.63.0"
   }
diff --git a/packages/css-to-react-native/package.json b/packages/css-to-react-native/package.json
index 2559a134ea10..040811bcaadc 100644
--- a/packages/css-to-react-native/package.json
+++ b/packages/css-to-react-native/package.json
@@ -1,7 +1,7 @@
 {
   "name": "taro-css-to-react-native",
   "description": "Convert CSS text to a React Native stylesheet object",
-  "version": "3.2.0-canary.1",
+  "version": "3.2.0-canary.2",
   "main": "dist/index.js",
   "license": "MIT",
   "dependencies": {
diff --git a/packages/eslint-config-taro/package.json b/packages/eslint-config-taro/package.json
index a0d3426de9c0..d236451a0235 100644
--- a/packages/eslint-config-taro/package.json
+++ b/packages/eslint-config-taro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-taro",
-  "version": "3.2.0-canary.1",
+  "version": "3.2.0-canary.2",
   "description": "Taro specific linting rules for ESLint",
   "main": "index.js",
   "files": [
diff --git a/packages/eslint-plugin-taro/package.json b/packages/eslint-plugin-taro/package.json
index d7f43c01398b..9adbce7a22bc 100644
--- a/packages/eslint-plugin-taro/package.json
+++ b/packages/eslint-plugin-taro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-taro",
-  "version": "3.2.0-canary.1",
+  "version": "3.2.0-canary.2",
   "description": "Taro specific linting plugin for ESLint",
   "main": "index.js",
   "files": [
diff --git a/packages/postcss-plugin-constparse/package.json b/packages/postcss-plugin-constparse/package.json
index 285a06df7865..11c13ce9a83b 100644
--- a/packages/postcss-plugin-constparse/package.json
+++ b/packages/postcss-plugin-constparse/package.json
@@ -1,6 +1,6 @@
 {
   "name": "postcss-plugin-constparse",
-  "version": "3.2.0-canary.1",
+  "version": "3.2.0-canary.2",
   "description": "parse constants defined in config",
   "main": "index.js",
   "author": "Simba",
diff --git a/packages/postcss-pxtransform/package.json b/packages/postcss-pxtransform/package.json
index c30419d9ee9e..28c91c8362e1 100644
--- a/packages/postcss-pxtransform/package.json
+++ b/packages/postcss-pxtransform/package.json
@@ -1,6 +1,6 @@
 {
   "name": "postcss-pxtransform",
-  "version": "3.2.0-canary.1",
+  "version": "3.2.0-canary.2",
   "description": "PostCSS plugin px 转小程序 rpx及h5 rem 单位",
   "keywords": [
     "postcss",
diff --git a/packages/shared/package.json b/packages/shared/package.json
index a01529480058..3f740476eaf2 100644
--- a/packages/shared/package.json
+++ b/packages/shared/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/shared",
-  "version": "3.2.0-canary.1",
+  "version": "3.2.0-canary.2",
   "description": "> TODO: description",
   "author": "yuche <i@yuche.me>",
   "homepage": "https://github.com/nervjs/taro/tree/master/packages/shared#readme",
diff --git a/packages/stylelint-config-taro-rn/package.json b/packages/stylelint-config-taro-rn/package.json
index 9fb470f110fd..e77228608332 100644
--- a/packages/stylelint-config-taro-rn/package.json
+++ b/packages/stylelint-config-taro-rn/package.json
@@ -1,6 +1,6 @@
 {
   "name": "stylelint-config-taro-rn",
-  "version": "3.2.0-canary.1",
+  "version": "3.2.0-canary.2",
   "description": "Shareable stylelint config for React Native CSS modules",
   "main": "index.js",
   "files": [
diff --git a/packages/stylelint-taro-rn/package.json b/packages/stylelint-taro-rn/package.json
index b9c3a4d0adb1..8515d555a80b 100644
--- a/packages/stylelint-taro-rn/package.json
+++ b/packages/stylelint-taro-rn/package.json
@@ -1,7 +1,7 @@
 {
   "name": "stylelint-taro-rn",
   "description": "A collection of React Native specific rules for stylelint",
-  "version": "3.2.0-canary.1",
+  "version": "3.2.0-canary.2",
   "main": "dist/index.js",
   "files": [
     "dist",
diff --git a/packages/taro-api/package.json b/packages/taro-api/package.json
index df46c99e6632..e9712af7938f 100644
--- a/packages/taro-api/package.json
+++ b/packages/taro-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/api",
-  "version": "3.2.0-canary.1",
+  "version": "3.2.0-canary.2",
   "description": "Taro common API",
   "author": "yuche <i@yuche.me>",
   "homepage": "https://github.com/nervjs/taro/tree/master/packages/api#readme",
@@ -29,6 +29,6 @@
     "url": "https://github.com/NervJS/taro/issues"
   },
   "dependencies": {
-    "@tarojs/runtime": "3.2.0-canary.1"
+    "@tarojs/runtime": "3.2.0-canary.2"
   }
 }
diff --git a/packages/taro-cli/package.json b/packages/taro-cli/package.json
index b0ba81313a24..d86232bbae8c 100644
--- a/packages/taro-cli/package.json
+++ b/packages/taro-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/cli",
-  "version": "3.2.0-canary.1",
+  "version": "3.2.0-canary.2",
   "description": "cli tool for taro",
   "main": "index.js",
   "scripts": {
@@ -44,11 +44,11 @@
   "license": "MIT",
   "dependencies": {
     "@hapi/joi": "17.1.1",
-    "@tarojs/helper": "3.2.0-canary.1",
-    "@tarojs/service": "3.2.0-canary.1",
-    "@tarojs/shared": "3.2.0-canary.1",
-    "@tarojs/taro": "3.2.0-canary.1",
-    "@tarojs/taroize": "3.2.0-canary.1",
+    "@tarojs/helper": "3.2.0-canary.2",
+    "@tarojs/service": "3.2.0-canary.2",
+    "@tarojs/shared": "3.2.0-canary.2",
+    "@tarojs/taro": "3.2.0-canary.2",
+    "@tarojs/taroize": "3.2.0-canary.2",
     "@tarojs/transformer-wx": "^2.0.4",
     "@types/request": "^2.48.1",
     "@typescript-eslint/parser": "^2.0.0",
@@ -76,11 +76,11 @@
     "ejs": "^2.6.1",
     "envinfo": "^6.0.1",
     "eslint": "^6.1.0",
-    "eslint-config-taro": "3.2.0-canary.1",
+    "eslint-config-taro": "3.2.0-canary.2",
     "eslint-plugin-import": "^2.8.0",
     "eslint-plugin-react": "^7.4.0",
     "eslint-plugin-react-hooks": "^1.6.1",
-    "eslint-plugin-taro": "3.2.0-canary.1",
+    "eslint-plugin-taro": "3.2.0-canary.2",
     "eslint-plugin-vue": "^6.2.2",
     "fbjs": "^1.0.0",
     "find-yarn-workspace-root": "1.2.1",
@@ -103,7 +103,7 @@
     "postcss-modules-resolve-imports": "^1.3.0",
     "postcss-modules-scope": "^1.1.0",
     "postcss-modules-values": "^1.3.0",
-    "postcss-pxtransform": "3.2.0-canary.1",
+    "postcss-pxtransform": "3.2.0-canary.2",
     "postcss-reporter": "^6.0.1",
     "postcss-taro-unit-transform": "1.2.15",
     "postcss-url": "^7.3.2",
@@ -124,7 +124,7 @@
     "xxhashjs": "^0.2.2"
   },
   "devDependencies": {
-    "@tarojs/mini-runner": "3.2.0-canary.1",
-    "@tarojs/webpack-runner": "3.2.0-canary.1"
+    "@tarojs/mini-runner": "3.2.0-canary.2",
+    "@tarojs/webpack-runner": "3.2.0-canary.2"
   }
 }
diff --git a/packages/taro-components-rn/package.json b/packages/taro-components-rn/package.json
index c4cf0aff9c78..47499fc3d6ac 100644
--- a/packages/taro-components-rn/package.json
+++ b/packages/taro-components-rn/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/components-rn",
-  "version": "3.2.0-canary.1",
+  "version": "3.2.0-canary.2",
   "description": "多端解决方案基础组件（RN）",
   "main": "./dist/index.js",
   "scripts": {
@@ -48,7 +48,7 @@
     "utility-types": "^3.4.1"
   },
   "devDependencies": {
-    "@tarojs/components": "3.2.0-canary.1",
+    "@tarojs/components": "3.2.0-canary.2",
     "@types/react-native": "^0.63.33",
     "@types/sinon": "^9.0.8",
     "cpy-cli": "^3.1.1",
diff --git a/packages/taro-components/package.json b/packages/taro-components/package.json
index 76c8d83e76cc..e63473bb3e8e 100644
--- a/packages/taro-components/package.json
+++ b/packages/taro-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/components",
-  "version": "3.2.0-canary.1",
+  "version": "3.2.0-canary.2",
   "description": "",
   "main:h5": "src/index.js",
   "main": "dist/index.js",
@@ -38,7 +38,7 @@
   "license": "MIT",
   "dependencies": {
     "@stencil/core": "~1.8.1",
-    "@tarojs/taro": "3.2.0-canary.1",
+    "@tarojs/taro": "3.2.0-canary.2",
     "better-scroll": "^1.14.1",
     "classnames": "^2.2.5",
     "intersection-observer": "^0.7.0",
diff --git a/packages/taro-extend/package.json b/packages/taro-extend/package.json
index ea97e4f8a9ee..8f812232ab16 100644
--- a/packages/taro-extend/package.json
+++ b/packages/taro-extend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/extend",
-  "version": "3.2.0-canary.1",
+  "version": "3.2.0-canary.2",
   "description": "Taro extend functionality",
   "author": "yuche <i@yuche.me>",
   "homepage": "https://github.com/nervjs/taro/tree/master/packages/taro-extend#readme",
diff --git a/packages/taro-h5/package.json b/packages/taro-h5/package.json
index 681aa6cbdee9..654e5eca9f1b 100644
--- a/packages/taro-h5/package.json
+++ b/packages/taro-h5/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/taro-h5",
-  "version": "3.2.0-canary.1",
+  "version": "3.2.0-canary.2",
   "description": "Taro h5 framework",
   "main:h5": "src/index.js",
   "main": "dist/index.cjs.js",
@@ -33,9 +33,9 @@
   "author": "O2Team",
   "license": "MIT",
   "dependencies": {
-    "@tarojs/api": "3.2.0-canary.1",
-    "@tarojs/router": "3.2.0-canary.1",
-    "@tarojs/runtime": "3.2.0-canary.1",
+    "@tarojs/api": "3.2.0-canary.2",
+    "@tarojs/router": "3.2.0-canary.2",
+    "@tarojs/runtime": "3.2.0-canary.2",
     "base64-js": "^1.3.0",
     "jsonp-retry": "^1.0.3",
     "mobile-detect": "^1.4.2",
diff --git a/packages/taro-helper/package.json b/packages/taro-helper/package.json
index bea7ed37e19d..2e0bf94ca748 100644
--- a/packages/taro-helper/package.json
+++ b/packages/taro-helper/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/helper",
-  "version": "3.2.0-canary.1",
+  "version": "3.2.0-canary.2",
   "description": "Taro Helper",
   "main": "index.js",
   "types": "types/index.d.ts",
@@ -41,7 +41,7 @@
     "@babel/preset-typescript": "7.10.4",
     "@babel/register": "7.9.0",
     "@babel/runtime": "7.9.2",
-    "@tarojs/taro": "3.2.0-canary.1",
+    "@tarojs/taro": "3.2.0-canary.2",
     "babel-plugin-transform-react-jsx": "^6.24.1",
     "chalk": "3.0.0",
     "chokidar": "3.3.1",
diff --git a/packages/taro-loader/package.json b/packages/taro-loader/package.json
index a81429ac6cbc..c033998318b6 100644
--- a/packages/taro-loader/package.json
+++ b/packages/taro-loader/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/taro-loader",
-  "version": "3.2.0-canary.1",
+  "version": "3.2.0-canary.2",
   "description": "> TODO: description",
   "author": "yuche <i@yuche.me>",
   "homepage": "https://github.com/nervjs/taro/tree/master/packages/taro-loader#readme",
@@ -32,6 +32,6 @@
     "access": "public"
   },
   "devDependencies": {
-    "@tarojs/taro": "3.2.0-canary.1"
+    "@tarojs/taro": "3.2.0-canary.2"
   }
 }
diff --git a/packages/taro-mini-runner/package.json b/packages/taro-mini-runner/package.json
index 5586f54c2f41..85f07a97456d 100644
--- a/packages/taro-mini-runner/package.json
+++ b/packages/taro-mini-runner/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/mini-runner",
-  "version": "3.2.0-canary.1",
+  "version": "3.2.0-canary.2",
   "description": "Mini app runner for taro",
   "main": "index.js",
   "scripts": {
@@ -37,12 +37,12 @@
     "@babel/core": "7.11.1",
     "@babel/plugin-proposal-class-properties": "7.10.4",
     "@babel/preset-env": "7.11.0",
-    "@tarojs/helper": "3.2.0-canary.1",
-    "@tarojs/runner-utils": "3.2.0-canary.1",
-    "@tarojs/runtime": "3.2.0-canary.1",
-    "@tarojs/shared": "3.2.0-canary.1",
-    "@tarojs/taro": "3.2.0-canary.1",
-    "@tarojs/taro-loader": "3.2.0-canary.1",
+    "@tarojs/helper": "3.2.0-canary.2",
+    "@tarojs/runner-utils": "3.2.0-canary.2",
+    "@tarojs/runtime": "3.2.0-canary.2",
+    "@tarojs/shared": "3.2.0-canary.2",
+    "@tarojs/taro": "3.2.0-canary.2",
+    "@tarojs/taro-loader": "3.2.0-canary.2",
     "babel-loader": "8.0.6",
     "babel-types": "^6.26.0",
     "copy-webpack-plugin": "^5.0.3",
@@ -84,9 +84,9 @@
     "yauzl": "2.10.0"
   },
   "devDependencies": {
-    "@tarojs/cli": "3.2.0-canary.1",
-    "@tarojs/components": "3.2.0-canary.1",
-    "@tarojs/react": "3.2.0-canary.1",
-    "babel-preset-taro": "3.2.0-canary.1"
+    "@tarojs/cli": "3.2.0-canary.2",
+    "@tarojs/components": "3.2.0-canary.2",
+    "@tarojs/react": "3.2.0-canary.2",
+    "babel-preset-taro": "3.2.0-canary.2"
   }
 }
diff --git a/packages/taro-react/package.json b/packages/taro-react/package.json
index 3775e80d392d..32c74b194068 100644
--- a/packages/taro-react/package.json
+++ b/packages/taro-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/react",
-  "version": "3.2.0-canary.1",
+  "version": "3.2.0-canary.2",
   "description": "like react-dom, but for mini apps.",
   "author": "yuche <i@yuche.me>",
   "homepage": "https://github.com/nervjs/taro/tree/master/packages/taro-react#readme",
@@ -24,7 +24,7 @@
     "url": "https://github.com/NervJS/taro/issues"
   },
   "dependencies": {
-    "@tarojs/runtime": "3.2.0-canary.1",
+    "@tarojs/runtime": "3.2.0-canary.2",
     "react-reconciler": "^0.23.0",
     "scheduler": "^0.17.0"
   },
diff --git a/packages/taro-rn-runner/package.json b/packages/taro-rn-runner/package.json
index d98ad6e74cb1..cfd879a53583 100644
--- a/packages/taro-rn-runner/package.json
+++ b/packages/taro-rn-runner/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/rn-runner",
-  "version": "3.2.0-canary.1",
+  "version": "3.2.0-canary.2",
   "description": "ReactNative build tool for taro",
   "main": "index.js",
   "repository": {
@@ -31,9 +31,9 @@
   },
   "dependencies": {
     "@react-native-community/cli-server-api": "^4.13.1",
-    "@tarojs/helper": "3.2.0-canary.1",
-    "@tarojs/rn-style-transformer": "3.2.0-canary.1",
-    "@tarojs/rn-transformer": "3.2.0-canary.1",
+    "@tarojs/helper": "3.2.0-canary.2",
+    "@tarojs/rn-style-transformer": "3.2.0-canary.2",
+    "@tarojs/rn-transformer": "3.2.0-canary.2",
     "fs-extra": "^9.0.1",
     "lodash": "^4.17.4",
     "metro": "^0.58.0",
diff --git a/packages/taro-rn-style-transformer/package.json b/packages/taro-rn-style-transformer/package.json
index 147ad8670834..49bbb7a98744 100644
--- a/packages/taro-rn-style-transformer/package.json
+++ b/packages/taro-rn-style-transformer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/rn-style-transformer",
-  "version": "3.2.0-canary.1",
+  "version": "3.2.0-canary.2",
   "description": "提供Taro RN 统一处理样式文件能力",
   "main": "dist/index.js",
   "scripts": {
@@ -16,7 +16,7 @@
     "npm": ">=6.0.0"
   },
   "dependencies": {
-    "@tarojs/helper": "3.2.0-canary.1",
+    "@tarojs/helper": "3.2.0-canary.2",
     "app-root-path": "^3.0.0",
     "css-to-react-native-transform": "^1.9.0",
     "fbjs": "^2.0.0",
@@ -24,13 +24,13 @@
     "node-sass": "^4.14.1",
     "postcss": "^7.0.35",
     "postcss-import": "^12.0.1",
-    "postcss-pxtransform": "3.2.0-canary.1",
+    "postcss-pxtransform": "3.2.0-canary.2",
     "postcss-reporter": "^6.0.1",
     "prop-types": "^15.7.2",
     "stylelint": "^13.8.0",
-    "stylelint-config-taro-rn": "3.2.0-canary.1",
-    "stylelint-taro-rn": "3.2.0-canary.1",
+    "stylelint-config-taro-rn": "3.2.0-canary.2",
+    "stylelint-taro-rn": "3.2.0-canary.2",
     "stylus": "^0.54.8",
-    "taro-css-to-react-native": "3.2.0-canary.1"
+    "taro-css-to-react-native": "3.2.0-canary.2"
   }
 }
diff --git a/packages/taro-rn-transformer/package.json b/packages/taro-rn-transformer/package.json
index d11569567999..c4ffe345169a 100644
--- a/packages/taro-rn-transformer/package.json
+++ b/packages/taro-rn-transformer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/rn-transformer",
-  "version": "3.2.0-canary.1",
+  "version": "3.2.0-canary.2",
   "description": "Taro RN 入口文件处理",
   "main": "dist/index.js",
   "types": "./src/types/index.d.ts",
@@ -32,7 +32,7 @@
     "npm": ">=6.0.0"
   },
   "devDependencies": {
-    "@tarojs/helper": "3.2.0-canary.1",
+    "@tarojs/helper": "3.2.0-canary.2",
     "lodash": "^4.17.20"
   }
 }
diff --git a/packages/taro-rn/package.json b/packages/taro-rn/package.json
index 1379c531e509..7b0b6de74f6a 100644
--- a/packages/taro-rn/package.json
+++ b/packages/taro-rn/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/taro-rn",
-  "version": "3.2.0-canary.1",
+  "version": "3.2.0-canary.2",
   "description": "Taro RN framework",
   "main": "./dist/index.js",
   "files": [
@@ -31,7 +31,7 @@
     "@react-native-community/cameraroll": "^4.0.1",
     "@react-native-community/clipboard": "^1.5.1",
     "@react-native-community/netinfo": "^5.9.7",
-    "@tarojs/runtime-rn": "3.2.0-canary.1",
+    "@tarojs/runtime-rn": "3.2.0-canary.2",
     "babel-preset-expo": "^5.2.0",
     "base64-js": "^1.3.0",
     "expo-av": "~8.6.0",
@@ -55,7 +55,7 @@
     "react-native-unimodules": "^0.11.0"
   },
   "devDependencies": {
-    "@tarojs/taro": "3.2.0-canary.1",
+    "@tarojs/taro": "3.2.0-canary.2",
     "@types/react-native": "^0.63.33",
     "babel-plugin-jest-hoist": "^26.6.2",
     "cpy-cli": "^3.1.1",
diff --git a/packages/taro-router-rn/package.json b/packages/taro-router-rn/package.json
index 9239d4e367ae..8ec7ffec0ccc 100644
--- a/packages/taro-router-rn/package.json
+++ b/packages/taro-router-rn/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/router-rn",
-  "version": "3.2.0-canary.1",
+  "version": "3.2.0-canary.2",
   "description": "Taro-router-rn",
   "main": "dist/index.js",
   "typings": "src/index.ts",
diff --git a/packages/taro-router/package.json b/packages/taro-router/package.json
index 27d5333fef9e..bddbd974e3c1 100644
--- a/packages/taro-router/package.json
+++ b/packages/taro-router/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/router",
-  "version": "3.2.0-canary.1",
+  "version": "3.2.0-canary.2",
   "description": "Taro-router",
   "main:h5": "dist/router.esm.js",
   "main": "dist/index.js",
@@ -27,7 +27,7 @@
   "author": "O2Team",
   "license": "MIT",
   "dependencies": {
-    "@tarojs/runtime": "3.2.0-canary.1",
+    "@tarojs/runtime": "3.2.0-canary.2",
     "history": "^4.10.1",
     "universal-router": "^8.3.0",
     "url-parse": "^1.4.7"
diff --git a/packages/taro-runner-utils/package.json b/packages/taro-runner-utils/package.json
index 16a842292356..10f16bb48568 100644
--- a/packages/taro-runner-utils/package.json
+++ b/packages/taro-runner-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/runner-utils",
-  "version": "3.2.0-canary.1",
+  "version": "3.2.0-canary.2",
   "description": "Taro runner utilities.",
   "main": "dist/index.js",
   "types": "types/index.d.ts",
@@ -23,7 +23,7 @@
   "license": "MIT",
   "dependencies": {
     "@babel/core": "7.11.1",
-    "@tarojs/helper": "3.2.0-canary.1",
+    "@tarojs/helper": "3.2.0-canary.2",
     "chalk": "^3.0.0",
     "fs-extra": "^8.1.0",
     "lodash": "^4.17.15",
diff --git a/packages/taro-runtime-rn/package.json b/packages/taro-runtime-rn/package.json
index 70f2a1f6b5ae..6068f43647bd 100644
--- a/packages/taro-runtime-rn/package.json
+++ b/packages/taro-runtime-rn/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@tarojs/runtime-rn",
-    "version": "3.2.0-canary.1",
+    "version": "3.2.0-canary.2",
     "description": "taro-runtime-rn",
     "main": "dist/index.js",
     "files": [
@@ -28,8 +28,8 @@
         "react-native": "*"
     },
     "dependencies": {
-        "@tarojs/components-rn": "3.2.0-canary.1",
-        "@tarojs/router-rn": "3.2.0-canary.1",
+        "@tarojs/components-rn": "3.2.0-canary.2",
+        "@tarojs/router-rn": "3.2.0-canary.2",
         "@types/react-native": "^0.63.33"
     },
     "resolutions": {
diff --git a/packages/taro-runtime/package.json b/packages/taro-runtime/package.json
index 45b0a72be5ff..72d851520951 100644
--- a/packages/taro-runtime/package.json
+++ b/packages/taro-runtime/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/runtime",
-  "version": "3.2.0-canary.1",
+  "version": "3.2.0-canary.2",
   "description": "taro runtime for mini apps.",
   "main": "dist/runtime.esm.js",
   "module": "dist/runtime.esm.js",
diff --git a/packages/taro-service/package.json b/packages/taro-service/package.json
index 3b1aa3fa63df..d195983a9b1c 100644
--- a/packages/taro-service/package.json
+++ b/packages/taro-service/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/service",
-  "version": "3.2.0-canary.1",
+  "version": "3.2.0-canary.2",
   "description": "Taro Service",
   "main": "index.js",
   "types": "types/index.d.ts",
@@ -34,8 +34,8 @@
   "homepage": "https://github.com/NervJS/taro#readme",
   "dependencies": {
     "@hapi/joi": "17.1.1",
-    "@tarojs/helper": "3.2.0-canary.1",
-    "@tarojs/taro": "3.2.0-canary.1",
+    "@tarojs/helper": "3.2.0-canary.2",
+    "@tarojs/taro": "3.2.0-canary.2",
     "fs-extra": "8.1.0",
     "lodash": "4.17.20",
     "resolve": "1.15.1",
diff --git a/packages/taro-webpack-runner/package.json b/packages/taro-webpack-runner/package.json
index 6ce1da4226c1..ca41a975ff97 100644
--- a/packages/taro-webpack-runner/package.json
+++ b/packages/taro-webpack-runner/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/webpack-runner",
-  "version": "3.2.0-canary.1",
+  "version": "3.2.0-canary.2",
   "description": "webpack runner for taro",
   "main": "index.js",
   "scripts": {
@@ -31,11 +31,11 @@
   "homepage": "https://github.com/NervJS/taro#readme",
   "dependencies": {
     "@babel/core": "7.11.1",
-    "@tarojs/helper": "3.2.0-canary.1",
-    "@tarojs/runner-utils": "3.2.0-canary.1",
-    "@tarojs/runtime": "3.2.0-canary.1",
-    "@tarojs/shared": "3.2.0-canary.1",
-    "@tarojs/taro-loader": "3.2.0-canary.1",
+    "@tarojs/helper": "3.2.0-canary.2",
+    "@tarojs/runner-utils": "3.2.0-canary.2",
+    "@tarojs/runtime": "3.2.0-canary.2",
+    "@tarojs/shared": "3.2.0-canary.2",
+    "@tarojs/taro-loader": "3.2.0-canary.2",
     "autoprefixer": "9.7.4",
     "babel-loader": "8.0.6",
     "copy-webpack-plugin": "5.1.1",
@@ -53,8 +53,8 @@
     "open": "7.0.2",
     "ora": "4.0.3",
     "postcss-loader": "3.0.0",
-    "postcss-plugin-constparse": "3.2.0-canary.1",
-    "postcss-pxtransform": "3.2.0-canary.1",
+    "postcss-plugin-constparse": "3.2.0-canary.2",
+    "postcss-pxtransform": "3.2.0-canary.2",
     "resolve": "1.15.1",
     "resolve-url-loader": "3.1.1",
     "sass": "^1.25.0",
@@ -70,8 +70,8 @@
     "webpack-format-messages": "2.0.3"
   },
   "devDependencies": {
-    "@tarojs/components": "3.2.0-canary.1",
-    "@tarojs/taro": "3.2.0-canary.1",
+    "@tarojs/components": "3.2.0-canary.2",
+    "@tarojs/taro": "3.2.0-canary.2",
     "@types/autoprefixer": "9.7.0",
     "@types/detect-port": "1.1.0",
     "@types/lodash": "4.14.149",
@@ -79,7 +79,7 @@
     "@types/resolve": "1.14.0",
     "@types/webpack": "4.41.6",
     "@types/webpack-dev-server": "3.11.0",
-    "babel-plugin-transform-taroapi": "3.2.0-canary.1",
-    "babel-preset-taro": "3.2.0-canary.1"
+    "babel-plugin-transform-taroapi": "3.2.0-canary.2",
+    "babel-preset-taro": "3.2.0-canary.2"
   }
 }
diff --git a/packages/taro-with-weapp/package.json b/packages/taro-with-weapp/package.json
index e575a5ab6798..28b9517347a7 100644
--- a/packages/taro-with-weapp/package.json
+++ b/packages/taro-with-weapp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/with-weapp",
-  "version": "3.2.0-canary.1",
+  "version": "3.2.0-canary.2",
   "description": "taroize 之后的运行时",
   "main": "index.js",
   "scripts": {
@@ -22,8 +22,8 @@
   "author": "yuche",
   "license": "MIT",
   "dependencies": {
-    "@tarojs/runtime": "3.2.0-canary.1",
-    "@tarojs/taro": "3.2.0-canary.1",
+    "@tarojs/runtime": "3.2.0-canary.2",
+    "@tarojs/taro": "3.2.0-canary.2",
     "lodash": "^4.17.11"
   }
 }
diff --git a/packages/taro/package.json b/packages/taro/package.json
index 2c3a7f22c95d..e1367b1f4e31 100644
--- a/packages/taro/package.json
+++ b/packages/taro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/taro",
-  "version": "3.2.0-canary.1",
+  "version": "3.2.0-canary.2",
   "description": "Taro framework",
   "main": "index.js",
   "main:h5": "h5.js",
@@ -31,10 +31,10 @@
   "author": "O2Team",
   "license": "MIT",
   "dependencies": {
-    "@tarojs/api": "3.2.0-canary.1",
-    "@tarojs/taro-h5": "3.2.0-canary.1"
+    "@tarojs/api": "3.2.0-canary.2",
+    "@tarojs/taro-h5": "3.2.0-canary.2"
   },
   "devDependencies": {
-    "@tarojs/runtime": "3.2.0-canary.1"
+    "@tarojs/runtime": "3.2.0-canary.2"
   }
 }
diff --git a/packages/taroize/package.json b/packages/taroize/package.json
index aa0194d36a36..13ad8d575166 100644
--- a/packages/taroize/package.json
+++ b/packages/taroize/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/taroize",
-  "version": "3.2.0-canary.1",
+  "version": "3.2.0-canary.2",
   "description": "转换原生微信小程序代码为 Taro 代码",
   "main": "index.js",
   "files": [

From 33927a9fd6559fdf53463a284bec25615d55e277 Mon Sep 17 00:00:00 2001
From: yechunxi <yechunxi00@163.com>
Date: Mon, 7 Dec 2020 17:58:46 +0800
Subject: [PATCH 20/21] =?UTF-8?q?fix(rn-transformer):=20windows=E4=B8=8A?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=B8=8D=E7=94=9F=E6=95=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/taro-rn-transformer/src/utils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/taro-rn-transformer/src/utils.ts b/packages/taro-rn-transformer/src/utils.ts
index 0c974ea77bf5..11da8c360387 100644
--- a/packages/taro-rn-transformer/src/utils.ts
+++ b/packages/taro-rn-transformer/src/utils.ts
@@ -59,7 +59,7 @@ export function getStyleCode (code: string, basePath: string) {
 export function isPageFile (file: string, sourceDir: string) {
   if ((/node_modules/.test(file)) || file.indexOf(sourceDir) === -1) return false
   const pagesList = globalAny.__taroAppPages || []
-  const filePath = file.split('.')[0]
+  const filePath = file.split('.')[0].replace(/\\/g, '/')
   const filename = nodePath.basename(file).replace(nodePath.extname(file), '')
   return pagesList.includes(filePath) && !(filename.endsWith('.config'))
 }

From 12c4f4e52f183c0542adcf433af73767eb646098 Mon Sep 17 00:00:00 2001
From: shinken008 <shinken008@gmail.com>
Date: Mon, 7 Dec 2020 18:50:15 +0800
Subject: [PATCH 21/21] chore(release): publish 3.2.0-canary.2

---
 packages/taro-rn-style-transformer/__test__/index.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/taro-rn-style-transformer/__test__/index.spec.js b/packages/taro-rn-style-transformer/__test__/index.spec.js
index 2fb92cda766e..b561abd9efcd 100644
--- a/packages/taro-rn-style-transformer/__test__/index.spec.js
+++ b/packages/taro-rn-style-transformer/__test__/index.spec.js
@@ -60,7 +60,7 @@ describe('style transform', () => {
   }
 }`)
   })
-
+  //
   it('.scss transform @import', async () => {
     const css = await run(`
       @import './b.scss';