feat: use 3.5.0-beta.0

wuba · May 19, 2022 · 397d2ab · 397d2ab
1 parent 40d1d1d
commit 397d2ab
Show file tree

Hide file tree

Showing 10 changed files with 1,834 additions and 1,205 deletions.
diff --git a/.github/workflows/assemble_ios_debug.yml b/.github/workflows/assemble_ios_debug.yml
@@ -26,7 +26,7 @@ env:
 
 jobs:
   assemble:
-    runs-on: macos-11
+    runs-on: macos-12
     steps:
       - name: Checkout Project
         uses: actions/checkout@v2

diff --git a/.github/workflows/assemble_ios_release.yml b/.github/workflows/assemble_ios_release.yml
@@ -29,7 +29,7 @@ env:
 
 jobs:
   assemble:
-    runs-on: macos-11
+    runs-on: macos-12
     steps:
       - name: Get current date
         id: date

diff --git a/android/app/src/main/java/com/tarodemo/MainActivity.java b/android/app/src/main/java/com/tarodemo/MainActivity.java
@@ -12,7 +12,7 @@ public class MainActivity extends ReactActivity {
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     SplashScreen.show(this);
-    super.onCreate(savedInstanceState);
+    super.onCreate(null);
   }
 
   @Override

diff --git a/config/index.js b/config/index.js
@@ -47,6 +47,7 @@ const config = {
     }
   },
   framework: 'react',
+  compiler: 'webpack4',
   mini: {
     postcss: {
       pxtransform: {

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -1,46 +1,45 @@
 PODS:
   - boost (1.76.0)
   - DoubleConversion (1.1.6)
-  - EXApplication (4.0.2):
+  - EXApplication (4.1.0):
     - ExpoModulesCore
-  - EXAV (10.2.1):
+  - EXAV (11.2.3):
     - ExpoModulesCore
-    - ReactCommon/turbomodule/core
-  - EXBarCodeScanner (11.2.1):
+    - React-runtimeexecutor
+    - ReactCommon
+  - EXBarCodeScanner (11.3.0):
     - EXImageLoader
     - ExpoModulesCore
     - ZXingObjC/OneD
     - ZXingObjC/PDF417
-  - EXBrightness (10.1.1):
+  - EXBrightness (10.2.0):
     - ExpoModulesCore
-  - EXCamera (12.1.2):
+  - EXCamera (12.2.0):
     - ExpoModulesCore
-  - EXConstants (13.0.2):
+  - EXConstants (13.1.1):
     - ExpoModulesCore
-  - EXErrorRecovery (3.0.5):
+  - EXErrorRecovery (3.1.0):
     - ExpoModulesCore
-  - EXFileSystem (13.1.4):
+  - EXFileSystem (14.0.0):
     - ExpoModulesCore
-  - EXFont (10.0.5):
+  - EXFont (10.1.0):
     - ExpoModulesCore
-  - EXImageLoader (3.1.1):
+  - EXImageLoader (3.2.0):
     - ExpoModulesCore
     - React-Core
-  - EXImagePicker (12.0.2):
-    - ExpoModulesCore
-  - EXKeepAwake (10.0.2):
-    - ExpoModulesCore
   - EXLocation (14.0.2):
     - ExpoModulesCore
     - UMTaskManagerInterface
-  - EXPermissions (13.1.1):
+  - Expo (45.0.2):
+    - ExpoModulesCore
+  - ExpoImagePicker (13.1.1):
     - ExpoModulesCore
-  - Expo (44.0.6):
+  - ExpoKeepAwake (10.1.1):
     - ExpoModulesCore
-  - ExpoModulesCore (0.6.5):
+  - ExpoModulesCore (0.9.2):
     - React-Core
     - ReactCommon/turbomodule/core
-  - EXSensors (11.1.1):
+  - EXSensors (11.2.0):
     - ExpoModulesCore
   - FBLazyVector (0.67.4)
   - FBReactNativeSpec (0.67.4):
@@ -323,6 +322,24 @@ PODS:
     - ReactCommon/turbomodule/core (= 0.67.4)
   - React-runtimeexecutor (0.67.4):
     - React-jsi (= 0.67.4)
+  - ReactCommon (0.67.4):
+    - React-logger (= 0.67.4)
+    - ReactCommon/react_debug_core (= 0.67.4)
+    - ReactCommon/turbomodule (= 0.67.4)
+  - ReactCommon/react_debug_core (0.67.4):
+    - React-logger (= 0.67.4)
+  - ReactCommon/turbomodule (0.67.4):
+    - DoubleConversion
+    - glog
+    - RCT-Folly (= 2021.06.28.00-v2)
+    - React-callinvoker (= 0.67.4)
+    - React-Core (= 0.67.4)
+    - React-cxxreact (= 0.67.4)
+    - React-jsi (= 0.67.4)
+    - React-logger (= 0.67.4)
+    - React-perflogger (= 0.67.4)
+    - ReactCommon/turbomodule/core (= 0.67.4)
+    - ReactCommon/turbomodule/samples (= 0.67.4)
   - ReactCommon/turbomodule/core (0.67.4):
     - DoubleConversion
     - glog
@@ -333,6 +350,17 @@ PODS:
     - React-jsi (= 0.67.4)
     - React-logger (= 0.67.4)
     - React-perflogger (= 0.67.4)
+  - ReactCommon/turbomodule/samples (0.67.4):
+    - DoubleConversion
+    - glog
+    - RCT-Folly (= 2021.06.28.00-v2)
+    - React-callinvoker (= 0.67.4)
+    - React-Core (= 0.67.4)
+    - React-cxxreact (= 0.67.4)
+    - React-jsi (= 0.67.4)
+    - React-logger (= 0.67.4)
+    - React-perflogger (= 0.67.4)
+    - ReactCommon/turbomodule/core (= 0.67.4)
   - RNCAsyncStorage (1.15.17):
     - React-Core
   - RNCClipboard (1.5.1):
@@ -353,7 +381,7 @@ PODS:
   - RNSyanImagePicker (0.5.3):
     - React
     - TZImagePickerController
-  - TZImagePickerController (3.7.6)
+  - TZImagePickerController (3.8.1)
   - UMTaskManagerInterface (7.1.1):
     - ExpoModulesCore
   - Yoga (1.14.0)
@@ -376,11 +404,10 @@ DEPENDENCIES:
   - EXFileSystem (from `../node_modules/expo-file-system/ios`)
   - EXFont (from `../node_modules/expo-font/ios`)
   - EXImageLoader (from `../node_modules/expo-image-loader/ios`)
-  - EXImagePicker (from `../node_modules/expo-image-picker/ios`)
-  - EXKeepAwake (from `../node_modules/expo-keep-awake/ios`)
   - EXLocation (from `../node_modules/expo-location/ios`)
-  - EXPermissions (from `../node_modules/expo-permissions/ios`)
   - Expo (from `../node_modules/expo/ios`)
+  - ExpoImagePicker (from `../node_modules/expo-image-picker/ios`)
+  - ExpoKeepAwake (from `../node_modules/expo-keep-awake/ios`)
   - ExpoModulesCore (from `../node_modules/expo-modules-core/ios`)
   - EXSensors (from `../node_modules/expo-sensors/ios`)
   - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
@@ -464,16 +491,14 @@ EXTERNAL SOURCES:
     :path: "../node_modules/expo-font/ios"
   EXImageLoader:
     :path: "../node_modules/expo-image-loader/ios"
-  EXImagePicker:
-    :path: "../node_modules/expo-image-picker/ios"
-  EXKeepAwake:
-    :path: "../node_modules/expo-keep-awake/ios"
   EXLocation:
     :path: "../node_modules/expo-location/ios"
-  EXPermissions:
-    :path: "../node_modules/expo-permissions/ios"
   Expo:
     :path: "../node_modules/expo/ios"
+  ExpoImagePicker:
+    :path: "../node_modules/expo-image-picker/ios"
+  ExpoKeepAwake:
+    :path: "../node_modules/expo-keep-awake/ios"
   ExpoModulesCore:
     :path: "../node_modules/expo-modules-core/ios"
   EXSensors:
@@ -576,23 +601,22 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   boost: a7c83b31436843459a1961bfd74b96033dc77234
   DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662
-  EXApplication: 54fe5bd6268d697771645e8f1aef8b806a65247a
-  EXAV: b9ed0c201092244c46aa78f907f5c66176bed236
-  EXBarCodeScanner: e5ca0062d8ad1c4c1d2e386d6a308d5a32213020
-  EXBrightness: 8c4b08861ced2bdc31362e587aadcf73514ca7bb
-  EXCamera: 4a0d00d6d1e4703c31a75514d8bc804a2eab27bd
-  EXConstants: 88bf79622fbd9b476c96d8ec57fe97ca44fe8e3c
-  EXErrorRecovery: b0d7582714a2cc896e94a2308a356f94dbf14ef7
-  EXFileSystem: 08a3033ac372b6346becf07839e1ccef26fb1058
-  EXFont: 2597c10ac85a69d348d44d7873eccf5a7576ef5e
-  EXImageLoader: 347b72c2ec2df65120ccec40ea65a4c4f24317ff
-  EXImagePicker: bf4d62532cc2bf217edbe4abbb0014e73e079eac
-  EXKeepAwake: bf48d7f740a5cd2befed6cf9a49911d385c6c47d
+  EXApplication: d6562af1204162e0ac46d341a7d4e5dc720b33de
+  EXAV: 88f61c5af8415715b7ee51f084c1020235b85c56
+  EXBarCodeScanner: b9e1b69371c233a80fc857edcf95843f14ae9e7b
+  EXBrightness: 2a5e81b350838cad814730c10ab845c7afc45a11
+  EXCamera: 2cbc8206cb520562c1527fe565aa9f00df8e5e8f
+  EXConstants: fdbe52259365b6a6faaa5e99a3b82cfa6bc2eb61
+  EXErrorRecovery: 3ce46e5d42e53c0371ff048a7f0cbc959968ef4a
+  EXFileSystem: 2aa2d9289f84bca9532b9ccbd81504fa31eb1ded
+  EXFont: 04235cc22e6fef86028feb67db452978dc6f240f
+  EXImageLoader: b88e053d760f85a82405b1db2de4abf11978fc9f
   EXLocation: 013b5d07cca26c2d15d998766322e70b7a228b57
-  EXPermissions: 2f8db9cfb1919d6c6776f462bb2c5a903e423b2a
-  Expo: 534e51e607aba8229293297da5585f4b26f50fa1
-  ExpoModulesCore: 32c0ccb47f477d330ee93db72505380adf0de09a
-  EXSensors: 67a98cf6297d3d5996dc9f08613e4058675ce99d
+  Expo: 27c7466cea6c8be416d8e50a0c0faa48cf8b4d1a
+  ExpoImagePicker: d9d6b4f29db437fc7796f13cee5f133f5b4b5f7c
+  ExpoKeepAwake: c0c494b442ecd8122974c13b93ccfb57bd408e88
+  ExpoModulesCore: e4278a668e8c13c0269ed8b8a4200989deea2973
+  EXSensors: 7ab2611e2a780725d2b59fd831e59b8bdb330a5e
   FBLazyVector: f7b0632c6437e312acf6349288d9aa4cb6d59030
   FBReactNativeSpec: 0f4e1f4cfeace095694436e7c7fcc5bf4b03a0ff
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
@@ -639,7 +663,7 @@ SPEC CHECKSUMS:
   RNScreens: 40a2cb40a02a609938137a1e0acfbf8fc9eebf19
   RNSVG: 551acb6562324b1d52a4e0758f7ca0ec234e278f
   RNSyanImagePicker: 5c650d33f16f7cd59c47d9269f6c4856b30d7616
-  TZImagePickerController: fb446ac06ae9c217bc849185646a68465bcd0dd4
+  TZImagePickerController: 943511626019431372cf908f24c114521e484f0e
   UMTaskManagerInterface: 3184c93ecc290bd422c6e344badc89b601e9c29b
   Yoga: d6b6a80659aa3e91aaba01d0012e7edcbedcbecd
   ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb

diff --git a/ios/taroDemo.xcodeproj/project.pbxproj b/ios/taroDemo.xcodeproj/project.pbxproj
@@ -380,6 +380,7 @@
 					"-ObjC",
 					"-lc++",
 				);
+				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
 				PRODUCT_BUNDLE_IDENTIFIER = com.taro.demo;
 				PRODUCT_NAME = taroDemo;
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -410,6 +411,7 @@
 					"-ObjC",
 					"-lc++",
 				);
+				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
 				PRODUCT_BUNDLE_IDENTIFIER = com.taro.demo;
 				PRODUCT_NAME = taroDemo;
 				PROVISIONING_PROFILE_SPECIFIER = "";

diff --git a/package.json b/package.json
@@ -33,7 +33,7 @@
     "link": "react-native link",
     "update-version": "sh ./bin/update_version.sh",
     "podInstall": "pod-install",
-    "upgradePeerdeps": "install-peerdeps @tarojs/taro-rn@3.4.8 -o -Y && install-peerdeps @tarojs/components-rn@3.4.8 -o -Y && install-peerdeps @tarojs/router-rn@3.4.8 -o -Y && pod-install"
+    "upgradePeerdeps": "install-peerdeps @tarojs/taro-rn@3.5.0-beta.0 -o -Y && install-peerdeps @tarojs/components-rn@3.5.0-beta.0 -o -Y && install-peerdeps @tarojs/router-rn@3.5.0-beta.0 -o -Y && pod-install"
   },
   "browserslist": [
     "last 3 versions",
@@ -50,24 +50,23 @@
     "@react-native-community/slider": "~4.1.12",
     "@react-native-masked-view/masked-view": "~0.2.6",
     "@react-native-picker/picker": "~2.2.1",
-    "@tarojs/components": "3.4.8",
-    "@tarojs/plugin-framework-react": "3.4.8",
-    "@tarojs/react": "3.4.8",
-    "@tarojs/runtime": "3.4.8",
-    "@tarojs/taro": "3.4.8",
-    "@tarojs/taro-rn": "3.4.8",
-    "expo": "~44.0.6",
-    "expo-av": "~10.2.1",
-    "expo-barcode-scanner": "~11.2.1",
-    "expo-brightness": "~10.1.1",
-    "expo-camera": "~12.1.2",
-    "expo-file-system": "~13.1.4",
-    "expo-image-picker": "~12.0.2",
-    "expo-keep-awake": "~10.0.2",
+    "@tarojs/components": "3.5.0-beta.0",
+    "@tarojs/plugin-framework-react": "3.5.0-beta.0",
+    "@tarojs/react": "3.5.0-beta.0",
+    "@tarojs/runtime": "3.5.0-beta.0",
+    "@tarojs/taro": "3.5.0-beta.0",
+    "@tarojs/taro-rn": "3.5.0-beta.0",
+    "expo": "~45.0.2",
+    "expo-av": "~11.2.3",
+    "expo-barcode-scanner": "~11.3.0",
+    "expo-brightness": "~10.2.0",
+    "expo-camera": "~12.2.0",
+    "expo-file-system": "~14.0.0",
+    "expo-image-picker": "~13.1.1",
+    "expo-keep-awake": "~10.1.1",
     "expo-location": "~14.0.2",
-    "expo-modules-core": "~0.6.5",
-    "expo-permissions": "~13.1.1",
-    "expo-sensors": "~11.1.1",
+    "expo-modules-core": "~0.9.2",
+    "expo-sensors": "~11.2.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-native": "^0.67.3",
@@ -86,36 +85,26 @@
   "devDependencies": {
     "@babel/core": "^7.8.0",
     "@babel/runtime": "^7.7.7",
-    "@tarojs/cli": "3.4.8",
-    "@tarojs/mini-runner": "3.4.8",
-    "@tarojs/plugin-mini-ci": "3.4.8",
-    "@tarojs/rn-runner": "3.4.8",
-    "@tarojs/webpack-runner": "3.4.8",
+    "@pmmmwh/react-refresh-webpack-plugin": "0.5.5",
+    "@tarojs/cli": "3.5.0-beta.0",
+    "@tarojs/mini-runner": "3.5.0-beta.0",
+    "@tarojs/plugin-mini-ci": "3.5.0-beta.0",
+    "@tarojs/rn-runner": "3.5.0-beta.0",
+    "@tarojs/webpack-runner": "3.5.0-beta.0",
     "@types/react": "^17.0.2",
     "@types/webpack-env": "^1.13.6",
     "@typescript-eslint/eslint-plugin": "^4.15.1",
     "@typescript-eslint/parser": "^4.15.1",
-    "babel-preset-taro": "3.4.8",
+    "babel-preset-taro": "3.5.0-beta.0",
     "eslint": "^6.8.0",
-    "eslint-config-taro": "3.4.8",
+    "eslint-config-taro": "3.5.0-beta.0",
     "eslint-plugin-import": "^2.12.0",
     "eslint-plugin-react": "^7.8.2",
     "eslint-plugin-react-hooks": "^4.2.0",
     "install-peerdeps": "^3.0.3",
     "pod-install": "^0.1.23",
+    "react-refresh": "0.11.0",
     "stylelint": "9.3.0",
     "typescript": "^4.1.0"
-  },
-  "resolutions": {
-    "expo-av": "~10.2.1",
-    "expo-barcode-scanner": "~11.2.1",
-    "expo-brightness": "~10.1.1",
-    "expo-camera": "~12.1.2",
-    "expo-file-system": "~13.1.4",
-    "expo-image-picker": "~12.0.2",
-    "expo-keep-awake": "~10.0.2",
-    "expo-location": "~14.0.2",
-    "expo-permissions": "~13.1.1",
-    "expo-sensors": "~11.1.1"
   }
 }
diff --git a/src/pages/components/pages/camera/camera.scss b/src/pages/components/pages/camera/camera.scss
@@ -12,7 +12,9 @@
 }
 
 .preview {
+  /*  #ifndef  rn  */
   display: block;
+  /*  #endif  */
   width: 80%;
   margin: 0 auto;
   margin-top: 30px;

diff --git a/src/pages/components/pages/scroll-view/scroll-view.scss b/src/pages/components/pages/scroll-view/scroll-view.scss
@@ -4,7 +4,9 @@
     height: 240px;
     white-space: nowrap;
     &-item {
+      /*  #ifndef  rn  */
       display: inline-block;
+      /*  #endif  */
       width: 300px;
       height: 240px;
     }