Skip to content

Commit 84bda3b

Browse files
Merge branch 'master' into docs/mcp
2 parents 1da0da0 + 083dffe commit 84bda3b

File tree

1,266 files changed

+32998
-7639
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,266 files changed

+32998
-7639
lines changed

.circleci/config.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ jobs:
155155
test_browser:
156156
<<: *default-job
157157
docker:
158-
- image: mcr.microsoft.com/playwright:v1.52.0-noble
158+
- image: mcr.microsoft.com/playwright:v1.53.1-noble
159159
resource_class: medium+
160160
steps:
161161
- checkout
@@ -297,7 +297,7 @@ jobs:
297297
test_e2e:
298298
<<: *default-job
299299
docker:
300-
- image: mcr.microsoft.com/playwright:v1.52.0-noble
300+
- image: mcr.microsoft.com/playwright:v1.53.1-noble
301301
steps:
302302
- checkout
303303
- install_js:
@@ -309,7 +309,7 @@ jobs:
309309
test_e2e_website:
310310
<<: *default-job
311311
docker:
312-
- image: mcr.microsoft.com/playwright:v1.52.0-noble
312+
- image: mcr.microsoft.com/playwright:v1.53.1-noble
313313
steps:
314314
- checkout
315315
- install_js:
@@ -354,7 +354,7 @@ jobs:
354354
test_regressions:
355355
<<: *default-job
356356
docker:
357-
- image: mcr.microsoft.com/playwright:v1.52.0-noble
357+
- image: mcr.microsoft.com/playwright:v1.53.1-noble
358358
steps:
359359
- checkout
360360
- install_js:

.eslintrc.js

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const baseline = require('@mui/monorepo/.eslintrc');
22
const path = require('path');
33

4-
const CHARTS_PACKAGES = ['x-charts', 'x-charts-pro'];
4+
const CHARTS_PACKAGES = ['x-charts', 'x-charts-pro', 'x-charts-premium'];
55
const GRID_PACKAGES = [
66
'x-data-grid',
77
'x-data-grid-pro',
@@ -48,6 +48,7 @@ const RESTRICTED_TOP_LEVEL_IMPORTS = [
4848
'@mui/utils',
4949
'@mui/x-charts',
5050
'@mui/x-charts-pro',
51+
'@mui/x-charts-premium',
5152
'@mui/x-codemod',
5253
'@mui/x-date-pickers',
5354
'@mui/x-date-pickers-pro',
@@ -115,6 +116,10 @@ const buildPackageRestrictedImports = (packageName, root, allowRootImports = tru
115116
]),
116117
];
117118

119+
const mochaPluginOverride = baseline.overrides.find((override) =>
120+
override.extends?.includes('plugin:mocha/recommended'),
121+
);
122+
118123
module.exports = {
119124
...baseline,
120125
plugins: [
@@ -186,7 +191,19 @@ module.exports = {
186191
'react/no-unstable-nested-components': ['error', { allowAsProps: true }],
187192
},
188193
overrides: [
189-
...baseline.overrides,
194+
...baseline.overrides.filter(
195+
(override) => !override.extends?.includes('plugin:mocha/recommended'),
196+
),
197+
{
198+
...mochaPluginOverride,
199+
extends: [],
200+
rules: Object.entries(mochaPluginOverride.rules).reduce((acc, [key, value]) => {
201+
if (!key.includes('mocha')) {
202+
acc[key] = value;
203+
}
204+
return acc;
205+
}, {}),
206+
},
190207
{
191208
files: [
192209
// matching the pattern of the test runner
@@ -246,7 +263,7 @@ module.exports = {
246263
},
247264
{
248265
files: ['packages/*/src/**/*.?(c|m)[jt]s?(x)'],
249-
excludedFiles: ['*.d.ts', '*.spec.*'],
266+
excludedFiles: ['*.d.ts', '*.spec.*', '*.test.*'],
250267
rules: {
251268
'material-ui/mui-name-matches-component-name': [
252269
'error',
@@ -266,6 +283,7 @@ module.exports = {
266283
],
267284
},
268285
],
286+
'material-ui/disallow-react-api-in-server-components': 'error',
269287
},
270288
},
271289
{
@@ -322,6 +340,7 @@ module.exports = {
322340
},
323341
...buildPackageRestrictedImports('@mui/x-charts', 'x-charts', false),
324342
...buildPackageRestrictedImports('@mui/x-charts-pro', 'x-charts-pro', false),
343+
...buildPackageRestrictedImports('@mui/x-charts-premium', 'x-charts-premium', false),
325344
...buildPackageRestrictedImports('@mui/x-codemod', 'x-codemod', false),
326345
...buildPackageRestrictedImports('@mui/x-data-grid', 'x-data-grid'),
327346
...buildPackageRestrictedImports('@mui/x-data-grid-pro', 'x-data-grid-pro'),

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
packages/x-charts* @alexfauquette @bernardobelchior @JCQuintas

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ jobs:
2222
fetch-depth: 0
2323
- name: Set up pnpm
2424
uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
25-
- name: Use Node.js 23.x
25+
- name: Use Node.js 22.x
2626
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
2727
with:
28-
node-version: 23
28+
node-version: 22
2929
cache: 'pnpm' # https://github.com/actions/setup-node/blob/main/docs/advanced-usage.md#caching-packages-dependencies
3030
- run: pnpm pkg-pr-new:install
3131
- run: pnpm pkg-pr-new:build

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2020
# Initializes the CodeQL tools for scanning.
2121
- name: Initialize CodeQL
22-
uses: github/codeql-action/init@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19
22+
uses: github/codeql-action/init@39edc492dbe16b1465b0cafca41432d857bdb31a # v3.29.1
2323
with:
2424
languages: typescript
2525
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -29,4 +29,4 @@ jobs:
2929
# 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
3030
# queries: security-extended,security-and-quality
3131
- name: Perform CodeQL Analysis
32-
uses: github/codeql-action/analyze@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19
32+
uses: github/codeql-action/analyze@39edc492dbe16b1465b0cafca41432d857bdb31a # v3.29.1

.github/workflows/codspeed.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ jobs:
3838
- uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
3939
with:
4040
run_install: false
41-
- name: Use Node.js 20.x
41+
- name: Use Node.js 22.x
4242
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
4343
with:
44-
node-version: 20
44+
node-version: 22
4545
cache: 'pnpm' # https://github.com/actions/setup-node/blob/main/docs/advanced-usage.md#caching-packages-dependencies
4646
- run: pnpm install --frozen-lockfile
4747
# Ensure we are running on the prod version of our libs
48-
- run: pnpm --filter "@mui/x-charts-pro..." build
48+
- run: pnpm --filter "@mui/x-charts-premium..." build
4949
- name: Run benchmarks
5050
uses: CodSpeedHQ/action@0010eb0ca6e89b80c88e8edaaa07cfe5f3e6664d
5151
with:

.github/workflows/l10n.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ jobs:
2121
- uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
2222
with:
2323
run_install: false
24-
- name: Use Node.js 20.x
24+
- name: Use Node.js 22.x
2525
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
2626
with:
27-
node-version: 20
27+
node-version: 22
2828
cache: 'pnpm' # https://github.com/actions/setup-node/blob/main/docs/advanced-usage.md#caching-packages-dependencies
2929
- run: pnpm install --frozen-lockfile
3030
- name: pnpm l10n --report

.github/workflows/scorecards.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,6 @@ jobs:
4040
publish_results: true
4141
# Upload the results to GitHub's code scanning dashboard.
4242
- name: Upload to code-scanning
43-
uses: github/codeql-action/upload-sarif@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19
43+
uses: github/codeql-action/upload-sarif@39edc492dbe16b1465b0cafca41432d857bdb31a # v3.29.1
4444
with:
4545
sarif_file: results.sarif

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ __diff_output__
1616
/docs/.env.local
1717
/docs/export
1818
/test/regressions/screenshots
19+
/test/performance-charts/traces
1920
build
2021
dist
2122
node_modules

.mocharc.js

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)