feat: taro 4

wuba · Dec 25, 2023 · 11d4692 · 11d4692
1 parent 8c1cea6
commit 11d4692
Show file tree

Hide file tree

Showing 4 changed files with 382 additions and 358 deletions.
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -47,6 +47,9 @@ PODS:
  - ReactCommon/turbomodule/core
  - ExpoSensors (12.9.0):
  - ExpoModulesCore
+ - EXTaskManager (11.7.0):
+ - ExpoModulesCore
+ - UMAppLoader
  - FBLazyVector (0.73.1)
  - FBReactNativeSpec (0.73.1):
  - RCT-Folly (= 2022.05.16.00)
@@ -1216,6 +1219,7 @@ PODS:
  - RNSVG (14.1.0):
  - React-Core
  - SocketRocket (0.6.1)
+ - UMAppLoader (4.5.0)
  - Yoga (1.14.0)
  - ZXingObjC/Core (3.6.9)
  - ZXingObjC/OneD (3.6.9):
@@ -1242,6 +1246,7 @@ DEPENDENCIES:
  - ExpoKeepAwake (from `../node_modules/expo-keep-awake/ios`)
  - ExpoModulesCore (from `../node_modules/expo-modules-core`)
  - ExpoSensors (from `../node_modules/expo-sensors/ios`)
+ - EXTaskManager (from `../node_modules/expo-task-manager/ios`)
  - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
  - FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`)
  - Flipper (= 0.201.0)
@@ -1334,6 +1339,7 @@ DEPENDENCIES:
  - RNReanimated (from `../node_modules/react-native-reanimated`)
  - RNScreens (from `../node_modules/react-native-screens`)
  - RNSVG (from `../node_modules/react-native-svg`)
+ - UMAppLoader (from `../node_modules/unimodules-app-loader/ios`)
  - Yoga (from `../node_modules/react-native/ReactCommon/yoga`)
 
 SPEC REPOS:
@@ -1390,6 +1396,8 @@ EXTERNAL SOURCES:
  :path: "../node_modules/expo-modules-core"
  ExpoSensors:
  :path: "../node_modules/expo-sensors/ios"
+ EXTaskManager:
+ :path: "../node_modules/expo-task-manager/ios"
  FBLazyVector:
  :path: "../node_modules/react-native/Libraries/FBLazyVector"
  FBReactNativeSpec:
@@ -1525,6 +1533,8 @@ EXTERNAL SOURCES:
  :path: "../node_modules/react-native-screens"
  RNSVG:
  :path: "../node_modules/react-native-svg"
+ UMAppLoader:
+ :path: "../node_modules/unimodules-app-loader/ios"
  Yoga:
  :path: "../node_modules/react-native/ReactCommon/yoga"
 
@@ -1548,6 +1558,7 @@ SPEC CHECKSUMS:
  ExpoKeepAwake: ed71bfe0e6ecd38e337586ba6e1ba27a56eb373b
  ExpoModulesCore: 01c0abfa6cd9c41c4bd76d8a1a079e6b591db10f
  ExpoSensors: 773adb32167d5d3c28280697ceee342b88f606ab
+ EXTaskManager: 81b2dfaaba6d9f9a4bc3e3e2a786a98004eb9e98
  FBLazyVector: 2296bacb2fa157a43991048b0a9d71c1c8b65083
  FBReactNativeSpec: df0ebe69acd14ce0be0269cf75b6e338a727259b
  Flipper: c7a0093234c4bdd456e363f2f19b2e4b27652d44
@@ -1627,6 +1638,7 @@ SPEC CHECKSUMS:
  RNScreens: b582cb834dc4133307562e930e8fa914b8c04ef2
  RNSVG: ba3e7232f45e34b7b47e74472386cf4e1a676d0a
  SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
+ UMAppLoader: 5df85360d65cabaef544be5424ac64672e648482
  Yoga: 4f53dc50008d626fa679c7a1cb4bed898f8c0bde
  ZXingObjC: 8898711ab495761b2dbbdec76d90164a6d7e14c5
 

diff --git a/package.json b/package.json
@@ -34,7 +34,7 @@
  "link": "react-native link",
  "update-version": "sh ./bin/update_version.sh",
  "podInstall": "pod-install",
- "upgradePeerdeps": "install-peerdeps @tarojs/taro-rn@3.7.0-canary.6 -o -Y && install-peerdeps @tarojs/components-rn@3.7.0-canary.6 -o -Y && install-peerdeps @tarojs/router-rn@3.7.0-canary.6 -o -Y && pod-install"
+ "upgradePeerdeps": "install-peerdeps @tarojs/taro-rn@4.0.0-canary.0 -o -Y && install-peerdeps @tarojs/components-rn@4.0.0-canary.0 -o -Y && install-peerdeps @tarojs/router-rn@4.0.0-canary.0 -o -Y && pod-install"
  },
  "browserslist": [
  "last 3 versions",
@@ -55,23 +55,23 @@
  "@react-native-picker/picker": "~2.6.1",
  "@shopify/flash-list": "^1.3.1",
  "@shopify/react-native-skia": "^0.1.156",
- "@tarojs/components": "3.7.0-canary.6",
- "@tarojs/components-rn": "3.7.0-canary.6",
- "@tarojs/helper": "3.7.0-canary.6",
- "@tarojs/plugin-framework-react": "3.7.0-canary.6",
- "@tarojs/plugin-html": "3.7.0-canary.6",
- "@tarojs/plugin-platform-alipay": "3.7.0-canary.6",
- "@tarojs/plugin-platform-h5": "3.7.0-canary.6",
- "@tarojs/plugin-platform-jd": "3.7.0-canary.6",
- "@tarojs/plugin-platform-qq": "3.7.0-canary.6",
- "@tarojs/plugin-platform-swan": "3.7.0-canary.6",
- "@tarojs/plugin-platform-tt": "3.7.0-canary.6",
- "@tarojs/plugin-platform-weapp": "3.7.0-canary.6",
- "@tarojs/react": "3.7.0-canary.6",
- "@tarojs/runtime": "3.7.0-canary.6",
- "@tarojs/shared": "3.7.0-canary.6",
- "@tarojs/taro": "3.7.0-canary.6",
- "@tarojs/taro-rn": "3.7.0-canary.6",
+ "@tarojs/components": "4.0.0-canary.0",
+ "@tarojs/components-rn": "4.0.0-canary.0",
+ "@tarojs/helper": "4.0.0-canary.0",
+ "@tarojs/plugin-framework-react": "4.0.0-canary.0",
+ "@tarojs/plugin-html": "4.0.0-canary.0",
+ "@tarojs/plugin-platform-alipay": "4.0.0-canary.0",
+ "@tarojs/plugin-platform-h5": "4.0.0-canary.0",
+ "@tarojs/plugin-platform-jd": "4.0.0-canary.0",
+ "@tarojs/plugin-platform-qq": "4.0.0-canary.0",
+ "@tarojs/plugin-platform-swan": "4.0.0-canary.0",
+ "@tarojs/plugin-platform-tt": "4.0.0-canary.0",
+ "@tarojs/plugin-platform-weapp": "4.0.0-canary.0",
+ "@tarojs/react": "4.0.0-canary.0",
+ "@tarojs/runtime": "4.0.0-canary.0",
+ "@tarojs/shared": "4.0.0-canary.0",
+ "@tarojs/taro": "4.0.0-canary.0",
+ "@tarojs/taro-rn": "4.0.0-canary.0",
  "@wuba/react-native-echarts": "1.2.5",
  "d3-hierarchy": "^3.1.2",
  "echarts": "^5.4.1",
@@ -116,18 +116,18 @@
  "@pmmmwh/react-refresh-webpack-plugin": "0.5.5",
  "@react-native/metro-config": "^0.73.2",
  "@react-native/typescript-config": "^0.73.1",
- "@tarojs/cli": "3.7.0-canary.6",
- "@tarojs/plugin-mini-ci": "3.7.0-canary.6",
- "@tarojs/rn-runner": "3.7.0-canary.6",
- "@tarojs/webpack5-runner": "3.7.0-canary.6",
+ "@tarojs/cli": "4.0.0-canary.0",
+ "@tarojs/plugin-mini-ci": "4.0.0-canary.0",
+ "@tarojs/rn-runner": "4.0.0-canary.0",
+ "@tarojs/webpack5-runner": "4.0.0-canary.0",
  "@types/jest": "^29.2.1",
  "@types/react": "^18.0.24",
  "@types/webpack-env": "^1.13.6",
  "@typescript-eslint/eslint-plugin": "^5.20.0",
  "@typescript-eslint/parser": "^5.20.0",
- "babel-preset-taro": "3.7.0-canary.6",
+ "babel-preset-taro": "4.0.0-canary.0",
  "eslint": "^8.12.0",
- "eslint-config-taro": "3.7.0-canary.6",
+ "eslint-config-taro": "4.0.0-canary.0",
  "eslint-plugin-import": "^2.12.0",
  "eslint-plugin-react": "^7.8.2",
  "eslint-plugin-react-hooks": "^4.2.0",

diff --git a/...arojs+rn-transformer+3.7.0-canary.6.patch → ...arojs+rn-transformer+4.0.0-canary.0.patch b/...arojs+rn-transformer+3.7.0-canary.6.patch → ...arojs+rn-transformer+4.0.0-canary.0.patch
@@ -1,5 +1,5 @@
 diff --git a/node_modules/@tarojs/rn-transformer/dist/app.js b/node_modules/@tarojs/rn-transformer/dist/app.js
-index 523f86b..edbffba 100644
+index 937b81f..a953627 100644
 --- a/node_modules/@tarojs/rn-transformer/dist/app.js
 +++ b/node_modules/@tarojs/rn-transformer/dist/app.js
 @@ -113,7 +113,7 @@ function generateEntry({ filename, projectRoot, sourceDir, appName, entryName, d