Skip to content

Commit

Permalink
feat: taro 3.4.8
Browse files Browse the repository at this point in the history
  • Loading branch information
zhiqingchen committed Apr 26, 2022
1 parent eecc786 commit 9812420
Show file tree
Hide file tree
Showing 5 changed files with 604 additions and 5,251 deletions.
27 changes: 14 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"link": "react-native link",
"update-version": "sh ./bin/update_version.sh",
"podInstall": "pod-install",
"upgradePeerdeps": "install-peerdeps @tarojs/[email protected].7 -o -Y && install-peerdeps @tarojs/[email protected].7 -o -Y && install-peerdeps @tarojs/[email protected].7 -o -Y && pod-install"
"upgradePeerdeps": "install-peerdeps @tarojs/[email protected].8 -o -Y && install-peerdeps @tarojs/[email protected].8 -o -Y && install-peerdeps @tarojs/[email protected].8 -o -Y && pod-install"
},
"browserslist": [
"last 3 versions",
Expand All @@ -50,11 +50,12 @@
"@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.7",
"@tarojs/react": "3.4.7",
"@tarojs/runtime": "3.4.7",
"@tarojs/taro": "3.4.7",
"@tarojs/taro-rn": "3.4.7",
"@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-av": "~9.2.3",
"expo-barcode-scanner": "~10.2.2",
"expo-brightness": "~9.2.2",
Expand Down Expand Up @@ -85,18 +86,18 @@
"devDependencies": {
"@babel/core": "^7.8.0",
"@babel/runtime": "^7.7.7",
"@tarojs/cli": "3.4.7",
"@tarojs/mini-runner": "3.4.7",
"@tarojs/plugin-mini-ci": "3.4.7",
"@tarojs/rn-runner": "3.4.7",
"@tarojs/webpack-runner": "3.4.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",
"@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.7",
"babel-preset-taro": "3.4.8",
"eslint": "^6.8.0",
"eslint-config-taro": "3.4.7",
"eslint-config-taro": "3.4.8",
"eslint-plugin-import": "^2.12.0",
"eslint-plugin-react": "^7.8.2",
"eslint-plugin-react-hooks": "^4.2.0",
Expand Down
5 changes: 0 additions & 5 deletions src/app.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -119,10 +119,5 @@ export default {
text: '关于',
},
]
},
rn: {
stackProps: {
detachInactiveScreens: false
}
}
}
7 changes: 6 additions & 1 deletion src/pages/global/pages/styles/platform.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
.ifdef-bgc {
color: white;
font-size: 30px;
background-color: black;
/* #ifdef h5 */
background-color: red;
Expand All @@ -13,6 +14,7 @@
}
.ifndef-bgc {
color: white;
font-size: 30px;
background-color: black;
/* #ifndef weapp rn */
background-color: red;
Expand All @@ -24,7 +26,10 @@
background-color: blue;
/* #endif */
}
/* #ifdef h5 */
.ifdef-color, .ifndef-color {
font-size: 30px;
}
/* #ifdef h5 */
.ifdef-color {
color: red;
}
Expand Down
7 changes: 7 additions & 0 deletions src/pages/global/pages/styles/size.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,13 @@ export default function Size() {
<View className="global-page__header">
<Header title="unit"></Header>
</View>
<View className="global-page__body">
<View className="global-page__body-example example">
<View className='example-body'>
<View>font-size: inherit</View>
</View>
</View>
</View>
<View className="global-page__body">
<View className="global-page__body-example example">
<View className='example-body'>
Expand Down
Loading

0 comments on commit 9812420

Please sign in to comment.