Skip to content

Commit

Permalink
Merge branch 'refs/heads/next' into snackbar-v6-component-deprecation
Browse files Browse the repository at this point in the history
  • Loading branch information
fedirjh committed May 22, 2024
2 parents 1c1d0ed + 9c62cf0 commit ea241ae
Show file tree
Hide file tree
Showing 32 changed files with 156 additions and 98 deletions.
8 changes: 8 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ commands:
node scripts/useReactVersion.mjs
# log a patch for maintainers who want to check out this change
git --no-pager diff HEAD
- when:
condition: << parameters.browsers >>
steps:
Expand All @@ -93,6 +94,13 @@ commands:
name: Restore playwright cache
keys:
- v6-playwright-{{ arch }}-{{ checksum "/tmp/playwright_info.json" }}
- when:
condition:
not: << parameters.browsers >>
steps:
# See https://stackoverflow.com/a/73411601
- run: corepack enable --install-directory ~/bin

- run:
name: View install environment
command: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
# fetch all tags which are required for `pnpm release:changelog`
fetch-depth: 0
- name: Set up pnpm
uses: pnpm/action-setup@d882d12c64e032187b2edb46d3a0d003b7a43598 # v2.4.0
uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # v4.0.0
- name: Use Node.js 18.x
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/maintenance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
steps:
- run: echo "${{ github.actor }}"
- name: check if prs are dirty
uses: eps1lon/actions-label-merge-conflict@fd1f295ee7443d13745804bc49fe158e240f6c6e # v2.1.0
uses: eps1lon/actions-label-merge-conflict@6d74047dcef155976a15e4a124dde2c7fe0c5522 # v3.0.1
with:
dirtyLabel: 'PR: out-of-date'
removeOnDirtyLabel: 'PR: ready to ship'
Expand Down
16 changes: 8 additions & 8 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,15 @@
"@mui/system": "workspace:^",
"@mui/types": "workspace:^",
"@mui/utils": "workspace:^",
"@mui/x-charts": "7.4.0",
"@mui/x-data-grid": "7.4.0",
"@mui/x-data-grid-generator": "7.4.0",
"@mui/x-data-grid-premium": "7.4.0",
"@mui/x-data-grid-pro": "7.4.0",
"@mui/x-date-pickers": "7.4.0",
"@mui/x-date-pickers-pro": "7.4.0",
"@mui/x-charts": "7.5.0",
"@mui/x-data-grid": "7.5.0",
"@mui/x-data-grid-generator": "7.5.0",
"@mui/x-data-grid-premium": "7.5.0",
"@mui/x-data-grid-pro": "7.5.0",
"@mui/x-date-pickers": "7.5.0",
"@mui/x-date-pickers-pro": "7.5.0",
"@mui/x-license": "7.2.0",
"@mui/x-tree-view": "7.4.0",
"@mui/x-tree-view": "7.5.0",
"@popperjs/core": "^2.11.8",
"@react-spring/web": "^9.7.3",
"autoprefixer": "^10.4.19",
Expand Down
1 change: 1 addition & 0 deletions docs/public/static/base-ui/base-ui-logo-dark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions docs/public/static/base-ui/base-ui-logo-light.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions docs/public/static/pigment-css/pigment-css-logo-dark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions docs/public/static/pigment-css/pigment-css-logo-light.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit ea241ae

Please sign in to comment.