Skip to content

Commit

Permalink
Merge branch 'mui:master' into fixing-docs
Browse files Browse the repository at this point in the history
  • Loading branch information
Super-Kenil authored Dec 26, 2023
2 parents 9e7b201 + 971486d commit a07f957
Show file tree
Hide file tree
Showing 841 changed files with 9,928 additions and 3,782 deletions.
28 changes: 14 additions & 14 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ defaults: &defaults
AWS_REGION_ARTIFACTS: eu-central-1
working_directory: /tmp/material-ui
docker:
- image: cimg/node:18.18
- image: cimg/node:18.19

# CircleCI has disabled the cache across forks for security reasons.
# Following their official statement, it was a quick solution, they
Expand Down Expand Up @@ -351,7 +351,7 @@ jobs:
<<: *defaults
resource_class: 'medium+'
docker:
- image: mcr.microsoft.com/playwright:v1.40.0-focal
- image: mcr.microsoft.com/playwright:v1.40.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand Down Expand Up @@ -381,7 +381,7 @@ jobs:
test_e2e:
<<: *defaults
docker:
- image: mcr.microsoft.com/playwright:v1.40.0-focal
- image: mcr.microsoft.com/playwright:v1.40.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand All @@ -400,7 +400,7 @@ jobs:
test_e2e_website:
<<: *defaults
docker:
- image: mcr.microsoft.com/playwright:v1.40.0-focal
- image: mcr.microsoft.com/playwright:v1.40.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand All @@ -415,7 +415,7 @@ jobs:
test_profile:
<<: *defaults
docker:
- image: mcr.microsoft.com/playwright:v1.40.0-focal
- image: mcr.microsoft.com/playwright:v1.40.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand All @@ -442,7 +442,7 @@ jobs:
test_regressions:
<<: *defaults
docker:
- image: mcr.microsoft.com/playwright:v1.40.0-focal
- image: mcr.microsoft.com/playwright:v1.40.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand Down Expand Up @@ -496,7 +496,7 @@ jobs:
<<: *defaults
working_directory: /tmp/material-ui/test/bundling/fixtures/next-webpack4/
docker:
- image: mcr.microsoft.com/playwright:v1.40.0-focal
- image: mcr.microsoft.com/playwright:v1.40.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand All @@ -520,7 +520,7 @@ jobs:
<<: *defaults
working_directory: /tmp/material-ui/test/bundling/fixtures/next-webpack5/
docker:
- image: mcr.microsoft.com/playwright:v1.40.0-focal
- image: mcr.microsoft.com/playwright:v1.40.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand All @@ -544,7 +544,7 @@ jobs:
<<: *defaults
working_directory: /tmp/material-ui/test/bundling/fixtures/create-react-app/
docker:
- image: mcr.microsoft.com/playwright:v1.40.0-focal
- image: mcr.microsoft.com/playwright:v1.40.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand All @@ -568,7 +568,7 @@ jobs:
<<: *defaults
working_directory: /tmp/material-ui/test/bundling/fixtures/snowpack/
docker:
- image: mcr.microsoft.com/playwright:v1.40.0-focal
- image: mcr.microsoft.com/playwright:v1.40.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand All @@ -592,7 +592,7 @@ jobs:
<<: *defaults
working_directory: /tmp/material-ui/test/bundling/fixtures/vite/
docker:
- image: mcr.microsoft.com/playwright:v1.40.0-focal
- image: mcr.microsoft.com/playwright:v1.40.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand All @@ -616,7 +616,7 @@ jobs:
<<: *defaults
working_directory: /tmp/material-ui/test/bundling/fixtures/esbuild/
docker:
- image: mcr.microsoft.com/playwright:v1.40.0-focal
- image: mcr.microsoft.com/playwright:v1.40.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand Down Expand Up @@ -644,7 +644,7 @@ jobs:
<<: *defaults
working_directory: /tmp/material-ui/test/bundling/fixtures/gatsby/
docker:
- image: mcr.microsoft.com/playwright:v1.40.0-focal
- image: mcr.microsoft.com/playwright:v1.40.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand Down Expand Up @@ -745,7 +745,7 @@ jobs:
test_benchmark:
<<: *defaults
docker:
- image: mcr.microsoft.com/playwright:v1.40.0-focal
- image: mcr.microsoft.com/playwright:v1.40.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand Down
2 changes: 2 additions & 0 deletions .codesandbox/ci.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"packages/mui-styled-engine",
"packages/mui-styled-engine-sc",
"packages/mui-material-next",
"packages/mui-material-nextjs",
"packages/mui-joy"
],
"publishDirectory": {
Expand All @@ -32,6 +33,7 @@
"@mui/utils": "packages/mui-utils/build",
"@mui/base": "packages/mui-base/build",
"@mui/material-next": "packages/mui-material-next/build",
"@mui/material-nextjs": "packages/mui-material-nextjs/build",
"@mui/joy": "packages/mui-joy/build"
},
"sandboxes": [
Expand Down
14 changes: 2 additions & 12 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,7 @@ module.exports = {
'no-restricted-imports': [
'error',
{
patterns: [
'@mui/*/*/*',
// Macros are fine since their import path is transpiled away
'!@mui/utils/macros',
'@mui/utils/macros/*',
'!@mui/utils/macros/*.macro',
],
patterns: ['@mui/*/*/*'],
},
],
'no-continue': 'off',
Expand Down Expand Up @@ -269,7 +263,7 @@ module.exports = {
rules: {
'material-ui/no-hardcoded-labels': [
'error',
{ allow: ['MUI', 'Twitter', 'GitHub', 'Stack Overflow'] },
{ allow: ['MUI', 'X', 'GitHub', 'Stack Overflow'] },
],
},
},
Expand Down Expand Up @@ -345,8 +339,6 @@ module.exports = {
patterns: [
// Allow deeper imports for TypeScript types. TODO remove
'@mui/*/*/*/*',
// Macros are fine since they're transpiled into something else
'!@mui/utils/macros/*.macro',
],
},
],
Expand Down Expand Up @@ -379,8 +371,6 @@ module.exports = {
patterns: [
// Allow deeper imports for TypeScript types. TODO?
'@mui/*/*/*/*',
// Macros are fine since they're transpiled into something else
'!@mui/utils/macros/*.macro',
],
},
],
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/1.bug.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Bug report 🐛
description: Create a bug report for MUI Core.
labels: ['status: needs triage']
labels: ['status: waiting for maintainer']
body:
- type: markdown
attributes:
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/2.feature.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Feature request 💄
description: Suggest a new idea for MUI Core.
labels: ['status: needs triage']
labels: ['status: waiting for maintainer']
body:
- type: markdown
attributes:
Expand Down
6 changes: 1 addition & 5 deletions .github/ISSUE_TEMPLATE/3.rfc.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: RFC 💬
description: Request for comments for your proposal.
title: '[RFC] '
labels: ['status: needs triage', 'RFC']
labels: ['status: waiting for maintainer', 'RFC']
body:
- type: markdown
attributes:
Expand All @@ -13,18 +13,15 @@ body:
attributes:
label: What's the problem? 🤔
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.

- type: textarea
attributes:
label: What are the requirements? ❓
description: Provide a list of requirements that should be met by the accepted proposal.

- type: textarea
attributes:
label: What are our options? 💡
description: |
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.
- type: textarea
attributes:
label: Proposed solution 🟢
Expand All @@ -35,7 +32,6 @@ body:
- using diagrams to help illustrate your ideas
- including code examples if you're proposing an interface or system contract
- linking to relevant project briefs or wireframes
- type: textarea
attributes:
label: Resources and benchmarks 🔗
Expand Down
22 changes: 9 additions & 13 deletions .github/ISSUE_TEMPLATE/4.docs-feedback.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Docs feedback
description: Improve documentation about MUI Core.
labels: ['status: needs triage', 'support: docs-feedback']
labels: ['status: waiting for maintainer', 'support: docs-feedback']
title: '[docs] '
body:
- type: markdown
Expand All @@ -9,43 +9,39 @@ body:
Please provide a searchable summary of the issue in the title above ⬆️.
Thanks for contributing by creating an issue! ❤️
- type: checkboxes
- type: input
attributes:
label: Duplicates
description: Please [search the history](https://github.com/mui/material-ui/issues) to see if an issue already exists for the same problem.
options:
- label: I have searched the existing issues
required: true

label: Search keywords
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.
placeholder: e.g. datagrid column resizing
validations:
required: true
- type: input
id: page-url
attributes:
label: Related page
description: Which page of the documentation is this about?
placeholder: https://mui.com/material-ui/react-badge/
placeholder: https://mui.com/material-ui/
validations:
required: true

- type: dropdown
attributes:
label: Kind of issue
description: What kind of problem are you facing?
options:
- Unclear explanations
- Missing information
- Broken demonstration
- Broken demo
- Other
validations:
required: true

- type: textarea
attributes:
label: Issue description
description: |
Let us know what went wrong when you were using this documentation and what we could do to improve it.
value: |
I was looking for ... and it appears that ...
- type: textarea
attributes:
label: Context 🔦
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/5.priority-support.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: 'Priority Support: SLA ⏰'
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).
title: '[question] '
labels: ['status: needs triage', 'support: unknown']
labels: ['status: waiting for maintainer', 'support: unknown']
body:
- type: markdown
attributes:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ jobs:
os: [macos-latest, windows-latest, ubuntu-latest]
steps:
- run: echo "${{ github.actor }}"
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
with:
# fetch all tags which are required for `yarn release:changelog`
fetch-depth: 0
- name: Use Node.js 18.x
uses: actions/setup-node@1a4442cacd436585916779262731d5b162bc6ec7 # v3.8.2
uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
with:
node-version: 18
node-version: 18.18 # ts-node throws error on Node.js 18.19 (https://github.com/TypeStrong/ts-node/issues/2094)
cache: 'yarn' # https://github.com/actions/setup-node/blob/main/docs/advanced-usage.md#caching-packages-dependencies
- run: yarn install
- run: yarn release:build
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ jobs:
security-events: write
steps:
- name: Checkout repository
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@407ffafae6a767df3e0230c3df91b6443ae8df75 # v2.22.8
uses: github/codeql-action/init@012739e5082ff0c22ca6d6ab32e07c36df03c4a4 # v3.22.12
with:
languages: typescript
config-file: ./.github/codeql/codeql-config.yml
Expand All @@ -30,4 +30,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@407ffafae6a767df3e0230c3df91b6443ae8df75 # v2.22.8
uses: github/codeql-action/analyze@012739e5082ff0c22ca6d6ab32e07c36df03c4a4 # v3.22.12
4 changes: 2 additions & 2 deletions .github/workflows/ensure-triage-label.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
permissions:
issues: write
steps:
- uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6
- uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7
with:
script: |
const { data: labels } = await github.rest.issues.listLabelsOnIssue({
Expand All @@ -30,6 +30,6 @@ jobs:
issue_number: context.issue.number,
owner: context.repo.owner,
repo: context.repo.repo,
labels: ['status: needs triage']
labels: ['status: waiting for maintainer']
})
}
2 changes: 1 addition & 1 deletion .github/workflows/mark-duplicate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ jobs:
actions: 'mark-duplicate'
token: ${{ secrets.GITHUB_TOKEN }}
duplicate-labels: 'duplicate'
remove-labels: 'status: incomplete,status: needs triage'
remove-labels: 'status: incomplete,status: waiting for maintainer'
close-issue: true
10 changes: 7 additions & 3 deletions .github/workflows/no-response.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
name: No response

# Both `issue_comment` and `scheduled` event types are required for this Action
# `issues`.`closed`, `issue_comment`.`created`, and `scheduled` event types are required for this Action
# to work properly.
on:
issues:
types: [closed]
issue_comment:
types: [created]
schedule:
Expand All @@ -18,13 +20,15 @@ jobs:
contents: read
issues: write
steps:
- uses: lee-dohm/no-response@9bb0a4b5e6a45046f00353d5de7d90fb8bd773bb # v0.5.0
- uses: MBilalShafi/no-response-add-label@629add01d7b6f8e120811f978c42703736098947
with:
token: ${{ secrets.GITHUB_TOKEN }}
# Number of days of inactivity before an Issue is closed for lack of response
daysUntilClose: 7
# Label requiring a response
responseRequiredLabel: 'status: needs more information'
responseRequiredLabel: 'status: waiting for author'
# Label to add back when required label is removed
optionalFollowupLabel: 'status: waiting for maintainer'
# Comment to post when closing an Issue for lack of response. Set to `false` to disable
closeComment: >
Since the issue is missing key information and has been inactive for 7 days, it has been automatically closed.
Expand Down
Loading

0 comments on commit a07f957

Please sign in to comment.