Skip to content

Commit 397d2ab

Browse files
zhiqingchenzhiqingchen
committed
feat: use 3.5.0-beta.0
1 parent 40d1d1d commit 397d2ab

File tree

10 files changed

+1834
-1205
lines changed

10 files changed

+1834
-1205
lines changed

‎.github/workflows/assemble_ios_debug.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ env:
2626

2727
jobs:
2828
assemble:
29-
runs-on: macos-11
29+
runs-on: macos-12
3030
steps:
3131
- name: Checkout Project
3232
uses: actions/checkout@v2

‎.github/workflows/assemble_ios_release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ env:
2929

3030
jobs:
3131
assemble:
32-
runs-on: macos-11
32+
runs-on: macos-12
3333
steps:
3434
- name: Get current date
3535
id: date

‎android/app/src/main/java/com/tarodemo/MainActivity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public class MainActivity extends ReactActivity {
1212
@Override
1313
protected void onCreate(Bundle savedInstanceState) {
1414
SplashScreen.show(this);
15-
super.onCreate(savedInstanceState);
15+
super.onCreate(null);
1616
}
1717

1818
@Override

‎config/index.js

+1
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ const config = {
4747
}
4848
},
4949
framework: 'react',
50+
compiler: 'webpack4',
5051
mini: {
5152
postcss: {
5253
pxtransform: {

‎ios/Podfile.lock

+70-46
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,45 @@
11
PODS:
22
- boost (1.76.0)
33
- DoubleConversion (1.1.6)
4-
- EXApplication (4.0.2):
4+
- EXApplication (4.1.0):
55
- ExpoModulesCore
6-
- EXAV (10.2.1):
6+
- EXAV (11.2.3):
77
- ExpoModulesCore
8-
- ReactCommon/turbomodule/core
9-
- EXBarCodeScanner (11.2.1):
8+
- React-runtimeexecutor
9+
- ReactCommon
10+
- EXBarCodeScanner (11.3.0):
1011
- EXImageLoader
1112
- ExpoModulesCore
1213
- ZXingObjC/OneD
1314
- ZXingObjC/PDF417
14-
- EXBrightness (10.1.1):
15+
- EXBrightness (10.2.0):
1516
- ExpoModulesCore
16-
- EXCamera (12.1.2):
17+
- EXCamera (12.2.0):
1718
- ExpoModulesCore
18-
- EXConstants (13.0.2):
19+
- EXConstants (13.1.1):
1920
- ExpoModulesCore
20-
- EXErrorRecovery (3.0.5):
21+
- EXErrorRecovery (3.1.0):
2122
- ExpoModulesCore
22-
- EXFileSystem (13.1.4):
23+
- EXFileSystem (14.0.0):
2324
- ExpoModulesCore
24-
- EXFont (10.0.5):
25+
- EXFont (10.1.0):
2526
- ExpoModulesCore
26-
- EXImageLoader (3.1.1):
27+
- EXImageLoader (3.2.0):
2728
- ExpoModulesCore
2829
- React-Core
29-
- EXImagePicker (12.0.2):
30-
- ExpoModulesCore
31-
- EXKeepAwake (10.0.2):
32-
- ExpoModulesCore
3330
- EXLocation (14.0.2):
3431
- ExpoModulesCore
3532
- UMTaskManagerInterface
36-
- EXPermissions (13.1.1):
33+
- Expo (45.0.2):
34+
- ExpoModulesCore
35+
- ExpoImagePicker (13.1.1):
3736
- ExpoModulesCore
38-
- Expo (44.0.6):
37+
- ExpoKeepAwake (10.1.1):
3938
- ExpoModulesCore
40-
- ExpoModulesCore (0.6.5):
39+
- ExpoModulesCore (0.9.2):
4140
- React-Core
4241
- ReactCommon/turbomodule/core
43-
- EXSensors (11.1.1):
42+
- EXSensors (11.2.0):
4443
- ExpoModulesCore
4544
- FBLazyVector (0.67.4)
4645
- FBReactNativeSpec (0.67.4):
@@ -323,6 +322,24 @@ PODS:
323322
- ReactCommon/turbomodule/core (= 0.67.4)
324323
- React-runtimeexecutor (0.67.4):
325324
- React-jsi (= 0.67.4)
325+
- ReactCommon (0.67.4):
326+
- React-logger (= 0.67.4)
327+
- ReactCommon/react_debug_core (= 0.67.4)
328+
- ReactCommon/turbomodule (= 0.67.4)
329+
- ReactCommon/react_debug_core (0.67.4):
330+
- React-logger (= 0.67.4)
331+
- ReactCommon/turbomodule (0.67.4):
332+
- DoubleConversion
333+
- glog
334+
- RCT-Folly (= 2021.06.28.00-v2)
335+
- React-callinvoker (= 0.67.4)
336+
- React-Core (= 0.67.4)
337+
- React-cxxreact (= 0.67.4)
338+
- React-jsi (= 0.67.4)
339+
- React-logger (= 0.67.4)
340+
- React-perflogger (= 0.67.4)
341+
- ReactCommon/turbomodule/core (= 0.67.4)
342+
- ReactCommon/turbomodule/samples (= 0.67.4)
326343
- ReactCommon/turbomodule/core (0.67.4):
327344
- DoubleConversion
328345
- glog
@@ -333,6 +350,17 @@ PODS:
333350
- React-jsi (= 0.67.4)
334351
- React-logger (= 0.67.4)
335352
- React-perflogger (= 0.67.4)
353+
- ReactCommon/turbomodule/samples (0.67.4):
354+
- DoubleConversion
355+
- glog
356+
- RCT-Folly (= 2021.06.28.00-v2)
357+
- React-callinvoker (= 0.67.4)
358+
- React-Core (= 0.67.4)
359+
- React-cxxreact (= 0.67.4)
360+
- React-jsi (= 0.67.4)
361+
- React-logger (= 0.67.4)
362+
- React-perflogger (= 0.67.4)
363+
- ReactCommon/turbomodule/core (= 0.67.4)
336364
- RNCAsyncStorage (1.15.17):
337365
- React-Core
338366
- RNCClipboard (1.5.1):
@@ -353,7 +381,7 @@ PODS:
353381
- RNSyanImagePicker (0.5.3):
354382
- React
355383
- TZImagePickerController
356-
- TZImagePickerController (3.7.6)
384+
- TZImagePickerController (3.8.1)
357385
- UMTaskManagerInterface (7.1.1):
358386
- ExpoModulesCore
359387
- Yoga (1.14.0)
@@ -376,11 +404,10 @@ DEPENDENCIES:
376404
- EXFileSystem (from `../node_modules/expo-file-system/ios`)
377405
- EXFont (from `../node_modules/expo-font/ios`)
378406
- EXImageLoader (from `../node_modules/expo-image-loader/ios`)
379-
- EXImagePicker (from `../node_modules/expo-image-picker/ios`)
380-
- EXKeepAwake (from `../node_modules/expo-keep-awake/ios`)
381407
- EXLocation (from `../node_modules/expo-location/ios`)
382-
- EXPermissions (from `../node_modules/expo-permissions/ios`)
383408
- Expo (from `../node_modules/expo/ios`)
409+
- ExpoImagePicker (from `../node_modules/expo-image-picker/ios`)
410+
- ExpoKeepAwake (from `../node_modules/expo-keep-awake/ios`)
384411
- ExpoModulesCore (from `../node_modules/expo-modules-core/ios`)
385412
- EXSensors (from `../node_modules/expo-sensors/ios`)
386413
- FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
@@ -464,16 +491,14 @@ EXTERNAL SOURCES:
464491
:path: "../node_modules/expo-font/ios"
465492
EXImageLoader:
466493
:path: "../node_modules/expo-image-loader/ios"
467-
EXImagePicker:
468-
:path: "../node_modules/expo-image-picker/ios"
469-
EXKeepAwake:
470-
:path: "../node_modules/expo-keep-awake/ios"
471494
EXLocation:
472495
:path: "../node_modules/expo-location/ios"
473-
EXPermissions:
474-
:path: "../node_modules/expo-permissions/ios"
475496
Expo:
476497
:path: "../node_modules/expo/ios"
498+
ExpoImagePicker:
499+
:path: "../node_modules/expo-image-picker/ios"
500+
ExpoKeepAwake:
501+
:path: "../node_modules/expo-keep-awake/ios"
477502
ExpoModulesCore:
478503
:path: "../node_modules/expo-modules-core/ios"
479504
EXSensors:
@@ -576,23 +601,22 @@ EXTERNAL SOURCES:
576601
SPEC CHECKSUMS:
577602
boost: a7c83b31436843459a1961bfd74b96033dc77234
578603
DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662
579-
EXApplication: 54fe5bd6268d697771645e8f1aef8b806a65247a
580-
EXAV: b9ed0c201092244c46aa78f907f5c66176bed236
581-
EXBarCodeScanner: e5ca0062d8ad1c4c1d2e386d6a308d5a32213020
582-
EXBrightness: 8c4b08861ced2bdc31362e587aadcf73514ca7bb
583-
EXCamera: 4a0d00d6d1e4703c31a75514d8bc804a2eab27bd
584-
EXConstants: 88bf79622fbd9b476c96d8ec57fe97ca44fe8e3c
585-
EXErrorRecovery: b0d7582714a2cc896e94a2308a356f94dbf14ef7
586-
EXFileSystem: 08a3033ac372b6346becf07839e1ccef26fb1058
587-
EXFont: 2597c10ac85a69d348d44d7873eccf5a7576ef5e
588-
EXImageLoader: 347b72c2ec2df65120ccec40ea65a4c4f24317ff
589-
EXImagePicker: bf4d62532cc2bf217edbe4abbb0014e73e079eac
590-
EXKeepAwake: bf48d7f740a5cd2befed6cf9a49911d385c6c47d
604+
EXApplication: d6562af1204162e0ac46d341a7d4e5dc720b33de
605+
EXAV: 88f61c5af8415715b7ee51f084c1020235b85c56
606+
EXBarCodeScanner: b9e1b69371c233a80fc857edcf95843f14ae9e7b
607+
EXBrightness: 2a5e81b350838cad814730c10ab845c7afc45a11
608+
EXCamera: 2cbc8206cb520562c1527fe565aa9f00df8e5e8f
609+
EXConstants: fdbe52259365b6a6faaa5e99a3b82cfa6bc2eb61
610+
EXErrorRecovery: 3ce46e5d42e53c0371ff048a7f0cbc959968ef4a
611+
EXFileSystem: 2aa2d9289f84bca9532b9ccbd81504fa31eb1ded
612+
EXFont: 04235cc22e6fef86028feb67db452978dc6f240f
613+
EXImageLoader: b88e053d760f85a82405b1db2de4abf11978fc9f
591614
EXLocation: 013b5d07cca26c2d15d998766322e70b7a228b57
592-
EXPermissions: 2f8db9cfb1919d6c6776f462bb2c5a903e423b2a
593-
Expo: 534e51e607aba8229293297da5585f4b26f50fa1
594-
ExpoModulesCore: 32c0ccb47f477d330ee93db72505380adf0de09a
595-
EXSensors: 67a98cf6297d3d5996dc9f08613e4058675ce99d
615+
Expo: 27c7466cea6c8be416d8e50a0c0faa48cf8b4d1a
616+
ExpoImagePicker: d9d6b4f29db437fc7796f13cee5f133f5b4b5f7c
617+
ExpoKeepAwake: c0c494b442ecd8122974c13b93ccfb57bd408e88
618+
ExpoModulesCore: e4278a668e8c13c0269ed8b8a4200989deea2973
619+
EXSensors: 7ab2611e2a780725d2b59fd831e59b8bdb330a5e
596620
FBLazyVector: f7b0632c6437e312acf6349288d9aa4cb6d59030
597621
FBReactNativeSpec: 0f4e1f4cfeace095694436e7c7fcc5bf4b03a0ff
598622
fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
@@ -639,7 +663,7 @@ SPEC CHECKSUMS:
639663
RNScreens: 40a2cb40a02a609938137a1e0acfbf8fc9eebf19
640664
RNSVG: 551acb6562324b1d52a4e0758f7ca0ec234e278f
641665
RNSyanImagePicker: 5c650d33f16f7cd59c47d9269f6c4856b30d7616
642-
TZImagePickerController: fb446ac06ae9c217bc849185646a68465bcd0dd4
666+
TZImagePickerController: 943511626019431372cf908f24c114521e484f0e
643667
UMTaskManagerInterface: 3184c93ecc290bd422c6e344badc89b601e9c29b
644668
Yoga: d6b6a80659aa3e91aaba01d0012e7edcbedcbecd
645669
ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb

‎ios/taroDemo.xcodeproj/project.pbxproj

+2
Original file line numberDiff line numberDiff line change
@@ -380,6 +380,7 @@
380380
"-ObjC",
381381
"-lc++",
382382
);
383+
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
383384
PRODUCT_BUNDLE_IDENTIFIER = com.taro.demo;
384385
PRODUCT_NAME = taroDemo;
385386
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -410,6 +411,7 @@
410411
"-ObjC",
411412
"-lc++",
412413
);
414+
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
413415
PRODUCT_BUNDLE_IDENTIFIER = com.taro.demo;
414416
PRODUCT_NAME = taroDemo;
415417
PROVISIONING_PROFILE_SPECIFIER = "";

‎package.json

+26-37
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"link": "react-native link",
3434
"update-version": "sh ./bin/update_version.sh",
3535
"podInstall": "pod-install",
36-
"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"
36+
"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"
3737
},
3838
"browserslist": [
3939
"last 3 versions",
@@ -50,24 +50,23 @@
5050
"@react-native-community/slider": "~4.1.12",
5151
"@react-native-masked-view/masked-view": "~0.2.6",
5252
"@react-native-picker/picker": "~2.2.1",
53-
"@tarojs/components": "3.4.8",
54-
"@tarojs/plugin-framework-react": "3.4.8",
55-
"@tarojs/react": "3.4.8",
56-
"@tarojs/runtime": "3.4.8",
57-
"@tarojs/taro": "3.4.8",
58-
"@tarojs/taro-rn": "3.4.8",
59-
"expo": "~44.0.6",
60-
"expo-av": "~10.2.1",
61-
"expo-barcode-scanner": "~11.2.1",
62-
"expo-brightness": "~10.1.1",
63-
"expo-camera": "~12.1.2",
64-
"expo-file-system": "~13.1.4",
65-
"expo-image-picker": "~12.0.2",
66-
"expo-keep-awake": "~10.0.2",
53+
"@tarojs/components": "3.5.0-beta.0",
54+
"@tarojs/plugin-framework-react": "3.5.0-beta.0",
55+
"@tarojs/react": "3.5.0-beta.0",
56+
"@tarojs/runtime": "3.5.0-beta.0",
57+
"@tarojs/taro": "3.5.0-beta.0",
58+
"@tarojs/taro-rn": "3.5.0-beta.0",
59+
"expo": "~45.0.2",
60+
"expo-av": "~11.2.3",
61+
"expo-barcode-scanner": "~11.3.0",
62+
"expo-brightness": "~10.2.0",
63+
"expo-camera": "~12.2.0",
64+
"expo-file-system": "~14.0.0",
65+
"expo-image-picker": "~13.1.1",
66+
"expo-keep-awake": "~10.1.1",
6767
"expo-location": "~14.0.2",
68-
"expo-modules-core": "~0.6.5",
69-
"expo-permissions": "~13.1.1",
70-
"expo-sensors": "~11.1.1",
68+
"expo-modules-core": "~0.9.2",
69+
"expo-sensors": "~11.2.0",
7170
"react": "^17.0.2",
7271
"react-dom": "^17.0.2",
7372
"react-native": "^0.67.3",
@@ -86,36 +85,26 @@
8685
"devDependencies": {
8786
"@babel/core": "^7.8.0",
8887
"@babel/runtime": "^7.7.7",
89-
"@tarojs/cli": "3.4.8",
90-
"@tarojs/mini-runner": "3.4.8",
91-
"@tarojs/plugin-mini-ci": "3.4.8",
92-
"@tarojs/rn-runner": "3.4.8",
93-
"@tarojs/webpack-runner": "3.4.8",
88+
"@pmmmwh/react-refresh-webpack-plugin": "0.5.5",
89+
"@tarojs/cli": "3.5.0-beta.0",
90+
"@tarojs/mini-runner": "3.5.0-beta.0",
91+
"@tarojs/plugin-mini-ci": "3.5.0-beta.0",
92+
"@tarojs/rn-runner": "3.5.0-beta.0",
93+
"@tarojs/webpack-runner": "3.5.0-beta.0",
9494
"@types/react": "^17.0.2",
9595
"@types/webpack-env": "^1.13.6",
9696
"@typescript-eslint/eslint-plugin": "^4.15.1",
9797
"@typescript-eslint/parser": "^4.15.1",
98-
"babel-preset-taro": "3.4.8",
98+
"babel-preset-taro": "3.5.0-beta.0",
9999
"eslint": "^6.8.0",
100-
"eslint-config-taro": "3.4.8",
100+
"eslint-config-taro": "3.5.0-beta.0",
101101
"eslint-plugin-import": "^2.12.0",
102102
"eslint-plugin-react": "^7.8.2",
103103
"eslint-plugin-react-hooks": "^4.2.0",
104104
"install-peerdeps": "^3.0.3",
105105
"pod-install": "^0.1.23",
106+
"react-refresh": "0.11.0",
106107
"stylelint": "9.3.0",
107108
"typescript": "^4.1.0"
108-
},
109-
"resolutions": {
110-
"expo-av": "~10.2.1",
111-
"expo-barcode-scanner": "~11.2.1",
112-
"expo-brightness": "~10.1.1",
113-
"expo-camera": "~12.1.2",
114-
"expo-file-system": "~13.1.4",
115-
"expo-image-picker": "~12.0.2",
116-
"expo-keep-awake": "~10.0.2",
117-
"expo-location": "~14.0.2",
118-
"expo-permissions": "~13.1.1",
119-
"expo-sensors": "~11.1.1"
120109
}
121110
}

‎src/pages/components/pages/camera/camera.scss

+2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212
}
1313

1414
.preview {
15+
/* #ifndef rn */
1516
display: block;
17+
/* #endif */
1618
width: 80%;
1719
margin: 0 auto;
1820
margin-top: 30px;

‎src/pages/components/pages/scroll-view/scroll-view.scss

+2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44
height: 240px;
55
white-space: nowrap;
66
&-item {
7+
/* #ifndef rn */
78
display: inline-block;
9+
/* #endif */
810
width: 300px;
911
height: 240px;
1012
}

0 commit comments

Comments
 (0)