Skip to content

Commit

Permalink
Merge branch 'master' into computed-typography-pargraphs
Browse files Browse the repository at this point in the history
  • Loading branch information
ZeeshanTamboli committed Nov 26, 2024
2 parents 9da2ee3 + 72823b8 commit 1d743c6
Show file tree
Hide file tree
Showing 1,072 changed files with 10,080 additions and 6,845 deletions.
28 changes: 14 additions & 14 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: 2.1
orbs:
aws-cli: circleci/[email protected]
aws-s3: circleci/[email protected]
aws-s3: circleci/aws-s3@4.1.0

parameters:
browserstack-force:
Expand Down Expand Up @@ -380,7 +380,7 @@ jobs:
<<: *default-job
resource_class: 'medium+'
docker:
- image: mcr.microsoft.com/playwright:v1.48.1-focal
- image: mcr.microsoft.com/playwright:v1.48.2-focal
steps:
- checkout
- install_js:
Expand Down Expand Up @@ -408,7 +408,7 @@ jobs:
test_e2e:
<<: *default-job
docker:
- image: mcr.microsoft.com/playwright:v1.48.1-focal
- image: mcr.microsoft.com/playwright:v1.48.2-focal
steps:
- checkout
- install_js:
Expand All @@ -420,7 +420,7 @@ jobs:
# NOTE: This workflow runs after successful docs deploy. See /test/e2e-website/README.md#ci
<<: *default-job
docker:
- image: mcr.microsoft.com/playwright:v1.48.1-focal
- image: mcr.microsoft.com/playwright:v1.48.2-focal
steps:
- checkout
- install_js:
Expand All @@ -433,7 +433,7 @@ jobs:
test_profile:
<<: *default-job
docker:
- image: mcr.microsoft.com/playwright:v1.48.1-focal
- image: mcr.microsoft.com/playwright:v1.48.2-focal
steps:
- checkout
- install_js:
Expand All @@ -458,7 +458,7 @@ jobs:
test_regressions:
<<: *default-job
docker:
- image: mcr.microsoft.com/playwright:v1.48.1-focal
- image: mcr.microsoft.com/playwright:v1.48.2-focal
steps:
- checkout
- install_js:
Expand Down Expand Up @@ -525,7 +525,7 @@ jobs:
test_bundling_next_webpack4:
<<: *default-job
docker:
- image: mcr.microsoft.com/playwright:v1.48.1-focal
- image: mcr.microsoft.com/playwright:v1.48.2-focal
working_directory: /tmp/material-ui/test/bundling/fixtures/next-webpack4/
steps:
- checkout:
Expand All @@ -543,7 +543,7 @@ jobs:
test_bundling_next_webpack5:
<<: *default-job
docker:
- image: mcr.microsoft.com/playwright:v1.48.1-focal
- image: mcr.microsoft.com/playwright:v1.48.2-focal
working_directory: /tmp/material-ui/test/bundling/fixtures/next-webpack5/
steps:
- checkout:
Expand All @@ -561,7 +561,7 @@ jobs:
test_bundling_create_react_app:
<<: *default-job
docker:
- image: mcr.microsoft.com/playwright:v1.48.1-focal
- image: mcr.microsoft.com/playwright:v1.48.2-focal
working_directory: /tmp/material-ui/test/bundling/fixtures/create-react-app/
steps:
- checkout:
Expand All @@ -579,7 +579,7 @@ jobs:
test_bundling_snowpack:
<<: *default-job
docker:
- image: mcr.microsoft.com/playwright:v1.48.1-focal
- image: mcr.microsoft.com/playwright:v1.48.2-focal
working_directory: /tmp/material-ui/test/bundling/fixtures/snowpack/
steps:
- checkout:
Expand All @@ -597,7 +597,7 @@ jobs:
test_bundling_vite:
<<: *default-job
docker:
- image: mcr.microsoft.com/playwright:v1.48.1-focal
- image: mcr.microsoft.com/playwright:v1.48.2-focal
working_directory: /tmp/material-ui/test/bundling/fixtures/vite/
steps:
- checkout:
Expand All @@ -615,7 +615,7 @@ jobs:
test_bundling_esbuild:
<<: *default-job
docker:
- image: mcr.microsoft.com/playwright:v1.48.1-focal
- image: mcr.microsoft.com/playwright:v1.48.2-focal
working_directory: /tmp/material-ui/test/bundling/fixtures/esbuild/
steps:
- checkout:
Expand All @@ -633,7 +633,7 @@ jobs:
test_bundling_gatsby:
<<: *default-job
docker:
- image: mcr.microsoft.com/playwright:v1.48.1-focal
- image: mcr.microsoft.com/playwright:v1.48.2-focal
environment:
GATSBY_CPU_COUNT: '3'
working_directory: /tmp/material-ui/test/bundling/fixtures/gatsby/
Expand Down Expand Up @@ -734,7 +734,7 @@ jobs:
test_benchmark:
<<: *default-job
docker:
- image: mcr.microsoft.com/playwright:v1.48.1-focal
- image: mcr.microsoft.com/playwright:v1.48.2-focal
steps:
- checkout
- install_js:
Expand Down
65 changes: 36 additions & 29 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ const NO_RESTRICTED_IMPORTS_PATTERNS_DEEPLY_NESTED = [
module.exports = /** @type {Config} */ ({
root: true, // So parent files don't get applied
env: {
es6: true,
es2020: true,
browser: true,
node: true,
},
Expand Down Expand Up @@ -242,8 +242,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 +302,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 +314,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 +344,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 +364,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 +455,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 +530,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/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ jobs:
os: [macos-latest, windows-latest, ubuntu-latest]
steps:
- run: echo "${{ github.actor }}"
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
# fetch all tags which are required for `pnpm release:changelog`
fetch-depth: 0
- name: Set up pnpm
uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # v4.0.0
- name: Use Node.js 20.x
uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
with:
node-version: 20
cache: 'pnpm' # https://github.com/actions/setup-node/blob/main/docs/advanced-usage.md#caching-packages-dependencies
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@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
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@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
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/priority-support-validation-prompt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
body: |
You have created a support request under the ["Priority Support"](https://mui.com/legal/technical-support-sla/#priority-support) terms, which is a paid add-on to MUI X Premium ⏰. Please validate your support key using the link below:
https://tools-public.mui.com/prod/pages/jyhs86t?repo=mui-x&issueId=${{ github.event.issue.number }}
https://tools-public.mui.com/prod/pages/validateSupport?repo=mui-x&issueId=${{ github.event.issue.number }}
Do not share your support key in this issue!
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-canaries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ jobs:
publish:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
fetch-depth: 0
- name: Set up pnpm
uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # v4.0.0
- name: Use Node.js 20.x
uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
with:
node-version: 20
cache: 'pnpm' # https://github.com/actions/setup-node/blob/main/docs/advanced-usage.md#caching-packages-dependencies
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/scorecards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
persist-credentials: false

Expand All @@ -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@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
uses: github/codeql-action/upload-sarif@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
with:
sarif_file: results.sarif
Loading

0 comments on commit 1d743c6

Please sign in to comment.