Skip to content

Commit 1b3968a

Browse files
authored
Merge branch 'main' into fix/default-object-enums
2 parents a66d146 + cce870f commit 1b3968a

File tree

21 files changed

+148
-169
lines changed

21 files changed

+148
-169
lines changed

.gitignore

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -140,12 +140,8 @@ out/
140140

141141
# typescript tsbuildinfo
142142
*.tsbuildinfo
143-
lodashReplacer.js
144-
lodashReplacer.cjs
145-
muiReplacer.js
146-
muiReplacer.cjs
147-
ajvReplacer.js
148-
ajvReplacer.cjs
143+
*Replacer.js
144+
*Replacer.cjs
149145

150146
# Need this due to shadcn default utils folder is lib
151147
!packages/shadcn/src/lib

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,12 @@ should change the heading of the (upcoming) version to include a major version b
1616
1717
-->
1818

19+
# 6.0.0-beta.10
20+
21+
## @rjsf/mui
22+
23+
- Fixed build process to remove the `tsc-alias` replacer that was adding `/index.js` onto the `@mui/Xxxx` imports since MUI 7 has proper ESM support
24+
1925
# 6.0.0-beta.9
2026

2127
## @rjsf/antd

package-lock.json

Lines changed: 62 additions & 62 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/antd/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@rjsf/antd",
3-
"version": "6.0.0-beta.8",
3+
"version": "6.0.0-beta.10",
44
"description": "Ant Design theme, fields and widgets for react-jsonschema-form",
55
"main": "dist/index.js",
66
"module": "lib/index.js",
@@ -77,10 +77,10 @@
7777
},
7878
"devDependencies": {
7979
"@ant-design/icons": "^6.0.0",
80-
"@rjsf/core": "^6.0.0-beta.8",
81-
"@rjsf/snapshot-tests": "^6.0.0-beta.8",
82-
"@rjsf/utils": "^6.0.0-beta.8",
83-
"@rjsf/validator-ajv8": "^6.0.0-beta.8",
80+
"@rjsf/core": "^6.0.0-beta.10",
81+
"@rjsf/snapshot-tests": "^6.0.0-beta.10",
82+
"@rjsf/utils": "^6.0.0-beta.10",
83+
"@rjsf/validator-ajv8": "^6.0.0-beta.10",
8484
"@rollup/plugin-replace": "^6.0.2",
8585
"antd": "^5.24.9",
8686
"atob": "^2.1.2",

packages/chakra-ui/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@rjsf/chakra-ui",
3-
"version": "6.0.0-beta.8",
3+
"version": "6.0.0-beta.10",
44
"description": "Chakra UI theme, fields, and widgets for react-jsonschema-form",
55
"main": "dist/index.js",
66
"module": "lib/index.js",
@@ -87,10 +87,10 @@
8787
"@emotion/jest": "^11.13.0",
8888
"@emotion/react": "^11.14.0",
8989
"@emotion/styled": "^11.14.0",
90-
"@rjsf/core": "^6.0.0-beta.8",
91-
"@rjsf/snapshot-tests": "^6.0.0-beta.8",
92-
"@rjsf/utils": "^6.0.0-beta.8",
93-
"@rjsf/validator-ajv8": "^6.0.0-beta.8",
90+
"@rjsf/core": "^6.0.0-beta.10",
91+
"@rjsf/snapshot-tests": "^6.0.0-beta.10",
92+
"@rjsf/utils": "^6.0.0-beta.10",
93+
"@rjsf/validator-ajv8": "^6.0.0-beta.10",
9494
"chakra-react-select": "6.1.0",
9595
"eslint": "^8.56.0",
9696
"lucide-react": "^0.488.0"

packages/core/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@rjsf/core",
3-
"version": "6.0.0-beta.8",
3+
"version": "6.0.0-beta.10",
44
"description": "A simple React component capable of building HTML forms out of a JSON schema.",
55
"scripts": {
66
"compileReplacer": "tsc -p tsconfig.replacer.json && move-file lodashReplacer.js lodashReplacer.cjs",
@@ -77,9 +77,9 @@
7777
"prop-types": "^15.8.1"
7878
},
7979
"devDependencies": {
80-
"@rjsf/snapshot-tests": "^6.0.0-beta.8",
81-
"@rjsf/utils": "^6.0.0-beta.8",
82-
"@rjsf/validator-ajv8": "^6.0.0-beta.8",
80+
"@rjsf/snapshot-tests": "^6.0.0-beta.10",
81+
"@rjsf/utils": "^6.0.0-beta.10",
82+
"@rjsf/validator-ajv8": "^6.0.0-beta.10",
8383
"@testing-library/jest-dom": "^6.6.3",
8484
"@testing-library/react": "^16.2.0",
8585
"@testing-library/user-event": "^14.6.1",

0 commit comments

Comments
 (0)