You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by ha...@apache.org on 2026/07/11 09:16:39 UTC
(superset) 01/02: build(deps): update `@rjsf` deps to v6
This is an automated email from the ASF dual-hosted git repository.
hainenber pushed a commit to branch feat/migrate-rjsf-deps-to-v6
in repository https://gitbox.apache.org/repos/asf/superset.git
commit df2bb98dc4b912374a668e5c79422db9c796e0d3
Author: hainenber <do...@gmail.com>
AuthorDate: Sat Jul 11 16:15:10 2026 +0700
build(deps): update `@rjsf` deps to v6
Signed-off-by: hainenber <do...@gmail.com>
---
superset-frontend/package-lock.json | 287 ++++-----------------
superset-frontend/package.json | 7 +-
.../components/ScheduleQueryButton/index.tsx | 13 +-
3 files changed, 62 insertions(+), 245 deletions(-)
diff --git a/superset-frontend/package-lock.json b/superset-frontend/package-lock.json
index 91dc079a63b..e134cf72939 100644
--- a/superset-frontend/package-lock.json
+++ b/superset-frontend/package-lock.json
@@ -45,10 +45,9 @@
"@luma.gl/shadertools": "~9.2.5",
"@luma.gl/webgl": "~9.2.5",
"@reduxjs/toolkit": "^1.9.3",
- "@rjsf/antd": "^5.24.13",
- "@rjsf/core": "^5.24.13",
- "@rjsf/utils": "^5.24.3",
- "@rjsf/validator-ajv8": "^5.24.13",
+ "@rjsf/core": "^6.6.2",
+ "@rjsf/utils": "^6.6.2",
+ "@rjsf/validator-ajv8": "^6.6.2",
"@scarf/scarf": "^1.4.0",
"@superset-ui/chart-controls": "file:./packages/superset-ui-chart-controls",
"@superset-ui/core": "file:./packages/superset-ui-core",
@@ -9282,160 +9281,62 @@
"integrity": "sha512-ab9EmR80F/zQTMNeneUr4cv+jSwPJgIlvEmVwLerwrWVbpLlBuls9XHzIeTFy4cegU2NHBp3va0LKOzU5qFEYQ==",
"license": "MIT"
},
- "node_modules/@rjsf/antd": {
- "version": "5.24.13",
- "resolved": "https://registry.npmjs.org/@rjsf/antd/-/antd-5.24.13.tgz",
- "integrity": "sha512-UiWE8xoBxxCoe/SEkdQEmL5E6z3I1pw0+y0dTyGt8SHfAxxFc4/OWn7tKOAiNsKCXgf83t0JKn6CHWLD01sAdQ==",
- "license": "Apache-2.0",
- "dependencies": {
- "classnames": "^2.5.1",
- "lodash": "^4.17.21",
- "lodash-es": "^4.17.21",
- "rc-picker": "2.7.6"
- },
- "engines": {
- "node": ">=14"
- },
- "peerDependencies": {
- "@ant-design/icons": "^4.0.0 || ^5.0.0",
- "@rjsf/core": "^5.24.x",
- "@rjsf/utils": "^5.24.x",
- "antd": "^4.24.0 || ^5.8.5",
- "dayjs": "^1.8.0",
- "react": "^16.14.0 || >=17"
- }
- },
- "node_modules/@rjsf/antd/node_modules/rc-picker": {
- "version": "2.7.6",
- "resolved": "https://registry.npmjs.org/rc-picker/-/rc-picker-2.7.6.tgz",
- "integrity": "sha512-H9if/BUJUZBOhPfWcPeT15JUI3/ntrG9muzERrXDkSoWmDj4yzmBvumozpxYrHwjcKnjyDGAke68d+whWwvhHA==",
- "license": "MIT",
- "dependencies": {
- "@babel/runtime": "^7.10.1",
- "classnames": "^2.2.1",
- "date-fns": "2.x",
- "dayjs": "1.x",
- "moment": "^2.24.0",
- "rc-trigger": "^5.0.4",
- "rc-util": "^5.37.0",
- "shallowequal": "^1.1.0"
- },
- "engines": {
- "node": ">=8.x"
- },
- "peerDependencies": {
- "react": ">=16.9.0",
- "react-dom": ">=16.9.0"
- }
- },
- "node_modules/@rjsf/antd/node_modules/rc-picker/node_modules/rc-trigger": {
- "version": "5.3.4",
- "resolved": "https://registry.npmjs.org/rc-trigger/-/rc-trigger-5.3.4.tgz",
- "integrity": "sha512-mQv+vas0TwKcjAO2izNPkqR4j86OemLRmvL2nOzdP9OWNWA1ivoTt5hzFqYNW9zACwmTezRiN8bttrC7cZzYSw==",
- "license": "MIT",
- "dependencies": {
- "@babel/runtime": "^7.18.3",
- "classnames": "^2.2.6",
- "rc-align": "^4.0.0",
- "rc-motion": "^2.0.0",
- "rc-util": "^5.19.2"
- },
- "engines": {
- "node": ">=8.x"
- },
- "peerDependencies": {
- "react": ">=16.9.0",
- "react-dom": ">=16.9.0"
- }
- },
- "node_modules/@rjsf/antd/node_modules/rc-picker/node_modules/rc-trigger/node_modules/rc-align": {
- "version": "4.0.15",
- "resolved": "https://registry.npmjs.org/rc-align/-/rc-align-4.0.15.tgz",
- "integrity": "sha512-wqJtVH60pka/nOX7/IspElA8gjPNQKIx/ZqJ6heATCkXpe1Zg4cPVrMD2vC96wjsFFL8WsmhPbx9tdMo1qqlIA==",
- "license": "MIT",
- "dependencies": {
- "@babel/runtime": "^7.10.1",
- "classnames": "2.x",
- "dom-align": "^1.7.0",
- "rc-util": "^5.26.0",
- "resize-observer-polyfill": "^1.5.1"
- },
- "peerDependencies": {
- "react": ">=16.9.0",
- "react-dom": ">=16.9.0"
- }
- },
"node_modules/@rjsf/core": {
- "version": "5.24.13",
- "resolved": "https://registry.npmjs.org/@rjsf/core/-/core-5.24.13.tgz",
- "integrity": "sha512-ONTr14s7LFIjx2VRFLuOpagL76sM/HPy6/OhdBfq6UukINmTIs6+aFN0GgcR0aXQHFDXQ7f/fel0o/SO05Htdg==",
+ "version": "6.6.2",
+ "resolved": "https://registry.npmjs.org/@rjsf/core/-/core-6.6.2.tgz",
+ "integrity": "sha512-rmckOHIc0N3Vu0egcjrm4aRnw4ETW1i4fGdm0m63qd/298zHfF7x2md2rDh8F5HLgoxW3X/LdvrCHcsD1lxbGw==",
"license": "Apache-2.0",
"dependencies": {
- "lodash": "^4.17.21",
- "lodash-es": "^4.17.21",
- "markdown-to-jsx": "^7.4.1",
+ "lodash": "^4.18.1",
+ "lodash-es": "^4.18.1",
+ "markdown-to-jsx": "^9.8.1",
"prop-types": "^15.8.1"
},
"engines": {
- "node": ">=14"
- },
- "peerDependencies": {
- "@rjsf/utils": "^5.24.x",
- "react": "^16.14.0 || >=17"
- }
- },
- "node_modules/@rjsf/core/node_modules/markdown-to-jsx": {
- "version": "7.7.17",
- "resolved": "https://registry.npmjs.org/markdown-to-jsx/-/markdown-to-jsx-7.7.17.tgz",
- "integrity": "sha512-7mG/1feQ0TX5I7YyMZVDgCC/y2I3CiEhIRQIhyov9nGBP5eoVrOXXHuL5ZP8GRfxVZKRiXWJgwXkb9It+nQZfQ==",
- "license": "MIT",
- "engines": {
- "node": ">= 10"
+ "node": ">=20"
},
"peerDependencies": {
- "react": ">= 0.14.0"
- },
- "peerDependenciesMeta": {
- "react": {
- "optional": true
- }
+ "@rjsf/utils": "^6.6.x",
+ "react": ">=18"
}
},
"node_modules/@rjsf/utils": {
- "version": "5.24.3",
- "resolved": "https://registry.npmjs.org/@rjsf/utils/-/utils-5.24.3.tgz",
- "integrity": "sha512-IFzMyr6RDRgSi9jdfFBomwc8LMul6zLBsRSAgzD9wAB9laDcYHwPNEL2kZhOkAGrc+4iNQSPsawGFOA6CXH87Q==",
+ "version": "6.6.2",
+ "resolved": "https://registry.npmjs.org/@rjsf/utils/-/utils-6.6.2.tgz",
+ "integrity": "sha512-npqdWuuFmCkiXETrDLRx8a4EwDJoUdTTnGhJA/774bwDgT99u4nAEyXbJd75VuobunewcLm2FOS2cErD3e28cg==",
"license": "Apache-2.0",
"dependencies": {
- "json-schema-merge-allof": "^0.8.1",
+ "@x0k/json-schema-merge": "^1.0.3",
+ "fast-equals": "^6.0.0",
+ "fast-uri": "^3.1.2",
"jsonpointer": "^5.0.1",
- "lodash": "^4.17.21",
- "lodash-es": "^4.17.21",
- "react-is": "^18.2.0"
+ "lodash": "^4.18.1",
+ "lodash-es": "^4.18.1",
+ "react-is": "^18.3.1"
},
"engines": {
- "node": ">=14"
+ "node": ">=20"
},
"peerDependencies": {
- "react": "^16.14.0 || >=17"
+ "react": ">=18"
}
},
"node_modules/@rjsf/validator-ajv8": {
- "version": "5.24.13",
- "resolved": "https://registry.npmjs.org/@rjsf/validator-ajv8/-/validator-ajv8-5.24.13.tgz",
- "integrity": "sha512-oWHP7YK581M8I5cF1t+UXFavnv+bhcqjtL1a7MG/Kaffi0EwhgcYjODrD8SsnrhncsEYMqSECr4ZOEoirnEUWw==",
+ "version": "6.6.2",
+ "resolved": "https://registry.npmjs.org/@rjsf/validator-ajv8/-/validator-ajv8-6.6.2.tgz",
+ "integrity": "sha512-pi+CBfkXxyR1JhEveuwi7qA9NcqYvFSvadY8LkQDC6wP89bZS8TYXzolirvXC7okDdI3WCtPjx/FYnxYpXbj7Q==",
"license": "Apache-2.0",
"dependencies": {
- "ajv": "^8.12.0",
+ "ajv": "^8.20.0",
"ajv-formats": "^2.1.1",
- "lodash": "^4.17.21",
- "lodash-es": "^4.17.21"
+ "lodash": "^4.18.1",
+ "lodash-es": "^4.18.1"
},
"engines": {
- "node": ">=14"
+ "node": ">=20"
},
"peerDependencies": {
- "@rjsf/utils": "^5.24.x"
+ "@rjsf/utils": "^6.6.x"
}
},
"node_modules/@rtsao/scc": {
@@ -13458,6 +13359,15 @@
"dev": true,
"license": "MIT"
},
+ "node_modules/@x0k/json-schema-merge": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/@x0k/json-schema-merge/-/json-schema-merge-1.0.4.tgz",
+ "integrity": "sha512-KvmMgAftbVzATq4IRnkno/SKSu+gjaR2ZUPJG5JUlY4W3twRJo03sk2914u8scmosibBZ0m7s6euZlJuqpv8Ww==",
+ "license": "MIT",
+ "dependencies": {
+ "@types/json-schema": "^7.0.15"
+ }
+ },
"node_modules/@xtuc/ieee754": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
@@ -16135,27 +16045,6 @@
"node": ">= 0.6"
}
},
- "node_modules/compute-gcd": {
- "version": "1.2.1",
- "resolved": "https://registry.npmjs.org/compute-gcd/-/compute-gcd-1.2.1.tgz",
- "integrity": "sha512-TwMbxBNz0l71+8Sc4czv13h4kEqnchV9igQZBi6QUaz09dnz13juGnnaWWJTRsP3brxOoxeB4SA2WELLw1hCtg==",
- "dependencies": {
- "validate.io-array": "^1.0.3",
- "validate.io-function": "^1.0.2",
- "validate.io-integer-array": "^1.0.0"
- }
- },
- "node_modules/compute-lcm": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/compute-lcm/-/compute-lcm-1.1.2.tgz",
- "integrity": "sha512-OFNPdQAXnQhDSKioX8/XYT6sdUlXwpeMjfd6ApxMJfyZ4GxmLR1xvMERctlYhlHwIiz6CSpBc2+qYKjHGZw4TQ==",
- "dependencies": {
- "compute-gcd": "^1.2.1",
- "validate.io-array": "^1.0.3",
- "validate.io-function": "^1.0.2",
- "validate.io-integer-array": "^1.0.0"
- }
- },
"node_modules/compute-scroll-into-view": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/compute-scroll-into-view/-/compute-scroll-into-view-3.1.1.tgz",
@@ -17402,22 +17291,6 @@
"topojson": "^1.6.19"
}
},
- "node_modules/date-fns": {
- "version": "2.30.0",
- "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.30.0.tgz",
- "integrity": "sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==",
- "license": "MIT",
- "dependencies": {
- "@babel/runtime": "^7.21.0"
- },
- "engines": {
- "node": ">=0.11"
- },
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/date-fns"
- }
- },
"node_modules/dateformat": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.2.tgz",
@@ -18003,12 +17876,6 @@
"integrity": "sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg==",
"license": "MIT"
},
- "node_modules/dom-align": {
- "version": "1.12.4",
- "resolved": "https://registry.npmjs.org/dom-align/-/dom-align-1.12.4.tgz",
- "integrity": "sha512-R8LUSEay/68zE5c8/3BDxiTEvgb4xZTF0RKmAHfiEVN3klfIpXfi2/QCoiWPccVQ0J/ZGdz9OjzL4uJEP/MRAw==",
- "license": "MIT"
- },
"node_modules/dom-converter": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz",
@@ -19745,6 +19612,15 @@
"dev": true,
"license": "Apache-2.0"
},
+ "node_modules/fast-equals": {
+ "version": "6.0.2",
+ "resolved": "https://registry.npmjs.org/fast-equals/-/fast-equals-6.0.2.tgz",
+ "integrity": "sha512-sAjhj9ZhOxYCGiNMnZLaucOqf5ZeFnHNoKoAZiD9thhJ0N8RP85qJK759/97C/3L7NzzmGVB5uiX9AUpySZmUQ==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=6.0.0"
+ }
+ },
"node_modules/fast-fifo": {
"version": "1.3.2",
"resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.2.tgz",
@@ -26014,29 +25890,6 @@
"node": "^20.17.0 || >=22.9.0"
}
},
- "node_modules/json-schema-compare": {
- "version": "0.2.2",
- "resolved": "https://registry.npmjs.org/json-schema-compare/-/json-schema-compare-0.2.2.tgz",
- "integrity": "sha512-c4WYmDKyJXhs7WWvAWm3uIYnfyWFoIp+JEoX34rctVvEkMYCPGhXtvmFFXiffBbxfZsvQ0RNnV5H7GvDF5HCqQ==",
- "license": "MIT",
- "dependencies": {
- "lodash": "^4.17.4"
- }
- },
- "node_modules/json-schema-merge-allof": {
- "version": "0.8.1",
- "resolved": "https://registry.npmjs.org/json-schema-merge-allof/-/json-schema-merge-allof-0.8.1.tgz",
- "integrity": "sha512-CTUKmIlPJbsWfzRRnOXz+0MjIqvnleIXwFTzz+t9T86HnYX/Rozria6ZVGLktAU9e+NygNljveP+yxqtQp/Q4w==",
- "license": "MIT",
- "dependencies": {
- "compute-lcm": "^1.1.2",
- "json-schema-compare": "^0.2.2",
- "lodash": "^4.17.20"
- },
- "engines": {
- "node": ">=12.0.0"
- }
- },
"node_modules/json-schema-traverse": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
@@ -29558,6 +29411,7 @@
"resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz",
"integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
"license": "MIT",
+ "peer": true,
"engines": {
"node": "*"
}
@@ -35952,12 +35806,6 @@
"integrity": "sha512-b6i4ZpVuUxB9h5gfCxPiusKYkqTMOjEbBs4wMaFbkfia4yFv92UKZ6Df8WXcKbn08JNL/abvg3FnMAOfakDvUw==",
"license": "MIT"
},
- "node_modules/shallowequal": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz",
- "integrity": "sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==",
- "license": "MIT"
- },
"node_modules/shapefile": {
"version": "0.3.1",
"resolved": "https://registry.npmjs.org/shapefile/-/shapefile-0.3.1.tgz",
@@ -39538,39 +39386,6 @@
"node": "^18.17.0 || >=20.5.0"
}
},
- "node_modules/validate.io-array": {
- "version": "1.0.6",
- "resolved": "https://registry.npmjs.org/validate.io-array/-/validate.io-array-1.0.6.tgz",
- "integrity": "sha512-DeOy7CnPEziggrOO5CZhVKJw6S3Yi7e9e65R1Nl/RTN1vTQKnzjfvks0/8kQ40FP/dsjRAOd4hxmJ7uLa6vxkg==",
- "license": "MIT"
- },
- "node_modules/validate.io-function": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/validate.io-function/-/validate.io-function-1.0.2.tgz",
- "integrity": "sha512-LlFybRJEriSuBnUhQyG5bwglhh50EpTL2ul23MPIuR1odjO7XaMLFV8vHGwp7AZciFxtYOeiSCT5st+XSPONiQ=="
- },
- "node_modules/validate.io-integer": {
- "version": "1.0.5",
- "resolved": "https://registry.npmjs.org/validate.io-integer/-/validate.io-integer-1.0.5.tgz",
- "integrity": "sha512-22izsYSLojN/P6bppBqhgUDjCkr5RY2jd+N2a3DCAUey8ydvrZ/OkGvFPR7qfOpwR2LC5p4Ngzxz36g5Vgr/hQ==",
- "dependencies": {
- "validate.io-number": "^1.0.3"
- }
- },
- "node_modules/validate.io-integer-array": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/validate.io-integer-array/-/validate.io-integer-array-1.0.0.tgz",
- "integrity": "sha512-mTrMk/1ytQHtCY0oNO3dztafHYyGU88KL+jRxWuzfOmQb+4qqnWmI+gykvGp8usKZOM0H7keJHEbRaFiYA0VrA==",
- "dependencies": {
- "validate.io-array": "^1.0.3",
- "validate.io-integer": "^1.0.4"
- }
- },
- "node_modules/validate.io-number": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/validate.io-number/-/validate.io-number-1.0.3.tgz",
- "integrity": "sha512-kRAyotcbNaSYoDnXvb4MHg/0a1egJdLwS6oJ38TJY7aw9n93Fl/3blIXdyYvPOp55CNxywooG/3BcrwNrBpcSg=="
- },
"node_modules/value-equal": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/value-equal/-/value-equal-1.0.1.tgz",
@@ -42582,7 +42397,7 @@
"@deck.gl/extensions": "~9.2.9",
"@deck.gl/geo-layers": "~9.2.5",
"@deck.gl/layers": "~9.2.5",
- "@deck.gl/mapbox": "^9.3.6",
+ "@deck.gl/mapbox": "~9.3.6",
"@deck.gl/mesh-layers": "~9.2.5",
"@luma.gl/constants": "~9.2.5",
"@luma.gl/core": "~9.2.5",
diff --git a/superset-frontend/package.json b/superset-frontend/package.json
index 8167496c282..b47ebc544fa 100644
--- a/superset-frontend/package.json
+++ b/superset-frontend/package.json
@@ -128,10 +128,9 @@
"@luma.gl/shadertools": "~9.2.5",
"@luma.gl/webgl": "~9.2.5",
"@reduxjs/toolkit": "^1.9.3",
- "@rjsf/antd": "^5.24.13",
- "@rjsf/core": "^5.24.13",
- "@rjsf/utils": "^5.24.3",
- "@rjsf/validator-ajv8": "^5.24.13",
+ "@rjsf/core": "^6.6.2",
+ "@rjsf/utils": "^6.6.2",
+ "@rjsf/validator-ajv8": "^6.6.2",
"@scarf/scarf": "^1.4.0",
"@superset-ui/chart-controls": "file:./packages/superset-ui-chart-controls",
"@superset-ui/core": "file:./packages/superset-ui-core",
diff --git a/superset-frontend/src/SqlLab/components/ScheduleQueryButton/index.tsx b/superset-frontend/src/SqlLab/components/ScheduleQueryButton/index.tsx
index bf1b0ab2a2b..4c8cb1134d1 100644
--- a/superset-frontend/src/SqlLab/components/ScheduleQueryButton/index.tsx
+++ b/superset-frontend/src/SqlLab/components/ScheduleQueryButton/index.tsx
@@ -18,8 +18,8 @@
*/
import { FunctionComponent, useState, useRef, ChangeEvent } from 'react';
-import SchemaForm, { FormProps } from '@rjsf/core';
-import { FormValidation } from '@rjsf/utils';
+import SchemaForm from '@rjsf/core';
+import { type FormValidation } from '@rjsf/utils';
import validator from '@rjsf/validator-ajv8';
import { t } from '@apache-superset/core/translation';
import { styled } from '@apache-superset/core/theme';
@@ -74,10 +74,13 @@ const getValidationRules = () => scheduledQueriesConf?.VALIDATION || [];
const getValidator = () => {
const rules: any = getValidationRules();
- return (formData: Record<string, any>, errors: FormValidation) => {
+ return (
+ formData: Record<string, any> | undefined,
+ errors: FormValidation,
+ ) => {
rules.forEach((rule: any) => {
const test = validators[rule.name as keyof typeof validators];
- const args = rule.arguments.map((name: string) => formData[name]);
+ const args = rule.arguments.map((name: string) => formData?.[name]);
const container = rule.container || rule.arguments.slice(-1)[0];
if (!test(args[0], args[1])) {
errors[container]?.addError(rule.message);
@@ -157,7 +160,7 @@ const ScheduleQueryButton: FunctionComponent<ScheduleQueryButtonProps> = ({
const onScheduleSubmit = ({
formData,
}: {
- formData?: Omit<FormProps<Record<string, any>>, 'schema'>;
+ formData?: Record<string, any>;
}) => {
const query = {
label,