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.

Sign up for GitHub

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

Jump to bottom

Update monorepo #2758

Merged
merged 7 commits into from
Oct 6, 2023
Merged

Update monorepo #2758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
018a8dd
Update monorepo
apedroferreira Oct 5, 2023
c5c979b
Fix eslint errors
apedroferreira Oct 5, 2023
c865058
Run Prettier
apedroferreira Oct 5, 2023
6440dca
See if eslint still complains
apedroferreira Oct 6, 2023
2b1a125
Merge remote-tracking branch 'upstream/master' into update-monorepo-0…
apedroferreira Oct 6, 2023
99e006a
Disable rule in those lines
apedroferreira Oct 6, 2023
552608b
Merge remote-tracking branch 'upstream/master' into update-monorepo-0…
apedroferreira Oct 6, 2023
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
4 changes: 0 additions & 4 deletions docs/src/modules/components/SchemaReference.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,9 +234,7 @@ function JsonSchemaItemDisplay({ schema, idPrefix }: JsonSchemaItemDisplayProps)

return (
<React.Fragment>
{/* eslint-disable-next-line @typescript-eslint/no-use-before-define */}
<JsonDescriptionDisplay schema={schema} />
{/* eslint-disable-next-line @typescript-eslint/no-use-before-define */}
<JsonSchemaValueDisplay schema={schema} idPrefix={idPrefix} />
</React.Fragment>
);
Expand Down Expand Up @@ -288,7 +286,6 @@ function JsonSchemaPropertiesDisplay({ schema, idPrefix, open }: JsonSchemaPrope
{interleave(
properties.map(([propName, propSchema]) => {
return (
// eslint-disable-next-line @typescript-eslint/no-use-before-define
<JsonSchemaNameValueDisplay
key={propName}
name={propName}
Expand Down Expand Up @@ -318,7 +315,6 @@ function DefinitionTooltip({ name }: DefinitionTooltipProps) {
return (
<TooltipContext.Provider value={EMPTY_OBJECT}>
<Wrapper>
{/* eslint-disable-next-line @typescript-eslint/no-use-before-define */}
<JsonSchemaNameValueDisplay name={name} schema={definition} idPrefix={`definition`} />
</Wrapper>
</TooltipContext.Provider>
Expand Down
1 change: 0 additions & 1 deletion packages/toolpad-app/src/runtime/ToolpadApp.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -645,7 +645,6 @@ function RenderedNode({ nodeId }: RenderedNodeProps) {
const childNodeGroups = appDom.getChildNodes(dom, node);

return (
/* eslint-disable-next-line @typescript-eslint/no-use-before-define */
<RenderedNodeContent node={node} childNodeGroups={childNodeGroups} Component={Component} />
);
}
Expand Down
18 changes: 6 additions & 12 deletions packages/toolpad-app/src/server/localMode.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,18 +362,12 @@ function expandChildren<N extends appDom.AppDomNode>(
dom: appDom.AppDom,
): (Query | ElementType)[];
function expandChildren<N extends appDom.AppDomNode>(children: N[], dom: appDom.AppDom) {
return (
children
.sort((child1, child2) => {
invariant(
child1.parentIndex && child2.parentIndex,
'Nodes are not children of another node',
);
return appDom.compareFractionalIndex(child1.parentIndex, child2.parentIndex);
})
// eslint-disable-next-line @typescript-eslint/no-use-before-define
.map((child) => expandFromDom(child, dom))
);
return children
.sort((child1, child2) => {
invariant(child1.parentIndex && child2.parentIndex, 'Nodes are not children of another node');
return appDom.compareFractionalIndex(child1.parentIndex, child2.parentIndex);
})
.map((child) => expandFromDom(child, dom));
}

function undefinedWhenEmpty<O extends object | any[]>(obj?: O): O | undefined {
Expand Down
1 change: 1 addition & 0 deletions test/integration/backend-basic/base.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { expectBasicPageContent } from './shared';

test.use({
ignoreConsoleErrors: [
// eslint-disable-next-line material-ui/straight-quotes
/The page’s settings blocked the loading of a resource at http:\/\/localhost:\d+\/favicon\.ico/,
/Failed to load resource: the server responded with a status of 404/,
],
Expand Down
1 change: 1 addition & 0 deletions test/integration/backend-basic/baseProd.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { expectBasicPageContent } from './shared';

test.use({
ignoreConsoleErrors: [
// eslint-disable-next-line material-ui/straight-quotes
/The page’s settings blocked the loading of a resource at http:\/\/localhost:\d+\/favicon\.ico/,
/Failed to load resource: the server responded with a status of 404/,
],
Expand Down
4 changes: 2 additions & 2 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1939,8 +1939,8 @@
react-transition-group "^4.4.5"

"@mui/monorepo@https://github.com/mui/material-ui.git":
version "5.14.10"
resolved "https://github.com/mui/material-ui.git#f1401844507519e09814bf8ea3ac338ec8011044"
version "5.14.11"
resolved "https://github.com/mui/material-ui.git#92a5d8550c41998ed06df884e45b230bdb239c18"

"@mui/private-theming@^5.14.12":
version "5.14.12"
Expand Down
Loading