Skip to content

Commit

Permalink
Update MUI monorepo (#1883)
Browse files Browse the repository at this point in the history
Co-authored-by: Jan Potoms <[email protected]>
  • Loading branch information
apedroferreira and Janpot authored Apr 19, 2023
1 parent 618de50 commit e3aabbf
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 5 deletions.
2 changes: 1 addition & 1 deletion SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
The versions of the project that are currently supported with security updates.

| Version | Supported |
| ------- | ------------------ |
| :------ | :----------------- |
| <=1.0 | :white_check_mark: |

## Reporting a vulnerability
Expand Down
15 changes: 13 additions & 2 deletions docs/next.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export default withTM(
SOURCE_CODE_ROOT_URL: 'https://github.com/mui/mui-toolpad/blob/master',
SOURCE_CODE_REPO: 'https://github.com/mui/mui-toolpad',
},
webpack: (config) => {
webpack: (config, options) => {
return {
...config,
resolve: {
Expand All @@ -70,7 +70,18 @@ export default withTM(
oneOf: [
{
resourceQuery: /@mui\/markdown/,
use: require.resolve('@mui/monorepo/packages/markdown/loader'),
use: [
options.defaultLoaders.babel,
{
loader: require.resolve('@mui/monorepo/packages/markdown/loader'),
options: {
env: {
SOURCE_CODE_REPO: options.config.env.SOURCE_CODE_REPO,
LIB_VERSION: options.config.env.LIB_VERSION,
},
},
},
],
},
],
},
Expand Down
4 changes: 2 additions & 2 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1375,8 +1375,8 @@
react-transition-group "^4.4.5"

"@mui/monorepo@https://github.com/mui/material-ui.git":
version "5.11.5"
resolved "https://github.com/mui/material-ui.git#f13e534c3add5da6f8037ba7086f0db571ec7729"
version "5.12.0"
resolved "https://github.com/mui/material-ui.git#66a69ececd29cafd55ba7d52a56442771aa46b6e"

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

0 comments on commit e3aabbf

Please sign in to comment.