Skip to content

Commit 06bbcda

Browse files
committed
Merge remote-tracking branch 'origin/master' into charts/responsive-tick-adjustment
# Conflicts: # packages/x-charts/src/internals/plugins/featurePlugins/useChartCartesianAxis/useChartCartesianAxisRendering.selectors.ts
2 parents 7494d15 + 1708d95 commit 06bbcda

756 files changed

Lines changed: 30143 additions & 6318 deletions

File tree

Some content is hidden

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

.circleci/config.yml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: 2.1
22

33
orbs:
4-
code-infra: https://raw.githubusercontent.com/mui/mui-public/023c96ed6ca37cdb1ff687787e61257c0960285a/.circleci/orbs/code-infra.yml
4+
code-infra: https://raw.githubusercontent.com/mui/mui-public/f5b3498d2fb7a68d366ab7db1f94434b32c4b94d/.circleci/orbs/code-infra.yml
55

66
parameters:
77
browserstack-force:
@@ -57,7 +57,7 @@ default-job: &default-job
5757
BASE_BRANCH: master
5858
working_directory: /tmp/mui
5959
executor: code-infra/mui-node
60-
resource_class: medium
60+
resource_class: medium.gen2
6161
# CircleCI has disabled the cache across forks for security reasons.
6262
# Following their official statement, it was a quick solution, they
6363
# are working on providing this feature back with appropriate security measures.
@@ -84,7 +84,7 @@ commands:
8484
jobs:
8585
test_unit:
8686
<<: *default-job
87-
resource_class: large
87+
resource_class: large.gen2
8888
steps:
8989
- checkout
9090
- install-deps:
@@ -109,7 +109,7 @@ jobs:
109109
executor:
110110
name: code-infra/mui-node-browser
111111
playwright-img-version: v1.60.0-noble
112-
resource_class: xlarge
112+
resource_class: xlarge.gen2
113113
steps:
114114
- checkout
115115
- install-deps:
@@ -152,6 +152,9 @@ jobs:
152152
- code-infra/valelint
153153
test_static:
154154
<<: *default-job
155+
environment:
156+
<<: *default-environment
157+
NODE_OPTIONS: --max-old-space-size=3584
155158
steps:
156159
- checkout
157160
- install-deps
@@ -200,7 +203,7 @@ jobs:
200203
git add -A && git diff --exit-code --staged
201204
test_types:
202205
<<: *default-job
203-
resource_class: large
206+
resource_class: large.gen2
204207
steps:
205208
- checkout
206209
- install-deps
@@ -220,6 +223,7 @@ jobs:
220223
executor:
221224
name: code-infra/mui-node-browser
222225
playwright-img-version: v1.60.0-noble
226+
resource_class: medium
223227
steps:
224228
- checkout
225229
- install-deps:
@@ -235,6 +239,7 @@ jobs:
235239
executor:
236240
name: code-infra/mui-node-browser
237241
playwright-img-version: v1.60.0-noble
242+
resource_class: medium
238243
steps:
239244
- checkout
240245
- install-deps
@@ -245,6 +250,7 @@ jobs:
245250
PLAYWRIGHT_TEST_BASE_URL: << parameters.e2e-base-url >>
246251
test_package:
247252
<<: *default-job
253+
resource_class: medium
248254
steps:
249255
- checkout
250256
- install-deps:
@@ -258,7 +264,7 @@ jobs:
258264
executor:
259265
name: code-infra/mui-node-browser
260266
playwright-img-version: v1.60.0-noble
261-
resource_class: large
267+
resource_class: large.gen2
262268
steps:
263269
- checkout
264270
- install-deps:
@@ -277,6 +283,7 @@ jobs:
277283
executor:
278284
name: code-infra/mui-node-browser
279285
playwright-img-version: v1.60.0-noble
286+
resource_class: medium
280287
steps:
281288
- checkout
282289
- run:

.github/workflows/add-release-reviewers.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ permissions: {}
1010

1111
jobs:
1212
add-reviewers-to-release-pr:
13-
uses: mui/mui-public/.github/workflows/reusable-add-reviewers-to-pr.yml@023c96ed6ca37cdb1ff687787e61257c0960285a # master
13+
uses: mui/mui-public/.github/workflows/reusable-add-reviewers-to-pr.yml@4e18082e2410a90d523866a414c4e67296b9892c # master
1414
with:
1515
team-slug: x
1616
label-name: release

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ permissions: {}
1313
jobs:
1414
continuous-releases:
1515
name: Continuous releases
16-
uses: mui/mui-public/.github/workflows/ci-base.yml@023c96ed6ca37cdb1ff687787e61257c0960285a # master
16+
uses: mui/mui-public/.github/workflows/ci-base.yml@4e18082e2410a90d523866a414c4e67296b9892c # master
1717
with:
1818
node-version: '22.22.3'

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
add-comment:
1212
name: Add closing message
1313
if: github.event.issue.state_reason == 'completed'
14-
uses: mui/mui-public/.github/workflows/issues_add-closing-message.yml@023c96ed6ca37cdb1ff687787e61257c0960285a # master
14+
uses: mui/mui-public/.github/workflows/issues_add-closing-message.yml@4e18082e2410a90d523866a414c4e67296b9892c # master
1515
permissions:
1616
contents: read
1717
issues: write

.github/workflows/create-cherry-pick-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ permissions: {}
1919
jobs:
2020
create_pr:
2121
name: Create cherry-pick PR
22-
uses: mui/mui-public/.github/workflows/prs_create-cherry-pick-pr.yml@023c96ed6ca37cdb1ff687787e61257c0960285a # master
22+
uses: mui/mui-public/.github/workflows/prs_create-cherry-pick-pr.yml@4e18082e2410a90d523866a414c4e67296b9892c # master
2323
permissions:
2424
contents: write
2525
pull-requests: write

.github/workflows/issue-status-label-handler.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ jobs:
1818
issues: write
1919
actions: write
2020
name: Handle status labels
21-
uses: mui/mui-public/.github/workflows/issues_status-label-handler.yml@023c96ed6ca37cdb1ff687787e61257c0960285a # master
21+
uses: mui/mui-public/.github/workflows/issues_status-label-handler.yml@4e18082e2410a90d523866a414c4e67296b9892c # master

.github/workflows/new-issue-triage.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ permissions: {}
99
jobs:
1010
issue_cleanup:
1111
name: Clean issue body
12-
uses: mui/mui-public/.github/workflows/issues_body-cleanup.yml@023c96ed6ca37cdb1ff687787e61257c0960285a # master
12+
uses: mui/mui-public/.github/workflows/issues_body-cleanup.yml@4e18082e2410a90d523866a414c4e67296b9892c # master
1313
permissions:
1414
contents: read
1515
issues: write
1616
order_id_validation:
1717
name: Validate order ID
1818
needs: issue_cleanup
1919
if: needs.issue_cleanup.outputs.orderId != ''
20-
uses: mui/mui-public/.github/workflows/issues_order-id-validation.yml@023c96ed6ca37cdb1ff687787e61257c0960285a # master
20+
uses: mui/mui-public/.github/workflows/issues_order-id-validation.yml@4e18082e2410a90d523866a414c4e67296b9892c # master
2121
secrets: inherit
2222
with:
2323
orderId: ${{ needs.issue_cleanup.outputs.orderId }}

.github/workflows/no-response.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ jobs:
1616
issues: write
1717
pull-requests: write
1818
name: Handle stale issues and PRs
19-
uses: mui/mui-public/.github/workflows/general_handle-stale-issues-and-prs.yml@023c96ed6ca37cdb1ff687787e61257c0960285a # master
19+
uses: mui/mui-public/.github/workflows/general_handle-stale-issues-and-prs.yml@4e18082e2410a90d523866a414c4e67296b9892c # master

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
ref: ${{ inputs.sha }}
4141
fetch-depth: 0 # Fetch full history for proper git operations
4242
- name: Prepare for publishing
43-
uses: mui/mui-public/.github/actions/publish-prepare@023c96ed6ca37cdb1ff687787e61257c0960285a # master
43+
uses: mui/mui-public/.github/actions/publish-prepare@4e18082e2410a90d523866a414c4e67296b9892c # master
4444
- name: Publish packages
4545
env:
4646
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.lintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/.git
22
pnpm-lock.yaml
33
netlify/functions
4+
/examples
45
/docs/.next
56
/docs/export
67
/docs/pages/playground/

0 commit comments

Comments
 (0)