Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into fix-rtl-dark
Browse files Browse the repository at this point in the history
  • Loading branch information
alexfauquette committed Dec 4, 2024
2 parents 29ac9c1 + c328fe4 commit 88d1fbf
Show file tree
Hide file tree
Showing 487 changed files with 4,944 additions and 2,632 deletions.
67 changes: 39 additions & 28 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,10 @@ module.exports = /** @type {Config} */ ({
variables: true,
},
],
'@typescript-eslint/no-unused-vars': [
'error',
{ vars: 'all', args: 'after-used', ignoreRestSiblings: true, argsIgnorePattern: '^_' },
],
'no-use-before-define': 'off',

// disabled type-aware linting due to performance considerations
Expand Down Expand Up @@ -242,8 +246,6 @@ module.exports = /** @type {Config} */ ({

// We re-export default in many places, remove when https://github.com/airbnb/javascript/issues/2500 gets resolved
'no-restricted-exports': 'off',
// Some of these occurences are deliberate and fixing them will break things in repos that use @monorepo dependency
'import/no-relative-packages': 'off',
// Avoid accidental auto-"fixes" https://github.com/jsx-eslint/eslint-plugin-react/issues/3458
'react/no-invalid-html-attribute': 'off',

Expand Down Expand Up @@ -304,15 +306,6 @@ module.exports = /** @type {Config} */ ({
'react/no-unused-prop-types': 'off',
},
},
{
files: ['docs/src/modules/components/**/*.js'],
rules: {
'material-ui/no-hardcoded-labels': [
'error',
{ allow: ['MUI', 'X', 'GitHub', 'Stack Overflow'] },
],
},
},
// Next.js plugin
{
files: ['docs/**/*'],
Expand All @@ -325,18 +318,27 @@ module.exports = /** @type {Config} */ ({
rules: {
// We're not using the Image component at the moment
'@next/next/no-img-element': 'off',
'no-restricted-imports': [
'error',
{
paths: NO_RESTRICTED_IMPORTS_PATHS_TOP_LEVEL_PACKAGES,
patterns: NO_RESTRICTED_IMPORTS_PATTERNS_DEEPLY_NESTED,
},
],
},
},
// Next.js entry points pages
{
files: ['docs/pages/**/*.?(c|m)[jt]s?(x)'],
files: ['docs/src/modules/components/**/*'],
rules: {
'react/prop-types': 'off',
'material-ui/no-hardcoded-labels': [
'error',
{ allow: ['MUI', 'X', 'GitHub', 'Stack Overflow'] },
],
},
},
// demos
{
files: ['docs/src/pages/**/*.?(c|m)[jt]s?(x)', 'docs/data/**/*.?(c|m)[jt]s?(x)'],
files: ['docs/src/pages/**/*', 'docs/data/**/*'],
rules: {
// This most often reports data that is defined after the component definition.
// This is safe to do and helps readability of the demo code since the data is mostly irrelevant.
Expand All @@ -346,8 +348,15 @@ module.exports = /** @type {Config} */ ({
'no-console': 'off',
},
},
// Next.js entry points pages
{
files: ['docs/data/**/*.?(c|m)[jt]s?(x)'],
files: ['docs/pages/**/*'],
rules: {
'react/prop-types': 'off',
},
},
{
files: ['docs/data/**/*'],
excludedFiles: [
// filenames/match-exported sees filename as 'file-name.d'
// Plugin looks unmaintain, find alternative? (e.g. eslint-plugin-project-structure)
Expand All @@ -359,6 +368,14 @@ module.exports = /** @type {Config} */ ({
'filenames/match-exported': ['error'],
},
},
{
files: ['docs/data/material/getting-started/templates/**/*'],
rules: {
// So we can use # to improve the page UX
// and so developer get eslint warning to remind them to fix the links
'jsx-a11y/anchor-is-valid': 'off',
},
},
{
files: ['*.d.ts'],
rules: {
Expand Down Expand Up @@ -442,18 +459,6 @@ module.exports = /** @type {Config} */ ({
'no-bitwise': 'off',
},
},
{
files: ['docs/**/*.?(c|m)[jt]s?(x)'],
rules: {
'no-restricted-imports': [
'error',
{
paths: NO_RESTRICTED_IMPORTS_PATHS_TOP_LEVEL_PACKAGES,
patterns: NO_RESTRICTED_IMPORTS_PATTERNS_DEEPLY_NESTED,
},
],
},
},
{
files: ['packages/*/src/**/*.?(c|m)[jt]s?(x)'],
excludedFiles: ['*.d.ts', '*.spec.*'],
Expand Down Expand Up @@ -529,5 +534,11 @@ module.exports = /** @type {Config} */ ({
'react/react-in-jsx-scope': 'off',
},
},
{
files: ['apps/**/*'],
rules: {
'import/no-relative-packages': 'off',
},
},
],
});
4 changes: 1 addition & 3 deletions .github/ISSUE_TEMPLATE/1.bug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,8 @@ body:
Please provide a link to a live example and an unambiguous set of steps to reproduce this bug. See our [documentation](https://mui.com/material-ui/getting-started/support/#bug-reproductions) on how to build a reproduction case.
value: |
Link to live example: (required)
Steps:
1.
1. Open this link to live example: (required)
2.
3.
- type: textarea
Expand Down
34 changes: 0 additions & 34 deletions .github/workflows/cherry-pick-next-to-master.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@4f3212b61783c3c68e8309a0f18a699764811cda # v3.27.1
uses: github/codeql-action/init@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
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@4f3212b61783c3c68e8309a0f18a699764811cda # v3.27.1
uses: github/codeql-action/analyze@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
18 changes: 18 additions & 0 deletions .github/workflows/create-cherry-pick-pr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: Create cherry-pick PR
on:
pull_request_target:
branches:
- 'next'
- 'v*.x'
- 'master'
types: ['closed']

permissions: {}

jobs:
create_pr:
name: Create cherry-pick PR
uses: mui/mui-public/.github/workflows/prs_create-cherry-pick-pr.yml@master
permissions:
contents: write
pull-requests: write
2 changes: 1 addition & 1 deletion .github/workflows/scorecards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,6 @@ jobs:

# Upload the results to GitHub's code scanning dashboard.
- name: Upload to code-scanning
uses: github/codeql-action/upload-sarif@4f3212b61783c3c68e8309a0f18a699764811cda # v3.27.1
uses: github/codeql-action/upload-sarif@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
with:
sarif_file: results.sarif
Loading

0 comments on commit 88d1fbf

Please sign in to comment.