Skip to content

Commit b2362ce

Browse files
Merge branch 'master' into textfield_carret_position-branch
2 parents bfd6104 + 3d73ebc commit b2362ce

File tree

13 files changed

+178
-433
lines changed

13 files changed

+178
-433
lines changed

.circleci/config.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -219,11 +219,6 @@ jobs:
219219
command: |
220220
pnpm extract-error-codes
221221
git add -A && git diff --exit-code --staged
222-
- run:
223-
name: '`pnpm docs:link-check` changes committed?'
224-
command: |
225-
pnpm docs:link-check
226-
git add -A && git diff --exit-code --staged
227222
test_types:
228223
<<: *default-job
229224
resource_class: 'medium+'

docs/.link-check-errors.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.

docs/package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"private": true,
44
"license": "MIT",
55
"scripts": {
6-
"build": "rimraf ./export && cross-env NODE_ENV=production NODE_OPTIONS=--max_old_space_size=8192 next build && pnpm build-sw",
6+
"build": "rimraf ./export && cross-env NODE_ENV=production NODE_OPTIONS=--max_old_space_size=8192 next build && pnpm build-sw && pnpm link-check",
77
"build:clean": "rimraf .next && pnpm build",
88
"build-sw": "node ./scripts/buildServiceWorker.js",
99
"dev": "next dev",
@@ -14,7 +14,7 @@
1414
"typescript": "tsc -p tsconfig.json && tsc -p scripts/tsconfig.json",
1515
"typescript:transpile": "echo 'Use `pnpm docs:typescript:formatted'` instead && exit 1",
1616
"typescript:transpile:dev": "echo 'Use `pnpm docs:typescript'` instead && exit 1",
17-
"link-check": "tsx ./scripts/reportBrokenLinks.ts"
17+
"link-check": "tsx ./scripts/reportBrokenLinks.mts"
1818
},
1919
"dependencies": {
2020
"@babel/core": "^7.28.5",
@@ -130,7 +130,6 @@
130130
"chai": "^6.0.1",
131131
"cross-fetch": "^4.1.0",
132132
"gm": "^1.25.1",
133-
"marked": "^16.2.0",
134133
"prettier": "^3.6.2",
135134
"tailwindcss": "^4.1.17",
136135
"yargs": "^18.0.0"

docs/pages/blog/2020-q3-update.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ Here are the most significant improvements since June 2020. This was a dense qua
9292

9393
<img src="/static/blog/2020-q3-update/react-testing-library.png" alt="" style="width: 640px; margin-bottom: 40px; margin-top: 24px;" />
9494

95-
- 💅 We have completed the first iteration of the unstyled components for v5.<br />You can find a [new version](/material-ui/react-slider/#unstyled) of the slider in the lab without any styles.
95+
- 💅 We have completed the first iteration of the unstyled components for v5.<br />You can find a [new version](https://v5.mui.com/material-ui/react-slider/#unstyled) of the slider in the lab without any styles.
9696
The unstyled component weighs in at [5.2 kB gzipped](https://bundlephobia.com/package/@mui/lab@5.0.0-alpha.12), compared with 26 kB for the styled version (when used standalone). The component is best suited for use when you want to fully customize the look, without reimplementing the JavaScript and accessibility logic.<br />
9797
We're also pushing in this direction to address a concern we hear from large enterprises
9898
that want to be able to go one layer down in the abstraction, in order to gain more control.
@@ -101,10 +101,10 @@ Here are the most significant improvements since June 2020. This was a dense qua
101101
import SliderUnstyled from '@mui/lab/SliderUnstyled';
102102
```
103103

104-
Note that we have experimented with headless components (hooks only) in the past. For instance, you can leverage the [useAutocomplete](/material-ui/react-autocomplete/#useautocomplete), and [usePagination](/material-ui/react-pagination/#usepagination) hooks. However, we are pushing with unstyled first as a required step for the next item: ⬇️.
104+
Note that we have experimented with headless components (hooks only) in the past. For instance, you can leverage the [useAutocomplete](https://v5.mui.com/material-ui/react-autocomplete/#useautocomplete), and [usePagination](https://v5.mui.com/material-ui/react-pagination/#usepagination) hooks. However, we are pushing with unstyled first as a required step for the next item: ⬇️.
105105

106106
- 👩‍🎨 We have completed the first iteration of the new styling solution of v5.<br />
107-
You can find a [new version](/material-ui/react-slider/) of the slider in the lab powered by [Emotion](https://emotion.sh/docs/introduction).<br />
107+
You can find a [new version](https://v5.mui.com/material-ui/react-slider/) of the slider in the lab powered by [Emotion](https://emotion.sh/docs/introduction).<br />
108108
If you are already using styled-components in your application, you can swap Emotion for styled-components 💅. Check this [CodeSandbox](https://codesandbox.io/p/sandbox/sliderstyled-with-styled-components-forked-olc27?file=/package.json) or [CRA](https://github.com/mui/material-ui/tree/HEAD/examples/material-ui-cra-styled-components/) for a demo. It relies on aliases to prevent any bundle size overhead.<br />
109109
The new styling solution saves 2kB+ gzipped in the bundle compared to JSS, and about 14 kB gzipped if you were already using styled-components or Emotion.<br />
110110
Last but not least, this change allows us to take advantage of dynamic style props. We will use them for dynamic color props, variant props, and new style props available in the core components.

docs/pages/blog/2021-q3-update.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,43 +44,43 @@ Here are the most significant improvements since early July 2021.
4444

4545
<p class="blog-description">After</p>
4646

47-
- [Masonry](/material-ui/react-masonry/). We introduced a new component for use when the `Grid` component leads to wasted space. It's frequently used in dashboards.
47+
- [Masonry](https://v5.mui.com/material-ui/react-masonry/). We introduced a new component for use when the `Grid` component leads to wasted space. It's frequently used in dashboards.
4848

4949
<a href="/material-ui/react-masonry/"><img loading="lazy" src="/static/blog/2021-q3-update/masonry.png" style="width: 700px;" width="1400" height="906" alt="react-masonry" /></a>
5050

5151
- We introduced a new [package of components without styles](https://www.npmjs.com/package/@mui/base), laying the foundations for supporting multiple design systems with headless components.
5252
While it was tough to balance the time between working on v5 stable and developing the unstyled components, we still managed to introduce the first few:
53-
- [Autocomplete](/material-ui/react-autocomplete/#useautocomplete)
53+
- [Autocomplete](https://v5.mui.com/material-ui/react-autocomplete/#useautocomplete)
5454

5555
```jsx
5656
import { useAutocomplete } from '@mui/base/AutocompleteUnstyled';
5757
```
5858

59-
- [Button](/material-ui/react-button/#unstyled)
59+
- [Button](https://v5.mui.com/material-ui/react-button/#unstyled)
6060

6161
```jsx
6262
import { useButton } from '@mui/base/ButtonUnstyled';
6363
```
6464

65-
- [Modal](/material-ui/react-modal/#unstyled)
65+
- [Modal](https://v5.mui.com/material-ui/react-modal/#unstyled)
6666

6767
```jsx
6868
import { ModalUnstyled } from '@mui/base/ModalUnstyled';
6969
```
7070

71-
- [Slider](/material-ui/react-slider/#unstyled)
71+
- [Slider](https://v5.mui.com/material-ui/react-slider/#unstyled)
7272

7373
```jsx
7474
import { SliderUnstyled } from '@mui/base/SliderUnstyled';
7575
```
7676

77-
- [Switch](/material-ui/react-switch/#unstyled)
77+
- [Switch](https://v5.mui.com/material-ui/react-switch/#unstyled)
7878

7979
```jsx
8080
import { useSwitch } from '@mui/base/SwitchUnstyled';
8181
```
8282

83-
- [Portal](/material-ui/react-portal/#unstyled)
83+
- [Portal](https://v5.mui.com/material-ui/react-portal/#unstyled)
8484

8585
```jsx
8686
import { Portal } from '@mui/base/Portal';

docs/pages/blog/2022-tenerife-retreat.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ We're hiring!
172172

173173
MUI is on track to grow from roughly 20 people to 40 or more by the time we get to our next company retreat in late Q1 2023.
174174

175-
We are constantly interviewing React developers from all around the world, and we are also increasingly looking to hire for non-technical roles such as [People Operations Manager](/careers/people-operations-manager/) in which you could have a huge impact steering the direction of the company's nascent HR department.
175+
We are constantly interviewing React developers from all around the world, and we are also increasingly looking to hire for non-technical roles such as People Operations Manager in which you could have a huge impact steering the direction of the company's nascent HR department.
176176

177177
Check out [our open roles](/careers/) so you can join us before the next retreat!
178178

docs/scripts/reportBrokenLinks.mts

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
import * as path from 'path';
2+
import { crawl } from '@mui/internal-code-infra/brokenLinksChecker';
3+
import { globby } from 'globby';
4+
5+
async function main() {
6+
// The /blog/ page has pagination that's not persisted in the url.
7+
const blogPages = await globby('blog/**/*.js', {
8+
cwd: path.resolve(import.meta.dirname, '../pages'),
9+
});
10+
const blogSeedUrls = blogPages.map((page) => {
11+
const pathname = page.replace(/(?:\/index)?\.js$/, '');
12+
return `/${pathname}`;
13+
});
14+
15+
const { issues } = await crawl({
16+
startCommand: 'pnpm start --no-request-logging -p 3001',
17+
host: 'http://localhost:3001/',
18+
seedUrls: ['/', ...blogSeedUrls],
19+
outPath: path.resolve(import.meta.dirname, '../export/material-ui/link-structure.json'),
20+
// Target paths to ignore during link checking
21+
ignoredPaths: [
22+
// Internal links not on this server
23+
// TODO: Seed crawler with stored links from e.g. mui.com/x/link-structure.json
24+
/^\/(x|base-ui|joy-ui|store|toolpad)(\/|$)/,
25+
],
26+
// CSS selectors for content to ignore during link checking
27+
ignoredContent: [
28+
// Links used in demos under MemoryRouter
29+
// TODO: Create an easier way to identify content under MemoryRouter
30+
// (e.g. a class or an option on the demo)
31+
'[id^="demo-"] a[href^="/inbox"]',
32+
'[id^="demo-"] a[href^="/trash"]',
33+
'[id^="demo-"] a[href^="/spam"]',
34+
'[id^="demo-"] a[href^="/drafts"]',
35+
],
36+
});
37+
38+
process.exit(issues.length);
39+
}
40+
41+
main();

docs/scripts/reportBrokenLinks.ts

Lines changed: 0 additions & 78 deletions
This file was deleted.

0 commit comments

Comments
 (0)