Skip to content

Commit 3b62912

Browse files
authored
Merge branch 'master' into fix/types-theme-components2
2 parents 560287e + bfd10b6 commit 3b62912

61 files changed

Lines changed: 151 additions & 119 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: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -248,10 +248,7 @@ jobs:
248248
NODE_OPTIONS: --max-old-space-size=3072
249249
- run:
250250
name: Test module augmentation
251-
command: |
252-
pnpm --filter @mui/material typescript:module-augmentation
253-
pnpm --filter @mui/joy typescript:module-augmentation
254-
pnpm --filter @mui/system typescript:module-augmentation
251+
command: pnpm typescript:module-augmentation
255252
test_types_next:
256253
<<: *default-job
257254
resource_class: 'medium+'
@@ -574,7 +571,7 @@ jobs:
574571

575572
- run:
576573
name: build @mui packages
577-
command: pnpm lerna run --ignore @mui/icons-material --concurrency 6 --scope "@mui/*" build
574+
command: pnpm release:build
578575
- aws-cli/setup:
579576
aws_access_key_id: $AWS_ACCESS_KEY_ID_ARTIFACTS
580577
aws_secret_access_key: $AWS_SECRET_ACCESS_KEY_ARTIFACTS

.github/workflows/ci.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
matrix:
2929
os: [macos-latest, windows-latest, ubuntu-latest]
3030
steps:
31-
- run: echo "${{ github.actor }}"
31+
- run: echo '${{ github.actor }}'
3232
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3333
with:
3434
# fetch all tags which are required for `pnpm release:changelog`
@@ -51,15 +51,15 @@ jobs:
5151
${{ runner.os }}-nextjs-
5252
- run: pnpm release:build
5353
- name: Build docs
54-
shell: bash
55-
run: |
56-
# Increase file descriptor limit on macOS to prevent EMFILE errors
57-
if [ "$(uname)" = "Darwin" ]; then
58-
ulimit -n 10240
59-
fi
60-
pnpm docs:build
54+
run: pnpm docs:build
6155
env:
6256
NODE_OPTIONS: --max_old_space_size=6144
57+
# macOS-latest has 3 CPUs, but we get "EMFILE: too many open files" errors with that parallelism
58+
# Limit Next.js to 2 CPUs to prevent file descriptor exhaustion. Empty string uses os.availableParallelism()
59+
NEXT_PARALLELISM: ${{ runner.os == 'macOS' && '2' || '' }}
6360
- run: pnpm release:changelog
6461
env:
6562
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
63+
- name: Debug export-detail.json on when pnpm docs:build fails with EMFILE error
64+
if: failure()
65+
run: cat ./docs/.next/export-detail.json || true

.github/workflows/maintenance.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
contents: read
3030
pull-requests: write
3131
steps:
32-
- run: echo "${{ github.actor }}"
32+
- run: echo '${{ github.actor }}'
3333
- name: Check if prs are dirty
3434
uses: eps1lon/actions-label-merge-conflict@1df065ebe6e3310545d4f4c4e862e43bdca146f0 # v3.0.3
3535
with:

docs/data/joy/components/aspect-ratio/aspect-ratio.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Aspect Ratio is a wrapper component for quickly resizing content to conform to y
1616
Media content like images can be stretched, resized, and cropped based on the CSS `object-fit` property.
1717

1818
:::info
19-
A [native CSS `aspect-ratio` property](https://developer.mozilla.org/en-US/docs/Web/CSS/aspect-ratio) does exist, and we plan to implement it in Joy UI soon.
19+
A [native CSS `aspect-ratio` property](https://developer.mozilla.org/en-US/docs/Web/CSS/Reference/Properties/aspect-ratio) does exist, and we plan to implement it in Joy UI soon.
2020
:::
2121

2222
## Basics

docs/data/joy/components/badge/badge.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ Try clicking the arrows in the demo below to change the position of the Badge:
102102
### Inset
103103

104104
Use the `badgeInset` prop to fine-tune the position of the Badge relative to the element that it's attached to.
105-
This prop accepts a string composed of numbers expressed in units of `px`, `%`, `em`, or `rem`. (This syntax corresponds to the [inset CSS property](https://developer.mozilla.org/en-US/docs/Web/CSS/inset).)
105+
This prop accepts a string composed of numbers expressed in units of `px`, `%`, `em`, or `rem`. (This syntax corresponds to the [inset CSS property](https://developer.mozilla.org/en-US/docs/Web/CSS/Reference/Properties/inset).)
106106

107107
This string defines the inset from the Badge's [`anchorOrigin`](#position)—for instance, the demo below pushes the Badge 14% closer to the center of its child element (relative to the top-right corner) along both the vertical and horizontal axes:
108108

docs/data/joy/components/button-group/button-group.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ Use the `buttonFlex` prop to make the buttons fill the available space of the Bu
9797

9898
#### Minimum width
9999

100-
For a large container, control the default width of the buttons by providing a valid [CSS `flex`](https://developer.mozilla.org/en-US/docs/Web/CSS/flex) value to the `buttonFlex` prop.
100+
For a large container, control the default width of the buttons by providing a valid [CSS `flex`](https://developer.mozilla.org/en-US/docs/Web/CSS/Reference/Properties/flex) value to the `buttonFlex` prop.
101101

102102
{{"demo": "MinWidthButtonGroup.js"}}
103103

docs/data/joy/components/card/card.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ Hover your mouse on the demo below to see how the layers are stacked:
103103
#### Images and videos
104104

105105
Use an image or a video element inside the Card Cover to display media.
106-
The component uses [`object-fit: cover`](https://developer.mozilla.org/en-US/docs/Web/CSS/object-fit) to fill the whole Card by default.
106+
The component uses [`object-fit: cover`](https://developer.mozilla.org/en-US/docs/Web/CSS/Reference/Properties/object-fit) to fill the whole Card by default.
107107

108108
{{"demo": "MediaCover.js"}}
109109

@@ -145,7 +145,7 @@ In some cases, you might have to adjust the z-index to bring these elements to t
145145
{{"demo": "MultipleInteractionCard.js"}}
146146

147147
:::success
148-
You can use the CSS pseudo-class [`:focus-within`](https://developer.mozilla.org/en-US/docs/Web/CSS/:focus-within) to apply styles to the Card when any of its children receive focus.
148+
You can use the CSS pseudo-class [`:focus-within`](https://developer.mozilla.org/en-US/docs/Web/CSS/Reference/Selectors/:focus-within) to apply styles to the Card when any of its children receive focus.
149149
:::
150150

151151
#### Whole Card actions

docs/data/joy/components/checkbox/checkbox.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ To set the focus outline so that it only wraps the input, target the `checkboxCl
106106
### Clickable container
107107

108108
Use the `overlay` prop to shift the focus outline from the Checkbox to its container, making the entire container clickable to toggle the state of the Checkbox.
109-
This works with any wrapper element with [positioning](https://developer.mozilla.org/en-US/docs/Web/CSS/position#types_of_positioning)—the demo below uses [Sheet](/joy-ui/react-sheet/) (by default, it has `relative` position):
109+
This works with any wrapper element with [positioning](https://developer.mozilla.org/en-US/docs/Web/CSS/Reference/Properties/position#types_of_positioning)—the demo below uses [Sheet](/joy-ui/react-sheet/) (by default, it has `relative` position):
110110

111111
{{"demo": "OverlayCheckbox.js"}}
112112

docs/data/joy/components/drawer/drawer.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ import ModalClose from '@mui/joy/ModalClose';
5858

5959
Customize the Drawer's opening transition by using the CSS variables below inside the [`sx` prop](/system/getting-started/the-sx-prop/):
6060

61-
- `--Drawer-transitionFunction`: the [transition function](https://developer.mozilla.org/en-US/docs/Web/CSS/transition-timing-function); default is `ease`.
62-
- `--Drawer-transitionDuration`: the [duration of the transition](https://developer.mozilla.org/en-US/docs/Web/CSS/transition-duration); default is `0.3s`.
61+
- `--Drawer-transitionFunction`: the [transition function](https://developer.mozilla.org/en-US/docs/Web/CSS/Reference/Properties/transition-timing-function); default is `ease`.
62+
- `--Drawer-transitionDuration`: the [duration of the transition](https://developer.mozilla.org/en-US/docs/Web/CSS/Reference/Properties/transition-duration); default is `0.3s`.
6363

6464
{{"demo": "DrawerTransition.js"}}
6565

docs/data/joy/components/list/list.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ If used, it will automatically change the semantic element from the default `<li
9898

9999
### Marker
100100

101-
Use the `marker` prop with any valid [list-style-type](https://developer.mozilla.org/en-US/docs/Web/CSS/list-style-type) value to add a marker to the list items.
101+
Use the `marker` prop with any valid [list-style-type](https://developer.mozilla.org/en-US/docs/Web/CSS/Reference/Properties/list-style-type) value to add a marker to the list items.
102102

103103
{{"demo": "MarkerList.js"}}
104104

0 commit comments

Comments
 (0)