Skip to content

Commit

Permalink
Merge branch 'master' into inputprops-remove
Browse files Browse the repository at this point in the history
  • Loading branch information
sai6855 committed Nov 1, 2024
2 parents 83b0a47 + 0f9ae8a commit 0c5f3d9
Show file tree
Hide file tree
Showing 103 changed files with 3,017 additions and 2,195 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/aws-cli@5.1.1
aws-s3: circleci/aws-s3@4.0
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
2 changes: 1 addition & 1 deletion .github/workflows/cherry-pick-next-to-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
if: ${{ contains(github.event.pull_request.labels.*.name, 'needs cherry-pick') && github.event.pull_request.merged == true }}
steps:
- name: Checkout
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
fetch-depth: 0
- name: Cherry pick and create the new PR
Expand Down
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@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
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@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
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@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
with:
sarif_file: results.sarif
2 changes: 1 addition & 1 deletion .github/workflows/vale-action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
contents: read
pull-requests: write
steps:
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- uses: errata-ai/vale-action@d89dee975228ae261d22c15adcd03578634d429c # v2.1.1
continue-on-error: true # GitHub Action flag needed until https://github.com/errata-ai/vale-action/issues/89 is fixed
with:
Expand Down
52 changes: 52 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,57 @@
# [Versions](https://mui.com/versions/)

## 6.1.6

<!-- generated comparing v6.1.5..master -->

_Oct 30, 2024_

A big thanks to the 13 contributors who made this release possible.

### `@mui/material@6.1.6`

- [Autocomplete] Add missing `onMouseDown` type to AutocompleteRenderInputParams (#44183) @sai6855
- [Avatar] Fix AvatarGroup spacing (#44208) @aarongarciah
- [AvatarGroup] Fix spacing CSS variable (#44202) @navedqb
- [Divider] Fix CSS specificity order (#44204) @o-alexandrov
- [Slider] Fix value prop type warning (#44131) @joshkel
- Replace `useThemeProps` with `useDefaultProps` (#44193) @siriwatknp

### `@mui/material-nextjs@6.1.6`

- Support Next 15.0.0 (#42428) @nphmuller

### `@mui/lab@6.0.0-beta.14`

- [Tabs] Fix type of TabPanel component (#44207) @blackcow1987

### `@mui/codemod@6.1.6`

- Fix system props default import specifier (#44170) @siriwatknp

### `@mui/utils@6.1.6`

- Bring back useIsFocusVisible (#44256) @aarongarciah
- Bring back getReactNodeRef (#44248) @aarongarciah

### Docs

- [material-ui][Avatar] Add AvatarGroup spacing demo (#44209) @aarongarciah
- Fix a typo in CONTRIBUTING.md (#44200) @prakhargupta1
- Mark the Hidden component as deprecated in the sidenav (#44068) @jimmycallin
- Use () when referencing functions (#44184) @oliviertassinari
- Follow types description convention (#44187) @oliviertassinari

### Core

- Lock file maintenance (#43947)
- Run @mui/icon-material src:icons (#44097) @oliviertassinari
- [test][material-ui] Add tests for Pigment Grid and Stack (#44132) @DiegoAndai
- [test] Distinguish private with public tests API (#44188) @oliviertassinari
- [docs-infra] Add recursively the relative modules in the demos (#44150) @mnajdova

All contributors of this release in alphabetical order: @aarongarciah, @blackcow1987, @DiegoAndai, @jimmycallin, @joshkel, @mnajdova, @navedqb, @nphmuller, @o-alexandrov, @oliviertassinari, @prakhargupta1, @sai6855, @siriwatknp

## 6.1.5

<!-- generated comparing v6.1.4..master -->
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ docs/src/pages/components/buttons/

#### 2. Write the demo code

We uses TypeScript to document our components.
We use TypeScript to document our components.
We prefer demos written in TypeScript (using the `.tsx` file format).

After creating a TypeScript demo, run `pnpm docs:typescript:formatted` to automatically create the JavaScript version, which is also required.
Expand Down
6 changes: 3 additions & 3 deletions apps/pigment-css-next-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
"react-dom": "^18.3.1"
},
"devDependencies": {
"@pigment-css/nextjs-plugin": "0.0.24",
"@types/node": "^20.16.13",
"@types/react": "^18.3.11",
"@pigment-css/nextjs-plugin": "0.0.25",
"@types/node": "^20.17.1",
"@types/react": "^18.3.12",
"@types/react-dom": "^18.3.1",
"eslint": "^8.57.1",
"typescript": "^5.6.3"
Expand Down
14 changes: 7 additions & 7 deletions apps/pigment-css-vite-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,24 +17,24 @@
"@mui/system": "workspace:^",
"@mui/utils": "workspace:^",
"clsx": "^2.1.1",
"playwright": "^1.48.1",
"playwright": "^1.48.2",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-error-boundary": "^4.0.13",
"react-error-boundary": "^4.1.2",
"react-router-dom": "^6.27.0",
"webfontloader": "^1.6.28"
},
"devDependencies": {
"@babel/preset-react": "^7.25.7",
"@babel/preset-typescript": "^7.25.7",
"@pigment-css/vite-plugin": "0.0.24",
"@types/react": "^18.3.11",
"@babel/preset-react": "^7.25.9",
"@babel/preset-typescript": "^7.26.0",
"@pigment-css/vite-plugin": "0.0.25",
"@types/react": "^18.3.12",
"@types/react-dom": "^18.3.1",
"@types/webfontloader": "^1.6.38",
"@vitejs/plugin-react": "^4.3.3",
"postcss": "^8.4.47",
"postcss-combine-media-query": "^1.0.1",
"vite": "5.4.9",
"vite": "5.4.10",
"vite-plugin-node-polyfills": "0.22.0",
"vite-plugin-pages": "^0.32.3"
},
Expand Down
6 changes: 3 additions & 3 deletions benchmark/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"server:system": "cd ../ && cross-env NODE_ENV=production BABEL_ENV=benchmark babel-node benchmark/server/scenarios/system.js --inspect=0.0.0.0:9229 --extensions \".tsx,.ts,.js\""
},
"dependencies": {
"@babel/runtime": "^7.25.7",
"@babel/runtime": "^7.26.0",
"@chakra-ui/system": "^2.6.2",
"@emotion/react": "^11.13.3",
"@emotion/server": "^11.11.0",
Expand All @@ -25,7 +25,7 @@
"express": "^4.21.1",
"fs-extra": "^11.2.0",
"jss": "^10.10.0",
"playwright": "^1.48.1",
"playwright": "^1.48.2",
"prop-types": "^15.8.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
Expand All @@ -36,7 +36,7 @@
"serve-handler": "^6.1.6",
"styled-components": "^6.1.13",
"styled-system": "^5.1.5",
"theme-ui": "^0.16.2",
"theme-ui": "^0.17.1",
"webpack": "^5.95.0"
}
}
Loading

0 comments on commit 0c5f3d9

Please sign in to comment.