Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into pnpm
Browse files Browse the repository at this point in the history
  • Loading branch information
michaldudak committed Jan 2, 2024
2 parents 3972866 + c47d176 commit 0caa58e
Show file tree
Hide file tree
Showing 67 changed files with 87 additions and 24 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -676,7 +676,7 @@ jobs:
DANGER_COMMAND: prepareBundleSizeReport
- run:
name: build @mui packages
command: pnpm lerna run --ignore @mui/icons-material --concurrency 8 --scope "@mui/*" build
command: pnpm lerna run --ignore @mui/icons-material --concurrency 6 --scope "@mui/*" build
- run:
name: create @mui/material canary distributable
command: |
Expand Down
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,4 @@ docs/public/static/blog/feed/*
# vale downloaded config
.github/styles/Google
.github/styles/write-good

.nx/cache
.nx/cache
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@
"karma-mocha": "^2.0.1",
"karma-sourcemap-loader": "^0.4.0",
"karma-webpack": "^5.0.0",
"lerna": "8.0.1",
"lerna": "^8.0.1",
"lodash": "^4.17.21",
"markdownlint-cli2": "^0.11.0",
"mocha": "^10.2.0",
Expand Down
1 change: 1 addition & 0 deletions packages/mui-lab/src/Alert/Alert.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
'use client';
import * as React from 'react';
import Alert from '@mui/material/Alert';

Expand Down
1 change: 1 addition & 0 deletions packages/mui-lab/src/AlertTitle/AlertTitle.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
'use client';
import * as React from 'react';
import AlertTitle from '@mui/material/AlertTitle';

Expand Down
1 change: 1 addition & 0 deletions packages/mui-lab/src/Autocomplete/Autocomplete.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
'use client';
import * as React from 'react';
import Autocomplete from '@mui/material/Autocomplete';

Expand Down
1 change: 1 addition & 0 deletions packages/mui-lab/src/AvatarGroup/AvatarGroup.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
'use client';
import * as React from 'react';
import AvatarGroup from '@mui/material/AvatarGroup';

Expand Down
1 change: 1 addition & 0 deletions packages/mui-lab/src/CalendarPicker/CalendarPicker.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
'use client';
/* eslint-disable @typescript-eslint/no-unused-vars */
import * as React from 'react';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
'use client';
/* eslint-disable @typescript-eslint/no-unused-vars */
import * as React from 'react';

Expand Down
1 change: 1 addition & 0 deletions packages/mui-lab/src/ClockPicker/ClockPicker.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
'use client';
/* eslint-disable @typescript-eslint/no-unused-vars */
import * as React from 'react';

Expand Down
1 change: 1 addition & 0 deletions packages/mui-lab/src/DatePicker/DatePicker.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
'use client';
/* eslint-disable @typescript-eslint/no-unused-vars */
import * as React from 'react';

Expand Down
1 change: 1 addition & 0 deletions packages/mui-lab/src/DateTimePicker/DateTimePicker.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
'use client';
/* eslint-disable @typescript-eslint/no-unused-vars */
import * as React from 'react';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
'use client';
/* eslint-disable @typescript-eslint/no-unused-vars */
import * as React from 'react';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
'use client';
/* eslint-disable @typescript-eslint/no-unused-vars */
import * as React from 'react';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
'use client';
/* eslint-disable @typescript-eslint/no-unused-vars */
import * as React from 'react';

Expand Down
1 change: 1 addition & 0 deletions packages/mui-lab/src/LoadingButton/LoadingButton.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
'use client';
import * as React from 'react';
import PropTypes from 'prop-types';
import { chainPropTypes } from '@mui/utils';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
'use client';
import * as React from 'react';

let warnedOnce = false;
Expand Down
1 change: 1 addition & 0 deletions packages/mui-lab/src/Masonry/Masonry.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
'use client';
import { unstable_composeClasses as composeClasses } from '@mui/base';
import * as ReactDOM from 'react-dom';
import { styled, useThemeProps } from '@mui/material/styles';
Expand Down
1 change: 1 addition & 0 deletions packages/mui-lab/src/MobileDatePicker/MobileDatePicker.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
'use client';
/* eslint-disable @typescript-eslint/no-unused-vars */
import * as React from 'react';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
'use client';
/* eslint-disable @typescript-eslint/no-unused-vars */
import * as React from 'react';

Expand Down
1 change: 1 addition & 0 deletions packages/mui-lab/src/MobileTimePicker/MobileTimePicker.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
'use client';
/* eslint-disable @typescript-eslint/no-unused-vars */
import * as React from 'react';

Expand Down
1 change: 1 addition & 0 deletions packages/mui-lab/src/MonthPicker/MonthPicker.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
'use client';
/* eslint-disable @typescript-eslint/no-unused-vars */
import * as React from 'react';

Expand Down
1 change: 1 addition & 0 deletions packages/mui-lab/src/Pagination/Pagination.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
'use client';
import * as React from 'react';
import Pagination from '@mui/material/Pagination';

Expand Down
1 change: 1 addition & 0 deletions packages/mui-lab/src/Pagination/usePagination.js
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
'use client';
export { default } from '@mui/material/usePagination';
1 change: 1 addition & 0 deletions packages/mui-lab/src/PaginationItem/PaginationItem.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
'use client';
import * as React from 'react';
import PaginationItem from '@mui/material/PaginationItem';

Expand Down
1 change: 1 addition & 0 deletions packages/mui-lab/src/PickersDay/PickersDay.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
'use client';
/* eslint-disable @typescript-eslint/no-unused-vars */
import * as React from 'react';

Expand Down
1 change: 1 addition & 0 deletions packages/mui-lab/src/Rating/Rating.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
'use client';
import * as React from 'react';
import Rating from '@mui/material/Rating';

Expand Down
1 change: 1 addition & 0 deletions packages/mui-lab/src/Skeleton/Skeleton.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
'use client';
import * as React from 'react';
import Skeleton from '@mui/material/Skeleton';

Expand Down
1 change: 1 addition & 0 deletions packages/mui-lab/src/SpeedDial/SpeedDial.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
'use client';
import * as React from 'react';
import SpeedDial from '@mui/material/SpeedDial';

Expand Down
1 change: 1 addition & 0 deletions packages/mui-lab/src/SpeedDialAction/SpeedDialAction.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
'use client';
import * as React from 'react';
import SpeedDialAction from '@mui/material/SpeedDialAction';

Expand Down
1 change: 1 addition & 0 deletions packages/mui-lab/src/SpeedDialIcon/SpeedDialIcon.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
'use client';
import * as React from 'react';
import SpeedDialIcon from '@mui/material/SpeedDialIcon';

Expand Down
1 change: 1 addition & 0 deletions packages/mui-lab/src/StaticDatePicker/StaticDatePicker.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
'use client';
/* eslint-disable @typescript-eslint/no-unused-vars */
import * as React from 'react';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
'use client';
/* eslint-disable @typescript-eslint/no-unused-vars */
import * as React from 'react';

Expand Down
1 change: 1 addition & 0 deletions packages/mui-lab/src/StaticTimePicker/StaticTimePicker.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
'use client';
/* eslint-disable @typescript-eslint/no-unused-vars */
import * as React from 'react';

Expand Down
1 change: 1 addition & 0 deletions packages/mui-lab/src/TabContext/TabContext.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
'use client';
import * as React from 'react';
import PropTypes from 'prop-types';

Expand Down
1 change: 1 addition & 0 deletions packages/mui-lab/src/TabList/TabList.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
'use client';
import * as React from 'react';
import PropTypes from 'prop-types';
import Tabs from '@mui/material/Tabs';
Expand Down
1 change: 1 addition & 0 deletions packages/mui-lab/src/TabPanel/TabPanel.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
'use client';
import * as React from 'react';
import PropTypes from 'prop-types';
import clsx from 'clsx';
Expand Down
1 change: 1 addition & 0 deletions packages/mui-lab/src/TimePicker/TimePicker.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
'use client';
/* eslint-disable @typescript-eslint/no-unused-vars */
import * as React from 'react';

Expand Down
1 change: 1 addition & 0 deletions packages/mui-lab/src/Timeline/Timeline.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
'use client';
import * as React from 'react';
import PropTypes from 'prop-types';
import clsx from 'clsx';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
'use client';
import * as React from 'react';
import PropTypes from 'prop-types';
import clsx from 'clsx';
Expand Down
1 change: 1 addition & 0 deletions packages/mui-lab/src/TimelineContent/TimelineContent.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
'use client';
import * as React from 'react';
import PropTypes from 'prop-types';
import clsx from 'clsx';
Expand Down
1 change: 1 addition & 0 deletions packages/mui-lab/src/TimelineDot/TimelineDot.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
'use client';
import * as React from 'react';
import PropTypes from 'prop-types';
import clsx from 'clsx';
Expand Down
1 change: 1 addition & 0 deletions packages/mui-lab/src/TimelineItem/TimelineItem.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
'use client';
import * as React from 'react';
import PropTypes from 'prop-types';
import clsx from 'clsx';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
'use client';
import * as React from 'react';
import PropTypes from 'prop-types';
import clsx from 'clsx';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
'use client';
import * as React from 'react';
import PropTypes from 'prop-types';
import clsx from 'clsx';
Expand Down
1 change: 1 addition & 0 deletions packages/mui-lab/src/ToggleButton/ToggleButton.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
'use client';
import * as React from 'react';
import ToggleButton from '@mui/material/ToggleButton';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
'use client';
import * as React from 'react';
import ToggleButtonGroup from '@mui/material/ToggleButtonGroup';

Expand Down
1 change: 1 addition & 0 deletions packages/mui-lab/src/TreeItem/TreeItem.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
'use client';
import * as React from 'react';

let warnedOnce = false;
Expand Down
1 change: 1 addition & 0 deletions packages/mui-lab/src/TreeView/TreeView.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
'use client';
/* eslint-disable @typescript-eslint/no-unused-vars */
import * as React from 'react';

Expand Down
1 change: 1 addition & 0 deletions packages/mui-lab/src/YearPicker/YearPicker.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
'use client';
/* eslint-disable @typescript-eslint/no-unused-vars */
import * as React from 'react';

Expand Down
1 change: 1 addition & 0 deletions packages/mui-lab/src/internal/svg-icons/ArrowDropDown.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
'use client';
import * as React from 'react';
import { createSvgIcon } from '@mui/material/utils';

Expand Down
1 change: 1 addition & 0 deletions packages/mui-lab/src/internal/svg-icons/ArrowDropDown.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
'use client';
import * as React from 'react';
import { createSvgIcon } from '@mui/material/utils';

Expand Down
1 change: 1 addition & 0 deletions packages/mui-lab/src/internal/svg-icons/ArrowLeft.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
'use client';
import * as React from 'react';
import { createSvgIcon } from '@mui/material/utils';

Expand Down
1 change: 1 addition & 0 deletions packages/mui-lab/src/internal/svg-icons/ArrowRight.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
'use client';
import * as React from 'react';
import { createSvgIcon } from '@mui/material/utils';

Expand Down
1 change: 1 addition & 0 deletions packages/mui-lab/src/internal/svg-icons/Calendar.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
'use client';
import * as React from 'react';
import { createSvgIcon } from '@mui/material/utils';

Expand Down
1 change: 1 addition & 0 deletions packages/mui-lab/src/internal/svg-icons/Clock.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
'use client';
import * as React from 'react';
import { createSvgIcon } from '@mui/material/utils';

Expand Down
1 change: 1 addition & 0 deletions packages/mui-lab/src/internal/svg-icons/DateRange.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
'use client';
import * as React from 'react';
import { createSvgIcon } from '@mui/material/utils';

Expand Down
1 change: 1 addition & 0 deletions packages/mui-lab/src/internal/svg-icons/Pen.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
'use client';
import * as React from 'react';
import { createSvgIcon } from '@mui/material/utils';

Expand Down
1 change: 1 addition & 0 deletions packages/mui-lab/src/internal/svg-icons/Time.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
'use client';
import * as React from 'react';
import { createSvgIcon } from '@mui/material/utils';

Expand Down
1 change: 0 additions & 1 deletion packages/mui-material/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@
"devDependencies": {
"@mui-internal/babel-macros": "workspace:^",
"@mui-internal/test-utils": "workspace:^",
"@mui/icons-material": "workspace:^",
"@mui/lab": "workspace:*",
"@popperjs/core": "^2.11.8",
"@rollup/plugin-replace": "^5.0.5",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import * as React from 'react';
import { expect } from 'chai';
import { createRenderer, describeConformance } from '@mui-internal/test-utils';
import ArrowBackIcon from '@mui/icons-material/ArrowBack';
import ArrowForwardIcon from '@mui/icons-material/ArrowForward';
import TabScrollButton, { tabScrollButtonClasses as classes } from '@mui/material/TabScrollButton';
import { createSvgIcon } from '@mui/material/utils';

const ArrowBackIcon = createSvgIcon(<path d="M3 3h18v18H3z" />, 'ArrowBack');
const ArrowForwardIcon = createSvgIcon(<path d="M3 3h18v18H3z" />, 'ArrowForward');

describe('<TabScrollButton />', () => {
const defaultProps = {
Expand Down
16 changes: 12 additions & 4 deletions packages/mui-material/src/TablePagination/TablePagination.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,18 @@ import { outlinedInputClasses } from '@mui/material/OutlinedInput';
import { filledInputClasses } from '@mui/material/FilledInput';
import IconButton, { iconButtonClasses } from '@mui/material/IconButton';
import { svgIconClasses } from '@mui/material/SvgIcon';
import ArrowBackIcon from '@mui/icons-material/ArrowBack';
import ArrowForwardIcon from '@mui/icons-material/ArrowForward';
import KeyboardDoubleArrowLeftRoundedIcon from '@mui/icons-material/KeyboardDoubleArrowLeftRounded';
import KeyboardDoubleArrowRightRoundedIcon from '@mui/icons-material/KeyboardDoubleArrowRightRounded';
import { createSvgIcon } from '@mui/material/utils';

const ArrowBackIcon = createSvgIcon(<path d="M3 3h18v18H3z" />, 'ArrowBack');
const ArrowForwardIcon = createSvgIcon(<path d="M3 3h18v18H3z" />, 'ArrowForward');
const KeyboardDoubleArrowLeftRoundedIcon = createSvgIcon(
<path d="M3 3h18v18H3z" />,
'KeyboardDoubleArrowLeftRounded',
);
const KeyboardDoubleArrowRightRoundedIcon = createSvgIcon(
<path d="M3 3h18v18H3z" />,
'KeyboardDoubleArrowRightRounded',
);

describe('<TablePagination />', () => {
const noop = () => {};
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import * as React from 'react';
import { expect } from 'chai';
import { createRenderer, describeConformance } from '@mui-internal/test-utils';
import SortIcon from '@mui/icons-material/Sort';
import TableSortLabel, { tableSortLabelClasses as classes } from '@mui/material/TableSortLabel';
import ButtonBase from '@mui/material/ButtonBase';
import { createSvgIcon } from '@mui/material/utils';

const SortIcon = createSvgIcon(<path d="M3 3h18v18H3z" />, 'Sort');

describe('<TableSortLabel />', () => {
const { render } = createRenderer();
Expand Down
6 changes: 4 additions & 2 deletions packages/mui-material/src/Tabs/Tabs.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,16 @@ import {
strictModeDoubleLoggingSuppressed,
waitFor,
} from '@mui-internal/test-utils';
import ArrowBackIcon from '@mui/icons-material/ArrowBack';
import ArrowForwardIcon from '@mui/icons-material/ArrowForward';
import Tab from '@mui/material/Tab';
import Tabs, { tabsClasses as classes } from '@mui/material/Tabs';
import { svgIconClasses } from '@mui/material/SvgIcon';
import { createTheme, ThemeProvider } from '@mui/material/styles';
import { createSvgIcon } from '@mui/material/utils';
import capitalize from '../utils/capitalize';

const ArrowBackIcon = createSvgIcon(<path d="M3 3h18v18H3z" />, 'ArrowBack');
const ArrowForwardIcon = createSvgIcon(<path d="M3 3h18v18H3z" />, 'ArrowForward');

function findScrollButton(container, direction) {
return container.querySelector(`svg[data-testid="KeyboardArrow${capitalize(direction)}Icon"]`);
}
Expand Down
4 changes: 4 additions & 0 deletions packages/rsc-builder/buildRsc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@ const PROJECTS: Project[] = [
additionalPaths: ['custom'],
additionalFiles: ['src/utils/createSvgIcon.js'],
},
{
name: 'lab',
rootPath: path.join(process.cwd(), 'packages/mui-lab'),
},
];

async function processFile(
Expand Down
Loading

0 comments on commit 0caa58e

Please sign in to comment.