Skip to content

Commit 567b3d3

Browse files
committed
Merge branch 'master' into grid-2
2 parents 211e67f + d0ab052 commit 567b3d3

316 files changed

Lines changed: 4111 additions & 2996 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: 112 additions & 164 deletions
Large diffs are not rendered by default.

.eslintignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
/packages/mui-icons-material/material-icons/
1717
/packages/mui-icons-material/src/*.js
1818
/packages/mui-icons-material/templateSvgIcon.js
19-
/packages/mui-utils/macros/__fixtures__/
2019
# Ignore fixtures
2120
/packages-internal/scripts/typescript-to-proptypes/test/*/*
2221
/test/bundling/fixtures/**/*.fixture.js

.eslintrc.js

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
// @ts-check
2+
3+
/**
4+
* @typedef {import('eslint').Linter.Config} Config
5+
*/
6+
17
const path = require('path');
28

39
const OneLevelImportMessage = [
@@ -39,7 +45,7 @@ const NO_RESTRICTED_IMPORTS_PATTERNS_DEEPLY_NESTED = [
3945
},
4046
];
4147

42-
module.exports = {
48+
module.exports = /** @type {Config} */ ({
4349
root: true, // So parent files don't get applied
4450
env: {
4551
es6: true,
@@ -228,6 +234,10 @@ module.exports = {
228234
"The 'use client' pragma can't be used with export * in the same module. This is not supported by Next.js.",
229235
selector: 'ExpressionStatement[expression.value="use client"] ~ ExportAllDeclaration',
230236
},
237+
{
238+
message: 'Do not call `Error(...)` without `new`. Use `new Error(...)` instead.',
239+
selector: "CallExpression[callee.name='Error']",
240+
},
231241
],
232242

233243
// We re-export default in many places, remove when https://github.com/airbnb/javascript/issues/2500 gets resolved
@@ -240,6 +250,8 @@ module.exports = {
240250
'react/jsx-no-useless-fragment': ['error', { allowExpressions: true }],
241251
'lines-around-directive': 'off',
242252
...(ENABLE_REACT_COMPILER_PLUGIN ? { 'react-compiler/react-compiler': 'error' } : {}),
253+
// Prevent the use of `e` as a shorthand for `event`, `error`, etc.
254+
'id-denylist': ['error', 'e'],
243255
},
244256
overrides: [
245257
{
@@ -524,4 +536,4 @@ module.exports = {
524536
},
525537
},
526538
],
527-
};
539+
});

.github/workflows/cherry-pick-next-to-master.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
if: ${{ contains(github.event.pull_request.labels.*.name, 'needs cherry-pick') && github.event.pull_request.merged == true }}
1919
steps:
2020
- name: Checkout
21-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
21+
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
2222
with:
2323
fetch-depth: 0
2424
- name: Cherry pick and create the new PR

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ jobs:
2424
os: [macos-latest, windows-latest, ubuntu-latest]
2525
steps:
2626
- run: echo "${{ github.actor }}"
27-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
27+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
2828
with:
2929
# fetch all tags which are required for `pnpm release:changelog`
3030
fetch-depth: 0
3131
- name: Set up pnpm
3232
uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # v4.0.0
3333
- name: Use Node.js 20.x
34-
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
34+
uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
3535
with:
3636
node-version: 20
3737
cache: 'pnpm' # https://github.com/actions/setup-node/blob/main/docs/advanced-usage.md#caching-packages-dependencies

.github/workflows/codeql.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ jobs:
1616
security-events: write
1717
steps:
1818
- name: Checkout repository
19-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
19+
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
2020
# Initializes the CodeQL tools for scanning.
2121
- name: Initialize CodeQL
22-
uses: github/codeql-action/init@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7
22+
uses: github/codeql-action/init@e2b3eafc8d227b0241d48be5f425d47c2d750a13 # v3.26.10
2323
with:
2424
languages: typescript
2525
config-file: ./.github/codeql/codeql-config.yml
@@ -30,4 +30,4 @@ jobs:
3030
# 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
3131
# queries: security-extended,security-and-quality
3232
- name: Perform CodeQL Analysis
33-
uses: github/codeql-action/analyze@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7
33+
uses: github/codeql-action/analyze@e2b3eafc8d227b0241d48be5f425d47c2d750a13 # v3.26.10

.github/workflows/publish-canaries.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ jobs:
99
publish:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
12+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
1313
with:
1414
fetch-depth: 0
1515
- name: Set up pnpm
1616
uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # v4.0.0
1717
- name: Use Node.js 20.x
18-
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
18+
uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
1919
with:
2020
node-version: 20
2121
cache: 'pnpm' # https://github.com/actions/setup-node/blob/main/docs/advanced-usage.md#caching-packages-dependencies

.github/workflows/scorecards.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222

2323
steps:
2424
- name: Checkout code
25-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
25+
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
2626
with:
2727
persist-credentials: false
2828

@@ -43,6 +43,6 @@ jobs:
4343

4444
# Upload the results to GitHub's code scanning dashboard.
4545
- name: Upload to code-scanning
46-
uses: github/codeql-action/upload-sarif@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7
46+
uses: github/codeql-action/upload-sarif@e2b3eafc8d227b0241d48be5f425d47c2d750a13 # v3.26.10
4747
with:
4848
sarif_file: results.sarif

.github/workflows/support-stackoverflow.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ jobs:
2424
issue-comment: |
2525
👋 Thanks for using this project!
2626
27-
We use GitHub issues exclusively as a bug and feature requests tracker, however,
28-
this issue appears to be a support request.
27+
We use GitHub issues exclusively as a bug and feature requests tracker, however, this issue appears to be a support request.
2928
3029
For support with Material UI please check out https://mui.com/material-ui/getting-started/support/. Thanks!
3130

.github/workflows/vale-action.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,14 @@ jobs:
1212
contents: read
1313
pull-requests: write
1414
steps:
15-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
15+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
1616
- uses: errata-ai/vale-action@38bf078c328061f59879b347ca344a718a736018 # v2.1.0
1717
continue-on-error: true # GitHub Action flag needed until https://github.com/errata-ai/vale-action/issues/89 is fixed
1818
with:
19+
# Errors should be more visible
1920
fail_on_error: true
21+
# The other reports don't work, not really https://github.com/reviewdog/reviewdog#reporters
2022
reporter: github-pr-check
23+
# Required, set by GitHub actions automatically:
24+
# https://docs.github.com/en/actions/security-guides/automatic-token-authentication#about-the-github_token-secret
2125
token: ${{secrets.GITHUB_TOKEN}}

0 commit comments

Comments
 (0)