Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 5.4.3 into next #10425

Merged
merged 46 commits into from
Dec 20, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
dfc2d39
Update AccordionForm documentation
djhi Dec 11, 2024
33ae7f5
Update LongForm documentation
djhi Dec 11, 2024
af9672a
Update WizardForm documentation
djhi Dec 11, 2024
cbf50e9
Update OSS forms documentation
djhi Dec 11, 2024
195d26f
Update TabbedShowLayout documentation
djhi Dec 11, 2024
8560ea5
Improve OSS forms documentation
djhi Dec 11, 2024
247c03d
Remove mentions of useGetPermissions
djhi Dec 11, 2024
7183b49
Revert TabbedShowLayout changes
djhi Dec 11, 2024
8fc91f6
Improve SimpleShowLayout [no ci]
djhi Dec 11, 2024
9fe472c
Document Menu Access Control [no ci]
djhi Dec 11, 2024
c76da1c
Document CloneButton and ExportButton [no ci]
djhi Dec 11, 2024
bbd922c
Update Datagrid documentation [no ci]
djhi Dec 11, 2024
a551e35
Update RBAC documentation [no ci]
djhi Dec 11, 2024
725c236
Update DatagridAG documentation
djhi Dec 11, 2024
0724e49
Fix snippets
djhi Dec 11, 2024
2ec4722
Apply suggestions from code review
djhi Dec 12, 2024
809641a
Apply suggestions from code review
djhi Dec 12, 2024
d7e8d33
Fix link typo
djhi Dec 12, 2024
307c293
Merge pull request #10410 from marmelab/update-datagrid-ag-documentation
fzaninotto Dec 12, 2024
4308f7c
Improve introduction
fzaninotto Dec 12, 2024
40b374d
Document Datagrid access control in Datagrid doc
fzaninotto Dec 12, 2024
a98cd5a
Move the List RBAC features to the List doc
fzaninotto Dec 12, 2024
c2b7550
Move SimpleShowLayout RBAC doc to SimpleShowLayout chapter
fzaninotto Dec 12, 2024
5a33cfd
Move Simpleform RBAC doc to SimpleForm chapter
fzaninotto Dec 12, 2024
ff42f32
Move Menu RBAC doc to the Menu chapter
fzaninotto Dec 12, 2024
30ff4d3
Move TabbedShowLayout RBAC doc to TabbedshowLayout chapter
fzaninotto Dec 12, 2024
3011173
Move TabbedForm RBAC doc to TabbedForm chapter
fzaninotto Dec 12, 2024
7f60ef3
Move RBAC buttons doc to the Buttons chapter
fzaninotto Dec 12, 2024
0c71fe8
Add mention of built-in access control
fzaninotto Dec 12, 2024
1a96836
MAke access control section position consistent
fzaninotto Dec 12, 2024
babc4d5
Merge pull request #10409 from marmelab/update-rbac-documentation
fzaninotto Dec 12, 2024
c916284
Bump nanoid from 3.3.7 to 3.3.8
dependabot[bot] Dec 15, 2024
bdf5cce
Merge pull request #10414 from marmelab/dependabot/npm_and_yarn/nanoi…
fzaninotto Dec 15, 2024
8c01e20
[Doc] Remove `<ShowBase emptyWhileLoading>` from the docs
slax57 Dec 16, 2024
526d088
Merge pull request #10416 from marmelab/doc-ShowBase-emptyWhileLoading
djhi Dec 16, 2024
fa523be
Add a FormDataConsumer showing the issue
djhi Dec 16, 2024
08f256b
Fix FormDataConsumer
djhi Dec 16, 2024
5d339c8
Add comment [no ci]
djhi Dec 16, 2024
b05a1a0
[no ci] minor improvements to story
slax57 Dec 17, 2024
d135bd3
Merge pull request #10417 from marmelab/fix-form-data-consumer-flicker
slax57 Dec 17, 2024
a25733d
Update changelog for 5.4.3
djhi Dec 18, 2024
9e441c2
v5.4.3
djhi Dec 18, 2024
dabb850
Update yarn.lock for 5.4.3
djhi Dec 18, 2024
fef8540
Fix `useUpdate` ignores `meta` when populating the query cache in pes…
slax57 Dec 18, 2024
a1b7be0
Merge pull request #10422 from marmelab/fix-useUpdate-pessimistic-cac…
djhi Dec 19, 2024
ad6bf18
Merge branch 'master' into next
djhi Dec 19, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
v5.4.3
  • Loading branch information
djhi committed Dec 18, 2024
commit 9e441c23b084896137080d1e78d39eaf35b1eaef
4 changes: 2 additions & 2 deletions examples/data-generator/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "data-generator-retail",
"version": "5.4.2",
"version": "5.4.3",
"homepage": "https://github.com/marmelab/react-admin/tree/master/examples/data-generator",
"bugs": "https://github.com/marmelab/react-admin/issues",
"license": "MIT",
Expand All @@ -19,7 +19,7 @@
},
"devDependencies": {
"cross-env": "^5.2.0",
"ra-core": "^5.4.2",
"ra-core": "^5.4.3",
"rimraf": "^3.0.2",
"typescript": "^5.1.3"
},
Expand Down
14 changes: 7 additions & 7 deletions examples/simple/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "simple",
"version": "5.4.2",
"version": "5.4.3",
"private": true,
"type": "module",
"scripts": {
Expand All @@ -18,13 +18,13 @@
"@tanstack/react-query-devtools": "^5.21.7",
"jsonexport": "^3.2.0",
"lodash": "~4.17.5",
"ra-data-fakerest": "^5.4.2",
"ra-i18n-polyglot": "^5.4.2",
"ra-input-rich-text": "^5.4.2",
"ra-language-english": "^5.4.2",
"ra-language-french": "^5.4.2",
"ra-data-fakerest": "^5.4.3",
"ra-i18n-polyglot": "^5.4.3",
"ra-input-rich-text": "^5.4.3",
"ra-language-english": "^5.4.3",
"ra-language-french": "^5.4.3",
"react": "^18.3.1",
"react-admin": "^5.4.2",
"react-admin": "^5.4.3",
"react-dom": "^18.3.1",
"react-hook-form": "^7.53.0",
"react-router": "^6.22.0",
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"lerna": "2.5.1",
"packages": ["examples/data-generator", "examples/simple", "packages/*"],
"version": "5.4.2"
"version": "5.4.3"
}
2 changes: 1 addition & 1 deletion packages/create-react-admin/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "create-react-admin",
"description": "A CLI to quickly start a new react-admin project",
"version": "5.4.2",
"version": "5.4.3",
"license": "MIT",
"bin": "lib/cli.js",
"type": "module",
Expand Down
2 changes: 1 addition & 1 deletion packages/ra-core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ra-core",
"version": "5.4.2",
"version": "5.4.3",
"description": "Core components of react-admin, a frontend Framework for building admin applications on top of REST services, using ES6, React",
"files": [
"*.md",
Expand Down
4 changes: 2 additions & 2 deletions packages/ra-data-fakerest/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ra-data-fakerest",
"version": "5.4.2",
"version": "5.4.3",
"description": "JSON Server data provider for react-admin",
"main": "dist/cjs/index.js",
"module": "dist/esm/index.js",
Expand Down Expand Up @@ -43,7 +43,7 @@
"@types/jest": "^29.5.2",
"cross-env": "^5.2.0",
"expect": "^27.4.6",
"ra-core": "^5.4.2",
"ra-core": "^5.4.3",
"rimraf": "^3.0.2",
"typescript": "^5.1.3"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/ra-data-graphql-simple/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ra-data-graphql-simple",
"version": "5.4.2",
"version": "5.4.3",
"description": "A GraphQL simple data provider for react-admin",
"main": "dist/cjs/index.js",
"module": "dist/esm/index.js",
Expand Down Expand Up @@ -37,7 +37,7 @@
"graphql-ast-types-browser": "~1.0.2",
"lodash": "~4.17.5",
"pluralize": "~7.0.0",
"ra-data-graphql": "^5.4.2"
"ra-data-graphql": "^5.4.3"
},
"peerDependencies": {
"graphql": "^15.6.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/ra-data-graphql/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ra-data-graphql",
"version": "5.4.2",
"version": "5.4.3",
"description": "A GraphQL data provider for react-admin",
"main": "dist/cjs/index.js",
"module": "dist/esm/index.js",
Expand Down
4 changes: 2 additions & 2 deletions packages/ra-data-json-server/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ra-data-json-server",
"version": "5.4.2",
"version": "5.4.3",
"description": "JSON Server data provider for react-admin",
"main": "dist/cjs/index.js",
"module": "dist/esm/index.js",
Expand All @@ -26,7 +26,7 @@
},
"dependencies": {
"query-string": "^7.1.3",
"ra-core": "^5.4.2"
"ra-core": "^5.4.3"
},
"devDependencies": {
"cross-env": "^5.2.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/ra-data-localforage/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ra-data-local-forage",
"version": "5.4.2",
"version": "5.4.3",
"description": "LocalForage data provider for react-admin",
"main": "dist/cjs/index.js",
"module": "dist/esm/index.js",
Expand Down Expand Up @@ -42,7 +42,7 @@
"dependencies": {
"localforage": "^1.7.1",
"lodash": "~4.17.5",
"ra-data-fakerest": "^5.4.2"
"ra-data-fakerest": "^5.4.3"
},
"devDependencies": {
"cross-env": "^5.2.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/ra-data-localstorage/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ra-data-local-storage",
"version": "5.4.2",
"version": "5.4.3",
"description": "Local storage data provider for react-admin",
"main": "dist/cjs/index.js",
"module": "dist/esm/index.js",
Expand Down Expand Up @@ -38,7 +38,7 @@
},
"dependencies": {
"lodash": "~4.17.5",
"ra-data-fakerest": "^5.4.2"
"ra-data-fakerest": "^5.4.3"
},
"devDependencies": {
"cross-env": "^5.2.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/ra-data-simple-rest/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ra-data-simple-rest",
"version": "5.4.2",
"version": "5.4.3",
"description": "Simple REST data provider for react-admin",
"main": "dist/cjs/index.js",
"module": "dist/esm/index.js",
Expand Down Expand Up @@ -29,7 +29,7 @@
},
"devDependencies": {
"cross-env": "^5.2.0",
"ra-core": "^5.4.2",
"ra-core": "^5.4.3",
"rimraf": "^3.0.2",
"typescript": "^5.1.3"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/ra-i18n-i18next/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ra-i18n-i18next",
"version": "5.4.2",
"version": "5.4.3",
"description": "i18next i18n provider for react-admin",
"main": "dist/cjs/index.js",
"module": "dist/esm/index.js",
Expand All @@ -26,7 +26,7 @@
},
"dependencies": {
"i18next": "^23.5.1",
"ra-core": "^5.4.2",
"ra-core": "^5.4.3",
"react-i18next": "^14.1.1"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/ra-i18n-polyglot/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ra-i18n-polyglot",
"version": "5.4.2",
"version": "5.4.3",
"description": "Polyglot i18n provider for react-admin",
"main": "dist/cjs/index.js",
"module": "dist/esm/index.js",
Expand All @@ -26,7 +26,7 @@
},
"dependencies": {
"node-polyglot": "^2.2.2",
"ra-core": "^5.4.2"
"ra-core": "^5.4.3"
},
"devDependencies": {
"cross-env": "^5.2.0",
Expand Down
10 changes: 5 additions & 5 deletions packages/ra-input-rich-text/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ra-input-rich-text",
"version": "5.4.2",
"version": "5.4.3",
"description": "<RichTextInput> component for react-admin, useful for editing HTML code in admin GUIs.",
"author": "Gildas Garcia",
"repository": "marmelab/react-admin",
Expand Down Expand Up @@ -51,10 +51,10 @@
"@testing-library/react": "^15.0.7",
"@tiptap/extension-mention": "^2.0.3",
"@tiptap/suggestion": "^2.0.3",
"data-generator-retail": "^5.4.2",
"ra-core": "^5.4.2",
"ra-data-fakerest": "^5.4.2",
"ra-ui-materialui": "^5.4.2",
"data-generator-retail": "^5.4.3",
"ra-core": "^5.4.3",
"ra-data-fakerest": "^5.4.3",
"ra-ui-materialui": "^5.4.3",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-hook-form": "^7.53.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/ra-language-english/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ra-language-english",
"version": "5.4.2",
"version": "5.4.3",
"description": "English messages for react-admin, the frontend framework for building admin applications on top of REST/GraphQL services",
"repository": {
"type": "git",
Expand All @@ -21,7 +21,7 @@
"watch": "tsc --outDir dist/esm --module es2015 --watch"
},
"dependencies": {
"ra-core": "^5.4.2"
"ra-core": "^5.4.3"
},
"devDependencies": {
"rimraf": "^3.0.2",
Expand Down
4 changes: 2 additions & 2 deletions packages/ra-language-french/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ra-language-french",
"version": "5.4.2",
"version": "5.4.3",
"description": "French messages for react-admin, the frontend framework for building admin applications on top of REST/GraphQL services",
"repository": {
"type": "git",
Expand All @@ -21,7 +21,7 @@
"watch": "tsc --outDir dist/esm --module es2015 --watch"
},
"dependencies": {
"ra-core": "^5.4.2"
"ra-core": "^5.4.3"
},
"devDependencies": {
"rimraf": "^3.0.2",
Expand Down
6 changes: 3 additions & 3 deletions packages/ra-no-code/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ra-no-code",
"version": "5.4.2",
"version": "5.4.3",
"description": "",
"files": [
"*.md",
Expand Down Expand Up @@ -48,8 +48,8 @@
"inflection": "^3.0.0",
"lodash": "~4.17.5",
"papaparse": "^5.3.0",
"ra-data-local-storage": "^5.4.2",
"react-admin": "^5.4.2",
"ra-data-local-storage": "^5.4.3",
"react-admin": "^5.4.3",
"react-dropzone": "^14.2.3"
},
"gitHead": "587df4c27bfcec4a756df4f95e5fc14728dfc0d7"
Expand Down
8 changes: 4 additions & 4 deletions packages/ra-ui-materialui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ra-ui-materialui",
"version": "5.4.2",
"version": "5.4.3",
"description": "UI Components for react-admin with Material UI",
"files": [
"*.md",
Expand Down Expand Up @@ -39,9 +39,9 @@
"expect": "^27.4.6",
"file-api": "~0.10.4",
"ignore-styles": "~5.0.1",
"ra-core": "^5.4.2",
"ra-i18n-polyglot": "^5.4.2",
"ra-language-english": "^5.4.2",
"ra-core": "^5.4.3",
"ra-i18n-polyglot": "^5.4.3",
"ra-language-english": "^5.4.3",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-hook-form": "^7.53.0",
Expand Down
10 changes: 5 additions & 5 deletions packages/react-admin/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-admin",
"version": "5.4.2",
"version": "5.4.3",
"description": "A frontend Framework for building admin applications on top of REST services, using ES6, React and Material UI",
"files": [
"*.md",
Expand Down Expand Up @@ -40,10 +40,10 @@
"@emotion/styled": "^11.3.0",
"@mui/icons-material": "^5.15.20",
"@mui/material": "^5.15.20",
"ra-core": "^5.4.2",
"ra-i18n-polyglot": "^5.4.2",
"ra-language-english": "^5.4.2",
"ra-ui-materialui": "^5.4.2",
"ra-core": "^5.4.3",
"ra-i18n-polyglot": "^5.4.3",
"ra-language-english": "^5.4.3",
"ra-ui-materialui": "^5.4.3",
"react-hook-form": "^7.53.0",
"react-router": "^6.22.0",
"react-router-dom": "^6.22.0"
Expand Down
Loading