From f5c755e0d0bdb8790a38e8e828f4b529f86edeec Mon Sep 17 00:00:00 2001 From: Lukas Tyla Date: Fri, 23 Dec 2022 12:12:00 +0200 Subject: [PATCH 1/3] bump monorepo --- yarn.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yarn.lock b/yarn.lock index f853cc219d11..a1505e818ecf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2442,8 +2442,8 @@ react-transition-group "^4.4.5" "@mui/monorepo@https://github.com/mui/material-ui.git#master": - version "5.10.16" - resolved "https://github.com/mui/material-ui.git#b8e30a4b7c668ede64d5f1f76c00401590c977c1" + version "5.11.0" + resolved "https://github.com/mui/material-ui.git#b533db294fa00ce736a8943c1265e476dd34fbd4" "@mui/private-theming@^5.10.16": version "5.10.16" From ced9bd4718ce9ed4f3327e31d5fcb23168a2f87f Mon Sep 17 00:00:00 2001 From: Lukas Tyla Date: Fri, 23 Dec 2022 12:13:31 +0200 Subject: [PATCH 2/3] Update constants path --- docs/config.js | 1 + docs/next.config.js | 4 ++-- docs/src/modules/constants.js | 1 - 3 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 docs/config.js delete mode 100644 docs/src/modules/constants.js diff --git a/docs/config.js b/docs/config.js new file mode 100644 index 000000000000..49a7ebd2de7f --- /dev/null +++ b/docs/config.js @@ -0,0 +1 @@ +module.exports = require('@mui/monorepo/docs/config'); diff --git a/docs/next.config.js b/docs/next.config.js index 9c007a1aa772..34a436e5420e 100644 --- a/docs/next.config.js +++ b/docs/next.config.js @@ -6,7 +6,7 @@ const pkg = require('../package.json'); const dataGridPkg = require('../packages/grid/x-data-grid/package.json'); const datePickersPkg = require('../packages/x-date-pickers/package.json'); const { findPages } = require('./src/modules/utils/find'); -const { LANGUAGES, LANGUAGES_SSR } = require('./src/modules/constants'); +const { LANGUAGES, LANGUAGES_SSR } = require('./config'); const workspaceRoot = path.join(__dirname, '../'); @@ -63,7 +63,7 @@ module.exports = withDocsInfra({ 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/src/modules/constants.js b/docs/src/modules/constants.js deleted file mode 100644 index a0dfc4ee82cd..000000000000 --- a/docs/src/modules/constants.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../../node_modules/@mui/monorepo/docs/src/modules/constants'); From 84ed5532649997719a8ce2e095126ff1b3c61dcb Mon Sep 17 00:00:00 2001 From: Lukas Tyla Date: Fri, 23 Dec 2022 12:14:20 +0200 Subject: [PATCH 3/3] Update imports after monorepo structure change --- babel.config.js | 2 +- docs/babel.config.js | 2 +- .../api/buildComponentsDocumentation.ts | 18 +++++++++--------- .../api/buildGridEventsDocumentation.ts | 2 +- .../api/buildInterfacesDocumentation.ts | 2 +- docs/scripts/generateProptypes.ts | 2 +- docs/scripts/tsconfig.json | 2 +- webpackBaseConfig.js | 5 +---- 8 files changed, 16 insertions(+), 19 deletions(-) diff --git a/babel.config.js b/babel.config.js index 7c3c81afdbd9..5779ff856acb 100644 --- a/babel.config.js +++ b/babel.config.js @@ -14,7 +14,7 @@ const defaultAlias = { '@mui/x-license-pro': resolveAliasPath('./packages/x-license-pro/src'), '@mui/x-date-pickers': resolveAliasPath('./packages/x-date-pickers/src'), '@mui/x-date-pickers-pro': resolveAliasPath('./packages/x-date-pickers-pro/src'), - '@mui/markdown': '@mui/monorepo/docs/packages/markdown', + '@mui/markdown': '@mui/monorepo/packages/markdown', 'typescript-to-proptypes': '@mui/monorepo/packages/typescript-to-proptypes/src', docs: resolveAliasPath('./node_modules/@mui/monorepo/docs'), test: resolveAliasPath('./test'), diff --git a/docs/babel.config.js b/docs/babel.config.js index dbe331f47068..179d6d94faef 100644 --- a/docs/babel.config.js +++ b/docs/babel.config.js @@ -9,7 +9,7 @@ const alias = { '@mui/x-date-pickers-pro': '../packages/x-date-pickers-pro/src', '@mui/x-license-pro': '../packages/x-license-pro/src', '@mui/docs': '../node_modules/@mui/monorepo/packages/mui-docs/src', - '@mui/markdown': '../node_modules/@mui/monorepo/docs/packages/markdown', + '@mui/markdown': '../node_modules/@mui/monorepo/packages/markdown', '@mui/monorepo': '../node_modules/@mui/monorepo', '@mui/joy': '../node_modules/@mui/monorepo/packages/mui-joy/src', docs: '../node_modules/@mui/monorepo/docs', diff --git a/docs/scripts/api/buildComponentsDocumentation.ts b/docs/scripts/api/buildComponentsDocumentation.ts index 9eee350247ad..2995cf27b0ad 100644 --- a/docs/scripts/api/buildComponentsDocumentation.ts +++ b/docs/scripts/api/buildComponentsDocumentation.ts @@ -2,27 +2,27 @@ import * as ttp from '@mui/monorepo/packages/typescript-to-proptypes/src/index'; import * as fse from 'fs-extra'; import fs from 'fs'; import path from 'path'; -import parseStyles, { Styles } from '@mui/monorepo/docs/src/modules/utils/parseStyles'; +import parseStyles, { Styles } from '@mui/monorepo/packages/api-docs-builder/utils/parseStyles'; import fromPairs from 'lodash/fromPairs'; import createDescribeableProp, { DescribeablePropDescriptor, -} from '@mui/monorepo/docs/src/modules/utils/createDescribeableProp'; -import generatePropDescription from '@mui/monorepo/docs/src/modules/utils/generatePropDescription'; +} from '@mui/monorepo/packages/api-docs-builder/utils/createDescribeableProp'; +import generatePropDescription from '@mui/monorepo/packages/api-docs-builder/utils/generatePropDescription'; import { parse as parseDoctrine } from 'doctrine'; import generatePropTypeDescription, { getChained, -} from '@mui/monorepo/docs/src/modules/utils/generatePropTypeDescription'; -import parseTest from '@mui/monorepo/docs/src/modules/utils/parseTest'; +} from '@mui/monorepo/packages/api-docs-builder/utils/generatePropTypeDescription'; +import parseTest from '@mui/monorepo/packages/api-docs-builder/utils/parseTest'; import kebabCase from 'lodash/kebabCase'; -import { LANGUAGES } from 'docs/src/modules/constants'; -import { findPagesMarkdownNew } from '@mui/monorepo/docs/src/modules/utils/find'; +import { LANGUAGES } from 'docs/config'; +import findPagesMarkdownNew from '@mui/monorepo/packages/api-docs-builder/utils/findPagesMarkdown'; import { defaultHandlers, parse as docgenParse, ReactDocgenApi } from 'react-docgen'; import { renderInline as renderMarkdownInline, getHeaders, getTitle, -} from '@mui/monorepo/docs/packages/markdown'; -import { getLineFeed } from '@mui/monorepo/docs/scripts/helpers'; +} from '@mui/monorepo/packages/markdown'; +import { getLineFeed } from '@mui/monorepo/packages/docs-utilities'; import { unstable_generateUtilityClass as generateUtilityClass } from '@mui/utils'; import { DocumentedInterfaces, diff --git a/docs/scripts/api/buildGridEventsDocumentation.ts b/docs/scripts/api/buildGridEventsDocumentation.ts index 8b2b2d3ccfb4..d9fe8a13a134 100644 --- a/docs/scripts/api/buildGridEventsDocumentation.ts +++ b/docs/scripts/api/buildGridEventsDocumentation.ts @@ -1,6 +1,6 @@ import * as ts from 'typescript'; import path from 'path'; -import { renderInline as renderMarkdownInline } from '@mui/monorepo/docs/packages/markdown'; +import { renderInline as renderMarkdownInline } from '@mui/monorepo/packages/markdown'; import { DocumentedInterfaces, getSymbolDescription, diff --git a/docs/scripts/api/buildInterfacesDocumentation.ts b/docs/scripts/api/buildInterfacesDocumentation.ts index 454d2d377914..f1e9712e4855 100644 --- a/docs/scripts/api/buildInterfacesDocumentation.ts +++ b/docs/scripts/api/buildInterfacesDocumentation.ts @@ -2,7 +2,7 @@ import * as ts from 'typescript'; import * as prettier from 'prettier'; import kebabCase from 'lodash/kebabCase'; import path from 'path'; -import { renderInline as renderMarkdownInline } from '@mui/monorepo/docs/packages/markdown'; +import { renderInline as renderMarkdownInline } from '@mui/monorepo/packages/markdown'; import { escapeCell, getSymbolDescription, diff --git a/docs/scripts/generateProptypes.ts b/docs/scripts/generateProptypes.ts index 89be0a486ba8..b101054c1512 100644 --- a/docs/scripts/generateProptypes.ts +++ b/docs/scripts/generateProptypes.ts @@ -3,7 +3,7 @@ import * as path from 'path'; import * as fse from 'fs-extra'; import * as prettier from 'prettier'; import * as ttp from '@mui/monorepo/packages/typescript-to-proptypes/src'; -import { fixBabelGeneratorIssues, fixLineEndings } from 'docs/scripts/helpers'; +import { fixBabelGeneratorIssues, fixLineEndings } from '@mui/monorepo/packages/docs-utilities'; import { getTypeScriptProjects } from './getTypeScriptProjects'; const prettierConfig = prettier.resolveConfig.sync(process.cwd(), { diff --git a/docs/scripts/tsconfig.json b/docs/scripts/tsconfig.json index f6ec683df344..6c77015928a3 100644 --- a/docs/scripts/tsconfig.json +++ b/docs/scripts/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "../../tsconfig.json", "include": [ - "../../node_modules/@mui/monorepo/docs/types/react-docgen.d.ts", + "../../node_modules/@mui/monorepo/packages/api-docs-builder/react-docgen.d.ts", "api/buildApi.ts", "i18n.js" ], diff --git a/webpackBaseConfig.js b/webpackBaseConfig.js index ed97191fac06..131a86817003 100644 --- a/webpackBaseConfig.js +++ b/webpackBaseConfig.js @@ -20,10 +20,7 @@ module.exports = { '@mui/x-date-pickers': path.resolve(__dirname, './packages/x-date-pickers/src'), '@mui/x-date-pickers-pro': path.resolve(__dirname, './packages/x-date-pickers-pro/src'), '@mui/x-license-pro': path.resolve(__dirname, './packages/x-license-pro/src'), - '@mui/markdown': path.resolve( - __dirname, - './node_modules/@mui/monorepo/docs/packages/markdown', - ), + '@mui/markdown': path.resolve(__dirname, './node_modules/@mui/monorepo/packages/markdown'), docs: path.resolve(__dirname, './node_modules/@mui/monorepo/docs'), docsx: path.resolve(__dirname, './docs'), },