Merge the long-lived RJSF v5 branch to master

.eslintrc-javascript

@@ -0,0 +1,34 @@
+{
+  "extends": "eslint:recommended",
+  "parser": "@babel/eslint-parser",
+  "parserOptions": {
+    "babelOptions": {
+      "presets": ["@babel/preset-react"]
+    }
+  },
+  "rules": {
+    "react/jsx-uses-react": 2,
+    "react/jsx-uses-vars": 2,
+    "react/react-in-jsx-scope": 2,
+    "react/jsx-tag-spacing": [1, {
+      "beforeSelfClosing": "always"
+    }],
+    "curly": [2],
+    "linebreak-style": [2, "unix"],
+    "semi": [2, "always"],
+    "comma-dangle": [0],
+    "no-unused-vars": [2, {
+      "vars": "all",
+      "args": "none",
+      "ignoreRestSiblings": true
+    }],
+    "no-console": [0],
+    "object-curly-spacing": [2, "always"],
+    "keyword-spacing": ["error"]
+  },
+  "env": {
+    "es6": true,
+    "browser": true,
+    "node": true
+  }
+}

.eslintrc-typescript

@@ -0,0 +1,42 @@
+{
+  "parser": "@typescript-eslint/parser",
+  "extends": [
+    "eslint:recommended",
+    "plugin:@typescript-eslint/recommended",
+    "plugin:react/recommended",
+    "plugin:react-hooks/recommended"
+  ],
+  "rules": {
+    "react/prop-types": 0,
+    "react/no-find-dom-node": 0,
+    "react/display-name": 0,
+    "react/jsx-uses-react": 2,
+    "react/jsx-uses-vars": 2,
+    "react/react-in-jsx-scope": 2,
+    "react/jsx-tag-spacing": [1, {
+      "beforeSelfClosing": "always"
+    }],
+    "curly": [2],
+    "linebreak-style": [2, "unix"],
+    "semi": [2, "always"],
+    "comma-dangle": [0],
+    "@typescript-eslint/no-unused-vars": [2, {
+      "vars": "all",
+      "args": "none",
+      "ignoreRestSiblings": true
+    }],
+    "@typescript-eslint/no-explicit-any": "off",
+    "@typescript-eslint/no-non-null-assertion": "off",
+    "no-console": [0],
+    "object-curly-spacing": [2, "always"],
+    "keyword-spacing": ["error"],
+    "no-prototype-builtins": "warn",
+    "@typescript-eslint/no-empty-function": "warn",
+    "@typescript-eslint/no-var-requires": "warn"
+  },
+  "env": {
+    "es6": true,
+    "browser": true,
+    "node": true
+  }
+}

.github/workflows/ci.yml

@@ -2,16 +2,16 @@ name: CI
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master, rjsf-v5 ]
   pull_request:
-    branches: [ master ]
+    branches: [ master, rjsf-v5 ]
 
 jobs:
   build:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [12.x, 14.x]
+        node-version: [12.x, 14.x, 16.x, 18.x]
 
     steps:
     - uses: actions/checkout@v3
@@ -22,7 +22,7 @@ jobs:
     - run: npm ci
     - run: npm run lint
     - run: npm run cs-check
-    
+
     - name: Build with Netlify badge
       if: github.ref != 'refs/heads/master'
       run: npm run build
@@ -31,14 +31,14 @@ jobs:
     - name: Build
       if: github.ref == 'refs/heads/master'
       run: npm run build
-    
-    - if: matrix.node-version == '14.x'
+
+    - if: matrix.node-version == '16.x'
       uses: actions/upload-artifact@v2
       with:
         name: dist
         path: packages/playground/build
     - run: npm test
-    
+
   deploy_preview:
     runs-on: ubuntu-latest
     if: github.ref != 'refs/heads/master'
@@ -58,7 +58,7 @@ jobs:
           NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
           NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
           PR_NUMBER: ${{ github.event.pull_request.number }}
-  
+
   deploy_playground:
     runs-on: ubuntu-latest
     if: github.ref == 'refs/heads/master'
@@ -78,7 +78,7 @@ jobs:
           build_dir: dist
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  
+
   # deploy_canary:
   #   runs-on: ubuntu-latest
   #   if: github.ref == 'refs/heads/master'

.github/workflows/release.yml

@@ -9,10 +9,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Use Node.js 14.x
+      - name: Use Node.js 16.x
         uses: actions/setup-node@v3
         with:
-          node-version: 14.x
+          node-version: 16.x
       - run: npm ci
       - run: npm run build
       - run: npm test

.gitignore

@@ -110,6 +110,7 @@ $RECYCLE.BIN/
 
 # Windows shortcuts
 *.lnk
+.rts2_**
 
 # End of https://www.gitignore.io/api/osx,node,linux,windows
 
@@ -127,10 +128,12 @@ yarn.lock
 .vscode
 .idea
 *.iml
+.editorconfig
 
 # Code coverage
 coverage
 .nyc_output
 
 venv
 *.orig
+out/

.husky/pre-commit

@@ -0,0 +1,5 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+# Hopefully this disables husky on github CI
+[ -n "$CI" ] && exit 0
+npm run pre-commit:husky

.node-version

@@ -1 +1 @@
-14
+16

.nvmrc

@@ -1 +1 @@
-14
+16

.prettierrc.yaml

@@ -0,0 +1,5 @@
+bracketSameLine: false
+trailingComma: es5
+useTabs: false
+semi: true
+tabWidth: 2

CHANGELOG.md

@@ -15,7 +15,98 @@ it according to semantic versioning. For example, if your PR adds a breaking cha
 should change the heading of the (upcoming) version to include a major version bump.
 
 -->
-# v5.0.0 (coming soon)
+# v5.0.0-beta.1
+
+## Global changes across all themes:
+- Node 16 is now the default node engine for all packages, fixing (https://github.com/rjsf-team/react-jsonschema-form/issues/2687)
+- Refactored all themes to use the new `@rjsf/utils` library functions and types
+- Refactored the individual theme forms to consolidate `templates` as part of the fix for https://github.com/rjsf-team/react-jsonschema-form/issues/2526
+  - All the work implementing the `BaseInputTemplate` should fix (https://github.com/rjsf-team/react-jsonschema-form/issues/2926, https://github.com/rjsf-team/react-jsonschema-form/issues/2889, https://github.com/rjsf-team/react-jsonschema-form/issues/2875, https://github.com/rjsf-team/react-jsonschema-form/issues/2223)
+  - Also made the display of `title` and `description` consistent across themes, fixing (https://github.com/rjsf-team/react-jsonschema-form/issues/2481, https://github.com/rjsf-team/react-jsonschema-form/issues/2363, https://github.com/rjsf-team/react-jsonschema-form/issues/2219)
+  - This change also ensures that all templates are properly exported, resolving (https://github.com/rjsf-team/react-jsonschema-form/issues/2365)
+- Bumped most devDependencies to the latest versions where possible
+- Switched all repos `package.json` and `package-lock.json` files to be built and maintained by Node 16.
+- Adding button templates help to change text for buttons (https://github.com/rjsf-team/react-jsonschema-form/issues/2082, https://github.com/rjsf-team/react-jsonschema-form/issues/2357)
+
+## @rjsf/utils
+- New package created by refactoring and converting to Typescript the `utils.js` file from `core` into independent functions.
+  - Resolves (https://github.com/rjsf-team/react-jsonschema-form/issues/1655, https://github.com/rjsf-team/react-jsonschema-form/issues/2480, https://github.com/rjsf-team/react-jsonschema-form/issues/2341)
+- Updated `types` from `core` in `utils` to better match the implementation across all themes
+  - Included adding a bunch of new types for existing and new features
+  - The type updates should fix (https://github.com/rjsf-team/react-jsonschema-form/issues/2871, https://github.com/rjsf-team/react-jsonschema-form/issues/2673, https://github.com/rjsf-team/react-jsonschema-form/issues/2347, https://github.com/rjsf-team/react-jsonschema-form/issues/2186)
+- Clear errors on `formData` change when `liveOmit=true` when "additionalProperties: false" [issue 1507](https://github.com/rjsf-team/react-jsonschema-form/issues/1507) (https://github.com/rjsf-team/react-jsonschema-form/pull/2631)
+
+## @rjsf/validator-ajv6
+- New package created by refactoring and converting to Typescript the `validator.js` file from `core` into independent functions as well as a class that implements the new `ValidatorType` interface.
+  - [#2693](https://github.com/rjsf-team/react-jsonschema-form/issues/2693).
+- Added support for customizing the options passed to the creation of the `ajv` instance.
+
+## @rjsf/validator-ajv6
+- A **BREAKING CHANGE** to `toErrorList()` was made so that it takes `fieldPath: string[]` rather than `fieldName='root'` as part of the fix to (https://github.com/rjsf-team/react-jsonschema-form/issues/1596)
+  - The returned `errors` also now adds `property` from the `fieldPath` along with the proper path from the `property` to the `stack` message, making it consistent with the AJV errors.
+    - Previously the `stack` attribute would say `root: error message`; now it says `. error message`
+  - In addition, the extra information provided by AJV is no longer lost from the `errors` when merged with custom validation, fixing (https://github.com/rjsf-team/react-jsonschema-form/issues/1596).
+
+## @rjsf/core
+- Converted core to Typescript (https://github.com/rjsf-team/react-jsonschema-form/issues/583)
+- `ui:emptyValue` now works with selects (https://github.com/rjsf-team/react-jsonschema-form/issues/1041)
+- Refactoring `utils.js` into the new `@rjsf/utils` fixes (https://github.com/rjsf-team/react-jsonschema-form/issues/2719)
+- **BREAKING CHANGE** Fix overriding core submit button className (https://github.com/rjsf-team/react-jsonschema-form/issues/2979)
+- Fix `ui:field` with anyOf or oneOf no longer rendered twice (#2890)
+- **BREAKING CHANGE** Fixed `anyOf` and `oneOf` getting incorrect, potentially duplicate ids when combined with array (https://github.com/rjsf-team/react-jsonschema-form/issues/2197)
+- `formContext` is now passed properly to `SchemaField`, fixes (https://github.com/rjsf-team/react-jsonschema-form/issues/2394, https://github.com/rjsf-team/react-jsonschema-form/issues/2274) 
+- Added `ui:duplicateKeySuffixSeparator` to customize how duplicate object keys are renamed when using `additionalProperties`.
+- The `extraErrors` are now consistently appended onto the end of the schema validation-based `errors` information that is returned via the `onErrors()` callback when submit fails.
+  - In addition, the extra information provided by AJV is no longer stripped from the `errors` during the merge process, fixing (https://github.com/rjsf-team/react-jsonschema-form/issues/1596).
+- Fixed id generation for `RadioWidget` to no longer use random numbers fixing (https://github.com/rjsf-team/react-jsonschema-form/issues/2461)
+- Correctly call the `onChange` handler in the new set of props if it changed, fixing (https://github.com/rjsf-team/react-jsonschema-form/issues/1708).
+- Fixed race condition for `onChange` when `formData` is controlled prop, fixing (https://github.com/rjsf-team/react-jsonschema-form/issues/513),
+
+## @rjsf/antd
+- Fix esm build to use `@rollup/plugin-replace` to replace `antd/lib` and `rc-picker/lib` with `antd/es` and `rc-picker/es` respectively, fixing (https://github.com/rjsf-team/react-jsonschema-form/issues/2962)
+
+## @rjsf/bootstrap-4
+- Bootstrap-4 `withTheme` customizations should work properly now (https://github.com/rjsf-team/react-jsonschema-form/issues/2058)
+- `ArrayFieldTemplate` refactor seems to have fixed https://github.com/rjsf-team/react-jsonschema-form/issues/2775
+- Fix issues with `SelectField` (https://github.com/rjsf-team/react-jsonschema-form/issues/2616, https://github.com/rjsf-team/react-jsonschema-form/issues/2875)
+
+## @rjsf/chakra-ui
+- Properly handle the hidden field in this theme (https://github.com/rjsf-team/react-jsonschema-form/issues/2571)
+
+## @rjsf/material-ui 
+- The theme for Material UI version 5 (i.e. `@rjsf/mui`) was split out of the theme for version 4 (i.e. `@rjsf/material-ui`) to resolve the following issues:
+  - [#2762](https://github.com/rjsf-team/react-jsonschema-form/issues/2762)
+  - [#2858](https://github.com/rjsf-team/react-jsonschema-form/issues/2858)
+  - [#2905](https://github.com/rjsf-team/react-jsonschema-form/issues/2905)
+  - [#2945](https://github.com/rjsf-team/react-jsonschema-form/issues/2945)
+  - [#2774](https://github.com/rjsf-team/react-jsonschema-form/issues/2774)
+- Material-UI TextWidget now respects `inputType` in uiSchema (https://github.com/rjsf-team/react-jsonschema-form/issues/2057)
+  - Also respects `step` for `number` type (https://github.com/rjsf-team/react-jsonschema-form/issues/2488)
+- Material-UI UpDownWidget now support min/max/step (https://github.com/rjsf-team/react-jsonschema-form/issues/2022)
+- Properly handle the hidden field in this theme (https://github.com/rjsf-team/react-jsonschema-form/issues/2571)
+- Select properly accepts true or false (https://github.com/rjsf-team/react-jsonschema-form/issues/2326)
+
+## @rjsf/mui
+- The theme for Material UI version 5 (i.e. `@rjsf/mui`) was split out of the theme for version 4 (i.e. `@rjsf/material-ui`) to resolve the following issues:
+  - [#2762](https://github.com/rjsf-team/react-jsonschema-form/issues/2762)
+  - [#2858](https://github.com/rjsf-team/react-jsonschema-form/issues/2858)
+  - [#2905](https://github.com/rjsf-team/react-jsonschema-form/issues/2905)
+  - [#2945](https://github.com/rjsf-team/react-jsonschema-form/issues/2945)
+  - [#2774](https://github.com/rjsf-team/react-jsonschema-form/issues/2774)
+- Material-UI TextWidget now respects `inputType` in uiSchema (https://github.com/rjsf-team/react-jsonschema-form/issues/2057)
+  - Also respects `step` for `number` type (https://github.com/rjsf-team/react-jsonschema-form/issues/2488)
+- Material-UI UpDownWidget now support min/max/step (https://github.com/rjsf-team/react-jsonschema-form/issues/2022)
+- Properly handle the hidden field in this theme (https://github.com/rjsf-team/react-jsonschema-form/issues/2571)
+
+## @rjsf/semantic-ui
+- Fix missing error class on fields (https://github.com/rjsf-team/react-jsonschema-form/issues/2666)
+- Fixed the `main` definition in `semantic-ui` to fix (https://github.com/withastro/astro/issues/4357)
+- Properly handle the hidden field in this theme (https://github.com/rjsf-team/react-jsonschema-form/issues/2571)
+
+## Dev / docs / playground
+- Demonstrate use of `ui:field` with `anyOf` (#2890)
+- Playground now uses webpack 5
+- Corrected number field default (https://github.com/rjsf-team/react-jsonschema-form/issues/2358)
 
 # 4.2.1
 * fix typo by @epicfaace in https://github.com/rjsf-team/react-jsonschema-form/pull/2854
@@ -47,7 +138,7 @@ should change the heading of the (upcoming) version to include a major version b
   - NOTE: `@rjsf/material-ui` was retained to avoid a breaking change, but using it will continue to cause bundler warnings
   - See the `README.md` for the `@rjsf/material-ui` package for updated usage information
 - Fixed (#2831) for `material-ui` by removing the `DefaultChildren` passed into the themes
-  
+
 ## @rjsf/bootstrap-4
 - SubmitButton widget to use new ui:submitButtonOptions on the submit button for forms (https://github.com/rjsf-team/react-jsonschema-form/pull/2640)
 

docs/3.x upgrade guide.md

@@ -12,7 +12,7 @@ Dropped support for Node 8, 9, 10. Minimum supported version of Node.js is now 1
 
 ### Help field IDs
 
-IDs for [Help fields](https://react-jsonschema-form.readthedocs.io/en/latest/api-reference/uiSchema/#help) are now suffixed by `__help` so that the IDs are unique. Previously, their IDs would be nonexistent or the same as the fields that they were describing.
+IDs for [Help fields](https://react-jsonschema-form.readthedocs.io/en/stable/api-reference/uiSchema/#help) are now suffixed by `__help` so that the IDs are unique. Previously, their IDs would be nonexistent or the same as the fields that they were describing.
 
 ### Bring your own polyfills
 

docs/4.x upgrade guide.md

@@ -8,4 +8,4 @@ No longer actively supporting React version < 16.3. The minimum supported versio
 
 ### @rjsf/material-ui package - Minimum version of material-ui 4
 
-If you are using the material-ui 4 theme, @material-ui/core and @material-ui/icons packages should be updated to the latest versions. The minimum versions supported for @material-ui/core and @material-ui/icons are 4.12.0 and 4.11.1 respectively. This change is required for [support for the material-ui version 5 theme](https://github.com/rjsf-team/react-jsonschema-form/tree/master/packages/material-ui)
+If you are using the material-ui 4 theme, @material-ui/core and @material-ui/icons packages should be updated to the latest versions. The minimum versions supported for @material-ui/core and @material-ui/icons are 4.12.0 and 4.11.1 respectively. This change is required for [support for the material-ui version 5 theme](https://github.com/rjsf-team/react-jsonschema-form/tree/master/packages/material-ui)