Skip to content

Commit 79236de

Browse files
authored
chore: 修改版本兼容最新的模拟器 (#1510)
1 parent 0b14946 commit 79236de

File tree

3 files changed

+2934
-2636
lines changed

3 files changed

+2934
-2636
lines changed
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
const fs = require('fs')
22
const path = require('path')
3-
const blacklist = require('metro-config/src/defaults/exclusionList')
3+
const exclusionList = require('metro-config/src/defaults/exclusionList')
44
const escape = require('escape-string-regexp')
55

66
const taroUI = path.resolve(__dirname, '../taro-ui')
77
const pak = JSON.parse(
8-
fs.readFileSync(path.join(taroUI, 'package.json'), 'utf8'),
8+
fs.readFileSync(path.join(taroUI, 'package.json'), 'utf8')
99
)
1010

1111
const modules = [
@@ -17,8 +17,8 @@ const modules = [
1717
'react-native-root-siblings',
1818
...Object.keys({
1919
...pak.dependencies,
20-
...pak.peerDependencies,
21-
}),
20+
...pak.peerDependencies
21+
})
2222
]
2323

2424
module.exports = {
@@ -30,8 +30,8 @@ module.exports = {
3030
acc[name] = path.join(__dirname, 'node_modules', name)
3131
return acc
3232
}, {}),
33-
blacklistRE: blacklist([
34-
new RegExp(`^${escape(path.join(taroUI, 'node_modules'))}\\/.*$`),
35-
]),
36-
},
33+
blockList: exclusionList([
34+
new RegExp(`^${escape(path.join(taroUI, 'node_modules'))}\\/.*$`)
35+
])
36+
}
3737
}

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

Lines changed: 28 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,31 +42,47 @@
4242
],
4343
"dependencies": {
4444
"@babel/runtime": "^7.7.7",
45-
"@tarojs/components": "^3.3.20",
46-
"@tarojs/react": "^3.3.20",
47-
"@tarojs/rn-runner": "^3.3.20",
48-
"@tarojs/runtime": "^3.3.20",
49-
"@tarojs/taro": "^3.3.20",
50-
"@tarojs/taro-rn": "^3.3.20",
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",
5152
"react": "^17.0.2",
5253
"react-dom": "^16.13.0",
53-
"react-native": "^0.66.0",
54+
"react-native": "~0.68.1",
5455
"react-native-modal": "^13.0.0",
5556
"taro-ui": "3.1.0-beta.2"
5657
},
5758
"devDependencies": {
5859
"@babel/core": "^7.8.0",
5960
"@react-native-picker/picker": "^1.15.0",
60-
"@tarojs/cli": "^3.3.20",
61-
"@tarojs/mini-runner": "^3.3.20",
62-
"@tarojs/webpack-runner": "^3.3.20",
61+
"@tarojs/cli": "3.4.13",
62+
"@tarojs/mini-runner": "3.4.13",
63+
"@tarojs/webpack-runner": "3.4.13",
6364
"@types/react": "^16.0.0",
6465
"@types/webpack-env": "^1.13.6",
6566
"babel-plugin-transform-imports": "^2.0.0",
66-
"babel-preset-taro": "^3.3.20",
67+
"babel-preset-taro": "3.4.13",
6768
"escape-string-regexp": "^4.0.0",
68-
"eslint-config-taro": "^3.3.20",
69+
"eslint-config-taro": "3.4.13",
70+
"expo-constants": "13.1.1",
71+
"expo-modules-core": "0.9.2",
6972
"patch-package": "^6.4.7",
7073
"typescript": "^3.8.3"
74+
},
75+
"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"
7187
}
7288
}

0 commit comments

Comments
 (0)