Merge branch 'master' into next

Author: djhi

.storybook/main.js

@@ -1,14 +1,18 @@
 const fs = require('fs');
 const path = require('path');
-
 const packages = fs.readdirSync(path.resolve(__dirname, '../packages'));
 module.exports = {
-    core: {
-        builder: 'webpack5',
-    },
     stories: [`../packages/${process.env.ONLY || '**'}/**/*.stories.@(tsx)`],
     addons: [
-        '@storybook/addon-storysource',
+        {
+            name: '@storybook/addon-storysource',
+            options: {
+                loaderOptions: {
+                    injectStoryParameters: false,
+                    parser: 'typescript',
+                },
+            },
+        },
         '@storybook/addon-actions',
         '@storybook/addon-controls',
     ],
@@ -21,18 +25,34 @@ module.exports = {
         const { plugins = [] } = options;
         return {
             ...options,
+            presets: [
+                '@babel/preset-env',
+                '@babel/preset-react',
+                '@babel/preset-typescript',
+            ],
             plugins: [
                 ...plugins,
                 [
                     '@babel/plugin-proposal-private-property-in-object',
-                    { loose: true },
+                    {
+                        loose: true,
+                    },
+                ],
+                [
+                    '@babel/plugin-proposal-private-methods',
+                    {
+                        loose: true,
+                    },
+                ],
+                [
+                    '@babel/plugin-proposal-class-properties',
+                    {
+                        loose: true,
+                    },
                 ],
             ],
         };
     },
-    reactOptions: {
-        fastRefresh: true,
-    },
     webpackFinal: async (config, { configType }) => {
         return {
             ...config,
@@ -51,4 +71,11 @@ module.exports = {
             },
         };
     },
+    framework: {
+        name: '@storybook/react-webpack5',
+        options: {},
+    },
+    docs: {
+        autodocs: false,
+    },
 };

CHANGELOG.md

@@ -1,5 +1,41 @@
 # Changelog
 
+## v4.10.6
+
+* Fix ra-language-french package.json to avoid including tsconfig ([#8939](https://github.com/marmelab/react-admin/pull/8939)) ([djhi](https://github.com/djhi))
+* Fix create-react-admin adds unnecessary files ([#8935](https://github.com/marmelab/react-admin/pull/8935)) ([djhi](https://github.com/djhi))
+* [TypeScript] Fix `<Create>` generic record type should not require an `id` field ([#8923](https://github.com/marmelab/react-admin/pull/8923)) ([djhi](https://github.com/djhi))
+* [Doc] Fix tutorial with create-react-admin ([#8934](https://github.com/marmelab/react-admin/pull/8934)) ([fzaninotto](https://github.com/fzaninotto))
+* [chore] Update Storybook to v7 & Cypress to use Vite ([#8936](https://github.com/marmelab/react-admin/pull/8936)) ([djhi](https://github.com/djhi))
+
+## v4.10.5
+
+* Fix create and edit controller's save callback should use calltime meta param ([#8933](https://github.com/marmelab/react-admin/pull/8933)) ([slax57](https://github.com/slax57))
+* Fix create-react-admin does not include its templates ([#8932](https://github.com/marmelab/react-admin/pull/8932)) ([djhi](https://github.com/djhi))
+
+## v4.10.4
+
+* Fix `<DatagridConfigurable>` inspector hides the wrong column when using empty children ([#8929](https://github.com/marmelab/react-admin/pull/8929)) ([fzaninotto](https://github.com/fzaninotto))
+* Fix `<DatagridConfigurable>` fails to render when using a Field with a label element ([#8928](https://github.com/marmelab/react-admin/pull/8928)) ([fzaninotto](https://github.com/fzaninotto))
+* Fix `<TextField>` and `<RichTextField>` don't translate the `emptyText` ([#8924](https://github.com/marmelab/react-admin/pull/8924)) ([fzaninotto](https://github.com/fzaninotto))
+* Fix `<SaveButton>` spinner while submitting ([#8920](https://github.com/marmelab/react-admin/pull/8920)) ([fzaninotto](https://github.com/fzaninotto))
+* [Doc] Fix video playback on iOS ([#8922](https://github.com/marmelab/react-admin/pull/8922)) ([slax57](https://github.com/slax57))
+* [Doc] Fix `<List disableSyncWithLocation>` doc about persisting list params in the store ([#8919](https://github.com/marmelab/react-admin/pull/8919)) ([fzaninotto](https://github.com/fzaninotto))
+* [Doc] Document type parameter in generic hooks ([#8916](https://github.com/marmelab/react-admin/pull/8916)) ([djhi](https://github.com/djhi))
+
+## v4.10.3
+
+* Fix `<ReferenceField>` link function is called with referencing record instead of referenced record ([#8899](https://github.com/marmelab/react-admin/pull/8899)) ([djhi](https://github.com/djhi))
+* Fix `ReferenceFieldView` backwards compatibility ([#8912](https://github.com/marmelab/react-admin/pull/8912)) ([djhi](https://github.com/djhi))
+* Fix `create-react-admin` requires node 16 ([#8902](https://github.com/marmelab/react-admin/pull/8902)) ([fzaninotto](https://github.com/fzaninotto))
+* [Typescript] Fix Layout's `sidebar` prop type ([#8887](https://github.com/marmelab/react-admin/pull/8887)) ([smeng9](https://github.com/smeng9))
+* [Doc] Add Advanced Tutorial about Custom Tags Selector ([#8906](https://github.com/marmelab/react-admin/pull/8906)) ([slax57](https://github.com/slax57))
+* [Doc] Update Datagrid's `isRowSelectable` description and examples ([#8901](https://github.com/marmelab/react-admin/pull/8901)) ([WiXSL](https://github.com/WiXSL))
+* [Doc] fix import statements in example code ([#8896](https://github.com/marmelab/react-admin/pull/8896)) ([charlie-ac](https://github.com/charlie-ac))
+* [Doc] add casdoor auth provider ([#8894](https://github.com/marmelab/react-admin/pull/8894)) ([akriventsev](https://github.com/akriventsev))
+* [Doc] Add Supabase realtime adapter ([#8893](https://github.com/marmelab/react-admin/pull/8893)) ([fzaninotto](https://github.com/fzaninotto))
+* [Doc] Update tutorial to use `create-react-admin` ([#8881](https://github.com/marmelab/react-admin/pull/8881)) ([djhi](https://github.com/djhi))
+
 ## v4.10.2
 
 * Fix custom redirect in pessimistic `<Edit>` or `<Create>` when using `warnWhenUnsavedChanges` ([#8882](https://github.com/marmelab/react-admin/pull/8882)) ([slax57](https://github.com/slax57))

cypress/cypress.config.js

@@ -1,6 +1,7 @@
-const { defineConfig } = require('cypress');
+import { defineConfig } from 'cypress';
+import vitePreprocessor from 'cypress-vite';
 
-module.exports = defineConfig({
+export default defineConfig({
     fixturesFolder: 'fixtures',
     screenshotsFolder: 'screenshots',
     videosFolder: 'videos',
@@ -11,7 +12,19 @@ module.exports = defineConfig({
         // We've imported your old cypress plugins here.
         // You may want to clean this up later by importing these.
         setupNodeEvents(on, config) {
-            return require('./plugins/index.js')(on, config);
+            on('before:browser:launch', (browser = {}, launchOptions) => {
+                // Fix for Cypress 4:
+                // https://docs.cypress.io/api/plugins/browser-launch-api.html#Usage
+                if (browser.name === 'chrome') {
+                    launchOptions.args.push(
+                        '--disable-blink-features=RootLayerScrolling'
+                    );
+                    launchOptions.args.push('--disable-gpu');
+                    launchOptions.args.push('--proxy-bypass-list=<-loopback>');
+                    return launchOptions;
+                }
+            });
+            on('file:preprocessor', vitePreprocessor());
         },
         baseUrl: 'http://localhost:8080',
         specPattern: 'e2e/**/*.cy.{js,jsx,ts,tsx}',

cypress/package.json

@@ -1,15 +1,15 @@
 {
     "private": true,
     "name": "e2e",
-    "version": "4.10.0",
+    "version": "4.10.6",
     "scripts": {
         "start": "cypress open",
         "test": "yarn node ./start.js"
     },
     "devDependencies": {
-        "@cypress/webpack-preprocessor": "^5.10.0",
         "cypress": "^10.9.0",
         "cypress-plugin-tab": "^1.0.5",
+        "cypress-vite": "^1.4.0",
         "express": "~4.17.3"
     }
 }

cypress/plugins/index.js

@@ -1 +1 @@
-require('cypress-plugin-tab');
+import 'cypress-plugin-tab';

cypress/support/index.js

@@ -74,3 +74,16 @@ This article shows how to customize react-admin look and feel using only the Mat
 
 * [Article](https://marmelab.com/blog/2020/09/11/react-admin-tutorials-build-your-own-theme.html)
 * [Code Repository](https://github.com/Luwangel/react-admin-tutorials-build-your-own-theme)
+
+## Build A Custom Tags Selector
+
+This tutorial explains how to create a custom component to select tags for a record, fetching the list of existing tags and allowing to create new tags on the fly.
+
+<video controls autoplay playsinline muted loop width="100%">
+    <source src="https://marmelab.com/b612ecd6bf066e85bad0a036614f55b0/tags-list-edit.webm" type="video/webm" />
+    Your browser does not support the video tag.
+</video>
+
+* [Article](https://marmelab.com/blog/2023/04/26/build-a-custom-tags-selector-with-react-admin.html)
+* Test it live in the [CRM Demo](https://marmelab.com/react-admin-crm/#/contacts/1/show)
+* CRM Demo [Repository](https://github.com/marmelab/react-admin/blob/master/examples/crm/src/contacts/TagsListEdit.tsx)

docs/AdvancedTutorials.md

@@ -7,8 +7,9 @@ title: "The AppBar Component"
 
 The default react-admin layout renders a horizontal app bar at the top, which is rendered by the `<AppBar>` component.
 
-<video controls autoplay muted loop width="100%">
+<video controls autoplay playsinline muted loop width="100%">
   <source src="./img/AppBar.webm" type="video/webm" />
+  <source src="./img/AppBar.mp4" type="video/mp4" />
   Your browser does not support the video tag.
 </video>
 
@@ -222,8 +223,9 @@ export const MyAppBar = () => (
 
 If your app uses [authentication](./Authentication.md), the `<AppBar>` component displays a button to display the user menu on the right side. By default, the user menu only contains a logout button.
 
-<video controls autoplay muted loop width="100%">
+<video controls autoplay playsinline muted loop width="100%">
   <source src="./img/AppBar-user-menu.webm" type="video/webm"/>
+  <source src="./img/AppBar-user-menu.mp4" type="video/mp4"/>
   Your browser does not support the video tag.
 </video>
 
@@ -435,8 +437,9 @@ export const MyLayout = (props) => (
 
 By default, users can override the page title [in configurable mode](./Features.md#configurable-ui).
 
-<video controls autoplay muted loop width="100%">
+<video controls autoplay playsinline muted loop width="100%">
   <source src="./img/TitleConfigurable.webm" type="video/webm"/>
+  <source src="./img/TitleConfigurable.mp4" type="video/mp4"/>
   Your browser does not support the video tag.
 </video>
 

docs/AppBar.md

@@ -105,8 +105,9 @@ We spend a great deal of time refining the UI to make it as intuitive as possibl
 
 React-admin produces a user interface that is voluntarily bland by default because we want to emphasize content rather than chrome.
 
-<video controls autoplay muted loop>
+<video controls autoplay playsinline muted loop>
   <source src="./img/sort-button.webm" type="video/webm"/>
+  <source src="./img/sort-button.mp4" type="video/mp4"/>
   Your browser does not support the video tag.
 </video>
 

docs/Architecture.md

@@ -7,8 +7,9 @@ title: "The ArrayInput Component"
 
 To edit arrays of data embedded inside a record, `<ArrayInput>` creates a list of sub-forms.
 
-<video controls autoplay muted loop>
+<video controls autoplay playsinline muted loop>
   <source src="./img/array-input.webm" type="video/webm"/>
+  <source src="./img/array-input.mp4" type="video/mp4"/>
   Your browser does not support the video tag.
 </video>