Skip to content

Commit

Permalink
Merge branch 'master' into use-local-storage-state
Browse files Browse the repository at this point in the history
Signed-off-by: Jan Potoms <[email protected]>
  • Loading branch information
Janpot authored Feb 21, 2024
2 parents 8bff4db + 2009462 commit b41efdc
Show file tree
Hide file tree
Showing 733 changed files with 4,322 additions and 4,075 deletions.
10 changes: 6 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -166,17 +166,17 @@ jobs:
echo "no changes"
fi
- run:
name: typescript-to-proptypes
name: internal-scripts
command: |
# latest commit
LATEST_COMMIT=$(git rev-parse HEAD)
# latest commit where packages/typescript-to-proptypes was changed
FOLDER_COMMIT=$(git log -1 --format=format:%H --full-diff packages/typescript-to-proptypes)
# latest commit where internal-scripts was changed
FOLDER_COMMIT=$(git log -1 --format=format:%H --full-diff packages-internal/scripts)
if [ $FOLDER_COMMIT = $LATEST_COMMIT ]; then
echo "changes, let's run the tests"
pnpm --filter typescript-to-proptypes test
pnpm --filter @mui/internal-scripts test
else
echo "no changes"
fi
Expand Down Expand Up @@ -260,6 +260,8 @@ jobs:
- run:
name: Tests TypeScript definitions
command: pnpm typescript:ci
environment:
NODE_OPTIONS: --max-old-space-size=3072
- run:
name: Test module augmentation
command: |
Expand Down
4 changes: 2 additions & 2 deletions .codesandbox/ci.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"packages/mui-types",
"packages/mui-utils",
"packages/docs-utils",
"packages/typescript-to-proptypes"
"packages-internal/scripts"
],
"publishDirectory": {
"@mui/base": "packages/mui-base/build",
Expand All @@ -40,7 +40,7 @@
"@mui/types": "packages/mui-types/build",
"@mui/utils": "packages/mui-utils/build",
"@mui-internal/docs-utils": "packages/docs-utils",
"@mui-internal/typescript-to-proptypes": "packages/typescript-to-proptypes"
"@mui/internal-scripts": "packages-internal/scripts"
},
"sandboxes": [
"/examples/material-ui-cra-ts",
Expand Down
2 changes: 1 addition & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
/packages/zero-runtime/tests/fixtures/
/packages/zero-next-plugin/loader.js
# Ignore fixtures
/packages/typescript-to-proptypes/test/*/*
/packages-internal/scripts/typescript-to-proptypes/test/*/*
/test/bundling/fixtures/**/*.fixture.js
# just an import that reports eslint errors depending on whether the fixture (which is not checked in) exists
/test/bundling/fixtures/create-react-app/src/index.js
Expand Down
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ module.exports = {
},
},
{
files: ['packages/typescript-to-proptypes/src/**/*.ts'],
files: ['packages-internal/scripts/typescript-to-proptypes/src/**/*.ts'],
rules: {
// Working with flags is common in TypeScript compiler
'no-bitwise': 'off',
Expand Down
2 changes: 2 additions & 0 deletions .github/styles/Blog/NamingConventions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,5 @@ swap:
Javascript: JavaScript
css: CSS
Css: CSS
NPM: npm # https://css-tricks.com/start-sentence-npm/
Github: GitHub
1 change: 1 addition & 0 deletions .github/styles/Blog/NoCompanyName.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ exceptions:
- 'MUI Core'
- 'MUI Toolpad'
- 'MUI Connect'
- 'MUI organization' # valid use of a regular space
48 changes: 24 additions & 24 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ This release was mostly about 🐛 bug fixes and 📚 documentation improvements

### Core

- [blog] Add post about upcoming plans for Base UI (#40882) @danilo-leal
- [blog] Add post about upcoming plans for Base UI (#40882) @danilo-leal
- [core] Simplify CodeSandbox reproduction @oliviertassinari
- [core] Missing redirection @oliviertassinari
- [core] Export functions from `copyFiles` script to reuse in MUI X repo (#40970) @cherniavskii
Expand Down Expand Up @@ -119,7 +119,7 @@ A big thanks to the 17 contributors who made this release possible. Here are som
### Docs

- &#8203;<!-- 34 -->[base-ui] Update usage.md (#40916) @adebiyial
- &#8203;<!-- 33 -->[base-ui] Improve Base UI traffic from Material UI (#40875) @oliviertassinari
- &#8203;<!-- 33 -->[base-ui] Improve Base UI traffic from Material UI (#40875) @oliviertassinari
- &#8203;<!-- 32 -->[base-ui] Change Radio component terminology from Button to Group (#40888) @danilo-leal
- &#8203;<!-- 42 -->[base-ui] Remove redundant "Styled" prefix (#40478) @oliviertassinari
- &#8203;<!-- 48 -->[base-ui] Update listbox slot style in demo (#40952) @sai6855
Expand Down Expand Up @@ -156,7 +156,7 @@ A big thanks to the 17 contributors who made this release possible. Here are som
- &#8203;<!-- 07 -->[website] Fix broken link @oliviertassinari
- &#8203;<!-- 06 -->[website] Fix heading structure (#40912) @oliviertassinari
- &#8203;<!-- 05 -->[website] Add Customer Support Agent role to careers page (#40890) @rluzists1
- &#8203;<!-- 04 -->[website] Refine the Material UI homepage demo (#40881) @danilo-leal
- &#8203;<!-- 04 -->[website] Refine the Material UI homepage demo (#40881) @danilo-leal
- &#8203;<!-- 03 -->[website] Use em-dash when relevant over hyphen @oliviertassinari
- &#8203;<!-- 03 -->[zero] Fix build for demo next.js app (#40854) @brijeshb42

Expand Down Expand Up @@ -217,7 +217,7 @@ This release was mostly about 🐛 bug fixes and 📚 documentation improvements
- &#8203;<!-- 30 -->Fix build @oliviertassinari
- &#8203;<!-- 29 -->Add support pages for each product @oliviertassinari
- &#8203;<!-- 28 -->Add survey banner to docs and website (#40553) @joserodolfofreitas
- &#8203;<!-- 24 -->[Menu] Fix hydration mismatch error on Base UI's Menu docs (#40758) @michaldudak
- &#8203;<!-- 24 -->[Menu] Fix hydration mismatch error on Base UI's Menu docs (#40758) @michaldudak
- &#8203;<!-- 25 -->[material-nextjs] Add theming and configuration content to the page (#40626) @siriwatknp

### Core
Expand All @@ -242,7 +242,7 @@ This release was mostly about 🐛 bug fixes and 📚 documentation improvements
- &#8203;<!-- 23 -->[examples] Fix build on Next.js Pages Router examples (#40665) @oliviertassinari
- &#8203;<!-- 18 -->[test] Speed up the envinfo test (#40669) @michaldudak
- &#8203;<!-- 17 -->[typescript-to-proptypes] Allow to represent dates as `PropTypes.object` (#40774) @flaviendelangle
- &#8203;<!-- 14 -->[website] Add new Base UI role (#40773) @colmtuite
- &#8203;<!-- 14 -->[website] Add new Base UI role (#40773) @colmtuite
- &#8203;<!-- 13 -->[website] Fix a couple of rough edges (#40849) @danilo-leal
- &#8203;<!-- 12 -->[website] Small polishing after latest changes to the theme (#40846) @zanivan
- &#8203;<!-- 11 -->[website] Polish some pages and stray components (#40797) @danilo-leal
Expand Down Expand Up @@ -1324,7 +1324,7 @@ A big thanks to the 17 contributors who made this release possible. Here are som
- [core] Update eslint rules (#39178) @romgrk
- [core] Fix Greg GitHub slug @oliviertassinari
- [core] Priority Support casing normalization @oliviertassinari
- [website] Add Heat map in pricing page (#39269) @oliviertassinari
- [website] Add Heatmap in pricing page (#39269) @oliviertassinari
- [website] Update `React Engineer - xCharts` Ashby link (#39172) @DanailH
- [website] Add Charts to the pricing table (#38680) @alexfauquette
- [website] Polish career experience @oliviertassinari
Expand Down Expand Up @@ -2692,7 +2692,7 @@ A big thanks to the 25 contributors who made this release possible. Here are som
- [docs] Fix link to Joy UI GitHub issues @oliviertassinari
- [docs] Show default value for `filterOptions` prop in Autocomplete's API docs (#37230) @ZeeshanTamboli
- [docs] Add summary and improve `test_static` CI doc in CONTRIBUTING readme file (#36711) @kriskw1999
- [docs] Update theme customization typescript (#35551) @siriwatknp
- [docs] Update theme customization TypeScript (#35551) @siriwatknp
- [docs] Add Joy Frames X web blocks template (#37203) @siriwatknp
- [docs] Change Base UI `alpha` to `beta` in README (#37228) @ZeeshanTamboli
- [docs] Improve Base UI overview page (#37227) @mnajdova
Expand Down Expand Up @@ -2731,14 +2731,14 @@ A big thanks to the 18 contributors who made this release possible. Here are som

- [Input][joy] Improve alignment on date fields (#37146) @wewakekumar
- [Alery][joy] Turn JS test to TS test (#37077) @hbjORbj
- [AspectRatio][joy] js test replaced with ts test (#37087) @PunitSoniME
- [Badge][AvatarGroup][joy] js test replaced with ts test (#37089) @PunitSoniME
- [AspectRatio][joy] js test replaced with TypeScript test (#37087) @PunitSoniME
- [Badge][AvatarGroup][joy] js test replaced with TypeScript test (#37089) @PunitSoniME
- [Box][Card][MenuList][joy] Turn JS test to TS test (#37126) @uuxxx
- [List][Menu][joy] Turn JS test to TS test (#37123) @uuxxx
- [test][Joy] Remove duplicate Avatar test (#37201) @zignis
- [test][joy] js test cases converted to ts (#37117) @PunitSoniME
- [Button][joy] Convert Button test to typescript (#37181) @akash191095
- [CardContent][CardCover][CardOverflow][Chip][ChipDelete][joy] js text case converted to ts (#37116) @PunitSoniME
- [test][joy] js test cases converted to TypeScript (#37117) @PunitSoniME
- [Button][joy] Convert Button test to TypeScript (#37181) @akash191095
- [CardContent][CardCover][CardOverflow][Chip][ChipDelete][joy] js text case converted to TypeScript (#37116) @PunitSoniME
- [Radio][IconButton][Checkbox][Option][joy] Switch to TypeScript unit test (#37137) @DerTimonius

### `@mui/[email protected]`
Expand Down Expand Up @@ -3436,7 +3436,7 @@ A big thanks to the 17 contributors who made this release possible. Here are som
- &#8203;<!-- 15 -->[docs][joy] Build TS versions for Checkbox component demos (#36381) @sai6855
- &#8203;<!-- 14 -->[docs][joy] Build TS versions for Select component demos (#36380) @sai6855
- &#8203;<!-- 13 -->[docs][joy] Build TS versions for Typography component demos (#36378) @varunmulay22
- &#8203;<!-- 12 -->[docs][joy] Add typescript demos for `Divider` (#36374) @sai6855
- &#8203;<!-- 12 -->[docs][joy] Add TypeScript demos for `Divider` (#36374) @sai6855
- &#8203;<!-- 11 -->[docs][joy] Build TS versions for Textarea component demos (#36371) @varunmulay22
- &#8203;<!-- 10 -->[docs][joy] Build TS versions for Link component demos (#36366) @hbjORbj

Expand Down Expand Up @@ -4156,7 +4156,7 @@ A big thanks to the 19 contributors who made this release possible. Here are som

- [Alert] Update icon color in all variants (#35414) @danilo-leal
- [Select] Fix `MenuProps.PopoverClasses` being overriden (#35394) @vitorfrs-dev
- [SwipeableDrawer] Fixed typescript warning "prop open undefined" (#34710) @kraftware
- [SwipeableDrawer] Fix TypeScript warning "prop open undefined" (#34710) @kraftware

### `@mui/[email protected]`

Expand Down Expand Up @@ -5657,7 +5657,7 @@ A big thanks to the 13 contributors who made this release possible. Here are som
### `@mui/[email protected]`

- [base] Remove a type incompatible with TypeScript 3.5 (#33361) @michaldudak
- [BadgeUnstyled] Export BadgeUnstyledOwnProps interface to fix typescript compiler error (#33314) @aaronlademann-wf
- [BadgeUnstyled] Export BadgeUnstyledOwnProps interface to fix TypeScript compiler error (#33314) @aaronlademann-wf
- [TablePaginationUnstyled] Accept callbacks in componentsProps (#33309) @michaldudak

### Docs
Expand Down Expand Up @@ -6827,7 +6827,7 @@ A big thanks to the 16 contributors who made this release possible. Here are som
- &#8203;<!-- 18 -->[docs] Fix maxWidth of scrollable Tabs demos (#31285) @danilo-leal
- &#8203;<!-- 17 -->[docs] Fix icon linking implementation concurrent safe (#30428) @Janpot
- &#8203;<!-- 16 -->[docs] Follow up new doc space issues (#31251) @siriwatknp
- &#8203;<!-- 29 -->[examples] Add `@types/node` to nextjs typescript starter (#30918) @Daggy1234
- &#8203;<!-- 29 -->[examples] Add `@types/node` to Next.js TypeScript starter (#30918) @Daggy1234
- &#8203;<!-- 14 -->[examples] Fix import ThemeProvider from correct package in remix-wit… (#30981) @nnecec
- &#8203;<!-- 25 -->[blog] Simplify the labels (#30921) @oliviertassinari
- &#8203;<!-- 08 -->[l10n] Add Croatian (hr-HR) and Serbian (sr-RS) translation (#30906) @m14d3n
Expand Down Expand Up @@ -7594,7 +7594,7 @@ A big thanks to the 25 contributors who made this release possible. Here are som
### `@mui/[email protected]`

- &#8203;<!-- 06 -->[system] Fix return type of `createBox` (#29989) @mnajdova
- &#8203;<!-- 05 -->[system] Support boolean values in typescript for the `sx` prop when used as array (#29911) @tasugi
- &#8203;<!-- 05 -->[system] Support boolean values in TypeScript for the `sx` prop when used as array (#29911) @tasugi

### `@mui/[email protected]`

Expand Down Expand Up @@ -9462,7 +9462,7 @@ A big thanks to the 18 contributors who made this release possible. Here are som
- &#8203;<!-- 02 -->[docs] Fix small PT typo fix: inciar -> iniciar (#26775) @brunocavalcante
- &#8203;<!-- 03 -->[I10n] Add Chinese (Hong Kong) (zh-HK) locale (#26637) @kshuiroy
- &#8203;<!-- 44 -->[l10n] Add sinhalese (siLK) locale (#26875) @pavinduLakshan
- &#8203;<!-- 39 -->[examples] Rename nextjs typescript theme from tsx to ts (#26862) @Izhaki
- &#8203;<!-- 39 -->[examples] Rename Next.js TypeScript theme from tsx to ts (#26862) @Izhaki

### Core

Expand Down Expand Up @@ -10810,7 +10810,7 @@ A big thanks to the 26 contributors who made this release possible. Here are som
### Docs

- &#8203;<!-- 46 -->[docs] Provide an alternative to right-to-left (#25584) @dariusk
- &#8203;<!-- 45 -->[docs] Add note for typescript on the styled() customization guide (#25576) @mnajdova
- &#8203;<!-- 45 -->[docs] Add note for TypeScript on the styled() customization guide (#25576) @mnajdova
- &#8203;<!-- 44 -->[docs] Replace incorrect instances of defined with define (#25572) @surajpoddar16
- &#8203;<!-- 42 -->[docs] Fix spelling error in roadmap.md file (#25570) @Brlaney
- &#8203;<!-- 37 -->[docs] Migrate Card demos to emotion (#25557) @vicasas
Expand Down Expand Up @@ -12195,7 +12195,7 @@ A big thanks to the 18 contributors who made this release possible. Here are som
- [DatePicker] Add missing exports (#23621) @havgry
- [DatePicker] Add missing TypeScript definitions (#23560) @mbrookes
- [DatePicker] Fix false-positive when validating mask in Safari (#23602) @eps1lon
- [DatePicker] Fix missing manifest for typescript packages (#23564) @eps1lon
- [DatePicker] Fix missing manifest for TypeScript packages (#23564) @eps1lon
- [TimePicker] Prevent scroll when interacting with the clock (#23563) @knightss27

### Docs
Expand Down Expand Up @@ -14298,28 +14298,28 @@ A big thanks to the 33 contributors who made this release possible. Here are som
+</Accordion>
```

- [BottomNavigation] typescript: The `event` in `onChange` is no longer typed as a `React.ChangeEvent` but `React.SyntheticEvent`.
- [BottomNavigation] TypeScript: The `event` in `onChange` is no longer typed as a `React.ChangeEvent` but `React.SyntheticEvent`.

```diff
-<BottomNavigation onChange={(event: React.ChangeEvent<{}>) => {}} />
+<BottomNavigation onChange={(event: React.SyntheticEvent) => {}} />
```

- [Slider] typescript: The `event` in `onChange` is no longer typed as a `React.ChangeEvent` but `React.SyntheticEvent`.
- [Slider] TypeScript: The `event` in `onChange` is no longer typed as a `React.ChangeEvent` but `React.SyntheticEvent`.

```diff
-<Slider onChange={(event: React.ChangeEvent<{}>, value: unknown) => {}} />
+<Slider onChange={(event: React.SyntheticEvent, value: unknown) => {}} />
```

- [Tabs] typescript: The `event` in `onChange` is no longer typed as a `React.ChangeEvent` but `React.SyntheticEvent`.
- [Tabs] TypeScript: The `event` in `onChange` is no longer typed as a `React.ChangeEvent` but `React.SyntheticEvent`.

```diff
-<Tabs onChange={(event: React.ChangeEvent<{}>, value: unknown) => {}} />
+<Tabs onChange={(event: React.SyntheticEvent, value: unknown) => {}} />
```

- [Accordion] typescript: The `event` in `onChange` is no longer typed as a `React.ChangeEvent` but `React.SyntheticEvent`.
- [Accordion] TypeScript: The `event` in `onChange` is no longer typed as a `React.ChangeEvent` but `React.SyntheticEvent`.

```diff
-<Accordion onChange={(event: React.ChangeEvent<{}>, expanded: boolean) => {}} />
Expand Down
14 changes: 7 additions & 7 deletions CHANGELOG.old.md
Original file line number Diff line number Diff line change
Expand Up @@ -1307,7 +1307,7 @@ Here are some highlights ✨:
- [ci] Fix heap out of memory in azure pipelines (#19825) @eps1lon
- [core] Migrate to import \* as React from 'react' (#19802) @TrySound
- [test] Fix defaultProps overriding props (#19858) @eps1lon
- [test] Test against typescript nightlies (#19857) @eps1lon
- [test] Test against TypeScript nightlies (#19857) @eps1lon

## 4.9.4

Expand Down Expand Up @@ -2226,7 +2226,7 @@ Here are some highlights ✨:
- [ExpansionPanelSummary] Test in StrictMode (#17873) @eps1lon
- [FormControlLabel] Add missing CSS class keys to TS (#17963) @itayyehezkel
- [Link] Warn when using plain function component in `component` (#17825) @Nikhil-Pavan-Sai
- [ListSubheader] Reduce specificity of typescript type (#17715) @sakulstra
- [ListSubheader] Reduce specificity of TypeScript type (#17715) @sakulstra
- [Menu] Add new context menu demo (#17839) @SarthakC
- [Modal] Fix tabIndex customization (#17939) @Cyrus-d
- [Modal] Improve Gatsby support (#17972) @sreetej1998
Expand Down Expand Up @@ -2639,7 +2639,7 @@ Here are some highlights ✨:
- [docs] Add script to merge MD icon tags with synonyms (#17312) @mbrookes
- [docs] Batch small changes (#17268) @oliviertassinari
- [docs] Fix more SEO issue report @oliviertassinari
- [docs] Add typescript version of paperbase theme (#17213) @eps1lon
- [docs] Add TypeScript version of paperbase theme (#17213) @eps1lon
- [docs] Improve /customization/typography/ (#17307) @meebix
- [docs] Improve grammar in snackbars (#17296) @chaseholdren
- [docs] Notification for v4.4.0 @oliviertassinari
Expand Down Expand Up @@ -4340,7 +4340,7 @@ This release fixes an important regression with TypeScript: https://github.com/m
- [docs] Fix typo in simple breadcrumbs example (#14575) @AndrewUsher
- [blog] Material UI Developer Survey 2019 (#14614) @oliviertassinari
- [docs] Change Gitter to Spectrum (#14668) @mbrookes
- [docs] Update link to http://cssinjs.org/jss-api/ (#14788) @monicatie
- [docs] Update link to https://cssinjs.org/jss-api/ (#14788) @monicatie
- [docs] Add Algolia metadata (#14835) @oliviertassinari
- [docs] Improve overrides.md wording (#14403) @i0
- [docs] Grammar fix (#14960) @nateq314
Expand Down Expand Up @@ -7324,7 +7324,7 @@ N/A
#### Labs

- [SpeedDial] Fix classes prop description (#11599) @mbrookes
- [Slider] Misc fixes towards standard Material UI patterns (#11605) @mbrookes
- [Slider] Misc fixes towards standard Material UI patterns (#11605) @mbrookes
- [Slider] Fire the right event on mouseDown (#11642) @acroyear
- [SpeedDial] Add type definitions to lab, so SpeedDial can be use with TypeScript project (#11542) @TR3MIC

Expand Down Expand Up @@ -13906,7 +13906,7 @@ _Dec. 15, 2014_
### Breaking Changes

- Removed PaperButton - Use FlatButton, RaisedButton, or FloatingActionButton
- Removed Roboto font import (#104) - Be sure to [include the Roboto](http://www.google.com/fonts#UsePlace:use/Collection:Roboto:400,300,500) font in your project.
- Removed Roboto font import (#104) - Be sure to [include the Roboto](https://fonts.google.com/specimen/Roboto) font in your project.

### General

Expand Down Expand Up @@ -14077,7 +14077,7 @@ _Nov. 11, 2014_
- Changed project structure to be less confusing. Material UI components/styles live in the src directory.
Docs site code lives in the docs directory. This still allows us to easily test components in the docs site
as we are working on them
- Added .editorconfig to help keep code formatting consistent among contributors. See http://editorconfig.org/
- Added .editorconfig to help keep code formatting consistent among contributors. See https://editorconfig.org/
- Fixed drop down display issue in safari
- Fixed nested menu arrow icon
- Added hover transitions to menus
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Contributing to Material UI, Base UI, MUI System, Joy UI
# Contributing to Material UI, Base UI, MUI System, Joy UI

If you're reading this, you're awesome!
Thank you for being a part of the community and helping us make these projects great.
Expand Down
Loading

0 comments on commit b41efdc

Please sign in to comment.