Skip to content

Commit 2a33d44

Browse files
committed
feat: use rn 0.70.1
1 parent 34035c0 commit 2a33d44

File tree

6 files changed

+4756
-3616
lines changed

6 files changed

+4756
-3616
lines changed

packages/taro-ui-demo-rn/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
import '@tarojs/rn-supporter/entry-file.js'

packages/taro-ui-demo-rn/metro.config.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
const { mergeConfig } = require('metro-config')
2+
const { getMetroConfig } = require('@tarojs/rn-supporter')
13
const fs = require('fs')
24
const path = require('path')
35
const exclusionList = require('metro-config/src/defaults/exclusionList')
@@ -13,6 +15,7 @@ const modules = [
1315
'react-native',
1416
'@tarojs/components-rn',
1517
'@tarojs/taro-rn',
18+
'@tarojs/runtime-rn',
1619
'react-native-svg',
1720
'react-native-root-siblings',
1821
...Object.keys({
@@ -21,7 +24,7 @@ const modules = [
2124
})
2225
]
2326

24-
module.exports = {
27+
module.exports = mergeConfig({
2528
// maxWorkers: 1,
2629
// resetCache: true,
2730
watchFolders: [taroUI, __dirname],
@@ -34,4 +37,4 @@ module.exports = {
3437
new RegExp(`^${escape(path.join(taroUI, 'node_modules'))}\\/.*$`)
3538
])
3639
}
37-
}
40+
}, getMetroConfig())

packages/taro-ui-demo-rn/package.json

Lines changed: 18 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -42,47 +42,37 @@
4242
],
4343
"dependencies": {
4444
"@babel/runtime": "^7.7.7",
45-
"@tarojs/components": "3.4.13",
46-
"@tarojs/plugin-framework-react": "3.4.13",
47-
"@tarojs/react": "3.4.13",
48-
"@tarojs/rn-runner": "3.4.13",
49-
"@tarojs/runtime": "3.4.13",
50-
"@tarojs/taro": "3.4.13",
51-
"@tarojs/taro-rn": "3.4.13",
52-
"react": "^17.0.2",
53-
"react-dom": "^16.13.0",
54-
"react-native": "~0.68.1",
45+
"@tarojs/components": "3.5.7-alpha.11",
46+
"@tarojs/plugin-framework-react": "3.5.7-alpha.11",
47+
"@tarojs/react": "3.5.7-alpha.11",
48+
"@tarojs/rn-runner": "3.5.7-alpha.11",
49+
"@tarojs/runtime": "3.5.7-alpha.11",
50+
"@tarojs/taro": "3.5.7-alpha.11",
51+
"@tarojs/taro-rn": "3.5.7-alpha.11",
52+
"react": "^18.1.0",
53+
"react-dom": "^18.1.0",
54+
"react-native": "~0.70.5",
5555
"react-native-modal": "^13.0.0",
5656
"taro-ui": "3.1.0-beta.4"
5757
},
5858
"devDependencies": {
5959
"@babel/core": "^7.8.0",
6060
"@react-native-picker/picker": "^1.15.0",
61-
"@tarojs/cli": "3.4.13",
62-
"@tarojs/mini-runner": "3.4.13",
63-
"@tarojs/webpack-runner": "3.4.13",
61+
"@tarojs/cli": "3.5.7-alpha.11",
62+
"@tarojs/mini-runner": "3.5.7-alpha.11",
63+
"@tarojs/webpack-runner": "3.5.7-alpha.11",
6464
"@types/react": "^16.0.0",
6565
"@types/webpack-env": "^1.13.6",
6666
"babel-plugin-transform-imports": "^2.0.0",
67-
"babel-preset-taro": "3.4.13",
67+
"babel-preset-taro": "3.5.7-alpha.11",
6868
"escape-string-regexp": "^4.0.0",
69-
"eslint-config-taro": "3.4.13",
70-
"expo-constants": "13.1.1",
71-
"expo-modules-core": "0.9.2",
69+
"eslint-config-taro": "3.5.7-alpha.11",
70+
"expo": "~47.0.3",
7271
"patch-package": "^6.4.7",
72+
"react-native-svg": "13.4.0",
7373
"typescript": "^3.8.3"
7474
},
7575
"resolutions": {
76-
"sass": "1.37.5",
77-
"expo-camera": "12.3.0",
78-
"expo-barcode-scanner": "11.3.0",
79-
"expo-image-picker": "13.1.1",
80-
"expo-brightness": "10.2.0",
81-
"expo-file-system": "14.0.0",
82-
"expo-keep-awake": "10.1.1",
83-
"expo-permissions": "13.2.0",
84-
"expo-sensors": "11.3.0",
85-
"expo-asset": "8.5.0",
86-
"expo-av": "11.2.3"
76+
"sass": "1.37.5"
8777
}
8878
}

0 commit comments

Comments
 (0)