Skip to content

Commit 44eee95

Browse files
committed
react 18 upgrade
1 parent 430bf86 commit 44eee95

File tree

3 files changed

+1279
-599
lines changed

3 files changed

+1279
-599
lines changed

lib/Views/render.jsx

Lines changed: 12 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,18 @@
1-
import ReactDOM from "react-dom";
2-
import RedBox from "redbox-react";
3-
import React from "react";
1+
import { createRoot } from "react-dom/client";
2+
43
import Variables from "../Styles/variables.scss";
54
import UI from "./UserInterface";
65

76
export default function renderUi(terria, allBaseMaps, viewState) {
8-
let render = () => {
9-
ReactDOM.render(
10-
<UI
11-
terria={terria}
12-
allBaseMaps={allBaseMaps}
13-
viewState={viewState}
14-
themeOverrides={Variables}
15-
/>,
16-
document.getElementById("ui")
17-
);
18-
};
19-
20-
if (module.hot && process.env.NODE_ENV !== "production") {
21-
// Support hot reloading of components
22-
// and display an overlay for runtime errors
23-
const renderApp = render;
24-
const renderError = (error) => {
25-
console.error(error);
26-
console.error(error.stack);
27-
ReactDOM.render(<RedBox error={error} />, document.getElementById("ui"));
28-
};
29-
render = () => {
30-
try {
31-
renderApp();
32-
} catch (error) {
33-
renderError(error);
34-
}
35-
};
36-
module.hot.accept("./UserInterface", () => {
37-
setTimeout(render);
38-
});
39-
}
7+
const container = document.getElementById("ui");
8+
const root = createRoot(container);
409

41-
render();
10+
root.render(
11+
<UI
12+
terria={terria}
13+
allBaseMaps={allBaseMaps}
14+
viewState={viewState}
15+
themeOverrides={Variables}
16+
/>
17+
);
4218
}

package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@
3434
},
3535
"resolutions": {
3636
"underscore": "^1.12.1",
37-
"@types/react": "^17.0.3",
37+
"@types/react": "^18.3.3",
38+
"@types/react-dom": "^18.3.1",
3839
"@types/lodash": "4.14.182",
3940
"@types/css-font-loading-module": "^0.0.13"
4041
},
@@ -66,8 +67,8 @@
6667
"prettier": "2.7.1",
6768
"pretty-quick": "^4.0.0",
6869
"prop-types": "^15.6.0",
69-
"react": "^16.14.0",
70-
"react-dom": "^16.14.0",
70+
"react": "^18.3.1",
71+
"react-dom": "^18.3.1",
7172
"redbox-react": "^1.3.6",
7273
"resolve-url-loader": "^5.0.0",
7374
"sass": "^1.81.0",

0 commit comments

Comments
 (0)