Merge remote-tracking branch 'upstream/master' into use-re-exported-u…

…tils-in-docs

.circleci/config.yml

@@ -59,13 +59,6 @@ commands:
         description: 'Set to true if you intend to any browser (for example with playwright).'
 
     steps:
-      - run:
-          name: Resolve React version
-          command: |
-            node scripts/useReactVersion.mjs
-            # log a patch for maintainers who want to check out this change
-            git --no-pager diff HEAD
-
       - when:
           condition: << parameters.browsers >>
           steps:
@@ -97,16 +90,14 @@ commands:
             pnpm --version
       - run:
           name: Install js dependencies
+          command: pnpm install
+
+      - run:
+          name: Resolve React version
           command: |
-            echo "React version $REACT_VERSION"
-            if [ $REACT_VERSION == "stable" ];
-            then
-              echo "pnpm install"
-              pnpm install
-            else
-              echo "pnpm install --no-frozen-lockfile"
-              pnpm install --no-frozen-lockfile
-            fi
+            pnpm use-react-version
+            # log a patch for maintainers who want to check out this change
+            git --no-pager diff HEAD
 
       - when:
           condition: << parameters.browsers >>
@@ -134,7 +125,8 @@ jobs:
       - run:
           name: '`pnpm dedupe` was run?'
           command: |
-            if [[ $(git diff --name-status next | grep pnpm-lock) == "" ]];
+            # #default-branch-switch
+            if [[ $(git diff --name-status master | grep pnpm-lock) == "" ]];
             then
                 echo "No changes to dependencies detected. Skipping..."
             else
@@ -145,9 +137,6 @@ jobs:
     steps:
       - checkout
       - install_js
-      - run:
-          name: Tests charts
-          command: pnpm test:charts:unit # Run special test for charts due to ESM compatibility issue
       - run:
           name: Tests fake browser
           command: pnpm test:coverage
@@ -185,7 +174,14 @@ jobs:
       - install_js
       - run:
           name: '`pnpm prettier` changes committed?'
-          command: pnpm prettier --check
+          command: |
+            # #default-branch-switch
+            if [[ $(git diff --name-status master | grep pnpm-lock) == "" ]];
+            then
+                pnpm prettier --check
+            else
+                pnpm prettier:check
+            fi
       - run:
           name: Generate PropTypes
           command: pnpm proptypes
@@ -213,6 +209,18 @@ jobs:
           command: |
             pnpm docs:link-check
             git add -A && git diff --exit-code --staged
+      - run:
+          name: '`pnpm @mui/x-charts-vendor build` was run?'
+          command: |
+            # #default-branch-switch 
+            if [[ $(git diff --name-status master | grep pnpm-lock) == "" ]]; 
+            then
+              echo "No changes to dependencies detected. Skipping..."
+            else
+              pnpm --filter @mui/x-charts-vendor build
+              git add -A && git diff --exit-code --staged
+            fi
+
   test_browser:
     <<: *default-job
     docker:

.codesandbox/ci.json

@@ -11,6 +11,7 @@
     "packages/x-date-pickers",
     "packages/x-date-pickers-pro",
     "packages/x-charts",
+    "packages/x-charts-vendor",
     "packages/x-tree-view",
     "packages/x-internals"
   ],
@@ -23,6 +24,7 @@
     "@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-charts-vendor": "packages/x-charts-vendor",
     "@mui/x-charts-pro": "packages/x-charts-pro/build",
     "@mui/x-tree-view": "packages/x-tree-view/build",
     "@mui/x-tree-view-pro": "packages/x-tree-view-pro/build",

.eslintignore

@@ -6,7 +6,9 @@ netlify/functions
 /docs/pages/playground/
 /lerna.json
 /packages/x-codemod/src/**/*.spec.js
+/packages/x-charts-vendor
 build
+/coverage
 CHANGELOG.md
 dist
 node_modules

.github/ISSUE_TEMPLATE/1.bug.yml

@@ -1,6 +1,6 @@
 name: Bug report 🐛
 description: Create a bug report for MUI X.
-labels: ['status: waiting for maintainer']
+labels: ['status: waiting for maintainer', 'bug 🐛']
 body:
   - type: markdown
     attributes:
@@ -20,6 +20,16 @@ body:
       options:
         - label: I have tested the latest version
           required: true
+  - type: dropdown
+    attributes:
+      label: Affected products
+      description: Which products are affected by this issue? If you're not sure, leave this blank.
+      multiple: true
+      options:
+        - Data Grid
+        - Date and Time Pickers
+        - Charts
+        - Tree View
   - type: textarea
     attributes:
       label: Steps to reproduce

.github/ISSUE_TEMPLATE/2.feature.yml

@@ -1,6 +1,6 @@
 name: Feature request 💄
 description: Suggest a new idea for MUI X.
-labels: ['status: waiting for maintainer']
+labels: ['status: waiting for maintainer', 'new feature']
 body:
   - type: markdown
     attributes:

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

@@ -32,6 +32,16 @@ body:
       options:
         - label: I have tested the latest version
           required: true
+  - type: dropdown
+    attributes:
+      label: Affected products
+      description: Which products are affected by this issue? If you're not sure, leave this blank.
+      multiple: true
+      options:
+        - Data Grid
+        - Date and Time Pickers
+        - Charts
+        - Tree View
   - type: textarea
     attributes:
       label: The problem in depth

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

@@ -32,6 +32,16 @@ body:
       options:
         - label: I have tested the latest version
           required: true
+  - type: dropdown
+    attributes:
+      label: Affected products
+      description: Which products are affected by this issue? If you're not sure, leave this blank.
+      multiple: true
+      options:
+        - Data Grid
+        - Date and Time Pickers
+        - Charts
+        - Tree View
   - type: textarea
     attributes:
       label: The problem in depth

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

@@ -22,6 +22,16 @@ body:
       options:
         - label: I have tested the latest version
           required: true
+  - type: dropdown
+    attributes:
+      label: Affected products
+      description: Which products are affected by this issue? If you're not sure, leave this blank.
+      multiple: true
+      options:
+        - Data Grid
+        - Date and Time Pickers
+        - Charts
+        - Tree View
   - type: textarea
     attributes:
       label: The problem in depth

.github/workflows/codeql.yml

@@ -19,7 +19,7 @@ jobs:
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12
+        uses: github/codeql-action/init@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
         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@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12
+        uses: github/codeql-action/analyze@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15

.github/workflows/codspeed.yml

@@ -0,0 +1,54 @@
+name: Benchmarks
+
+on:
+  push:
+    branches:
+      - 'master'
+      - 'next'
+    paths:
+      - 'packages/x-charts*/**'
+  pull_request:
+    types:
+      - labeled
+      - opened
+      - synchronize
+      - reopened
+    branches:
+      - 'master'
+      - 'next'
+
+jobs:
+  benchmarks:
+    name: Benchmarks Charts
+    runs-on: ubuntu-latest
+    # L1: Run the benchmarks for pushes to the master or next branch and if the changes are in the charts package based on on.push.paths
+    # L2: Run the benchmarks if we add the label 'component: charts' to the pull request
+    # L3: Run the benchmarks for pull requests with the label 'component: charts'
+    # Yaml syntax looks a little weird, but it is correct.
+    if: >-
+      ${{ 
+          (github.event_name == 'push') || 
+          (github.event_name == 'pull_request' && github.event.action == 'labeled' && github.event.label.name == 'component: charts') || 
+          (github.event_name == 'pull_request' && github.event.action != 'labeled' && contains(github.event.pull_request.labels.*.name, 'component: charts')) 
+      }}
+    steps:
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # v4.0.0
+        with:
+          run_install: false
+      - name: Use Node.js 20.x
+        uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
+        with:
+          node-version: 20
+          cache: 'pnpm' # https://github.com/actions/setup-node/blob/main/docs/advanced-usage.md#caching-packages-dependencies
+      - run: pnpm install --frozen-lockfile
+      # Ensure we are running on the prod version of our libs
+      # Only charts and license are needed for the benchmarks
+      - run: pnpm --filter @mui/x-license build
+      - run: pnpm --filter @mui/x-charts build
+      - run: pnpm --filter @mui/x-charts-pro build
+      - name: Run benchmarks
+        uses: CodSpeedHQ/action@a58b84c0b61569a9cbb7cfb378cc849d65cf1ce5
+        with:
+          run: pnpm --filter @mui-x-internal/performance-charts test:performance
+          token: ${{ secrets.CODSPEED_TOKEN }}

.github/workflows/issue-cleanup.yml

@@ -1,4 +1,4 @@
-name: Cleanup issue comment
+name: Issue cleanup
 
 on:
   issues:
@@ -10,43 +10,26 @@ permissions: {}
 jobs:
   issue_cleanup:
     runs-on: ubuntu-latest
+    name: Clean issue body and add support label
     permissions:
       issues: write
     steps:
-      - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7
+      - name: Checkout repository
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - name: Clean issue body
+        id: cleanup
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
         with:
           script: |
-            const issue = await github.rest.issues.get({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: context.issue.number,
-            })
-
-            const lines = issue.data.body.split('\n')
-
-            const _ = extractInputSection(lines, 'Latest version')
-            const searchKeywords = extractInputSection(lines, 'Search keywords')
-            const orderID = extractInputSection(lines, 'Order ID or Support key')
-
-            lines.push('')
-            lines.push('**Search keywords**: ' + searchKeywords)
-            if (orderID !== '' && orderID !== '_No response_') {
-              lines.push('**Order ID**: ' + orderID)
-            }
-
-            const body = lines.join('\n')
-
-            await github.rest.issues.update({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: context.issue.number,
-              body,
-            })
-
-            function extractInputSection(lines, title) {
-              const index = lines.findIndex(line => line.startsWith('###') && line.includes(title))
-              if (index === -1) {
-                return ''
-              }
-              return lines.splice(index, 4)[2].trim()
-            }
+            const script = require('./scripts/githubActions/issueBodyCleanup.js')
+            await script({core, github, context})
+      - name: Add support label
+        if: steps.cleanup.outputs.ORDER_ID != ''
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        with:
+          script: |
+            const script = require('./scripts/githubActions/orderIdValidation.js')
+            await script({core, github, context})
+        env:
+          ORDER_API_TOKEN: ${{ secrets.SHOP_AUTH_TOKEN }}
+          ORDER_ID: ${{ steps.cleanup.outputs.ORDER_ID }}

.github/workflows/scorecards.yml

@@ -28,7 +28,7 @@ jobs:
           persist-credentials: false
 
       - name: Run analysis
-        uses: ossf/scorecard-action@dc50aa9510b46c811795eb24b2f1ba02a914e534 # v2.3.3
+        uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0
         with:
           results_file: results.sarif
           results_format: sarif
@@ -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@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12
+        uses: github/codeql-action/upload-sarif@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
         with:
           sarif_file: results.sarif

.gitignore

@@ -25,3 +25,4 @@ performance-snapshot.json
 .github/styles/Google
 .github/styles/MUI
 .github/styles/.vale-config
+test-results

.mocharc.js

@@ -7,9 +7,6 @@ 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/**',
-    'packages/x-charts-pro/**',
   ],
   recursive: true,
   timeout: (process.env.CIRCLECI === 'true' ? 5 : 2) * 1000, // Circle CI has low-performance CPUs.