Merge branch 'next' into issue-11945

.circleci/config.yml

@@ -18,7 +18,7 @@ parameters:
     type: string
     default: ''
 
-defaults: &defaults
+default-job: &default-job
   parameters:
     react-dist-tag:
       description: The dist-tag of react to be used
@@ -46,13 +46,17 @@ defaults: &defaults
 #   restore_cache:
 #     key: v1-repo-{{ .Branch }}-{{ .Revision }}
 
+default-context: &default-context
+  context:
+    - org-global
+
 commands:
   install_js:
     parameters:
       browsers:
         type: boolean
         default: false
-        description: 'Set to true if you intend to any browser (e.g. with playwright).'
+        description: 'Set to true if you intend to any browser (for example with playwright).'
 
     steps:
       - run:
@@ -114,7 +118,7 @@ commands:
 
 jobs:
   checkout:
-    <<: *defaults
+    <<: *default-job
     steps:
       - checkout
       - install_js
@@ -125,10 +129,13 @@ jobs:
           name: Check for duplicated packages
           command: yarn deduplicate
   test_unit:
-    <<: *defaults
+    <<: *default-job
     steps:
       - checkout
       - install_js
+      - run:
+          name: Tests charts
+          command: yarn test:charts:unit # Run special test for charts due to ESM compatibility issue
       - run:
           name: Tests fake browser
           command: yarn test:coverage
@@ -146,7 +153,7 @@ jobs:
             chmod +x codecov
             ./codecov -t ${CODECOV_TOKEN} -Z -F "$REACT_DIST_TAG-jsdom"
   test_lint:
-    <<: *defaults
+    <<: *default-job
     steps:
       - checkout
       - install_js
@@ -160,7 +167,7 @@ jobs:
           name: Lint Markdown
           command: yarn markdownlint
   test_static:
-    <<: *defaults
+    <<: *default-job
     steps:
       - checkout
       - install_js
@@ -191,7 +198,7 @@ jobs:
             yarn docs:link-check
             git add -A && git diff --exit-code --staged
   test_browser:
-    <<: *defaults
+    <<: *default-job
     docker:
       - image: mcr.microsoft.com/playwright:v1.41.2-focal
         environment:
@@ -208,7 +215,7 @@ jobs:
           path: /tmp/_karma_webpack_
           destination: artifact-file
   test_types:
-    <<: *defaults
+    <<: *default-job
     steps:
       - checkout
       - install_js
@@ -224,7 +231,7 @@ jobs:
           environment:
             NODE_OPTIONS: --max-old-space-size=3072
   test_e2e:
-    <<: *defaults
+    <<: *default-job
     docker:
       - image: mcr.microsoft.com/playwright:v1.41.2-focal
         environment:
@@ -237,7 +244,7 @@ jobs:
           name: Run e2e tests
           command: yarn test:e2e
   test_e2e_website:
-    <<: *defaults
+    <<: *default-job
     docker:
       - image: mcr.microsoft.com/playwright:v1.41.2-focal
         environment:
@@ -252,7 +259,7 @@ jobs:
           environment:
             PLAYWRIGHT_TEST_BASE_URL: << parameters.e2e-base-url >>
   test_regressions:
-    <<: *defaults
+    <<: *default-job
     docker:
       - image: mcr.microsoft.com/playwright:v1.41.2-focal
         environment:
@@ -268,7 +275,7 @@ jobs:
           name: Upload screenshots to Argos CI
           command: yarn test:argos
   run_danger:
-    <<: *defaults
+    <<: *default-job
     docker:
       - image: mcr.microsoft.com/playwright:v1.41.2-focal
         environment:
@@ -288,36 +295,46 @@ workflows:
     when:
       equal: [pipeline, << pipeline.parameters.workflow >>]
     jobs:
-      - checkout
+      - checkout:
+          <<: *default-context
       - test_unit:
+          <<: *default-context
           requires:
             - checkout
       - test_lint:
+          <<: *default-context
           requires:
             - checkout
       - test_static:
+          <<: *default-context
           requires:
             - checkout
       - test_browser:
+          <<: *default-context
           requires:
             - checkout
       - test_types:
+          <<: *default-context
           requires:
             - checkout
       - test_e2e:
+          <<: *default-context
           requires:
             - checkout
       - test_regressions:
+          <<: *default-context
           requires:
             - checkout
       - run_danger:
+          <<: *default-context
           requires:
             - checkout
   e2e-website:
     when:
       equal: [e2e-website, << pipeline.parameters.workflow >>]
     jobs:
-      - checkout
+      - checkout:
+          <<: *default-context
       - test_e2e_website:
           requires:
             - checkout

.eslintrc.js

@@ -157,10 +157,10 @@ module.exports = {
       },
     },
     buildPackageRestrictedImports('@mui/x-charts', 'x-charts'),
-    buildPackageRestrictedImports('@mui/x-data-grid', 'grid/x-data-grid'),
-    buildPackageRestrictedImports('@mui/x-data-grid-pro', 'grid/x-data-grid-pro'),
-    buildPackageRestrictedImports('@mui/x-data-grid-premium', 'grid/x-data-grid-premium'),
-    buildPackageRestrictedImports('@mui/x-data-grid-generator', 'grid/x-data-grid-generator'),
+    buildPackageRestrictedImports('@mui/x-data-grid', 'x-data-grid'),
+    buildPackageRestrictedImports('@mui/x-data-grid-pro', 'x-data-grid-pro'),
+    buildPackageRestrictedImports('@mui/x-data-grid-premium', 'x-data-grid-premium'),
+    buildPackageRestrictedImports('@mui/x-data-grid-generator', 'x-data-grid-generator'),
     buildPackageRestrictedImports('@mui/x-pickers', 'x-pickers'),
     buildPackageRestrictedImports('@mui/x-pickers-pro', 'x-pickers-pro'),
     buildPackageRestrictedImports('@mui/x-license', 'x-license'),

.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@47b3d888fe66b639e431abf22ebca059152f1eea # v3.24.5
+        uses: github/codeql-action/init@8a470fddafa5cbb6266ee11b37ef4d8aae19c571 # v3.24.6
         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@47b3d888fe66b639e431abf22ebca059152f1eea # v3.24.5
+        uses: github/codeql-action/analyze@8a470fddafa5cbb6266ee11b37ef4d8aae19c571 # v3.24.6

.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@47b3d888fe66b639e431abf22ebca059152f1eea # v3.24.5
+        uses: github/codeql-action/upload-sarif@8a470fddafa5cbb6266ee11b37ef4d8aae19c571 # v3.24.6
         with:
           sarif_file: results.sarif

.gitignore

@@ -20,5 +20,7 @@ dist
 node_modules
 size-snapshot.json
 performance-snapshot.json
+# vale downloaded config
 .github/styles/Google
-.github/styles/write-good
+.github/styles/MUI
+.github/styles/.vale-config

.mocharc.js

@@ -7,6 +7,8 @@ module.exports = {
     // Mocha seems to ignore .next anyway (maybe because dotfiles?).
     // We're leaving this to make sure.
     'docs/.next/**',
+    // x-charts requires 'tsx/cjs' which conflict with the babel date-fns override for picker tests
+    'packages/x-charts/**',
   ],
   recursive: true,
   timeout: (process.env.CIRCLECI === 'true' ? 5 : 2) * 1000, // Circle CI has low-performance CPUs.

.vale.ini

@@ -1,33 +1,27 @@
-# Config vale. More information at https://docs.errata.ai/vale/config
+# Vale config. More information at https://vale.sh/docs/topics/config/
 StylesPath = .github/styles
-MinAlertLevel = suggestion
+MinAlertLevel = error
 
-Packages = Google
+# To update mui-vale package:
+# 1. Go to the docs folder in the material-ui repo
+# 2. Update/create YAML files
+# 3. Run `pnpm docs:zipRules` to generate the zip files
+# 4. You can test locally by replacing the url with the file path of the generated zip
+Packages = Google, https://github.com/mui/material-ui/raw/HEAD/docs/mui-vale.zip
 
 [*.md]
-# Ignore code injection which start with {{...
+# Ignore code injections that start with {{...
 BlockIgnores = {{.*
 
-# Custom syle
-# BasedOnStyles = Blog
+BasedOnStyles = MUI
 
-Blog.ComposedWords = YES
-Blog.NamingConventions = YES
-Blog.Typos = YES
-Blog.BrandName = YES
-Blog.NoCompanyName = YES
+# Google errors:
+Google.GenderBias = YES # No Gender bias
+# Google warings:
+Google.FirstPerson = YES # Avoid first-person
+Google.We = YES # Avoid first-person plural
+Google.Will = YES # Avoid future tense
+Google.OxfordComma = YES # Prefer Oxford comma
 
-# Google:
-Google.FirstPerson = YES # Avoid first-person pronouns such as I, me, ...'.
-Google.GenderBias = YES # Avoid gendered profession
-Google.OxfordComma = YES
-Google.Quotes = YES # Commas and periods go inside quotation marks.
-Google.Spelling = YES # In general, use American spelling (word ending with 'nised' or 'logue')
-Google.We = YES # Try to avoid using first-person plural
-
-# Those rules are not repected a lot
-# Google.Passive = YES # In general, use active voice instead of passive voice.
-# Google.Will = YES # Avoid using will
-
-# False positives with "1st" nearly no use in our doc
-# Google.Units = YES # Put a nonbreaking space between the number and the unit
+[CHANGELOG*.md]
+MUI.CorrectReferenceAllCases = NO