Skip to content

Commit e32669c

Browse files
aq-ikhwa-techaq-ikhwa-tech
authored
Merge branch 'dev' into add-auth-handling-to-rest-api-datasource
2 parents 27f45f7 + b4a9873 commit e32669c

File tree

51 files changed

+432
-1731
lines changed

Some content is hidden

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

51 files changed

+432
-1731
lines changed

‎client/config/test/jest.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export default {
3636
path.resolve(currentDir, "../../packages/lowcoder-design/src"),
3737
],
3838
setupFiles: [path.resolve(currentDir, "./jest.setup.js")],
39-
setupFilesAfterEnv: [path.resolve(currentDir, "./jest.setup-after-env.js")],
39+
setupFilesAfterEnv: [path.resolve(currentDir, "./jest.setup-after-env.js"), 'jest-canvas-mock'],
4040
transform: {
4141
"^.+\\.(js|jsx|mjs|cjs|ts|tsx)$": path.resolve(currentDir, "./transform/babelTransform.js"),
4242
"^.+\\.css$": path.resolve(currentDir, "./transform/cssTransform.js"),

‎client/config/test/jest.setup-after-env.js

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,19 @@ window.ResizeObserver = function () {
2121
disconnect: () => {},
2222
};
2323
};
24+
25+
window.ImageData = {}
26+
window.MediaStreamTrack = {}
27+
window.URL.createObjectURL = () => {}
28+
29+
class Worker {
30+
constructor(stringUrl) {
31+
this.url = stringUrl;
32+
this.onmessage = () => {};
33+
}
34+
35+
postMessage(msg) {
36+
this.onmessage(msg);
37+
}
38+
}
39+
window.Worker = Worker;

‎client/package.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@
2525
"@babel/preset-typescript": "^7.18.6",
2626
"@rollup/plugin-typescript": "^8.5.0",
2727
"@testing-library/jest-dom": "^5.16.5",
28-
"@testing-library/react": "^12.0.0",
29-
"@testing-library/user-event": "^13.2.1",
30-
"@types/ali-oss": "^6.16.4",
3128
"@types/file-saver": "^2.0.5",
3229
"@types/jest": "^29.2.2",
3330
"@types/mime": "^2.0.3",
@@ -40,14 +37,14 @@
4037
"@types/styled-components": "^5.1.19",
4138
"@types/stylis": "^4.0.2",
4239
"@types/tern": "0.23.4",
43-
"@types/toposort": "^2.0.3",
4440
"@types/ua-parser-js": "^0.7.36",
4541
"@welldone-software/why-did-you-render": "^6.2.3",
4642
"add": "^2.0.6",
4743
"babel-jest": "^29.3.0",
4844
"babel-preset-react-app": "^10.0.1",
4945
"husky": "^8.0.1",
5046
"jest": "^29.5.0",
47+
"jest-canvas-mock": "^2.5.2",
5148
"jest-environment-jsdom": "^29.5.0",
5249
"lint-staged": "^13.0.1",
5350
"lowcoder-cli": "workspace:^",
@@ -66,7 +63,7 @@
6663
},
6764
"packageManager": "yarn@3.6.4",
6865
"resolutions": {
69-
"@types/react": "^17",
66+
"@types/react": "^18",
7067
"moment": "2.29.2",
7168
"canvas": "https://registry.yarnpkg.com/@favware/skip-dependency/-/skip-dependency-1.2.1.tgz",
7269
"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/jest.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ import config from "../../config/test/jest.config.js";
22

33
export default {
44
...config,
5-
setupFiles: [...config.setupFiles, 'jest-canvas-mock'],
5+
setupFiles: [...config.setupFiles],
66
};

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "lowcoder-comps",
3-
"version": "0.0.22",
3+
"version": "0.0.23",
44
"type": "module",
55
"license": "MIT",
66
"dependencies": {
@@ -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:^",
21-
"mermaid": "^10.2.4",
22-
"react": "17",
23-
"react-dom": "17",
21+
"mermaid": "^10.6.1",
22+
"react": "^18.2.0",
23+
"react-dom": "^18.2.0",
2424
"typescript": "4.8.4"
2525
},
2626
"lowcoder": {
@@ -69,7 +69,6 @@
6969
},
7070
"devDependencies": {
7171
"jest": "29.3.0",
72-
"jest-canvas-mock": "^2.5.2",
7372
"vite": "^4.3.9",
7473
"vite-tsconfig-paths": "^3.6.0"
7574
}

‎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",

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@
4848
"vite-tsconfig-paths": "^3.6.0"
4949
},
5050
"peerDependencies": {
51-
"react": ">=17",
52-
"react-dom": ">=17"
51+
"react": ">=18",
52+
"react-dom": ">=18"
5353
},
5454
"keywords": [
5555
"lowcoder"

‎client/packages/lowcoder/package.json

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,14 @@
77
"types": "src/index.sdk.ts",
88
"dependencies": {
99
"@ant-design/icons": "^4.7.0",
10-
"@ant-design/pro-form": "^1.52.9",
11-
"@ant-design/pro-table": "^2.62.7",
12-
"@codemirror/autocomplete": "^0.20.3",
13-
"@codemirror/basic-setup": "^0.20.0",
14-
"@codemirror/lang-css": "0.20",
15-
"@codemirror/lang-html": "0.20",
16-
"@codemirror/lang-javascript": "^0.20.1",
17-
"@codemirror/lang-json": "0.20.0",
18-
"@codemirror/lang-sql": "^0.20.4",
10+
"@codemirror/autocomplete": "^6.11.1",
11+
"@codemirror/commands": "^6.3.2",
12+
"@codemirror/lang-css": "^6.2.1",
13+
"@codemirror/lang-html": "^6.4.7",
14+
"@codemirror/lang-javascript": "^6.2.1",
15+
"@codemirror/lang-json": "^6.0.1",
16+
"@codemirror/lang-sql": "^6.5.4",
17+
"@codemirror/search": "^6.5.5",
1918
"@dnd-kit/core": "^5.0.1",
2019
"@dnd-kit/modifiers": "^5.0.0",
2120
"@dnd-kit/sortable": "^6.0.0",
@@ -31,18 +30,16 @@
3130
"@rjsf/validator-ajv8": "^5.10.0",
3231
"@types/lodash": "^4.14.194",
3332
"@types/node": "^16.7.13",
34-
"@types/react": "^17.0.20",
35-
"@types/react-dom": "^17.0.9",
33+
"@types/react": "^18.2.45",
34+
"@types/react-dom": "^18.2.18",
3635
"@types/react-signature-canvas": "^1.0.2",
3736
"@types/react-test-renderer": "^18.0.0",
3837
"@types/react-virtualized": "^9.21.21",
3938
"agora-access-token": "^2.0.4",
4039
"agora-rtc-sdk-ng": "^4.19.0",
4140
"agora-rtm-sdk": "^1.5.1",
42-
"ali-oss": "^6.17.1",
4341
"antd": "^5.12.2",
44-
"antd-img-crop": "^4.12.2",
45-
"axios": "^0.21.1",
42+
"axios": "^1.6.2",
4643
"buffer": "^6.0.3",
4744
"clsx": "^2.0.0",
4845
"cnchar": "^3.2.4",
@@ -66,10 +63,10 @@
6663
"papaparse": "^5.3.2",
6764
"qrcode.react": "^3.1.0",
6865
"rc-trigger": "^5.3.1",
69-
"react": "^17.0.2",
66+
"react": "^18.2.0",
7067
"react-colorful": "^5.5.1",
7168
"react-documents": "^1.2.1",
72-
"react-dom": "^17.0.2",
69+
"react-dom": "^18.2.0",
7370
"react-draggable": "^4.4.4",
7471
"react-grid-layout": "^1.3.0",
7572
"react-helmet": "^6.1.0",
@@ -84,6 +81,7 @@
8481
"react-router": "^5.2.1",
8582
"react-router-dom": "^5.3.0",
8683
"react-signature-canvas": "^1.0.6",
84+
"react-sortable-hoc": "^2.0.0",
8785
"react-test-renderer": "^18.1.0",
8886
"react-use": "^17.3.2",
8987
"really-relaxed-json": "^0.3.2",
@@ -99,7 +97,6 @@
9997
"styled-components": "^5.3.3",
10098
"stylis": "^4.1.1",
10199
"tern": "^0.24.3",
102-
"toposort": "^2.0.2",
103100
"typescript-collections": "^1.3.3",
104101
"ua-parser-js": "^1.0.33",
105102
"uuid": "^9.0.0",

0 commit comments

Comments
 (0)