Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[core] Update monorepo #4854

Merged
merged 3 commits into from
May 12, 2022
Merged

[core] Update monorepo #4854

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4f5d137
bump monorepo
cherniavskii May 12, 2022
5babfff
add alias for @mui/joy
cherniavskii May 12, 2022
a52d3cd
use MuiPage type
cherniavskii May 12, 2022
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
1 change: 1 addition & 0 deletions docs/babel.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ const alias = {
'@mui/docs': '../node_modules/@mui/monorepo/packages/mui-docs/src',
'@mui/markdown': '../node_modules/@mui/monorepo/docs/packages/markdown',
'@mui/monorepo': '../node_modules/@mui/monorepo',
'@mui/joy': '../node_modules/@mui/monorepo/packages/mui-joy/src',
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

_document in monorepo started to use @mui/joy in mui/material-ui#32576

Initially, I wanted to add @mui/joy dependency to our docs/package.json, but it can get out of sync with monorepo quickly. I think using alias is a better.

docs: '../node_modules/@mui/monorepo/docs', // TODO remove
docsx: './',
};
Expand Down
4 changes: 3 additions & 1 deletion docs/data/pages.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
const pages = [
import type { MuiPage } from '@mui/monorepo/docs/src/MuiPage';

const pages: MuiPage[] = [
{
pathname: '/x/advanced-components',
title: 'Overview',
Expand Down
4 changes: 2 additions & 2 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2600,8 +2600,8 @@
react-transition-group "^4.4.2"

"@mui/monorepo@https://github.com/mui/material-ui.git#master":
version "5.6.4"
resolved "https://github.com/mui/material-ui.git#a09acabfc4affd241b227ebb9418c271fba873b8"
version "5.7.0"
resolved "https://github.com/mui/material-ui.git#40643a8a32d93d6a838ed50851d48239ee4a7d28"

"@mui/private-theming@^5.6.2":
version "5.6.2"
Expand Down