diff --git a/docs/next.config.mjs b/docs/next.config.mjs index 39599d9a081..6fcee955439 100644 --- a/docs/next.config.mjs +++ b/docs/next.config.mjs @@ -17,25 +17,25 @@ const withTM = require('next-transpile-modules')(['@mui/monorepo'], { const pkg = require('../package.json'); const { findPages } = require('./src/modules/utils/find'); -const MONORPO_PATH = path.resolve(currentDirectory, './node_modules/@mui/monorepo'); +const MONOREPO_PATH = path.resolve(currentDirectory, './node_modules/@mui/monorepo'); const MONOREPO_PACKAGES = { - '@mui/base': path.resolve(MONORPO_PATH, './packages/mui-base/src'), - '@mui/codemod': path.resolve(MONORPO_PATH, './packages/mui-codemod/src'), - '@mui/docs': path.resolve(MONORPO_PATH, './packages/mui-docs/src'), - '@mui/envinfo': path.resolve(MONORPO_PATH, './packages/mui-envinfo'), - '@mui/icons-material': path.resolve(MONORPO_PATH, './packages/mui-icons-material/lib'), - '@mui/joy': path.resolve(MONORPO_PATH, './packages/mui-joy/src'), - '@mui/lab': path.resolve(MONORPO_PATH, './packages/mui-lab/src'), - '@mui/material': path.resolve(MONORPO_PATH, './packages/mui-material/src'), - '@mui/material-next': path.resolve(MONORPO_PATH, './packages/mui-material-next/src'), - '@mui/private-theming': path.resolve(MONORPO_PATH, './packages/mui-private-theming/src'), - '@mui/styled-engine': path.resolve(MONORPO_PATH, './packages/mui-styled-engine/src'), - '@mui/styled-engine-sc': path.resolve(MONORPO_PATH, './packages/mui-styled-engine-sc/src'), - '@mui/styles': path.resolve(MONORPO_PATH, './packages/mui-styles'), - '@mui/system': path.resolve(MONORPO_PATH, './packages/mui-system/src'), - '@mui/types': path.resolve(MONORPO_PATH, './packages/mui-types'), - '@mui/markdown': path.resolve(MONORPO_PATH, './docs/packages/markdown'), - '@mui/utils': path.resolve(MONORPO_PATH, './packages/mui-utils'), + '@mui/base': path.resolve(MONOREPO_PATH, './packages/mui-base/src'), + '@mui/codemod': path.resolve(MONOREPO_PATH, './packages/mui-codemod/src'), + '@mui/docs': path.resolve(MONOREPO_PATH, './packages/mui-docs/src'), + '@mui/envinfo': path.resolve(MONOREPO_PATH, './packages/mui-envinfo'), + '@mui/icons-material': path.resolve(MONOREPO_PATH, './packages/mui-icons-material/lib'), + '@mui/joy': path.resolve(MONOREPO_PATH, './packages/mui-joy/src'), + '@mui/lab': path.resolve(MONOREPO_PATH, './packages/mui-lab/src'), + '@mui/material': path.resolve(MONOREPO_PATH, './packages/mui-material/src'), + '@mui/material-next': path.resolve(MONOREPO_PATH, './packages/mui-material-next/src'), + '@mui/private-theming': path.resolve(MONOREPO_PATH, './packages/mui-private-theming/src'), + '@mui/styled-engine': path.resolve(MONOREPO_PATH, './packages/mui-styled-engine/src'), + '@mui/styled-engine-sc': path.resolve(MONOREPO_PATH, './packages/mui-styled-engine-sc/src'), + '@mui/styles': path.resolve(MONOREPO_PATH, './packages/mui-styles'), + '@mui/system': path.resolve(MONOREPO_PATH, './packages/mui-system/src'), + '@mui/types': path.resolve(MONOREPO_PATH, './packages/mui-types'), + '@mui/markdown': path.resolve(MONOREPO_PATH, './packages/markdown'), + '@mui/utils': path.resolve(MONOREPO_PATH, './packages/mui-utils'), }; export default withTM( @@ -56,8 +56,8 @@ export default withTM( ...config.resolve, alias: { ...config.resolve.alias, - docs: path.resolve(MONORPO_PATH, './docs'), - [path.resolve(MONORPO_PATH, './packages/mui-utils/macros/MuiError.macro')]: 'react', + docs: path.resolve(MONOREPO_PATH, './docs'), + [path.resolve(MONOREPO_PATH, './packages/mui-utils/macros/MuiError.macro')]: 'react', ...MONOREPO_PACKAGES, }, }, @@ -70,7 +70,7 @@ export default withTM( oneOf: [ { resourceQuery: /@mui\/markdown/, - use: require.resolve('@mui/monorepo/docs/packages/markdown/loader'), + use: require.resolve('@mui/monorepo/packages/markdown/loader'), }, ], }, diff --git a/docs/pages/_app.js b/docs/pages/_app.js index 6868d137a6d..75a66a4fff2 100644 --- a/docs/pages/_app.js +++ b/docs/pages/_app.js @@ -133,8 +133,6 @@ function AppWrapper(props) { } }, []); - const activePage = findActivePage(pages, router.pathname); - let fonts = []; if (router.pathname.match(/onepirate/)) { fonts = [ @@ -142,7 +140,11 @@ function AppWrapper(props) { ]; } - const pageContextValue = React.useMemo(() => ({ activePage, pages }), [activePage]); + const pageContextValue = React.useMemo(() => { + const { activePage, activePageParents } = findActivePage(pages, router.pathname); + + return { activePage, activePageParents, pages }; + }, [router.pathname]); return ( diff --git a/yarn.lock b/yarn.lock index c495c059a3b..a6f3bd97f7d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1948,8 +1948,8 @@ react-transition-group "^4.4.5" "@mui/monorepo@https://github.com/mui/material-ui.git": - version "5.10.14" - resolved "https://github.com/mui/material-ui.git#764faaf1ed158402c17ead5498defedd73dd317d" + version "5.11.5" + resolved "https://github.com/mui/material-ui.git#f13e534c3add5da6f8037ba7086f0db571ec7729" "@mui/private-theming@^5.11.2": version "5.11.2"