Skip to content

Commit 5ff3e77

Browse files
michaldudakmichaldudak
committed
Merge remote-tracking branch 'upstream/master' into make-proptypes-generic
2 parents 37815dd + 531646c commit 5ff3e77

File tree

662 files changed

+6739
-5403
lines changed

Some content is hidden

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

662 files changed

+6739
-5403
lines changed

‎.circleci/config.yml

-12
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,6 @@ commands:
7171
node scripts/useReactVersion.mjs
7272
# log a patch for maintainers who want to check out this change
7373
git --no-pager diff HEAD
74-
- restore_cache:
75-
name: Restore pnpm package cache
76-
keys:
77-
- pnpm-packages-{{ checksum "pnpm-lock.yaml" }}
7874
- when:
7975
condition: << parameters.browsers >>
8076
steps:
@@ -107,14 +103,6 @@ commands:
107103
- run:
108104
name: Install playwright browsers
109105
command: pnpm playwright install --with-deps
110-
- save_cache:
111-
name: Save pnpm package cache
112-
key: pnpm-packages-{{ checksum "pnpm-lock.yaml" }}
113-
paths:
114-
- node_modules
115-
- when:
116-
condition: << parameters.browsers >>
117-
steps:
118106
- save_cache:
119107
name: Save playwright cache
120108
key: v6-playwright-{{ arch }}-{{ checksum "/tmp/playwright_info.json" }}

‎.codesandbox/ci.json

+20-18
Original file line numberDiff line numberDiff line change
@@ -3,38 +3,40 @@
33
"installCommand": "install:codesandbox",
44
"node": "18",
55
"packages": [
6-
"packages/mui-material",
6+
"packages/mui-base",
77
"packages/mui-codemod",
8+
"packages/mui-core-downloads-tracker",
89
"packages/mui-icons-material",
10+
"packages/mui-joy",
911
"packages/mui-lab",
12+
"packages/mui-material-next",
13+
"packages/mui-material-nextjs",
14+
"packages/mui-material",
15+
"packages/mui-private-theming",
16+
"packages/mui-styled-engine-sc",
17+
"packages/mui-styled-engine",
1018
"packages/mui-styles",
1119
"packages/mui-system",
12-
"packages/mui-private-theming",
1320
"packages/mui-types",
14-
"packages/mui-utils",
15-
"packages/mui-base",
16-
"packages/mui-styled-engine",
17-
"packages/mui-styled-engine-sc",
18-
"packages/mui-material-next",
19-
"packages/mui-material-nextjs",
20-
"packages/mui-joy"
21+
"packages/mui-utils"
2122
],
2223
"publishDirectory": {
24+
"@mui/base": "packages/mui-base/build",
2325
"@mui/codemod": "packages/mui-codemod/build",
24-
"@mui/material": "packages/mui-material/build",
26+
"@mui/core-downloads-tracker": "packages/mui-core-downloads-tracker/build",
2527
"@mui/icons-material": "packages/mui-icons-material/build",
28+
"@mui/joy": "packages/mui-joy/build",
2629
"@mui/lab": "packages/mui-lab/build",
27-
"@mui/styles": "packages/mui-styles/build",
28-
"@mui/styled-engine": "packages/mui-styled-engine/build",
30+
"@mui/material-next": "packages/mui-material-next/build",
31+
"@mui/material-nextjs": "packages/mui-material-nextjs/build",
32+
"@mui/material": "packages/mui-material/build",
33+
"@mui/private-theming": "packages/mui-private-theming/build",
2934
"@mui/styled-engine-sc": "packages/mui-styled-engine-sc/build",
35+
"@mui/styled-engine": "packages/mui-styled-engine/build",
36+
"@mui/styles": "packages/mui-styles/build",
3037
"@mui/system": "packages/mui-system/build",
31-
"@mui/private-theming": "packages/mui-private-theming/build",
3238
"@mui/types": "packages/mui-types/build",
33-
"@mui/utils": "packages/mui-utils/build",
34-
"@mui/base": "packages/mui-base/build",
35-
"@mui/material-next": "packages/mui-material-next/build",
36-
"@mui/material-nextjs": "packages/mui-material-nextjs/build",
37-
"@mui/joy": "packages/mui-joy/build"
39+
"@mui/utils": "packages/mui-utils/build"
3840
},
3941
"sandboxes": [
4042
"material-ui-issue-latest-s2dsx",

‎.github/ISSUE_TEMPLATE/1.bug.yml

+6-8
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
name: Bug report 🐛
2-
description: Create a bug report for MUI Core.
2+
description: Create a bug report for Material UI, Base UI, MUI System, or Joy UI.
33
labels: ['status: waiting for maintainer']
44
body:
55
- type: markdown
66
attributes:
7-
value: |
8-
Please provide a searchable summary of the issue in the title above ⬆️.
9-
10-
Thanks for contributing by creating an issue! ❤️
7+
value: Thanks for contributing by creating an issue! ❤️ Please provide a searchable summary of the issue in the title above ⬆️.
118
- type: input
129
attributes:
1310
label: Search keywords
14-
description: Your issue may have already been reported! List the keywords you've used to search the [existing issues](https://github.com/mui/material-ui/issues). This will also make your issue searchable for others.
15-
placeholder: e.g. tooltip color
11+
description: |
12+
Your issue may have already been reported! First search for duplicates among the [existing issues](https://github.com/mui/material-ui/issues).
13+
If your issue isn't a duplicate, great! Please list the keywords you used so people in the future can find this one more easily:
1614
validations:
1715
required: true
1816
- type: checkboxes
@@ -47,7 +45,7 @@ body:
4745
- type: textarea
4846
attributes:
4947
label: Context
50-
description: What are you trying to accomplish? How has this issue affected you? Providing context helps us come up with a solution that is more useful in the real world.
48+
description: What are you trying to accomplish? Providing context helps us come up with a solution that is more useful in the real world.
5149
- type: textarea
5250
attributes:
5351
label: Your environment

‎.github/ISSUE_TEMPLATE/2.feature.yml

+10-12
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,18 @@
11
name: Feature request 💄
2-
description: Suggest a new idea for MUI Core.
2+
description: Suggest a new idea for Material UI, Base UI, MUI System, or Joy UI.
33
labels: ['status: waiting for maintainer']
44
body:
55
- type: markdown
66
attributes:
7-
value: |
8-
Please provide a searchable summary of the issue in the title above ⬆️.
9-
10-
Thanks for contributing by creating an issue! ❤️
11-
- type: checkboxes
7+
value: Thanks for contributing by creating an issue! ❤️ Please provide a searchable summary of the issue in the title above ⬆️.
8+
- type: input
129
attributes:
13-
label: Duplicates
14-
description: Please [search the history](https://github.com/mui/material-ui/issues) to see if an issue already exists for the same problem.
15-
options:
16-
- label: I have searched the existing issues
17-
required: true
10+
label: Search keywords
11+
description: |
12+
Your issue may have already been reported! First search for duplicates among the [existing issues](https://github.com/mui/material-ui/issues).
13+
If your issue isn't a duplicate, great! Please list the keywords you used so people in the future can find this one more easily:
14+
validations:
15+
required: true
1816
- type: checkboxes
1917
attributes:
2018
label: Latest version
@@ -33,4 +31,4 @@ body:
3331
- type: textarea
3432
attributes:
3533
label: Motivation
36-
description: What are you trying to accomplish? How has the lack of this feature affected you? Providing context helps us come up with a solution that is more useful in the real world.
34+
description: What are you trying to accomplish? Providing context helps us come up with a solution that is more useful in the real world.

‎.github/ISSUE_TEMPLATE/3.rfc.yml

+3-4
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,15 @@ body:
1212
- type: textarea
1313
attributes:
1414
label: What's the problem?
15-
description: Write a short paragraph or bulleted list to briefly explain what you're trying to do, what outcomes you're aiming for, and any other relevant details to help us understand the motivation behind this RFC.
15+
description: Write a short paragraph or bulleted list to briefly explain what you're trying to do, what outcomes you're aiming for.
1616
- type: textarea
1717
attributes:
1818
label: What are the requirements?
1919
description: Provide a list of requirements that should be met by the accepted proposal.
2020
- type: textarea
2121
attributes:
2222
label: What are our options?
23-
description: |
24-
Have you considered alternative options for achieving your desired outcome? It's not necessary to go into too much detail here, but it can help strengthen your main proposal.
23+
description: What are the alternative options to achieve the desired outcome?
2524
- type: textarea
2625
attributes:
2726
label: Proposed solution
@@ -35,4 +34,4 @@ body:
3534
- type: textarea
3635
attributes:
3736
label: Resources and benchmarks
38-
description: Attach any issues, PRs, links, documents, etc… that might be relevant to the RFC
37+
description: Attach any issues, PRs, links, documents, etc… that might be relevant to the RFC.

‎.github/ISSUE_TEMPLATE/4.docs-feedback.yml

+6-10
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
name: Docs feedback
2-
description: Improve documentation about Material UI, Joy UI, Base UI, MUI System.
2+
description: Improve documentation about Material UI, Base UI, MUI System, or Joy UI.
33
labels: ['status: waiting for maintainer', 'support: docs-feedback']
44
title: '[docs] '
55
body:
66
- type: markdown
77
attributes:
8-
value: |
9-
Please provide a searchable summary of the issue in the title above ⬆️.
10-
11-
Thanks for contributing by creating an issue! ❤️
8+
value: Thanks for contributing by creating an issue! ❤️ Please provide a searchable summary of the issue in the title above ⬆️.
129
- type: input
1310
attributes:
1411
label: Search keywords
15-
description: Your issue may have already been reported! List the keywords you've used to search the [existing issues](https://github.com/mui/material-ui/issues). This will also make your issue searchable for others.
16-
placeholder: e.g. datagrid column resizing
12+
description: |
13+
Your issue may have already been reported! First search for duplicates among the [existing issues](https://github.com/mui/material-ui/issues).
14+
If your issue isn't a duplicate, great! Please list the keywords you used so people in the future can find this one more easily:
1715
validations:
1816
required: true
1917
- type: input
@@ -40,9 +38,7 @@ body:
4038
label: Issue description
4139
description: |
4240
Let us know what went wrong when you were using this documentation and what we could do to improve it.
43-
value: |
44-
I was looking for ... and it appears that ...
4541
- type: textarea
4642
attributes:
4743
label: Context
48-
description: What are you trying to accomplish? What brought you to this page? Your context can help us to come up with solutions that benefit the community as a whole.
44+
description: What are you trying to accomplish? Providing context helps us come up with a solution that is more useful in the real world.

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

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
name: 'Priority Support: SLA ⏰'
2-
description: I'm an MUI X Premium user and we have purchased the Priority Support add-on. I can't find a solution to my problem with MUI Core (Material UI, Base UI, MUI System, and Joy UI).
2+
description: I'm an MUI X Premium user and we have purchased the Priority Support add-on. I can't find a solution to my problem with Material UI, Base UI, MUI System, or Joy UI.
33
title: '[question] '
44
labels: ['status: waiting for maintainer', 'support: unknown']
55
body:
66
- type: markdown
77
attributes:
88
value: |
99
Please provide a searchable summary of the issue in the title above ⬆️.
10-
- type: checkboxes
10+
- type: input
1111
attributes:
12-
label: Duplicates
13-
description: Please [search the history](https://github.com/mui/material-ui/issues) to see if an issue already exists for the same problem.
14-
options:
15-
- label: I have searched the existing issues
16-
required: true
12+
label: Search keywords
13+
description: |
14+
Your issue may have already been reported! First search for duplicates among the [existing issues](https://github.com/mui/material-ui/issues).
15+
If your issue isn't a duplicate, great! Please list the keywords you used so people in the future can find this one more easily:
16+
required: true
1717
- type: checkboxes
1818
attributes:
1919
label: Latest version

‎.github/ISSUE_TEMPLATE/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
contact_links:
22
- name: Support ❔
33
url: https://mui.com/getting-started/support/
4-
about: I need support with MUI Core.
4+
about: I need support with Material UI, Base UI, MUI System, or Joy UI.

‎.github/styles/Blog/BrandName.yml

+4
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,7 @@ swap:
1010
MUI X: MUI X
1111
Base UI: Base UI
1212
MUI System: MUI System
13+
MUI Store: MUI Store
14+
MUI Core: MUI Core
15+
MUI Toolpad: MUI Toolpad
16+
MUI Connect: MUI Connect

‎.github/styles/Blog/NoCompanyName.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ tokens:
66
- 'MUI \w+'
77
exceptions:
88
- 'MUI X'
9-
- 'MUI X'
10-
- 'MUI System'
119
- 'MUI System'
10+
- 'MUI Store'
11+
- 'MUI Core'
12+
- 'MUI Toolpad'
13+
- 'MUI Connect'

0 commit comments

Comments
 (0)