Merge branch 'next' into use-client-directive

.circleci/config.yml

@@ -36,7 +36,7 @@ defaults: &defaults
     REACT_DIST_TAG: << parameters.react-dist-tag >>
   working_directory: /tmp/mui
   docker:
-    - image: cimg/node:18.16
+    - image: cimg/node:18.19
 # CircleCI has disabled the cache across forks for security reasons.
 # Following their official statement, it was a quick solution, they
 # are working on providing this feature back with appropriate security measures.
@@ -193,7 +193,7 @@ jobs:
   test_browser:
     <<: *defaults
     docker:
-      - image: mcr.microsoft.com/playwright:v1.41.1-focal
+      - image: mcr.microsoft.com/playwright:v1.41.2-focal
         environment:
           NODE_ENV: development # Needed if playwright is in `devDependencies`
     steps:
@@ -226,7 +226,7 @@ jobs:
   test_e2e:
     <<: *defaults
     docker:
-      - image: mcr.microsoft.com/playwright:v1.41.1-focal
+      - image: mcr.microsoft.com/playwright:v1.41.2-focal
         environment:
           NODE_ENV: development # Needed if playwright is in `devDependencies`
     steps:
@@ -239,7 +239,7 @@ jobs:
   test_e2e_website:
     <<: *defaults
     docker:
-      - image: mcr.microsoft.com/playwright:v1.41.1-focal
+      - image: mcr.microsoft.com/playwright:v1.41.2-focal
         environment:
           NODE_ENV: development # Needed if playwright is in `devDependencies`
     steps:
@@ -254,7 +254,7 @@ jobs:
   test_regressions:
     <<: *defaults
     docker:
-      - image: mcr.microsoft.com/playwright:v1.41.1-focal
+      - image: mcr.microsoft.com/playwright:v1.41.2-focal
         environment:
           NODE_ENV: development # Needed if playwright is in `devDependencies`
     steps:
@@ -270,7 +270,7 @@ jobs:
   run_danger:
     <<: *defaults
     docker:
-      - image: mcr.microsoft.com/playwright:v1.41.1-focal
+      - image: mcr.microsoft.com/playwright:v1.41.2-focal
         environment:
           NODE_ENV: development # Needed if playwright is in `devDependencies`
     steps:

.codesandbox/ci.json

@@ -3,31 +3,27 @@
   "installCommand": "install:codesandbox",
   "node": "18",
   "packages": [
-    "packages/x-license-pro",
-    "packages/grid/x-data-grid",
-    "packages/grid/x-data-grid-pro",
-    "packages/grid/x-data-grid-premium",
-    "packages/grid/x-data-grid-generator",
+    "packages/x-license",
+    "packages/x-data-grid",
+    "packages/x-data-grid-pro",
+    "packages/x-data-grid-premium",
+    "packages/x-data-grid-generator",
     "packages/x-date-pickers",
     "packages/x-date-pickers-pro",
     "packages/x-charts",
     "packages/x-tree-view"
   ],
   "publishDirectory": {
-    "@mui/x-license-pro": "packages/x-license-pro/build",
-    "@mui/x-data-grid": "packages/grid/x-data-grid/build",
-    "@mui/x-data-grid-pro": "packages/grid/x-data-grid-pro/build",
-    "@mui/x-data-grid-premium": "packages/grid/x-data-grid-premium/build",
-    "@mui/x-data-grid-generator": "packages/grid/x-data-grid-generator/build",
+    "@mui/x-license": "packages/x-license/build",
+    "@mui/x-data-grid": "packages/x-data-grid/build",
+    "@mui/x-data-grid-pro": "packages/x-data-grid-pro/build",
+    "@mui/x-data-grid-premium": "packages/x-data-grid-premium/build",
+    "@mui/x-data-grid-generator": "packages/x-data-grid-generator/build",
     "@mui/x-date-pickers": "packages/x-date-pickers/build",
     "@mui/x-date-pickers-pro": "packages/x-date-pickers-pro/build",
     "@mui/x-charts": "packages/x-charts/build",
     "@mui/x-tree-view": "packages/x-tree-view/build"
   },
-  "sandboxes": [
-    "new",
-    "github/mui/material-ui/tree/master/examples/create-react-app",
-    "github/mui/material-ui/tree/master/examples/create-react-app-with-typescript"
-  ],
+  "sandboxes": ["/bug-reproductions/x-data-grid"],
   "silent": true
 }

.eslintignore

@@ -3,7 +3,6 @@
 /docs/export
 /docs/pages/playground/
 /lerna.json
-/packages/grid/x-data-grid/src/lib
 /packages/x-codemod/src/**/*.spec.js
 build
 CHANGELOG.md

.eslintrc.js

@@ -98,11 +98,16 @@ module.exports = {
       },
     },
     {
-      files: ['packages/grid/**/*.ts', 'packages/grid/**/*.js', 'docs/src/pages/**/*.tsx'],
+      files: [
+        'packages/x-data-grid/**/*{.tsx,.ts,.js}',
+        'packages/x-data-grid-pro/**/*{.tsx,.ts,.js}',
+        'packages/x-data-grid-premium/**/*{.tsx,.ts,.js}',
+        'docs/src/pages/**/*.tsx',
+      ],
       excludedFiles: [
-        'packages/grid/x-data-grid/src/themeAugmentation/index.js', // TypeScript ignores JS files with the same name as the TS file
-        'packages/grid/x-data-grid-pro/src/themeAugmentation/index.js',
-        'packages/grid/x-data-grid-premium/src/themeAugmentation/index.js',
+        'packages/x-data-grid/src/themeAugmentation/index.js', // TypeScript ignores JS files with the same name as the TS file
+        'packages/x-data-grid-pro/src/themeAugmentation/index.js',
+        'packages/x-data-grid-premium/src/themeAugmentation/index.js',
       ],
       rules: {
         'material-ui/no-direct-state-access': 'error',
@@ -122,6 +127,12 @@ module.exports = {
         'filenames/match-exported': ['error'],
       },
     },
+    {
+      files: ['**/*.mjs'],
+      rules: {
+        'import/extensions': ['error', 'ignorePackages'],
+      },
+    },
     {
       files: ['packages/*/src/**/*{.ts,.tsx,.js}'],
       excludedFiles: ['*.d.ts', '*.spec.ts', '*.spec.tsx'],
@@ -135,6 +146,7 @@ module.exports = {
               'useTimePickerDefaultizedProps',
               'useDateTimePickerDefaultizedProps',
               'useDateRangePickerDefaultizedProps',
+              'useDateTimeRangePickerDefaultizedProps',
               'useDateCalendarDefaultizedProps',
               'useMonthCalendarDefaultizedProps',
               'useYearCalendarDefaultizedProps',
@@ -151,6 +163,6 @@ module.exports = {
     buildPackageRestrictedImports('@mui/x-data-grid-generator', 'grid/x-data-grid-generator'),
     buildPackageRestrictedImports('@mui/x-pickers', 'x-pickers'),
     buildPackageRestrictedImports('@mui/x-pickers-pro', 'x-pickers-pro'),
-    buildPackageRestrictedImports('@mui/x-license-pro', 'x-license-pro'),
+    buildPackageRestrictedImports('@mui/x-license', 'x-license'),
   ],
 };

.github/ISSUE_TEMPLATE/1.bug.yml

@@ -26,9 +26,7 @@ body:
       description: |
         **⚠️ Issues that we can't reproduce can't be fixed.**
 
-        If you don't have one, you can use one of these options:
-          - [DataGrid codesandbox template](https://codesandbox.io/s/github/mui/mui-x/tree/master/templates/x-data-grid?file=/src/demo.tsx)
-          - Fork any of the examples in our [documentation](https://mui.com/x/introduction/) by [clicking on the codesandbox or stackblitz icon](https://mui.com/static/docs/forking-an-example.png)
+        Please provide a link to a live example and an unambiguous set of steps to reproduce this bug. See our [documentation](https://mui.com/x/introduction/support/#bug-reproductions) on how to build a reproduction case.
       value: |
         Link to live example: (required)
 

.github/ISSUE_TEMPLATE/3.pro-support.yml

@@ -36,10 +36,7 @@ body:
     attributes:
       label: The problem in depth
       description: |
-        **If applicable, please provide a live example to explain your problem.**
-        If you don't have one, you can use one of these options:
-          - [DataGrid codesandbox template](https://codesandbox.io/s/github/mui/mui-x/tree/master/templates/x-data-grid?file=/src/demo.tsx)
-          - Fork any of the examples in our [documentation](https://mui.com/x/introduction/) by [clicking on the codesandbox or stackblitz icon](https://mui.com/static/docs/forking-an-example.png)
+        Please provide a link to a live example and an unambiguous set of steps to reproduce this bug. See our [documentation](https://mui.com/x/introduction/support/#bug-reproductions) on how to build a reproduction case.
   - type: textarea
     attributes:
       label: Your environment

.github/ISSUE_TEMPLATE/4.premium-support.yml

@@ -36,10 +36,7 @@ body:
     attributes:
       label: The problem in depth
       description: |
-        **If applicable, please provide a live example to explain your problem.**
-        If you don't have one, you can use one of these options:
-          - [DataGrid codesandbox template](https://codesandbox.io/s/github/mui/mui-x/tree/master/templates/x-data-grid?file=/src/demo.tsx)
-          - Fork any of the examples in our [documentation](https://mui.com/x/introduction/) by [clicking on the codesandbox or stackblitz icon](https://mui.com/static/docs/forking-an-example.png)
+        Please provide a link to a live example and an unambiguous set of steps to reproduce this bug. See our [documentation](https://mui.com/x/introduction/support/#bug-reproductions) on how to build a reproduction case.
   - type: textarea
     attributes:
       label: Your environment

.github/ISSUE_TEMPLATE/5.priority-support.yml

@@ -26,10 +26,7 @@ body:
     attributes:
       label: The problem in depth
       description: |
-        **If you're reporting a bug, please provide a live example for your report.**
-        If you don't have one, you can use one of these options:
-          - [DataGrid codesandbox template](https://codesandbox.io/s/github/mui/mui-x/tree/master/templates/x-data-grid?file=/src/demo.tsx)
-          - Fork any of the examples in our [documentation](https://mui.com/x/introduction/) by [clicking on the codesandbox or stackblitz icon](https://mui.com/static/docs/forking-an-example.png)
+        Please provide a link to a live example and an unambiguous set of steps to reproduce this bug. See our [documentation](https://mui.com/x/introduction/support/#bug-reproductions) on how to build a reproduction case.
   - type: textarea
     attributes:
       label: Your environment

.github/styles/Blog/BrandName.yml

@@ -1,4 +1,7 @@
-# Without a non-breaking space, brand names can be split in the middle, with the start and end on two different lines.
+# Without a non-breaking space, brand names can be split in the middle
+# with the start and end on two different lines.
+# For example, Apple does this meticulously with their brand name: https://www.apple.com/macbook-air/.
+# Also read https://www.chrisdpeters.com/blog/using-non-breaking-spaces-to-help-with-branding/ for why.
 extends: substitution
 message: Use a non-breaking space for brand name ('%s' instead of '%s')
 level: error
@@ -14,3 +17,8 @@ swap:
   MUI Core: MUI Core
   MUI Toolpad: MUI Toolpad
   MUI Connect: MUI Connect
+  Stack Overflow: Stack Overflow
+# Don't forget to run the following command to generate the package writing-rules.zip file
+# Vale uses that ZIP file and not the YAML files.
+#
+# pnpm docs:zipRules

.github/styles/Blog/ComposedWords.yml

@@ -11,3 +11,5 @@ swap:
   'sub components': subcomponents
   'use-case': 'use case'
   'usecase': 'use case'
+  "can't": 'cannot'
+  'can not': 'cannot'

.github/styles/Blog/NamingConventions.yml

@@ -15,3 +15,5 @@ swap:
   Javascript: JavaScript
   css: CSS
   Css: CSS
+  NPM: npm # https://css-tricks.com/start-sentence-npm/
+  Github: GitHub

.github/styles/Blog/NoCompanyName.yml

@@ -11,3 +11,4 @@ exceptions:
   - 'MUI Core'
   - 'MUI Toolpad'
   - 'MUI Connect'
+  - 'MUI organization' # valid use of a regular space

.github/workflows/cherry-pick-next-to-master.yml

@@ -18,7 +18,7 @@ jobs:
     if: ${{ contains(github.event.pull_request.labels.*.name, 'needs cherry-pick') && github.event.pull_request.merged == true }}
     steps:
       - name: Checkout
-        uses: actions/checkout@722adc63f1aa60a57ec37892e133b1d319cae598 # v2.0.0
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           fetch-depth: 0
       - name: Cherry pick and create the new PR

.github/workflows/closed-issue-message.yaml

@@ -0,0 +1,35 @@
+name: Add comment
+
+on:
+  issues:
+    types:
+      - closed
+
+permissions: {}
+
+jobs:
+  add-comment:
+    env:
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      GH_REPO: ${{ github.repository }}
+      NUMBER: ${{ github.event.issue.number }}
+      BODY: |
+        :warning: **This issue has been closed.**
+        If you have a similar problem, please open a [new issue](https://github.com/mui/mui-x/issues/new/choose) and provide details about your specific problem.
+        If you can provide additional information related to this topic that could help future readers, please feel free to leave a comment.
+      APPENDIX: |
+
+        **How did we do @${{ github.event.issue.user.login }}?**
+        Your experience with our support team matters to us. If you have a moment, please share your thoughts through our [brief survey](https://tally.so/r/w4r5Mk?issue=${{ github.event.issue.number }}).
+
+    if: github.event.issue.state_reason != 'inactivity'
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+    steps:
+      - name: Add comment for outside contributors
+        if: github.event.issue.author_association != 'MEMBER' && github.event.issue.author_association != 'OWNER'
+        run: gh issue comment "$NUMBER" --body "$BODY $APPENDIX"
+      - name: Add comment for maintainers
+        if: github.event.issue.author_association == 'MEMBER' || github.event.issue.author_association == 'OWNER'
+        run: gh issue comment "$NUMBER" --body "$BODY"

.github/workflows/codeql.yml

@@ -19,7 +19,7 @@ jobs:
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@c0d1daa7f7e14667747d73a7dbbe8c074bc8bfe2 # v2.22.9
+        uses: github/codeql-action/init@b7bf0a3ed3ecfa44160715d7c442788f65f0f923 # v3.23.2
         with:
           languages: typescript
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -29,4 +29,4 @@ jobs:
           # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
           # queries: security-extended,security-and-quality
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@c0d1daa7f7e14667747d73a7dbbe8c074bc8bfe2 # v2.22.9
+        uses: github/codeql-action/analyze@b7bf0a3ed3ecfa44160715d7c442788f65f0f923 # v3.23.2

.github/workflows/ensure-triage-label.yml

@@ -16,7 +16,7 @@ jobs:
     permissions:
       issues: write
     steps:
-      - uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6
+      - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7
         with:
           script: |
             const { data: labels } = await github.rest.issues.listLabelsOnIssue({

.github/workflows/issue-cleanup.yml

@@ -13,7 +13,7 @@ jobs:
     permissions:
       issues: write
     steps:
-      - uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6
+      - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7
         with:
           script: |
             const issue = await github.rest.issues.get({

.github/workflows/l10n.yml

@@ -18,10 +18,10 @@ jobs:
     steps:
       - run: echo "${{ github.actor }}"
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-      - name: Use Node.js 18.x
-        uses: actions/setup-node@1a4442cacd436585916779262731d5b162bc6ec7 # v3.8.2
+      - name: Use Node.js 20.x
+        uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
         with:
-          node-version: 18
+          node-version: 20
           cache: 'yarn' # https://github.com/actions/setup-node/blob/main/docs/advanced-usage.md#caching-packages-dependencies
       - run: yarn install
       - name: yarn l10n --report

.github/workflows/no-response.yml

@@ -20,7 +20,7 @@ jobs:
       contents: read
       issues: write
     steps:
-      - uses: MBilalShafi/no-response-add-label@629add01d7b6f8e120811f978c42703736098947
+      - uses: MBilalShafi/no-response-add-label@8336c12292902f27b931154c34ba4670cb9899a2
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           # Number of days of inactivity before an Issue is closed for lack of response
@@ -32,4 +32,3 @@ jobs:
           # Comment to post when closing an Issue for lack of response. Set to `false` to disable
           closeComment: >
             The issue has been inactive for 7 days and has been automatically closed.
-            If you think that it has been incorrectly closed, please reopen it and provide missing information (if any) or continue the last discussion.

.github/workflows/scorecards.yml

@@ -44,6 +44,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: Upload to code-scanning
-        uses: github/codeql-action/upload-sarif@c0d1daa7f7e14667747d73a7dbbe8c074bc8bfe2 # v2.22.9
+        uses: github/codeql-action/upload-sarif@b7bf0a3ed3ecfa44160715d7c442788f65f0f923 # v3.23.2
         with:
           sarif_file: results.sarif

.github/workflows/support-stackoverflow.yml

@@ -14,7 +14,7 @@ jobs:
       contents: read
       issues: write
     steps:
-      - uses: dessant/support-requests@b1303caf4438e66dea1130aa4c30189dc28e690d # v3.0.0
+      - uses: dessant/support-requests@47d5ea12f6c9e4a081637de9626b7319b415a3bf # v4.0.0
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           # Label used to mark issues as support requests
@@ -29,7 +29,7 @@ jobs:
 
             For support, please check out https://mui.com/x/introduction/support/. Thanks!
 
-            If you have a question on Stack Overflow, you are welcome to link to it here, it might help others.
+            If you have a question on Stack Overflow, you are welcome to link to it here, it might help others.
             If your issue is subsequently confirmed as a bug, and the report follows the issue template, it can be reopened.
           close-issue: true
           lock-issue: false