Skip to content

Commit e3b43ab

Browse files
authored
Merge pull request #8230 from marmelab/update-lerna
Fix development dependencies causing security alerts
2 parents 351b2fa + 8427f56 commit e3b43ab

File tree

4 files changed

+1040
-812
lines changed

4 files changed

+1040
-812
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"jest-circus": "26.6.0",
5252
"jest-resolve": "26.6.0",
5353
"jest-watch-typeahead": "0.6.1",
54-
"lerna": "~5.1.8",
54+
"lerna": "~5.5.2",
5555
"lint-staged": "^13.0.3",
5656
"lolex": "~2.3.2",
5757
"prettier": "~2.1.1",

packages/ra-ui-materialui/src/detail/TabbedShowLayout.tsx

+5-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,11 @@ export const TabbedShowLayout = (props: TabbedShowLayoutProps) => {
8888
const record = useRecordContext(props);
8989
const nonNullChildren = Children.toArray(children).filter(
9090
child => child !== null
91-
);
91+
) as ReactElement<{
92+
context?: string;
93+
spacing?: ResponsiveStyleValue<number | string>;
94+
divider?: ReactNode;
95+
}>[];
9296
const [tabValue, setTabValue] = useState(0);
9397

9498
const handleTabChange = (event: ChangeEvent<{}>, value: any): void => {

packages/ra-ui-materialui/src/list/BulkActionsToolbar.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ export const BulkActionsToolbar = (props: BulkActionsToolbarProps) => {
7272
</div>
7373
<TopToolbar className={BulkActionsToolbarClasses.topToolbar}>
7474
{Children.map(children, child =>
75-
isValidElement(child)
75+
isValidElement<any>(child)
7676
? cloneElement(child, {
7777
filterValues,
7878
resource,

0 commit comments

Comments
 (0)