Skip to content

Commit eab45a9

Browse files
robinv8robinv8
committed
Merge branch 'feat/rn-71' into v3.4
2 parents e1bda1e + dc77a8a commit eab45a9

File tree

9 files changed

+7440
-7181
lines changed

9 files changed

+7440
-7181
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: 20 additions & 14 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,17 +24,20 @@ const modules = [
2124
})
2225
]
2326

24-
module.exports = {
25-
// maxWorkers: 1,
26-
// resetCache: true,
27-
watchFolders: [taroUI, __dirname],
28-
resolver: {
29-
extraNodeModules: modules.reduce((acc, name) => {
30-
acc[name] = path.join(__dirname, 'node_modules', name)
31-
return acc
32-
}, {}),
33-
blockList: exclusionList([
34-
new RegExp(`^${escape(path.join(taroUI, 'node_modules'))}\\/.*$`)
35-
])
36-
}
37-
}
27+
module.exports = mergeConfig(
28+
{
29+
// maxWorkers: 1,
30+
// resetCache: true,
31+
watchFolders: [taroUI, __dirname],
32+
resolver: {
33+
extraNodeModules: modules.reduce((acc, name) => {
34+
acc[name] = path.join(__dirname, 'node_modules', name)
35+
return acc
36+
}, {}),
37+
blockList: exclusionList([
38+
new RegExp(`^${escape(path.join(taroUI, 'node_modules'))}\\/.*$`)
39+
])
40+
}
41+
},
42+
getMetroConfig()
43+
)

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

Lines changed: 19 additions & 29 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.6.5-canary.1",
46+
"@tarojs/plugin-framework-react": "3.6.5-canary.1",
47+
"@tarojs/react": "3.6.5-canary.1",
48+
"@tarojs/rn-runner": "3.6.5-canary.1",
49+
"@tarojs/runtime": "3.6.5-canary.1",
50+
"@tarojs/taro": "3.6.5-canary.1",
51+
"@tarojs/taro-rn": "3.6.5-canary.1",
52+
"react": "^18.2.0",
53+
"react-dom": "^18.2.0",
54+
"react-native": "^0.71.6",
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",
64-
"@types/react": "^16.0.0",
61+
"@tarojs/cli": "3.6.5-canary.1",
62+
"@tarojs/mini-runner": "3.6.5-canary.1",
63+
"@tarojs/webpack-runner": "3.6.5-canary.1",
64+
"@types/react": "^18.2.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.6.5-canary.1",
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.6.5-canary.1",
70+
"expo": "~48.0.0",
7271
"patch-package": "^6.4.7",
72+
"react-native-svg": "13.8.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
}

‎packages/taro-ui-demo-rn/yarn.lock

Lines changed: 3779 additions & 4790 deletions
Large diffs are not rendered by default.

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@
5656
"@tarojs/runtime": "~3.6.1",
5757
"@tarojs/shared": "~3.6.1",
5858
"@tarojs/taro": "~3.6.1",
59-
"react": "^18.0.0",
60-
"react-dom": "^18.0.0",
59+
"react": "^18.2.0",
60+
"react-dom": "^18.2.0",
6161
"taro-ui": "file:../taro-ui"
6262
},
6363
"devDependencies": {
@@ -66,8 +66,8 @@
6666
"@tarojs/cli": "~3.6.1",
6767
"@tarojs/mini-runner": "~3.6.1",
6868
"@tarojs/webpack-runner": "~3.6.1",
69-
"@types/react": "^18.0.0",
70-
"@types/react-dom": "^18.0.0",
69+
"@types/react": "^18.2.0",
70+
"@types/react-dom": "^18.2.0",
7171
"@types/webpack-env": "^1.13.6",
7272
"@typescript-eslint/eslint-plugin": "^5.20.0",
7373
"@typescript-eslint/parser": "^5.20.0",

‎packages/taro-ui-docs/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
"core-js": "~3.6.0",
3030
"highlight.js": "^9.18.1",
3131
"qrcode.react": "^1.0.0",
32-
"react": "^18.0.0",
33-
"react-dom": "^18.0.0",
32+
"react": "^18.2.0",
33+
"react-dom": "^18.2.0",
3434
"react-router-dom": "^5.1.2",
3535
"regenerator-runtime": "^0.13.5",
3636
"taro-ui-demo": "file:../taro-ui-demo"
@@ -42,8 +42,8 @@
4242
"@babel/preset-env": "^7.9.0",
4343
"@babel/preset-react": "^7.9.4",
4444
"@types/classnames": "^2.2.10",
45-
"@types/react": "^18.0.0",
46-
"@types/react-dom": "^18.0.0",
45+
"@types/react": "^18.2.0",
46+
"@types/react-dom": "^18.2.0",
4747
"@types/webpack-env": "^1.15.1",
4848
"babel-eslint": "^10.1.0",
4949
"babel-loader": "^8.1.0",

‎packages/taro-ui/package.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,16 @@
6262
"@tarojs/components": "~3.6.1",
6363
"@tarojs/react": "~3.6.1",
6464
"@tarojs/taro": "~3.6.1",
65+
"@tarojs/runtime-rn": "~3.6.1",
6566
"@types/classnames": "^2.2.9",
6667
"@types/node": "^13.11.1",
67-
"@types/react": "^18.0.0",
68-
"@types/react-dom": "^18.0.0",
68+
"@types/react": "^18.2.0",
69+
"@types/react-dom": "^18.2.0",
6970
"@types/react-native": "^0.64.13",
7071
"camelize": "^1.0.0",
71-
"react": "^18.0.0",
72-
"react-dom": "^18.0.0",
73-
"react-native": "^0.64.0",
72+
"react": "^18.2.0",
73+
"react-dom": "^18.2.0",
74+
"react-native": "^0.71.6",
7475
"rollup": "^2.3.1",
7576
"rollup-plugin-copy": "^3.3.0",
7677
"rollup-plugin-typescript2": "^0.27.0",

0 commit comments

Comments
 (0)