Skip to content

Commit

Permalink
[core] Upgrade monorepo (#7307)
Browse files Browse the repository at this point in the history
  • Loading branch information
LukasTy authored Dec 27, 2022
1 parent 6cce314 commit 196bedc
Show file tree
Hide file tree
Showing 12 changed files with 21 additions and 24 deletions.
2 changes: 1 addition & 1 deletion babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
Expand Down
2 changes: 1 addition & 1 deletion docs/babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
1 change: 1 addition & 0 deletions docs/config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module.exports = require('@mui/monorepo/docs/config');
4 changes: 2 additions & 2 deletions docs/next.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -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, '../');

Expand Down Expand Up @@ -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'),
},
],
},
Expand Down
18 changes: 9 additions & 9 deletions docs/scripts/api/buildComponentsDocumentation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion docs/scripts/api/buildGridEventsDocumentation.ts
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion docs/scripts/api/buildInterfacesDocumentation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion docs/scripts/generateProptypes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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(), {
Expand Down
2 changes: 1 addition & 1 deletion docs/scripts/tsconfig.json
Original file line number Diff line number Diff line change
@@ -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"
],
Expand Down
1 change: 0 additions & 1 deletion docs/src/modules/constants.js

This file was deleted.

5 changes: 1 addition & 4 deletions webpackBaseConfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
},
Expand Down
4 changes: 2 additions & 2 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 196bedc

Please sign in to comment.