Skip to content

Commit

Permalink
[core] Rename more instances of Material-UI to MUI (mui#3525)
Browse files Browse the repository at this point in the history
  • Loading branch information
oliviertassinari committed Jan 7, 2022
1 parent 3cb8d3b commit b7fb016
Show file tree
Hide file tree
Showing 69 changed files with 98 additions and 103 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ defaults: &defaults
# expose it globally otherwise we have to thread it from each job to the install command
BROWSERSTACK_FORCE: << pipeline.parameters.browserstack-force >>
REACT_DIST_TAG: << parameters.react-dist-tag >>
working_directory: /tmp/material-ui-x
working_directory: /tmp/mui
docker:
- image: circleci/node:12
# CircleCI has disabled the cache across forks for security reasons.
Expand Down
4 changes: 2 additions & 2 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const baseline = require('@material-ui/monorepo/.eslintrc');
const baseline = require('@mui/monorepo/.eslintrc');
const path = require('path');

module.exports = {
Expand All @@ -20,7 +20,7 @@ module.exports = {
'import/prefer-default-export': 'off',
// TODO move rule into the main repo once it has upgraded
'@typescript-eslint/return-await': 'off',
// TODO move rule into main repo to allow deep @material-ui/monorepo imports
// TODO move rule into main repo to allow deep @mui/monorepo imports
'no-restricted-imports': 'off',
'jsdoc/require-param': ['error', { contexts: ['TSFunctionType'] }],
'jsdoc/require-param-type': ['error', { contexts: ['TSFunctionType'] }],
Expand Down
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/3.pro-support.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@ body:
- type: textarea
attributes:
label: Your environment 🌎
description: Run `npx @material-ui/envinfo` and post the results. If you encounter issues with TypeScript please include the used tsconfig.
description: Run `npx @mui/envinfo` and post the results. If you encounter issues with TypeScript please include the used tsconfig.
value: |
<details>
<summary>`npx @material-ui/envinfo`</summary>
<summary>`npx @mui/envinfo`</summary>
```
Don't forget to mention which browser you used.
Output from `npx @material-ui/envinfo` goes here.
Output from `npx @mui/envinfo` goes here.
```
</details>
2 changes: 1 addition & 1 deletion .stylelintrc.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const baseline = require('@material-ui/monorepo/.stylelintrc');
const baseline = require('@mui/monorepo/.stylelintrc');

module.exports = {
...baseline,
Expand Down
4 changes: 2 additions & 2 deletions babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ const defaultAlias = {
'@mui/x-data-grid-generator': resolveAliasPath('./packages/grid/x-data-grid-generator/src'),
'@mui/x-data-grid-pro': resolveAliasPath('./packages/grid/x-data-grid-pro/src'),
'@mui/x-license-pro': resolveAliasPath('./packages/x-license-pro/src'),
'typescript-to-proptypes': '@material-ui/monorepo/packages/typescript-to-proptypes/src',
docs: resolveAliasPath('./node_modules/@material-ui/monorepo/docs'),
'typescript-to-proptypes': '@mui/monorepo/packages/typescript-to-proptypes/src',
docs: resolveAliasPath('./node_modules/@mui/monorepo/docs'),
};

module.exports = {
Expand Down
10 changes: 5 additions & 5 deletions docs/babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ const alias = {
'@mui/x-data-grid-generator': '../packages/grid/x-data-grid-generator/src',
'@mui/x-data-grid-pro': '../packages/grid/x-data-grid-pro/src',
'@mui/x-license-pro': '../packages/x-license-pro/src',
'@mui/docs': '../node_modules/@material-ui/monorepo/packages/mui-docs/src',
'@mui/markdown': '../node_modules/@material-ui/monorepo/docs/packages/markdown',
'@material-ui/monorepo': '../node_modules/@material-ui/monorepo',
docs: '../node_modules/@material-ui/monorepo/docs', // TODO remove
'@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',
docs: '../node_modules/@mui/monorepo/docs', // TODO remove
docsx: './',
};

Expand Down Expand Up @@ -56,7 +56,7 @@ module.exports = {
/@babel[\\|/]runtime/,
// Fix const foo = /{{(.+?)}}/gs; crashing.
/prettier/,
/@material-ui[\\|/]docs[\\|/]markdown/,
/@mui[\\|/]docs[\\|/]markdown/,
],
env: {
production: {
Expand Down
13 changes: 4 additions & 9 deletions docs/next.config.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const path = require('path');
const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer');
// const withTM = require('next-transpile-modules')(['@material-ui/monorepo']);
const pkg = require('../node_modules/@material-ui/monorepo/package.json');
// const withTM = require('next-transpile-modules')(['@mui/monorepo']);
const pkg = require('../node_modules/@mui/monorepo/package.json');
const { findPages } = require('./src/modules/utils/find');
const { LANGUAGES, LANGUAGES_SSR } = require('./src/modules/constants');

Expand Down Expand Up @@ -62,10 +62,7 @@ module.exports = {
);
}

const includesMonorepo = [
/(@material-ui[\\/]monorepo)$/,
/(@material-ui[\\/]monorepo)[\\/](?!.*node_modules)/,
];
const includesMonorepo = [/(@mui[\\/]monorepo)$/, /(@mui[\\/]monorepo)[\\/](?!.*node_modules)/];

return {
...config,
Expand All @@ -79,9 +76,7 @@ module.exports = {
oneOf: [
{
resourceQuery: /@mui\/markdown/,
use: require.resolve(
'../node_modules/@material-ui/monorepo/docs/packages/markdown/loader',
),
use: require.resolve('../node_modules/@mui/monorepo/docs/packages/markdown/loader'),
},
],
},
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/_document.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import MyDocument from '@material-ui/monorepo/docs/pages/_document';
import MyDocument from '@mui/monorepo/docs/pages/_document';

export default MyDocument;
2 changes: 1 addition & 1 deletion docs/pages/api-docs/data-grid/grid-api.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import MarkdownDocs from '@material-ui/monorepo/docs/src/modules/components/MarkdownDocs';
import MarkdownDocs from '@mui/monorepo/docs/src/modules/components/MarkdownDocs';
import { demos, docs, demoComponents } from './grid-api.md?@mui/markdown';

export default function Page() {
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/api-docs/data-grid/grid-cell-params.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import MarkdownDocs from '@material-ui/monorepo/docs/src/modules/components/MarkdownDocs';
import MarkdownDocs from '@mui/monorepo/docs/src/modules/components/MarkdownDocs';
import { demos, docs, demoComponents } from './grid-cell-params.md?@mui/markdown';

export default function Page() {
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/api-docs/data-grid/grid-col-def.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import MarkdownDocs from '@material-ui/monorepo/docs/src/modules/components/MarkdownDocs';
import MarkdownDocs from '@mui/monorepo/docs/src/modules/components/MarkdownDocs';
import { demos, docs, demoComponents } from './grid-col-def.md?@mui/markdown';

export default function Page() {
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/api-docs/data-grid/grid-csv-export-options.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import MarkdownDocs from '@material-ui/monorepo/docs/src/modules/components/MarkdownDocs';
import MarkdownDocs from '@mui/monorepo/docs/src/modules/components/MarkdownDocs';
import { demos, docs, demoComponents } from './grid-csv-export-options.md?@mui/markdown';

export default function Page() {
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/api-docs/data-grid/grid-print-export-options.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import MarkdownDocs from '@material-ui/monorepo/docs/src/modules/components/MarkdownDocs';
import MarkdownDocs from '@mui/monorepo/docs/src/modules/components/MarkdownDocs';
import { demos, docs, demoComponents } from './grid-print-export-options.md?@mui/markdown';

export default function Page() {
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/api-docs/data-grid/grid-row-params.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import MarkdownDocs from '@material-ui/monorepo/docs/src/modules/components/MarkdownDocs';
import MarkdownDocs from '@mui/monorepo/docs/src/modules/components/MarkdownDocs';
import { demos, docs, demoComponents } from './grid-row-params.md?@mui/markdown';

export default function Page() {
Expand Down
14 changes: 7 additions & 7 deletions docs/scripts/api/buildComponentsDocumentation.ts
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
import * as ttp from '@material-ui/monorepo/packages/typescript-to-proptypes/src/index';
import * as ttp from '@mui/monorepo/packages/typescript-to-proptypes/src/index';
import * as fse from 'fs-extra';
import path from 'path';
import parseStyles, { Styles } from '@material-ui/monorepo/docs/src/modules/utils/parseStyles';
import parseStyles, { Styles } from '@mui/monorepo/docs/src/modules/utils/parseStyles';
import fromPairs from 'lodash/fromPairs';
import createDescribeableProp, {
DescribeablePropDescriptor,
} from '@material-ui/monorepo/docs/src/modules/utils/createDescribeableProp';
import generatePropDescription from '@material-ui/monorepo/docs/src/modules/utils/generatePropDescription';
} from '@mui/monorepo/docs/src/modules/utils/createDescribeableProp';
import generatePropDescription from '@mui/monorepo/docs/src/modules/utils/generatePropDescription';
import { parse as parseDoctrine } from 'doctrine';
import generatePropTypeDescription, {
getChained,
} from '@material-ui/monorepo/docs/src/modules/utils/generatePropTypeDescription';
} from '@mui/monorepo/docs/src/modules/utils/generatePropTypeDescription';
import kebabCase from 'lodash/kebabCase';
import { LANGUAGES } from 'docs/src/modules/constants';
import { findPagesMarkdown } from 'docs/src/modules/utils/find';
import { defaultHandlers, parse as docgenParse, ReactDocgenApi } from 'react-docgen';
import {
renderInline as renderMarkdownInline,
getHeaders,
} from '@material-ui/monorepo/docs/packages/markdown';
import { getLineFeed } from '@material-ui/monorepo/docs/scripts/helpers';
} from '@mui/monorepo/docs/packages/markdown';
import { getLineFeed } from '@mui/monorepo/docs/scripts/helpers';
import createGenerateClassName from '@mui/styles/createGenerateClassName';
import {
DocumentedInterfaces,
Expand Down
2 changes: 1 addition & 1 deletion docs/scripts/api/buildEventsDocumentation.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 '@material-ui/monorepo/docs/packages/markdown';
import { renderInline as renderMarkdownInline } from '@mui/monorepo/docs/packages/markdown';

import {
DocumentedInterfaces,
Expand Down
4 changes: 2 additions & 2 deletions 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 '@material-ui/monorepo/docs/packages/markdown';
import { renderInline as renderMarkdownInline } from '@mui/monorepo/docs/packages/markdown';
import {
escapeCell,
getSymbolDescription,
Expand Down Expand Up @@ -274,7 +274,7 @@ export default function buildInterfacesDocumentation(options: BuildInterfacesDoc
writePrettifiedFile(
path.resolve(outputDirectory, `${slug}.js`),
`import * as React from 'react';
import MarkdownDocs from '@material-ui/monorepo/docs/src/modules/components/MarkdownDocs';
import MarkdownDocs from '@mui/monorepo/docs/src/modules/components/MarkdownDocs';
import { demos, docs, demoComponents } from './${slug}.md?@mui/markdown';
export default function Page() {
Expand Down
2 changes: 1 addition & 1 deletion docs/scripts/generateProptypes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as yargs from 'yargs';
import * as path from 'path';
import * as fse from 'fs-extra';
import * as prettier from 'prettier';
import * as ttp from '@material-ui/monorepo/packages/typescript-to-proptypes/src';
import * as ttp from '@mui/monorepo/packages/typescript-to-proptypes/src';
import { fixBabelGeneratorIssues, fixLineEndings } from 'docs/scripts/helpers';

const tsconfig = ttp.loadConfig(path.resolve(__dirname, '../../tsconfig.json'));
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/@material-ui/monorepo/docs/types/react-docgen.d.ts",
"../../node_modules/@mui/monorepo/docs/types/react-docgen.d.ts",
"api/buildApi.ts",
"i18n.js"
],
Expand Down
2 changes: 1 addition & 1 deletion docs/src/modules/constants.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
module.exports = require('../../../node_modules/@material-ui/monorepo/docs/src/modules/constants');
module.exports = require('../../../node_modules/@mui/monorepo/docs/src/modules/constants');
2 changes: 1 addition & 1 deletion docs/src/pages.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import pages from '@material-ui/monorepo/docs/src/pages';
import pages from '@mui/monorepo/docs/src/pages';

const components = pages[1];
const componentsAPI = pages[2];
Expand Down
2 changes: 1 addition & 1 deletion netlify.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = "1"

[[plugins]]
package = "./node_modules/@material-ui/monorepo/packages/netlify-plugin-cache-docs"
package = "./node_modules/@mui/monorepo/packages/netlify-plugin-cache-docs"
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"benchmark:browser": "yarn workspace benchmark browser",
"docs:dev": "yarn workspace docs dev",
"docs:api": "yarn docs:api:build",
"docs:api:build": "cross-env BABEL_ENV=development babel-node -i \"/node_modules/(?!@material-ui)/\" -x .ts,.tsx,.js ./docs/scripts/api/buildApi.ts ./docs/pages/api-docs/data-grid",
"docs:api:build": "cross-env BABEL_ENV=development babel-node -i \"/node_modules/(?!@mui)/\" -x .ts,.tsx,.js ./docs/scripts/api/buildApi.ts ./docs/pages/api-docs/data-grid",
"docs:build": "yarn workspace docs build",
"docs:export": "yarn workspace docs export",
"docs:typescript:formatted": "yarn workspace docs typescript:transpile",
Expand All @@ -22,7 +22,7 @@
"markdownlint": "markdownlint '**/*.md' --config .markdownlint.jsonc",
"prettier": "node ./scripts/prettier.js --branch master",
"prettier:all": "node ./scripts/prettier.js write",
"proptypes": "cross-env BABEL_ENV=development babel-node -i \"/node_modules/(?!@material-ui)/\" -x .ts,.tsx,.js ./docs/scripts/generateProptypes.ts",
"proptypes": "cross-env BABEL_ENV=development babel-node -i \"/node_modules/(?!@mui)/\" -x .ts,.tsx,.js ./docs/scripts/generateProptypes.ts",
"size:snapshot": "node --max-old-space-size=2048 ./scripts/sizeSnapshot/create",
"size:why": "yarn size:snapshot --analyze --accurateBundles",
"test": "lerna run test --parallel",
Expand Down Expand Up @@ -66,7 +66,7 @@
"@emotion/react": "^11.7.1",
"@emotion/styled": "^11.6.0",
"@eps1lon/enzyme-adapter-react-17": "^0.1.0",
"@material-ui/monorepo": "https://github.com/mui-org/material-ui.git#master",
"@mui/monorepo": "https://github.com/mui-org/material-ui.git#master",
"@mui/icons-material": "^5.2.5",
"@mui/material": "^5.2.7",
"@mui/styles": "^5.2.3",
Expand Down Expand Up @@ -163,7 +163,7 @@
"docs"
],
"nohoist": [
"**/@material-ui/monorepo"
"**/@mui/monorepo"
]
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-plugin-material-ui/src/index.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
const { rules } = require('@material-ui/monorepo/packages/eslint-plugin-material-ui');
const { rules } = require('@mui/monorepo/packages/eslint-plugin-material-ui');

module.exports.rules = rules;
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { createRenderer, describeConformance } from '@material-ui/monorepo/test/utils';
import { createRenderer, describeConformance } from '@mui/monorepo/test/utils';
import {
GridPanel,
gridPanelClasses as classes,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react';
import { spy } from 'sinon';
import { expect } from 'chai';
import { createRenderer } from '@material-ui/monorepo/test/utils';
import { createRenderer } from '@mui/monorepo/test/utils';
import { createUseGridApiEventHandler } from './useGridApiEventHandler';
import { FinalizationRegistryBasedCleanupTracking } from '../../utils/cleanupTracking/FinalizationRegistryBasedCleanupTracking';
import { TimerBasedCleanupTracking } from '../../utils/cleanupTracking/TimerBasedCleanupTracking';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as React from 'react';
import { GridApiRef, useGridApiRef, DataGridPro } from '@mui/x-data-grid-pro';
import { createRenderer, fireEvent } from '@material-ui/monorepo/test/utils';
import { createRenderer, fireEvent } from '@mui/monorepo/test/utils';
import { expect } from 'chai';
import { stub } from 'sinon';
import { getCell } from 'test/utils/helperFn';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { createRenderer, fireEvent, screen } from '@material-ui/monorepo/test/utils';
import { createRenderer, fireEvent, screen } from '@mui/monorepo/test/utils';
import { expect } from 'chai';
import { gridClasses, DataGridPro } from '@mui/x-data-grid-pro';
import { getColumnHeaderCell, getColumnValues } from 'test/utils/helperFn';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
} from '@mui/x-data-grid-pro';
import { spy } from 'sinon';
import { expect } from 'chai';
import { createRenderer, fireEvent, screen, createEvent } from '@material-ui/monorepo/test/utils';
import { createRenderer, fireEvent, screen, createEvent } from '@mui/monorepo/test/utils';
import { getCell, getColumnHeaderCell, getColumnHeadersTextContent } from 'test/utils/helperFn';
import { useData } from 'storybook/src/hooks/useData';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { createRenderer, fireEvent, screen, waitFor } from '@material-ui/monorepo/test/utils';
import { createRenderer, fireEvent, screen, waitFor } from '@mui/monorepo/test/utils';
import { expect } from 'chai';
import { spy } from 'sinon';
import {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { createRenderer, fireEvent } from '@material-ui/monorepo/test/utils';
import { createRenderer, fireEvent } from '@mui/monorepo/test/utils';
import { spy } from 'sinon';
import { expect } from 'chai';
import {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
GridEditSingleSelectCell,
} from '@mui/x-data-grid-pro';
import Portal from '@mui/base/Portal';
import { createRenderer, fireEvent, screen, waitFor, act } from '@material-ui/monorepo/test/utils';
import { createRenderer, fireEvent, screen, waitFor, act } from '@mui/monorepo/test/utils';
import { expect } from 'chai';
import * as React from 'react';
import { getActiveCell, getCell, getRow, getColumnHeaderCell } from 'test/utils/helperFn';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { createRenderer, fireEvent, screen, waitFor } from '@material-ui/monorepo/test/utils';
import { createRenderer, fireEvent, screen, waitFor } from '@mui/monorepo/test/utils';
import { expect } from 'chai';
import {
DataGridPro,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { GridApiRef, GridColumns, useGridApiRef, DataGridPro } from '@mui/x-data-grid-pro';
import { createRenderer } from '@material-ui/monorepo/test/utils';
import { createRenderer } from '@mui/monorepo/test/utils';
import { expect } from 'chai';
import * as React from 'react';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
useGridApiRef,
DataGridPro,
} from '@mui/x-data-grid-pro';
import { createRenderer, fireEvent, screen } from '@material-ui/monorepo/test/utils';
import { createRenderer, fireEvent, screen } from '@mui/monorepo/test/utils';
import { expect } from 'chai';
import * as React from 'react';
import { spy } from 'sinon';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { createRenderer, screen } from '@material-ui/monorepo/test/utils';
import { createRenderer, screen } from '@mui/monorepo/test/utils';
import { expect } from 'chai';
import { createTheme, ThemeProvider } from '@mui/material/styles';
import { GridApiRef, useGridApiRef, DataGridPro, ptBR } from '@mui/x-data-grid-pro';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { createRenderer, act } from '@material-ui/monorepo/test/utils';
import { createRenderer, act } from '@mui/monorepo/test/utils';
import { getColumnValues } from 'test/utils/helperFn';
import * as React from 'react';
import { expect } from 'chai';
Expand Down
Loading

0 comments on commit b7fb016

Please sign in to comment.