Merge remote-tracking branch 'refs/remotes/upstream/main' into experimental-custom-merge-all-of

# Conflicts:
#	CHANGELOG.md
#	packages/utils/src/schema/retrieveSchema.ts

Author: MarekBodinger

CHANGELOG.md

@@ -25,7 +25,8 @@ should change the heading of the (upcoming) version to include a major version b
 
 ## @rjsf/utils
 
-- Added `experimental_customMergeAllOf` option to `retrieveSchema` to allow custom merging of `allOf` schemas
+- Updated `ErrorSchemaBuilder` to support adding, updating, and removing paths that are numbers, fixing [#4297](https://github.com/rjsf-team/react-jsonschema-form/issues/4297)
+- Updated `retrieveSchema` to not merge `contains` properties in `allOf` schema lists, fixing [#2923](https://github.com/rjsf-team/react-jsonschema-form/issues/2923#issuecomment-1946034240)
 
 ## Dev / docs / playground
 
@@ -1993,7 +1994,7 @@ const Component = () => {
 
 ## @rjsf/validator-ajv8
 
-- Support for localization (L12n) on a customized validator using a `Localizer` function passed as a second parameter to `customizeValidator()`, fixing (https://github.com/rjsf-team/react-jsonschema-form/pull/846, and https://github.com/rjsf-team/react-jsonschema-form/issues/1195)
+- Support for localization (L10n) on a customized validator using a `Localizer` function passed as a second parameter to `customizeValidator()`, fixing (https://github.com/rjsf-team/react-jsonschema-form/pull/846, and https://github.com/rjsf-team/react-jsonschema-form/issues/1195)
 - Fixed the `README.md` to correct the package name in several places to match the actual package
 
 ## Dev / docs / playground

lerna.json

@@ -1,6 +1,6 @@
 {
   "packages": ["packages/*"],
-  "version": "5.21.1",
+  "version": "5.21.2",
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
   "useNx": true,
   "useWorkspaces": true

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@rjsf/antd",
-  "version": "5.21.1",
+  "version": "5.21.2",
   "description": "Ant Design theme, fields and widgets for react-jsonschema-form",
   "main": "dist/index.js",
   "module": "lib/index.js",
@@ -56,10 +56,10 @@
     "@babel/preset-env": "^7.23.9",
     "@babel/preset-react": "^7.23.3",
     "@babel/preset-typescript": "^7.23.3",
-    "@rjsf/core": "^5.21.1",
-    "@rjsf/snapshot-tests": "^5.21.1",
-    "@rjsf/utils": "^5.21.1",
-    "@rjsf/validator-ajv8": "^5.21.1",
+    "@rjsf/core": "^5.21.2",
+    "@rjsf/snapshot-tests": "^5.21.2",
+    "@rjsf/utils": "^5.21.2",
+    "@rjsf/validator-ajv8": "^5.21.2",
     "@rollup/plugin-replace": "^5.0.5",
     "@types/jest": "^29.5.12",
     "@types/lodash": "^4.14.202",

packages/antd/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rjsf/bootstrap-4",
-  "version": "5.21.1",
+  "version": "5.21.2",
   "main": "dist/index.js",
   "module": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -49,10 +49,10 @@
     "@babel/preset-env": "^7.23.9",
     "@babel/preset-react": "^7.23.3",
     "@babel/preset-typescript": "^7.23.3",
-    "@rjsf/core": "^5.21.1",
-    "@rjsf/snapshot-tests": "^5.21.1",
-    "@rjsf/utils": "^5.21.1",
-    "@rjsf/validator-ajv8": "^5.21.1",
+    "@rjsf/core": "^5.21.2",
+    "@rjsf/snapshot-tests": "^5.21.2",
+    "@rjsf/utils": "^5.21.2",
+    "@rjsf/validator-ajv8": "^5.21.2",
     "@types/jest": "^29.5.12",
     "@types/react": "^18.2.58",
     "@types/react-dom": "^18.2.19",