From cd2ebbc3c19d3f79e5f5461a5e14ffc6ce9d1bbf Mon Sep 17 00:00:00 2001 From: Heath C <51679588+heath-freenome@users.noreply.github.com> Date: Fri, 17 Nov 2023 13:58:43 -0800 Subject: [PATCH] Fix: fixes the antd peer dependencies for the @ant-design/icons (#3966) Fixes: #3507 to allow v5 `@ant-design/icons` - Updated the `antd` package.json to add `@ant-design/icons` v5 to the peer dependencies - Updated the `CHANGELOG.md` accordinglyl --- CHANGELOG.md | 12 ++++++++---- packages/antd/package.json | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 30a172961f..6bb03d79a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,14 @@ should change the heading of the (upcoming) version to include a major version b --> # 5.14.2 +## @rjsf/antd + +- Fixed the `peerDependencies` for `@ant-design/icons` to also support v5, fixing [#3507](https://github.com/rjsf-team/react-jsonschema-form/issues/3507) + +## @rjsf/core + +- avoid call `retrieveSchema` twice during `getStateFromProps` and `mustValidate` is true [#3959](https://github.com/rjsf-team/react-jsonschema-form/pull/3959) + ## @rjsf/mui - Resolve the React error caused by the propagation of the `hideError` property to the DOM element, fixing [#3945](https://github.com/rjsf-team/react-jsonschema-form/issues/3945) @@ -27,10 +35,6 @@ should change the heading of the (upcoming) version to include a major version b - Update `sanitizeDataForNewSchema()` to avoid spreading strings and Arrays into the returned value when the old schema is of type `string` or `array` and the new schema is of type `object`. Fixing [#3922](https://github.com/rjsf-team/react-jsonschema-form/issues/3922) -## @rjsf/core - -- avoid call `retrieveSchema` twice during `getStateFromProps` and `mustValidate` is true [#3959](https://github.com/rjsf-team/react-jsonschema-form/pull/3959) - # 5.14.1 ## @rjsf/utils diff --git a/packages/antd/package.json b/packages/antd/package.json index 9ec8c86b71..27064fcf84 100644 --- a/packages/antd/package.json +++ b/packages/antd/package.json @@ -33,7 +33,7 @@ "node": ">=14" }, "peerDependencies": { - "@ant-design/icons": "^4.0.0", + "@ant-design/icons": "^4.0.0 || ^5.0.0", "@rjsf/core": "^5.12.x", "@rjsf/utils": "^5.12.x", "antd": "^4.24.0 || ^5.8.5",