Skip to content

Commit 35c157a

Browse files
committed
upgrade to React 18
1 parent fb5f689 commit 35c157a

File tree

5 files changed

+17
-20
lines changed

5 files changed

+17
-20
lines changed

packages/pico-engine-ui/package.json

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,14 @@
2222
"build": "tsc && vite build && cp dist/pico-engine-ui.* ../pico-engine/public/"
2323
},
2424
"dependencies": {
25-
"react": "^16.8.5",
26-
"react-dom": "^16.8.5",
27-
"react-router-dom": "^6.20.0",
28-
"whatwg-fetch": "^3.0.0"
25+
"react": "^18.2.0",
26+
"react-dom": "^18.2.0",
27+
"react-router-dom": "^6.20.0"
2928
},
3029
"devDependencies": {
3130
"@types/node": "^20.9.2",
32-
"@types/react": "^16.8.8",
33-
"@types/react-dom": "^16.8.3",
34-
"@types/react-router-dom": "^5.3.3",
31+
"@types/react": "^18.2.38",
32+
"@types/react-dom": "^18.2.17",
3533
"@vitejs/plugin-react-swc": "^3.5.0",
3634
"sass": "^1.45.2",
3735
"scriptsp": "^1.1.1",

packages/pico-engine-ui/src/components/PicoTabs/Rulesets.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ const Rulesets: React.FC<Props> = ({ pico }) => {
162162
<div>
163163
<div>
164164
<b className="text-muted">Last flushed:</b>{" "}
165-
{ruleset.meta.flushed}
165+
{ruleset.meta.flushed + ""}
166166
</div>
167167
<div>
168168
<b className="text-muted">Hash:</b> {ruleset.meta.hash}

packages/pico-engine-ui/src/components/widgets/ChannelPolicies.tsx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ export function parseQueryPolicy(src: string): QueryPolicy {
9898
return policy;
9999
}
100100

101-
export const ParseError: React.SFC<{
101+
export const ParseError: React.FC<{
102102
error: any;
103103
line: string;
104104
}> = ({ error, line }) => {
@@ -112,7 +112,7 @@ export const ParseError: React.SFC<{
112112
);
113113
};
114114

115-
export const ParseNViewEventPolicy: React.SFC<{
115+
export const ParseNViewEventPolicy: React.FC<{
116116
src: string;
117117
}> = ({ src }) => {
118118
return (
@@ -137,7 +137,7 @@ export const ParseNViewEventPolicy: React.SFC<{
137137
);
138138
};
139139

140-
export const ParseNViewQueryPolicy: React.SFC<{
140+
export const ParseNViewQueryPolicy: React.FC<{
141141
src: string;
142142
}> = ({ src }) => {
143143
return (
@@ -162,7 +162,7 @@ export const ParseNViewQueryPolicy: React.SFC<{
162162
);
163163
};
164164

165-
export const ViewEventPolicy: React.SFC<{
165+
export const ViewEventPolicy: React.FC<{
166166
policy: EventPolicy;
167167
}> = ({ policy }) => {
168168
return (
@@ -177,7 +177,7 @@ export const ViewEventPolicy: React.SFC<{
177177
);
178178
};
179179

180-
export const ViewQueryPolicy: React.SFC<{
180+
export const ViewQueryPolicy: React.FC<{
181181
policy: QueryPolicy;
182182
}> = ({ policy }) => {
183183
return (
@@ -192,7 +192,7 @@ export const ViewQueryPolicy: React.SFC<{
192192
);
193193
};
194194

195-
const ViewEventPolicyRule: React.SFC<{
195+
const ViewEventPolicyRule: React.FC<{
196196
rule: EventPolicyRule;
197197
isAllow?: boolean;
198198
}> = ({ isAllow, rule }) => {
@@ -210,7 +210,7 @@ const ViewEventPolicyRule: React.SFC<{
210210
);
211211
};
212212

213-
const ViewQueryPolicyRule: React.SFC<{
213+
const ViewQueryPolicyRule: React.FC<{
214214
rule: QueryPolicyRule;
215215
isAllow?: boolean;
216216
}> = ({ isAllow, rule }) => {

packages/pico-engine-ui/src/components/widgets/ErrorStatus.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ interface Props {
44
error?: string | null;
55
}
66

7-
const ErrorStatus: React.SFC<Props> = props => {
7+
const ErrorStatus: React.FC<Props> = (props) => {
88
return props.error ? (
99
<span className="text-danger">{props.error}</span>
1010
) : (

packages/pico-engine-ui/src/index.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
import * as ReactDOM from "react-dom";
1+
import { createRoot } from "react-dom/client";
22
import { HashRouter, Route, Routes } from "react-router-dom";
3-
import "whatwg-fetch"; // polyfill for fetch
43
import PicosPage from "./components/PicosPage";
54
import "./bootstrap.4.6.2.min.css";
65
import "./index.scss";
76

87
const mountPoint = document.createElement("DIV");
98
document.body.append(mountPoint);
9+
const root = createRoot(mountPoint);
1010

11-
ReactDOM.render(
11+
root.render(
1212
<HashRouter>
1313
<Routes>
1414
{/* NOTE: Order matters, go from specific to general */}
@@ -17,5 +17,4 @@ ReactDOM.render(
1717
<Route path="*" element={<PicosPage />} />
1818
</Routes>
1919
</HashRouter>,
20-
mountPoint,
2120
);

0 commit comments

Comments
 (0)