Skip to content

Commit

Permalink
fix: remove the -beta.x tags from the peerDependencies (#3417)
Browse files Browse the repository at this point in the history
Lerna does not update `peerDependencies` so I had to manually remove the `-beta.x` from all of the `@rjsf` dependencies
- Also updated `.readthedocs.yml` to switch back to python 3.8 since it does not support 3.10 yet
- Fixed up the `5.x upgrade guide` to add a missing major breaking change and fix a link
- Switched to node 18 as the default
- Updated the `CHANGELOG.md` accordingly
  • Loading branch information
heath-freenome authored Jan 31, 2023
1 parent 7296cbe commit 48036c5
Show file tree
Hide file tree
Showing 27 changed files with 104 additions and 100 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
env:
NODE_OPTIONS: --max_old_space_size=4096

- if: matrix.node-version == '16.x'
- if: matrix.node-version == '18.x'
uses: actions/upload-artifact@v3
with:
name: dist
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Use Node.js 16.x
- name: Use Node.js 18.x
uses: actions/setup-node@v3
with:
node-version: 16.x
node-version: 18.x
- run: npm ci
- run: npm run build
env:
Expand Down
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16.0.0
18.13.0
2 changes: 1 addition & 1 deletion .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ mkdocs:
formats: all

python:
version: "3.10"
version: "3.8"
install:
- requirements: requirements.docs.txt
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ 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.
-->
# 5.0.1
- Updated the `peerDependencies` in all packages to remove the `-beta.x` tags from the `@rjsf/xxxx` packages

# 5.0.0

## @rjsf/antd
Expand Down
5 changes: 3 additions & 2 deletions docs/5.x upgrade guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@ There were several significant **breaking changes** in RJSF version 5 that were
- Schema validation was decoupled from `@rjsf/core` to resolve issue [#2693](https://github.com/rjsf-team/react-jsonschema-form/issues/2693). Additionally, in order to break a circular dependency in the validation refactor, the `@rjsf/core/utils.js` file was split out into its own `@rjsf/utils` package as was suggested in [#1655](https://github.com/rjsf-team/react-jsonschema-form/issues/1655).
- 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)
- As part of the fix for [#2526](https://github.com/rjsf-team/react-jsonschema-form/issues/2526) all the existing templates in the previous version were moved into a new `templates` dictionary, similar to how `widgets` and `fields` work. This `templates` dictionary was added to the `Registry` and also the `Form` props, replacing the `ArrayFieldTemplate`, `FieldTemplate`, `ObjectFieldTemplate` and `ErrorList` props. In addition, several of the `fields` and `widgets` based components were moved into the `templates` dictionary as they were more like templates than true `Field`s or `Widget`s. Also fixes [#2945](https://github.com/rjsf-team/react-jsonschema-form/issues/2945)
- Fixed `anyOf` and `oneOf` getting incorrect, potentially duplicate ids when combined with array (https://github.com/rjsf-team/react-jsonschema-form/issues/2197)
- Fixed `anyOf` and `oneOf` getting incorrect, potentially duplicate ids when combined with array [#2197](https://github.com/rjsf-team/react-jsonschema-form/issues/2197)
- `CheckboxesWidget`, `RadioWidget` and `SelectWidget` in all themes now use indexes into `enumOptions[]` rather than `option.value` to allow for objects in `enumOptions` - [#1494](https://github.com/rjsf-team/react-jsonschema-form/issues/1494)

### Node support

Version 5 is dropping official support for Node 12 as it is no longer a [maintained version](https://nodejs.org/en/about/releases/).
Please use Node 16 when making any changes to `package.json` and `package-lock.json` files.
Please use Node 18 when making any changes to `package.json` and `package-lock.json` files.
All PR and branch builds are running against Node 14, 16 and 18.

### React version
Expand Down
2 changes: 1 addition & 1 deletion netlify.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@

[build.environment]
VITE_SHOW_NETLIFY_BADGE = "true"
NODE_VERSION = "16"
NODE_VERSION = "18"
14 changes: 7 additions & 7 deletions packages/antd/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/antd/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
},
"peerDependencies": {
"@ant-design/icons": "^4.0.0",
"@rjsf/core": "^5.0.0-beta.1",
"@rjsf/utils": "^5.0.0-beta.1",
"@rjsf/core": "^5.0.0",
"@rjsf/utils": "^5.0.0",
"antd": "^4.0.0",
"dayjs": "^1.8.0",
"react": "^16.14.0 || >=17"
Expand Down
14 changes: 7 additions & 7 deletions packages/bootstrap-4/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/bootstrap-4/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
]
},
"peerDependencies": {
"@rjsf/core": "^5.0.0-beta.1",
"@rjsf/utils": "^5.0.0-beta.1",
"@rjsf/core": "^5.0.0",
"@rjsf/utils": "^5.0.0",
"react": "^16.14.0 || >=17",
"react-bootstrap": "^1.6.5"
},
Expand Down
14 changes: 7 additions & 7 deletions packages/chakra-ui/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/chakra-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
"peerDependencies": {
"@chakra-ui/icons": ">=1.1.1",
"@chakra-ui/react": ">=1.7.3",
"@rjsf/core": "^5.0.0-beta.1",
"@rjsf/utils": "^5.0.0-beta.1",
"@rjsf/core": "^5.0.0",
"@rjsf/utils": "^5.0.0",
"chakra-react-select": ">=3.3.8",
"framer-motion": ">=5.6.0",
"react": "^16.14.0 || >=17"
Expand Down
20 changes: 10 additions & 10 deletions packages/core/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"node": ">=14"
},
"peerDependencies": {
"@rjsf/utils": "^5.0.0-beta.1",
"@rjsf/utils": "^5.0.0",
"react": "^16.14.0 || >=17"
},
"dependencies": {
Expand Down
14 changes: 7 additions & 7 deletions packages/fluent-ui/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/fluent-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
},
"peerDependencies": {
"@fluentui/react": "^7.190.3",
"@rjsf/core": "^5.0.0-beta.1",
"@rjsf/utils": "^5.0.0-beta.1",
"@rjsf/core": "^5.0.0",
"@rjsf/utils": "^5.0.0",
"react": "^16.14.0 || >=17"
},
"devDependencies": {
Expand Down
Loading

0 comments on commit 48036c5

Please sign in to comment.