Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[core] Bump monorepo #10619

Merged
merged 8 commits into from
Oct 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ const defaultAlias = {
'@mui/markdown': '@mui/monorepo/packages/markdown',
'@mui-internal/api-docs-builder': '@mui/monorepo/packages/api-docs-builder',
'@mui-internal/docs-utilities': '@mui/monorepo/packages/docs-utilities',
'@mui-internal/test-utils': resolveAliasPath(
'./node_modules/@mui/monorepo/packages/test-utils/src',
),
LukasTy marked this conversation as resolved.
Show resolved Hide resolved
'typescript-to-proptypes': '@mui/monorepo/packages/typescript-to-proptypes/src',
docs: resolveAliasPath('./node_modules/@mui/monorepo/docs'),
test: resolveAliasPath('./test'),
Expand Down
5 changes: 3 additions & 2 deletions docs/data/date-pickers/base-concepts/ComponentFamilies.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import * as React from 'react';
import Link from 'next/link';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In theory, we would need to import from https://github.com/mui/material-ui/blob/master/docs/src/modules/components/Link.tsx to support multi language, but since we are not actively supporting Chinese, it's transparent for now.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It will be removed in a followup PR #10661

import dayjs from 'dayjs';
import { DemoContainer, DemoItem } from '@mui/x-date-pickers/internals/demo';
import { AdapterDayjs } from '@mui/x-date-pickers/AdapterDayjs';
Expand All @@ -16,9 +17,9 @@ function ProLabel({ children }) {
return (
<Stack direction="row" spacing={0.5} component="span">
<Tooltip title="Included in Pro package">
<a href="/x/introduction/licensing/#pro-plan">
<Link href="/x/introduction/licensing/#pro-plan">
<span className="plan-pro" />
</a>
</Link>
</Tooltip>
<span>{children}</span>
</Stack>
Expand Down
5 changes: 3 additions & 2 deletions docs/data/date-pickers/base-concepts/ComponentFamilies.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import * as React from 'react';
import Link from 'next/link';
import dayjs from 'dayjs';
import { DemoContainer, DemoItem } from '@mui/x-date-pickers/internals/demo';
import { AdapterDayjs } from '@mui/x-date-pickers/AdapterDayjs';
Expand All @@ -16,9 +17,9 @@ function ProLabel({ children }: { children: React.ReactNode }) {
return (
<Stack direction="row" spacing={0.5} component="span">
<Tooltip title="Included in Pro package">
<a href="/x/introduction/licensing/#pro-plan">
<Link href="/x/introduction/licensing/#pro-plan">
<span className="plan-pro" />
</a>
</Link>
</Tooltip>
<span>{children}</span>
</Stack>
Expand Down
5 changes: 3 additions & 2 deletions docs/data/date-pickers/overview/CommonlyUsedComponents.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import * as React from 'react';
import Link from 'next/link';
import Tooltip from '@mui/material/Tooltip';
import Stack from '@mui/material/Stack';
import { DemoContainer, DemoItem } from '@mui/x-date-pickers/internals/demo';
Expand All @@ -20,9 +21,9 @@ function Label({ componentName, valueType, isProOnly }) {
return (
<Stack direction="row" spacing={0.5} component="span">
<Tooltip title="Included on Pro package">
<a href="/x/introduction/licensing/#pro-plan">
<Link href="/x/introduction/licensing/#pro-plan">
<span className="plan-pro" />
</a>
</Link>
</Tooltip>
{content}
</Stack>
Expand Down
5 changes: 3 additions & 2 deletions docs/data/date-pickers/overview/CommonlyUsedComponents.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import * as React from 'react';
import Link from 'next/link';
import Tooltip from '@mui/material/Tooltip';
import Stack from '@mui/material/Stack';
import { DemoContainer, DemoItem } from '@mui/x-date-pickers/internals/demo';
Expand Down Expand Up @@ -28,9 +29,9 @@ function Label({
return (
<Stack direction="row" spacing={0.5} component="span">
<Tooltip title="Included on Pro package">
<a href="/x/introduction/licensing/#pro-plan">
<Link href="/x/introduction/licensing/#pro-plan">
<span className="plan-pro" />
</a>
</Link>
</Tooltip>
{content}
</Stack>
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@
"@mui/material": "^5.14.11",
"@mui/monorepo": "https://github.com/mui/material-ui.git#master",
"@mui/utils": "^5.14.11",
"@next/eslint-plugin-next": "^13.5.4",
"@octokit/plugin-retry": "^6.0.1",
"@octokit/rest": "^20.0.2",
"@playwright/test": "1.38.1",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { createRenderer, act } from '@mui/monorepo/test/utils';
import { createRenderer, act } from '@mui-internal/test-utils';
import { expect } from 'chai';
import {
DataGridPremium as DataGrid,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { createRenderer, screen, userEvent, within, act } from '@mui/monorepo/test/utils';
import { createRenderer, screen, userEvent, within, act } from '@mui-internal/test-utils';
import { expect } from 'chai';
import { getColumnHeaderCell, getColumnValues } from 'test/utils/helperFn';
import { SinonSpy, spy } from 'sinon';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as React from 'react';
import { stub, SinonStub } from 'sinon';
import { expect } from 'chai';
import { spyApi, getCell } from 'test/utils/helperFn';
import { createRenderer, fireEvent, act, userEvent } from '@mui/monorepo/test/utils';
import { createRenderer, fireEvent, act, userEvent } from '@mui-internal/test-utils';
import {
DataGridPremium,
DataGridPremiumProps,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
GridColDef,
} from '@mui/x-data-grid-premium';
// @ts-ignore Remove once the test utils are typed
import { createRenderer, fireEvent, userEvent, waitFor } from '@mui/monorepo/test/utils';
import { createRenderer, fireEvent, userEvent, waitFor } from '@mui-internal/test-utils';
import { expect } from 'chai';
import { stub, SinonStub, spy } from 'sinon';
import { getCell, getColumnValues, sleep } 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 { act, createRenderer, fireEvent } from '@mui/monorepo/test/utils';
import { act, createRenderer, fireEvent } from '@mui-internal/test-utils';
import { expect } from 'chai';
import { DataGridPremium, gridClasses } from '@mui/x-data-grid-premium';
import { getCell, getColumnHeaderCell } from 'test/utils/helperFn';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
DataGridPremiumProps,
GridActionsCellItem,
} from '@mui/x-data-grid-premium';
import { createRenderer, screen, fireEvent, act } from '@mui/monorepo/test/utils';
import { createRenderer, screen, fireEvent, act } from '@mui-internal/test-utils';
import { spy, SinonSpy } from 'sinon';
import { expect } from 'chai';
import Excel from 'exceljs';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react';
import addYears from 'date-fns/addYears';
import { expect } from 'chai';
import { createRenderer, screen, waitFor } from '@mui/monorepo/test/utils';
import { createRenderer, screen, waitFor } from '@mui-internal/test-utils';
import { DataGridPremium } from '@mui/x-data-grid-premium';
import { generateLicense, LicenseInfo } from '@mui/x-license-pro';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
act,
userEvent,
waitFor,
} from '@mui/monorepo/test/utils';
} from '@mui-internal/test-utils';
import {
microtasks,
getColumnHeaderCell,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { createRenderer } from '@mui/monorepo/test/utils';
import { createRenderer } from '@mui-internal/test-utils';
import * as React from 'react';
import { expect } from 'chai';
import {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
GridRowsProp,
useGridApiRef,
} from '@mui/x-data-grid-premium';
import { createRenderer, act } from '@mui/monorepo/test/utils';
import { createRenderer, act } from '@mui-internal/test-utils';
import { expect } from 'chai';
import { getColumnValues } from 'test/utils/helperFn';

Expand Down
2 changes: 1 addition & 1 deletion packages/grid/x-data-grid-premium/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"include": [
"src/**/*",
"../../test/utils/addChaiAssertions.ts",
"../../node_modules/@mui/monorepo/test/utils/initMatchers.ts",
"../../node_modules/@mui/monorepo/packages/test-utils/src/initMatchers.ts",
"../../../node_modules/@mui/material/themeCssVarsAugmentation"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { expect } from 'chai';
import axe from 'axe-core';
import { DataGridPro } from '@mui/x-data-grid-pro';
import { useBasicDemoData } from '@mui/x-data-grid-generator';
import { createRenderer } from '@mui/monorepo/test/utils';
import { createRenderer } from '@mui-internal/test-utils';

function logViolations(violations: any) {
if (violations.length !== 0) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
GridCellModes,
} from '@mui/x-data-grid-pro';
import { getBasicGridData } from '@mui/x-data-grid-generator';
import { createRenderer, fireEvent, act, userEvent } from '@mui/monorepo/test/utils';
import { createRenderer, fireEvent, act, userEvent } from '@mui-internal/test-utils';
import { getCell, spyApi } from 'test/utils/helperFn';

describe('<DataGridPro /> - Cell editing', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as React from 'react';
import { GridApi, useGridApiRef, DataGridPro, DataGridProProps } from '@mui/x-data-grid-pro';
import { createRenderer, fireEvent, act, userEvent } from '@mui/monorepo/test/utils';
import { createRenderer, fireEvent, act, userEvent } from '@mui-internal/test-utils';
import { expect } from 'chai';
import { stub, SinonStub } 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 '@mui/monorepo/test/utils';
import { createRenderer, fireEvent, screen } from '@mui-internal/test-utils';
import { expect } from 'chai';
import { gridClasses, DataGridPro, DataGridProProps } 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 @@ -18,7 +18,7 @@ import {
createEvent,
act,
userEvent,
} from '@mui/monorepo/test/utils';
} from '@mui-internal/test-utils';
import { getCell, getColumnHeaderCell, getColumnHeadersTextContent } from 'test/utils/helperFn';

// TODO Move to utils
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as React from 'react';
import { expect } from 'chai';
import { createRenderer, fireEvent, createEvent, act } from '@mui/monorepo/test/utils';
import { createRenderer, fireEvent, createEvent, act } from '@mui-internal/test-utils';
import {
getColumnHeadersTextContent,
getColumnHeaderCell,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { createRenderer, fireEvent, act, userEvent } from '@mui/monorepo/test/utils';
import { createRenderer, fireEvent, act, userEvent } from '@mui-internal/test-utils';
import { expect } from 'chai';
import { DataGridPro, GridApi, useGridApiRef, GridColDef, gridClasses } from '@mui/x-data-grid-pro';
import { getActiveCell, getCell, 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, act } from '@mui/monorepo/test/utils';
import { createRenderer, fireEvent, screen, act } from '@mui-internal/test-utils';
import { expect } from 'chai';
import { spy } from 'sinon';
import {
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, fireEvent, act } from '@mui/monorepo/test/utils';
import { createRenderer, fireEvent, act } from '@mui-internal/test-utils';
import {
DataGridPro,
DataGridProProps,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { createRenderer, EventType, fireEvent, userEvent } from '@mui/monorepo/test/utils';
import { createRenderer, EventType, fireEvent, userEvent } from '@mui-internal/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 @@ -18,7 +18,7 @@ import {
waitFor,
act,
userEvent,
} from '@mui/monorepo/test/utils';
} from '@mui-internal/test-utils';
import { getRow, getCell, getColumnValues, getRows } from 'test/utils/helperFn';

const isJSDOM = /jsdom/.test(window.navigator.userAgent);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
renderEditInputCell,
renderEditSingleSelectCell,
} from '@mui/x-data-grid-pro';
import { act, createRenderer, fireEvent, screen, userEvent } from '@mui/monorepo/test/utils';
import { act, createRenderer, fireEvent, screen, userEvent } from '@mui-internal/test-utils';
import { expect } from 'chai';
import { getCell, spyApi } from 'test/utils/helperFn';
import { spy, SinonSpy } 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, fireEvent, screen, act } from '@mui/monorepo/test/utils';
import { createRenderer, fireEvent, screen, act } from '@mui-internal/test-utils';
import { expect } from 'chai';
import {
DataGridPro,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
GridApi,
DataGridProProps,
} from '@mui/x-data-grid-pro';
import { createRenderer, act } from '@mui/monorepo/test/utils';
import { createRenderer, act } from '@mui-internal/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 @@ -7,7 +7,7 @@ import {
GridApi,
useGridApiRef,
} from '@mui/x-data-grid-pro';
import { createRenderer, act } from '@mui/monorepo/test/utils';
import { createRenderer, act } from '@mui-internal/test-utils';

const isJSDOM = /jsdom/.test(window.navigator.userAgent);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
gridExpandedSortedRowEntriesSelector,
gridClasses,
} from '@mui/x-data-grid-pro';
import { createRenderer, fireEvent, screen, act, within } from '@mui/monorepo/test/utils';
import { createRenderer, fireEvent, screen, act, within } from '@mui-internal/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, act } from '@mui/monorepo/test/utils';
import { createRenderer, screen, act } from '@mui-internal/test-utils';
import { expect } from 'chai';
import { createTheme, ThemeProvider } from '@mui/material/styles';
import { GridApi, useGridApiRef, DataGridPro, ptBR, DataGridProProps } from '@mui/x-data-grid-pro';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { createRenderer, fireEvent, act } from '@mui/monorepo/test/utils';
import { createRenderer, fireEvent, act } from '@mui-internal/test-utils';
import { getColumnHeaderCell, getColumnValues, getRow } from 'test/utils/helperFn';
import { expect } from 'chai';
import {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as React from 'react';
import { expect } from 'chai';
import { createRenderer, screen, waitFor } from '@mui/monorepo/test/utils';
import { createRenderer, screen, waitFor } from '@mui-internal/test-utils';
import { DataGridPro } from '@mui/x-data-grid-pro';
import { LicenseInfo } from '@mui/x-license-pro';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { createRenderer, act } from '@mui/monorepo/test/utils';
import { createRenderer, act } from '@mui-internal/test-utils';
import { getColumnValues } from 'test/utils/helperFn';
import * as React from 'react';
import { expect } from 'chai';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
DataGridProProps,
} from '@mui/x-data-grid-pro';
import { getBasicGridData } from '@mui/x-data-grid-generator';
import { createRenderer, screen, fireEvent, act } from '@mui/monorepo/test/utils';
import { createRenderer, screen, fireEvent, act } from '@mui-internal/test-utils';

describe('<DataGridPro /> - Print export', () => {
const { render, clock } = createRenderer();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
} from '@mui/x-data-grid-pro';
import Portal from '@mui/material/Portal';
import { getBasicGridData } from '@mui/x-data-grid-generator';
import { createRenderer, fireEvent, act, userEvent, screen } from '@mui/monorepo/test/utils';
import { createRenderer, fireEvent, act, userEvent, screen } from '@mui-internal/test-utils';
import { getCell, getRow, spyApi } from 'test/utils/helperFn';

describe('<DataGridPro /> - Row editing', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import {
act,
userEvent,
waitFor,
} from '@mui/monorepo/test/utils';
} from '@mui-internal/test-utils';
import {
getActiveCell,
getActiveColumnHeader,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react';
import { expect } from 'chai';
import { spy } from 'sinon';
import { createRenderer, fireEvent, createEvent } from '@mui/monorepo/test/utils';
import { createRenderer, fireEvent, createEvent } from '@mui-internal/test-utils';
import { getCell, getRowsFieldContent } from 'test/utils/helperFn';
import { useGridApiRef, DataGridPro, gridClasses, GridApi } from '@mui/x-data-grid-pro';
import { useBasicDemoData } from '@mui/x-data-grid-generator';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as React from 'react';
import { expect } from 'chai';
import { spy } from 'sinon';
import { getCell, getColumnValues, getRows } from 'test/utils/helperFn';
import { createRenderer, fireEvent, screen, act } from '@mui/monorepo/test/utils';
import { createRenderer, fireEvent, screen, act } from '@mui-internal/test-utils';
import {
GridApi,
useGridApiRef,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { createRenderer, fireEvent, act, userEvent } from '@mui/monorepo/test/utils';
import { createRenderer, fireEvent, act, userEvent } from '@mui-internal/test-utils';
import { spy } from 'sinon';
import { expect } from 'chai';
import {
Expand Down
Loading