Skip to content

Commit ea12bc5

Browse files
raheeliftikhar5raheeliftikhar5
committed
upgrade react, react-dom, @types/react, @types/react-dom and fixes
1 parent c975e53 commit ea12bc5

File tree

42 files changed

+190
-139
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+190
-139
lines changed

‎client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
},
6464
"packageManager": "yarn@3.6.4",
6565
"resolutions": {
66-
"@types/react": "^17",
66+
"@types/react": "^18",
6767
"moment": "2.29.2",
6868
"canvas": "https://registry.yarnpkg.com/@favware/skip-dependency/-/skip-dependency-1.2.1.tgz",
6969
"react-virtualized@^9.22.3": "patch:react-virtualized@npm%3A9.22.3#./.yarn/patches/react-virtualized-npm-9.22.3-0fff3cbf64.patch",

‎client/packages/lowcoder-cli-template-typescript/index.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import ReactDOM from "react-dom";
1+
import { createRoot } from "react-dom/client";
22
import { CompIDE } from "lowcoder-sdk";
33
import { name, version, lowcoder } from "./package.json";
44
import compMap from "./src/index";
@@ -16,4 +16,6 @@ function CompDevApp() {
1616
);
1717
}
1818

19-
ReactDOM.render(<CompDevApp />, document.querySelector("#root"));
19+
const container = document.querySelector("#root");
20+
const root = createRoot(container!);
21+
root.render(<CompDevApp />);

‎client/packages/lowcoder-cli/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
"commander": "^9.4.1",
3030
"cross-spawn": "^7.0.3",
3131
"fs-extra": "^10.1.0",
32-
"react": "^17",
33-
"react-dom": "^17",
32+
"react": "^18.2.0",
33+
"react-dom": "^18.2.0",
3434
"react-json-view": "^1.21.3",
3535
"rollup-plugin-external-globals": "^0.7.1",
3636
"vite": "^4.3.9",

‎client/packages/lowcoder-comps/index.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import ReactDOM from "react-dom";
1+
import { createRoot } from "react-dom/client";
22
import { CompIDE } from "lowcoder-sdk";
33
import { name, version, lowcoder } from "./package.json";
44
import compMap from "./src/index";
@@ -16,4 +16,6 @@ function CompDevApp() {
1616
);
1717
}
1818

19-
ReactDOM.render(<CompDevApp />, document.querySelector("#root"));
19+
const container = document.querySelector("#root");
20+
const root = createRoot(container!);
21+
root.render(<CompDevApp />);

‎client/packages/lowcoder-comps/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@
1111
"@fullcalendar/moment": "^6.1.6",
1212
"@fullcalendar/react": "^6.1.6",
1313
"@fullcalendar/timegrid": "^6.1.6",
14-
"@types/react": "17",
15-
"@types/react-dom": "17",
14+
"@types/react": "^18.2.45",
15+
"@types/react-dom": "^18.2.18",
1616
"big.js": "^6.2.1",
1717
"echarts-extension-gmap": "^1.6.0",
1818
"echarts-wordcloud": "^2.1.0",
1919
"lowcoder-cli": "workspace:^",
2020
"lowcoder-sdk": "workspace:^",
2121
"mermaid": "^10.6.1",
22-
"react": "17",
23-
"react-dom": "17",
22+
"react": "^18.2.0",
23+
"react-dom": "^18.2.0",
2424
"typescript": "4.8.4"
2525
},
2626
"lowcoder": {

‎client/packages/lowcoder-core/lib/index.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -664,7 +664,7 @@ declare class Translator<Messages extends object> {
664664
readonly language: string;
665665
constructor(fileData: object, filterLocales?: string, locales?: string[]);
666666
trans(key: NestedKey<Messages> | GlobalMessageKey, variables?: Record<string, VariableValue>): string;
667-
transToNode(key: NestedKey<Messages> | GlobalMessageKey, variables?: Record<string, VariableValue>): {};
667+
transToNode(key: NestedKey<Messages> | GlobalMessageKey, variables?: Record<string, VariableValue>): ReactNode;
668668
private getMessage;
669669
}
670670
declare function getI18nObjects<I18nObjects>(fileData: object, filterLocales?: string): I18nObjects;

‎client/packages/lowcoder-design/src/components/CustomModal.tsx

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -218,24 +218,26 @@ function CustomModalRender(props: CustomModalProps & ModalFuncProps) {
218218
return (
219219
<Draggable handle=".handle" disabled={!props.draggable}>
220220
<ModalWrapper width={props.width}>
221-
<ModalHeaderWrapper className="handle" $draggable={props.draggable}>
222-
<ModalHeader
223-
title={props.title}
224-
onCancel={props.onCancel}
225-
showBackLink={props.showBackLink}
226-
onBack={props.onBack}
227-
/>
228-
</ModalHeaderWrapper>
221+
<>
222+
<ModalHeaderWrapper className="handle" $draggable={props.draggable}>
223+
<ModalHeader
224+
title={props.title}
225+
onCancel={props.onCancel}
226+
showBackLink={props.showBackLink}
227+
onBack={props.onBack}
228+
/>
229+
</ModalHeaderWrapper>
229230

230-
<div style={{ padding: "0 16px", ...props.styles?.body }}>{props.children}</div>
231+
<div style={{ padding: "0 16px", ...props.styles?.body }}>{props.children}</div>
231232

232-
{props.footer === null || props.footer ? (
233-
props.footer
234-
) : (
235-
<ModalFooterWrapper>
236-
<ModalFooter {...props} />
237-
</ModalFooterWrapper>
238-
)}
233+
{props.footer === null || props.footer ? (
234+
props.footer
235+
) : (
236+
<ModalFooterWrapper>
237+
<ModalFooter {...props} />
238+
</ModalFooterWrapper>
239+
)}
240+
</>
239241
</ModalWrapper>
240242
</Draggable>
241243
);

‎client/packages/lowcoder-design/src/components/toolTip.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ function ToolTipLabel(
180180
return (
181181
<AntdTooltip
182182
color="#2c2c2c"
183-
title={title && <TooltipTitleWrapper>{title}</TooltipTitleWrapper>}
183+
title={title && <TooltipTitleWrapper><>{title}</></TooltipTitleWrapper>}
184184
overlayInnerStyle={{ maxWidth: "232px", whiteSpace: "break-spaces" }}
185185
arrow={{
186186
pointAtCenter: true

‎client/packages/lowcoder-plugin-demo/index.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import ReactDOM from "react-dom";
1+
import { createRoot } from "react-dom/client";
22
import { CompIDE } from "lowcoder-sdk";
33
import { name, version, lowcoder } from "./package.json";
44
import compMap from "./src/index";
@@ -16,4 +16,6 @@ function CompDevApp() {
1616
);
1717
}
1818

19-
ReactDOM.render(<CompDevApp />, document.querySelector("#root"));
19+
const container = document.querySelector("#root");
20+
const root = createRoot(container!);
21+
root.render(<CompDevApp />);

‎client/packages/lowcoder-plugin-demo/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"dependencies": {
77
"lowcoder-core": "^0.0.1",
88
"lowcoder-design": "^0.0.1",
9-
"react": "17",
10-
"react-dom": "17"
9+
"react": "^18.2.0",
10+
"react-dom": "^18.2.0"
1111
},
1212
"publishConfig": {
1313
"registry": "https://registry.npmjs.com"
@@ -30,8 +30,8 @@
3030
"build": "lowcoder-cli build"
3131
},
3232
"devDependencies": {
33-
"@types/react": "17",
34-
"@types/react-dom": "17",
33+
"@types/react": "^18.2.45",
34+
"@types/react-dom": "^18.2.18",
3535
"lowcoder-cli": "workspace:^",
3636
"lowcoder-sdk": "workspace:^",
3737
"typescript": "4.8.4",

0 commit comments

Comments
 (0)