Skip to content

Commit b02daba

Browse files
jasonzhuangyougensorrycc
authored
feat: support react 18 (#2515)
* 升级react 18 * 忽略.history * 忽略.history * build the project with react18 * change package.json version to 3.0.0 * 不修改code style, 不手动改版本号 * 不修改code style, 回滚代码样式格式化 * chore: code style * chore: code style --------- Co-authored-by: yougen <[email protected]> Co-authored-by: sorrycc <[email protected]>
1 parent 968da6a commit b02daba

File tree

5 files changed

+9
-8
lines changed

5 files changed

+9
-8
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@
88
/packages/**/node_modules
99
/packages/**/dist
1010
/lerna-debug.log
11+

docs/guide/source-code-explore.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -222,8 +222,8 @@ function getProvider(store, app, router) {
222222

223223
// 真正的 react 在这里
224224
function render(container, store, app, router) {
225-
const ReactDOM = require('react-dom'); // eslint-disable-line
226-
ReactDOM.render(React.createElement(getProvider(store, app, router)), container);
225+
const ReactDOM = require('react-dom/client') // eslint-disable-line
226+
ReactDOM.createRoot(container).render(React.createElement(getProvider(store, app, router)));
227227
}
228228
```
229229

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
"lerna-changelog": "^0.8.0",
3232
"lint-staged": "^7.2.2",
3333
"prettier": "^1.14.3",
34-
"react": "^16.8.4",
35-
"react-dom": "^16.8.4",
34+
"react": "^18.0.0",
35+
"react-dom": "^18.0.0",
3636
"react-testing-library": "^6.0.0",
3737
"shelljs": "^0.8.1",
3838
"umi-test": "^1.5.2"

packages/dva/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@
4545
"redux": "^4.0.1"
4646
},
4747
"peerDependencies": {
48-
"react": "^16.8.4",
49-
"react-dom": "^16.8.4"
48+
"react": ">=18",
49+
"react-dom": ">=18"
5050
},
5151
"files": [
5252
"dist",

packages/dva/src/index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ function getProvider(store, app, router) {
9999
}
100100

101101
function render(container, store, app, router) {
102-
const ReactDOM = require('react-dom'); // eslint-disable-line
103-
ReactDOM.render(React.createElement(getProvider(store, app, router)), container);
102+
const ReactDOM = require('react-dom/client'); // eslint-disable-line
103+
ReactDOM.createRoot(container).render(React.createElement(getProvider(store, app, router)));
104104
}
105105

106106
function patchHistory(history) {

0 commit comments

Comments
 (0)