Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
d8ae2b8
v6.0.0-alpha.11
brijeshb42 Jun 11, 2024
c1302e7
Bump versions
brijeshb42 Jun 12, 2024
715df3c
Merge branch 'next' of https://github.com/mui/material-ui into v6.0.0…
siriwatknp Jun 12, 2024
95ed43b
restore
siriwatknp Jun 12, 2024
8a138f9
update changelog
siriwatknp Jun 12, 2024
3caa5f8
fix non-breaking space
siriwatknp Jun 12, 2024
dfa8bf9
Merge branch 'next' of https://github.com/mui/material-ui into v6.0.0…
siriwatknp Jun 13, 2024
e57ac7b
add PropsProvider
siriwatknp Jun 13, 2024
ea9650a
migrate to useDefaultProps
siriwatknp Jun 13, 2024
66146d0
run proptypes and docs:api
siriwatknp Jun 13, 2024
672c180
fix lint
siriwatknp Jun 13, 2024
d2ddf3b
fix lint and test
siriwatknp Jun 13, 2024
37c6c5d
fix lint plugin
siriwatknp Jun 13, 2024
4b89434
remove createUseThemeProps
siriwatknp Jun 13, 2024
37e9996
remove useThemeProps
siriwatknp Jun 14, 2024
ba20d00
Merge branch 'next' of https://github.com/mui/material-ui into feat/p…
siriwatknp Jun 14, 2024
0dec6b2
fix lint
siriwatknp Jun 14, 2024
68fd0ca
Merge branch 'next' of https://github.com/mui/material-ui into feat/p…
siriwatknp Jun 17, 2024
57ad7b6
Merge branch 'next' of https://github.com/mui/material-ui into feat/p…
siriwatknp Jun 19, 2024
8f66700
apply suggestion
siriwatknp Jun 19, 2024
e955495
use custom getThemeProps logic
siriwatknp Jun 19, 2024
894a6a4
fix line mismatch
siriwatknp Jun 19, 2024
01b6988
Merge branch 'next' of https://github.com/mui/material-ui into feat/p…
siriwatknp Jun 20, 2024
f2b658a
restore
siriwatknp Jun 20, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Bump versions
  • Loading branch information
brijeshb42 committed Jun 12, 2024
commit c1302e7120fc6bd21dd48c81b7b5425748f48689
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mui/monorepo",
"version": "6.0.0-alpha.10",
"version": "6.0.0-alpha.11",
"private": true,
"scripts": {
"preinstall": "npx only-allow pnpm",
Expand Down
2 changes: 1 addition & 1 deletion packages-internal/scripts/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mui/internal-scripts",
"version": "1.0.9",
"version": "1.0.10",
"author": "MUI Team",
"description": "Utilities supporting MUI libraries build and docs generation. This is an internal package not meant for general use.",
"main": "build/index.js",
Expand Down
2 changes: 1 addition & 1 deletion packages-internal/test-utils/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mui/internal-test-utils",
"version": "1.0.0",
"version": "1.0.1",
"author": "MUI Team",
"description": "Utilities for MUI tests. This is an internal package not meant for general use.",
"main": "./build/index.js",
Expand Down
2 changes: 1 addition & 1 deletion packages/markdown/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mui/internal-markdown",
"version": "1.0.4",
"version": "1.0.5",
"author": "MUI Team",
"description": "MUI markdown parser. This is an internal package not meant for general use.",
"main": "./index.js",
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-babel-macros/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mui/internal-babel-macros",
"version": "1.0.4",
"version": "1.0.5",
"author": "MUI Team",
"description": "MUI Babel macros. This is an internal package not meant for general use.",
"main": "./MuiError.macro.js",
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-base/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mui/base",
"version": "5.0.0-beta.48",
"version": "5.0.0-beta.49",
"private": false,
"author": "MUI Team",
"description": "Base UI is a library of headless ('unstyled') React components and low-level hooks. You gain complete control over your app's CSS and accessibility features.",
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-codemod/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mui/codemod",
"version": "6.0.0-alpha.10",
"version": "6.0.0-alpha.11",
"bin": "./codemod.js",
"private": false,
"author": "MUI Team",
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-core-downloads-tracker/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mui/core-downloads-tracker",
"version": "6.0.0-alpha.10",
"version": "6.0.0-alpha.11",
"private": false,
"author": "MUI Team",
"description": "Internal package to track number of downloads of our design system libraries",
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-docs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mui/docs",
"version": "6.0.0-alpha.10",
"version": "6.0.0-alpha.11",
"private": false,
"author": "MUI Team",
"description": "MUI Docs - Documentation building blocks.",
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-icons-material/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mui/icons-material",
"version": "6.0.0-alpha.10",
"version": "6.0.0-alpha.11",
"private": false,
"author": "MUI Team",
"description": "Material Design icons distributed as SVG React components.",
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-joy/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mui/joy",
"version": "5.0.0-beta.43",
"version": "5.0.0-beta.44",
"private": false,
"author": "MUI Team",
"description": "Joy UI is an open-source React component library that implements MUI's own design principles. It's comprehensive and can be used in production out of the box.",
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-lab/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mui/lab",
"version": "6.0.0-alpha.10",
"version": "6.0.0-alpha.11",
"private": false,
"author": "MUI Team",
"description": "Laboratory for new MUI modules.",
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-material-nextjs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mui/material-nextjs",
"version": "6.0.0-alpha.1",
"version": "6.0.0-alpha.11",
"private": false,
"author": "MUI Team",
"description": "Collection of utilities for integration between Material UI and Next.js.",
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-material/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mui/material",
"version": "6.0.0-alpha.10",
"version": "6.0.0-alpha.11",
"private": false,
"author": "MUI Team",
"description": "Material UI is an open-source React component library that implements Google's Material Design. It's comprehensive and can be used in production out of the box.",
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-private-theming/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mui/private-theming",
"version": "6.0.0-alpha.9",
"version": "6.0.0-alpha.11",
"private": false,
"author": "MUI Team",
"description": "Private - The React theme context to be shared between `@mui/styles` and `@mui/material`.",
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-styled-engine-sc/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mui/styled-engine-sc",
"version": "6.0.0-alpha.25",
"version": "6.0.0-alpha.26",
"private": false,
"author": "MUI Team",
"description": "styled() API wrapper package for styled-components.",
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-styled-engine/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mui/styled-engine",
"version": "6.0.0-alpha.9",
"version": "6.0.0-alpha.11",
"private": false,
"author": "MUI Team",
"description": "styled() API wrapper package for emotion.",
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-styles/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mui/styles",
"version": "6.0.0-alpha.10",
"version": "6.0.0-alpha.11",
"private": false,
"author": "MUI Team",
"description": "MUI Styles - The legacy JSS-based styling solution of Material UI.",
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-system/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mui/system",
"version": "6.0.0-alpha.10",
"version": "6.0.0-alpha.11",
"private": false,
"author": "MUI Team",
"description": "MUI System is a set of CSS utilities to help you build custom designs more efficiently. It makes it possible to rapidly lay out custom designs.",
Expand Down
4 changes: 2 additions & 2 deletions packages/mui-utils/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mui/utils",
"version": "6.0.0-alpha.9",
"version": "6.0.0-alpha.11",
"private": false,
"author": "MUI Team",
"description": "Utility functions for React components.",
Expand Down Expand Up @@ -44,8 +44,8 @@
"react-is": "^18.2.0"
},
"devDependencies": {
"@mui/internal-test-utils": "workspace:^",
"@mui/internal-babel-macros": "workspace:^",
"@mui/internal-test-utils": "workspace:^",
"@mui/types": "workspace:^",
"@types/chai": "^4.3.16",
"@types/mocha": "^10.0.6",
Expand Down
Loading