Skip to content

Antd Upgrade #307

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Jul 28, 2023
Merged

Antd Upgrade #307

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
f582d37
feat: upgrade antd version from v4 to v5
raheeliftikhar5 Jul 21, 2023
d09ebc3
upgrade antd dependencies
raheeliftikhar5 Jul 24, 2023
9e60dc0
refactor: replace momentJS with dayJS
raheeliftikhar5 Jul 24, 2023
a3606cb
refactor: updated dropdown
raheeliftikhar5 Jul 24, 2023
e4996df
refactor: added global instances for message, modal and notification
raheeliftikhar5 Jul 24, 2023
5baddfe
refactor: use global instances of modal, message
raheeliftikhar5 Jul 24, 2023
47c1723
refactor: antd component changes
raheeliftikhar5 Jul 24, 2023
4dbbd23
fix: fixed unit test
raheeliftikhar5 Jul 24, 2023
020d569
fix: datepicker and timepicker issues fixed
raheeliftikhar5 Jul 25, 2023
4d93ea2
Merge branch 'lowcoder-org:main' into antd-upgrade
raheeliftikhar5 Jul 25, 2023
501e00d
fix: fixed popover and collapse
raheeliftikhar5 Jul 26, 2023
a19df59
fix: updated timeline
raheeliftikhar5 Jul 26, 2023
9f7a49b
fix: UI fixes
raheeliftikhar5 Jul 26, 2023
b025eba
Merge branch 'main' into antd-upgrade
FalkWolsky Jul 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
upgrade antd dependencies
  • Loading branch information
@raheeliftikhar5
raheeliftikhar5 committed Jul 24, 2023
commit d09ebc3b7c8fe2e6c69466e60cfe659efe6585ff
6 changes: 4 additions & 2 deletions client/packages/lowcoder/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,10 @@
"@fortawesome/free-solid-svg-icons": "^6.4.0",
"@fortawesome/react-fontawesome": "latest",
"@manaflair/redux-batch": "^1.0.0",
"@rjsf/antd": "^4.1.1",
"@rjsf/core": "^4.2.0",
"@rjsf/antd": "^5.10.0",
"@rjsf/core": "^5.10.0",
"@rjsf/utils": "^5.10.0",
"@rjsf/validator-ajv8": "^5.10.0",
"@types/lodash": "^4.14.194",
"@types/node": "^16.7.13",
"@types/react": "^17.0.20",
Expand Down
173 changes: 119 additions & 54 deletions client/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3158,39 +3158,67 @@ __metadata:
languageName: node
linkType: hard

"@rjsf/antd@npm:^4.1.1":
version: 4.2.3
resolution: "@rjsf/antd@npm:4.2.3"
"@rjsf/antd@npm:^5.10.0":
version: 5.10.0
resolution: "@rjsf/antd@npm:5.10.0"
dependencies:
classnames: ^2.3.2
lodash: ^4.17.21
lodash-es: ^4.17.21
rc-picker: ^2.7.2
peerDependencies:
"@ant-design/icons": ^4.0.0
"@rjsf/core": ^4.0.0
"@rjsf/core": ^5.8.x
"@rjsf/utils": ^5.8.x
antd: ^4.0.0
antd-dayjs-webpack-plugin: 1.0.0
dayjs: ^1.8.0
lodash: ^4.17.15
lodash-es: ^4.17.15
react: ">=16"
checksum: 5f82909576007e6617bcaaf3b68cc3d96f35d0e7adba6cd9b955fab8a142e34bb91dd1ff91b8d7f7f83a92ae73923bc4d23e9a0cca43fc377023ecb9db6a20ce
react: ^16.14.0 || >=17
checksum: 2d4ad996d45b1caa2a7fbd532bd031cc4a16ebac29f69ad9f002a5409e8462121c2c431ff68485ccc710bdf18c6a1cdd12f4138ba7ff3a55b3e71322c5f75359
languageName: node
linkType: hard

"@rjsf/core@npm:^4.2.0":
version: 4.2.3
resolution: "@rjsf/core@npm:4.2.3"
"@rjsf/core@npm:^5.10.0":
version: 5.10.0
resolution: "@rjsf/core@npm:5.10.0"
dependencies:
"@types/json-schema": ^7.0.7
ajv: ^6.7.0
core-js-pure: ^3.6.5
json-schema-merge-allof: ^0.6.0
jsonpointer: ^5.0.0
lodash: ^4.17.15
lodash-es: ^4.17.15
nanoid: ^3.1.23
prop-types: ^15.7.2
react-is: 16.9.0
lodash: ^4.17.21
lodash-es: ^4.17.21
markdown-to-jsx: ^7.2.1
nanoid: ^3.3.6
prop-types: ^15.8.1
peerDependencies:
react: ">=16 || >=17"
checksum: a68a075b918e75ffd7e408a782e38a90f33f1519c238493d4be181e15e569a060c1a0ab80047851175913d231498e9af3fca814e0f563d20de97139ddec0acc0
"@rjsf/utils": ^5.8.x
react: ^16.14.0 || >=17
checksum: 11ff7f07e31ba13c1c6cb5e9aee94c4a5916a3f0013cb19fdeaea9254a77b50acee05d531a70adf92ee8a2024525916b20bb1af79d7afaadbd212a6124a57e5a
languageName: node
linkType: hard

"@rjsf/utils@npm:^5.10.0":
version: 5.10.0
resolution: "@rjsf/utils@npm:5.10.0"
dependencies:
json-schema-merge-allof: ^0.8.1
jsonpointer: ^5.0.1
lodash: ^4.17.21
lodash-es: ^4.17.21
react-is: ^18.2.0
peerDependencies:
react: ^16.14.0 || >=17
checksum: 5f44334598cfee3c2bf9a9561680e9c91abce9240ddf54cdb800fbbbb69b182fa7cc1839127558b3661aadbb185fba676eb3189352c8a8b5eea83d0b46987fa7
languageName: node
linkType: hard

"@rjsf/validator-ajv8@npm:^5.10.0":
version: 5.10.0
resolution: "@rjsf/validator-ajv8@npm:5.10.0"
dependencies:
ajv: ^8.12.0
ajv-formats: ^2.1.1
lodash: ^4.17.21
lodash-es: ^4.17.21
peerDependencies:
"@rjsf/utils": ^5.8.x
checksum: 9f26a938f63ed647042eb389a96ca03a95357cc978d356ba477339bb4f4b4813378a3b7bbc6fcd451ad9e21444fb2365064393bba60b2cf4379488b120d86754
languageName: node
linkType: hard

Expand Down Expand Up @@ -3910,7 +3938,7 @@ __metadata:
languageName: node
linkType: hard

"@types/json-schema@npm:^7.0.7, @types/json-schema@npm:^7.0.9":
"@types/json-schema@npm:^7.0.9":
version: 7.0.12
resolution: "@types/json-schema@npm:7.0.12"
checksum: 00239e97234eeb5ceefb0c1875d98ade6e922bfec39dd365ec6bd360b5c2f825e612ac4f6e5f1d13601b8b30f378f15e6faa805a3a732f4a1bbe61915163d293
Expand Down Expand Up @@ -4699,7 +4727,21 @@ __metadata:
languageName: node
linkType: hard

"ajv@npm:^6.10.0, ajv@npm:^6.12.3, ajv@npm:^6.12.4, ajv@npm:^6.7.0":
"ajv-formats@npm:^2.1.1":
version: 2.1.1
resolution: "ajv-formats@npm:2.1.1"
dependencies:
ajv: ^8.0.0
peerDependencies:
ajv: ^8.0.0
peerDependenciesMeta:
ajv:
optional: true
checksum: 4a287d937f1ebaad4683249a4c40c0fa3beed30d9ddc0adba04859026a622da0d317851316ea64b3680dc60f5c3c708105ddd5d5db8fe595d9d0207fd19f90b7
languageName: node
linkType: hard

"ajv@npm:^6.10.0, ajv@npm:^6.12.3, ajv@npm:^6.12.4":
version: 6.12.6
resolution: "ajv@npm:6.12.6"
dependencies:
Expand All @@ -4711,6 +4753,18 @@ __metadata:
languageName: node
linkType: hard

"ajv@npm:^8.0.0, ajv@npm:^8.12.0":
version: 8.12.0
resolution: "ajv@npm:8.12.0"
dependencies:
fast-deep-equal: ^3.1.1
json-schema-traverse: ^1.0.0
require-from-string: ^2.0.2
uri-js: ^4.2.2
checksum: 4dc13714e316e67537c8b31bc063f99a1d9d9a497eb4bbd55191ac0dcd5e4985bbb71570352ad6f1e76684fb6d790928f96ba3b2d4fd6e10024be9612fe3f001
languageName: node
linkType: hard

"ali-oss@npm:^6.17.1":
version: 6.17.1
resolution: "ali-oss@npm:6.17.1"
Expand Down Expand Up @@ -6170,7 +6224,7 @@ __metadata:
languageName: node
linkType: hard

"compute-lcm@npm:^1.1.0":
"compute-lcm@npm:^1.1.2":
version: 1.1.2
resolution: "compute-lcm@npm:1.1.2"
dependencies:
Expand Down Expand Up @@ -6298,13 +6352,6 @@ __metadata:
languageName: node
linkType: hard

"core-js-pure@npm:^3.6.5":
version: 3.30.2
resolution: "core-js-pure@npm:3.30.2"
checksum: e0e012fe94e38663d837410baac62efe05d0c7431e3fbaa70c65f51eb980da9c3add225eca04208d576bc0d92cefeca9a4f7671a65fd84fd7dfc92d8618dddfd
languageName: node
linkType: hard

"core-js@npm:^3.0.1, core-js@npm:^3.25.2":
version: 3.30.2
resolution: "core-js@npm:3.30.2"
Expand Down Expand Up @@ -10864,14 +10911,14 @@ __metadata:
languageName: node
linkType: hard

"json-schema-merge-allof@npm:^0.6.0":
version: 0.6.0
resolution: "json-schema-merge-allof@npm:0.6.0"
"json-schema-merge-allof@npm:^0.8.1":
version: 0.8.1
resolution: "json-schema-merge-allof@npm:0.8.1"
dependencies:
compute-lcm: ^1.1.0
compute-lcm: ^1.1.2
json-schema-compare: ^0.2.2
lodash: ^4.17.4
checksum: 2008aede3f5d05d7870e7d5e554e5c6a5b451cfff1357d34d3d8b34e2ba57468a97c76aa5b967bdb411d91b98c734f19f350de578d25b2a0a27cd4e1ca92bd1d
lodash: ^4.17.20
checksum: 82700f6ac77351959138d6b153d77375a8c29cf48d907241b85c8292dd77aabd8cb816400f2b0d17062c4ccc8893832ec4f664ab9c814927ef502e7a595ea873
languageName: node
linkType: hard

Expand All @@ -10882,6 +10929,13 @@ __metadata:
languageName: node
linkType: hard

"json-schema-traverse@npm:^1.0.0":
version: 1.0.0
resolution: "json-schema-traverse@npm:1.0.0"
checksum: 02f2f466cdb0362558b2f1fd5e15cce82ef55d60cd7f8fa828cf35ba74330f8d767fcae5c5c2adb7851fa811766c694b9405810879bc4e1ddd78a7c0e03658ad
languageName: node
linkType: hard

"json-schema@npm:0.4.0":
version: 0.4.0
resolution: "json-schema@npm:0.4.0"
Expand Down Expand Up @@ -10957,7 +11011,7 @@ __metadata:
languageName: node
linkType: hard

"jsonpointer@npm:^5.0.0":
"jsonpointer@npm:^5.0.1":
version: 5.0.1
resolution: "jsonpointer@npm:5.0.1"
checksum: 0b40f712900ad0c846681ea2db23b6684b9d5eedf55807b4708c656f5894b63507d0e28ae10aa1bddbea551241035afe62b6df0800fc94c2e2806a7f3adecd7c
Expand Down Expand Up @@ -11301,7 +11355,7 @@ __metadata:
languageName: node
linkType: hard

"lodash-es@npm:^4.17.15, lodash-es@npm:^4.17.21":
"lodash-es@npm:^4.17.21":
version: 4.17.21
resolution: "lodash-es@npm:4.17.21"
checksum: 05cbffad6e2adbb331a4e16fbd826e7faee403a1a04873b82b42c0f22090f280839f85b95393f487c1303c8a3d2a010048bf06151a6cbe03eee4d388fb0a12d2
Expand Down Expand Up @@ -11385,7 +11439,7 @@ __metadata:
languageName: node
linkType: hard

"lodash@npm:^4, lodash@npm:^4.0.1, lodash@npm:^4.17.15, lodash@npm:^4.17.19, lodash@npm:^4.17.21, lodash@npm:^4.17.4":
"lodash@npm:^4, lodash@npm:^4.0.1, lodash@npm:^4.17.15, lodash@npm:^4.17.19, lodash@npm:^4.17.20, lodash@npm:^4.17.21, lodash@npm:^4.17.4":
version: 4.17.21
resolution: "lodash@npm:4.17.21"
checksum: eb835a2e51d381e561e508ce932ea50a8e5a68f4ebdd771ea240d3048244a8d13658acbd502cd4829768c56f2e16bdd4340b9ea141297d472517b83868e677f7
Expand Down Expand Up @@ -11629,8 +11683,10 @@ __metadata:
"@fortawesome/free-solid-svg-icons": ^6.4.0
"@fortawesome/react-fontawesome": latest
"@manaflair/redux-batch": ^1.0.0
"@rjsf/antd": ^4.1.1
"@rjsf/core": ^4.2.0
"@rjsf/antd": ^5.10.0
"@rjsf/core": ^5.10.0
"@rjsf/utils": ^5.10.0
"@rjsf/validator-ajv8": ^5.10.0
"@types/core-js": ^2.5.5
"@types/intl": ^1.2.0
"@types/lodash": ^4.14.194
Expand Down Expand Up @@ -11879,6 +11935,15 @@ __metadata:
languageName: node
linkType: hard

"markdown-to-jsx@npm:^7.2.1":
version: 7.2.1
resolution: "markdown-to-jsx@npm:7.2.1"
peerDependencies:
react: ">= 0.14.0"
checksum: 0c8c715229044401ea48c2fc26c2554464100074959dafacdd9e4a0e849f0a190b02f39edb373bbdd95e38b8f910074b83b63d08752b8ae6be6ddcfb40ea50a0
languageName: node
linkType: hard

"md5.js@npm:^1.3.4":
version: 1.3.5
resolution: "md5.js@npm:1.3.5"
Expand Down Expand Up @@ -12775,7 +12840,7 @@ __metadata:
languageName: node
linkType: hard

"nanoid@npm:^3.1.23, nanoid@npm:^3.3.6":
"nanoid@npm:^3.3.6":
version: 3.3.6
resolution: "nanoid@npm:3.3.6"
bin:
Expand Down Expand Up @@ -14348,7 +14413,7 @@ __metadata:
languageName: node
linkType: hard

"rc-picker@npm:~2.7.0":
"rc-picker@npm:^2.7.2, rc-picker@npm:~2.7.0":
version: 2.7.2
resolution: "rc-picker@npm:2.7.2"
dependencies:
Expand Down Expand Up @@ -15009,13 +15074,6 @@ __metadata:
languageName: node
linkType: hard

"react-is@npm:16.9.0":
version: 16.9.0
resolution: "react-is@npm:16.9.0"
checksum: 7a137450539af42d342082b985c518c92af1664f3f8b06835398d902e33a6c4e9ab8d7897db3941fd692ef3af1ac81cfc3861b8a4f830ecbfd210a23e1e80914
languageName: node
linkType: hard

"react-is@npm:^16.12.0 || ^17.0.0 || ^18.0.0, react-is@npm:^18.0.0, react-is@npm:^18.2.0":
version: 18.2.0
resolution: "react-is@npm:18.2.0"
Expand Down Expand Up @@ -15733,6 +15791,13 @@ __metadata:
languageName: node
linkType: hard

"require-from-string@npm:^2.0.2":
version: 2.0.2
resolution: "require-from-string@npm:2.0.2"
checksum: a03ef6895445f33a4015300c426699bc66b2b044ba7b670aa238610381b56d3f07c686251740d575e22f4c87531ba662d06937508f0f3c0f1ddc04db3130560b
languageName: node
linkType: hard

"requireindex@npm:~1.1.0":
version: 1.1.0
resolution: "requireindex@npm:1.1.0"
Expand Down