Skip to content

Commit 9812420

Browse files
committed
feat: taro 3.4.8
1 parent eecc786 commit 9812420

File tree

5 files changed

+604
-5251
lines changed

5 files changed

+604
-5251
lines changed

package.json

+14-13
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.7 -o -Y && install-peerdeps @tarojs/components-rn@3.4.7 -o -Y && install-peerdeps @tarojs/router-rn@3.4.7 -o -Y && 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"
3737
},
3838
"browserslist": [
3939
"last 3 versions",
@@ -50,11 +50,12 @@
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.7",
54-
"@tarojs/react": "3.4.7",
55-
"@tarojs/runtime": "3.4.7",
56-
"@tarojs/taro": "3.4.7",
57-
"@tarojs/taro-rn": "3.4.7",
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",
5859
"expo-av": "~9.2.3",
5960
"expo-barcode-scanner": "~10.2.2",
6061
"expo-brightness": "~9.2.2",
@@ -85,18 +86,18 @@
8586
"devDependencies": {
8687
"@babel/core": "^7.8.0",
8788
"@babel/runtime": "^7.7.7",
88-
"@tarojs/cli": "3.4.7",
89-
"@tarojs/mini-runner": "3.4.7",
90-
"@tarojs/plugin-mini-ci": "3.4.7",
91-
"@tarojs/rn-runner": "3.4.7",
92-
"@tarojs/webpack-runner": "3.4.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",
9394
"@types/react": "^17.0.2",
9495
"@types/webpack-env": "^1.13.6",
9596
"@typescript-eslint/eslint-plugin": "^4.15.1",
9697
"@typescript-eslint/parser": "^4.15.1",
97-
"babel-preset-taro": "3.4.7",
98+
"babel-preset-taro": "3.4.8",
9899
"eslint": "^6.8.0",
99-
"eslint-config-taro": "3.4.7",
100+
"eslint-config-taro": "3.4.8",
100101
"eslint-plugin-import": "^2.12.0",
101102
"eslint-plugin-react": "^7.8.2",
102103
"eslint-plugin-react-hooks": "^4.2.0",

src/app.config.ts

-5
Original file line numberDiff line numberDiff line change
@@ -119,10 +119,5 @@ export default {
119119
text: '关于',
120120
},
121121
]
122-
},
123-
rn: {
124-
stackProps: {
125-
detachInactiveScreens: false
126-
}
127122
}
128123
}

src/pages/global/pages/styles/platform.scss

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
.ifdef-bgc {
22
color: white;
3+
font-size: 30px;
34
background-color: black;
45
/* #ifdef h5 */
56
background-color: red;
@@ -13,6 +14,7 @@
1314
}
1415
.ifndef-bgc {
1516
color: white;
17+
font-size: 30px;
1618
background-color: black;
1719
/* #ifndef weapp rn */
1820
background-color: red;
@@ -24,7 +26,10 @@
2426
background-color: blue;
2527
/* #endif */
2628
}
27-
/* #ifdef h5 */
29+
.ifdef-color, .ifndef-color {
30+
font-size: 30px;
31+
}
32+
/* #ifdef h5 */
2833
.ifdef-color {
2934
color: red;
3035
}

src/pages/global/pages/styles/size.tsx

+7
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,13 @@ export default function Size() {
99
<View className="global-page__header">
1010
<Header title="unit"></Header>
1111
</View>
12+
<View className="global-page__body">
13+
<View className="global-page__body-example example">
14+
<View className='example-body'>
15+
<View>font-size: inherit</View>
16+
</View>
17+
</View>
18+
</View>
1219
<View className="global-page__body">
1320
<View className="global-page__body-example example">
1421
<View className='example-body'>

0 commit comments

Comments
 (0)