For #12359 and #12362 #153
Comments
|
Run #12359 |
|
Run #12362 |
|
prettier/prettier#12359 VS prettier/prettier@main
Diff (332 lines)diff --git ORI/excalidraw/src/components/LibraryUnit.tsx ALT/excalidraw/src/components/LibraryUnit.tsx
index 46b0e8d..630ec32 100644
--- ORI/excalidraw/src/components/LibraryUnit.tsx
+++ ALT/excalidraw/src/components/LibraryUnit.tsx
@@ -107,13 +107,15 @@ export const LibraryUnit = ({
}}
/>
{adder}
- {id && elements && (isHovered || isMobile || selected) && (
- <CheckboxItem
- checked={selected}
- onChange={(checked, event) => onToggle(id, event)}
- className="library-unit__checkbox"
- />
- )}
+ {id &&
+ elements &&
+ (isHovered || isMobile || selected) && (
+ <CheckboxItem
+ checked={selected}
+ onChange={(checked, event) => onToggle(id, event)}
+ className="library-unit__checkbox"
+ />
+ )}
</div>
);
};
diff --git ORI/prettier/website/playground/Playground.js ALT/prettier/website/playground/Playground.js
index 2228960..29a2484 100644
--- ORI/prettier/website/playground/Playground.js
+++ ALT/prettier/website/playground/Playground.js
@@ -259,13 +259,14 @@ class Playground extends React.Component {
checked={editorState.showSecondFormat}
onChange={editorState.toggleSecondFormat}
/>
- {editorState.showDoc && debug.doc && (
- <ClipboardButton
- copy={() => this.getMarkdown({ doc: debug.doc })}
- >
- Copy doc
- </ClipboardButton>
- )}
+ {editorState.showDoc &&
+ debug.doc && (
+ <ClipboardButton
+ copy={() => this.getMarkdown({ doc: debug.doc })}
+ >
+ Copy doc
+ </ClipboardButton>
+ )}
</SidebarCategory>
<div className="sub-options">
<Button onClick={this.resetOptions}>
diff --git ORI/react-admin/examples/crm/src/dataProvider.ts ALT/react-admin/examples/crm/src/dataProvider.ts
index 028332a..4d53e56 100644
--- ORI/react-admin/examples/crm/src/dataProvider.ts
+++ ALT/react-admin/examples/crm/src/dataProvider.ts
@@ -5,11 +5,12 @@ import generateData from './dataGenerator';
const baseDataProvider = fakerestDataProvider(generateData(), true);
export const dataProvider = new Proxy(baseDataProvider, {
- get: (target, name: string) => (resource: string, params: any) =>
- new Promise(resolve =>
- setTimeout(
- () => resolve(baseDataProvider[name](resource, params)),
- 300
- )
- ),
+ get:
+ (target, name: string) => (resource: string, params: any) =>
+ new Promise(resolve =>
+ setTimeout(
+ () => resolve(baseDataProvider[name](resource, params)),
+ 300
+ )
+ ),
});
diff --git ORI/react-admin/examples/simple/src/dataProvider.tsx ALT/react-admin/examples/simple/src/dataProvider.tsx
index 6ec6d95..2aa1725 100644
--- ORI/react-admin/examples/simple/src/dataProvider.tsx
+++ ALT/react-admin/examples/simple/src/dataProvider.tsx
@@ -29,14 +29,17 @@ const sometimesFailsDataProvider = new Proxy(uploadCapableDataProvider, {
},
});
const delayedDataProvider = new Proxy(sometimesFailsDataProvider, {
- get: (target, name) => (resource, params) =>
- new Promise(resolve =>
- setTimeout(
- () =>
- resolve(sometimesFailsDataProvider[name](resource, params)),
- 300
- )
- ),
+ get:
+ (target, name) => (resource, params) =>
+ new Promise(resolve =>
+ setTimeout(
+ () =>
+ resolve(
+ sometimesFailsDataProvider[name](resource, params)
+ ),
+ 300
+ )
+ ),
});
interface ResponseError extends Error {
diff --git ORI/react-admin/packages/ra-ui-materialui/src/field/FunctionField.tsx ALT/react-admin/packages/ra-ui-materialui/src/field/FunctionField.tsx
index 674ee6a..4931a0b 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/field/FunctionField.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/field/FunctionField.tsx
@@ -49,8 +49,9 @@ FunctionField.propTypes = {
render: PropTypes.func.isRequired,
};
-export interface FunctionFieldProps<RecordType extends Record = Record>
- extends PublicFieldProps,
+export interface FunctionFieldProps<
+ RecordType extends Record = Record
+> extends PublicFieldProps,
InjectedFieldProps<RecordType>,
TypographyProps {
render: (record?: RecordType, source?: string) => any;
diff --git ORI/react-admin/packages/ra-ui-materialui/src/field/ReferenceField.tsx ALT/react-admin/packages/ra-ui-materialui/src/field/ReferenceField.tsx
index 50c5da5..db1afc8 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/field/ReferenceField.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/field/ReferenceField.tsx
@@ -127,8 +127,9 @@ ReferenceField.defaultProps = {
link: 'edit',
};
-export interface ReferenceFieldProps<RecordType extends Record = Record>
- extends PublicFieldProps,
+export interface ReferenceFieldProps<
+ RecordType extends Record = Record
+> extends PublicFieldProps,
InjectedFieldProps<RecordType> {
children: ReactElement;
classes?: ClassesOverride<typeof useStyles>;
diff --git ORI/react-admin/packages/ra-ui-materialui/src/field/types.ts ALT/react-admin/packages/ra-ui-materialui/src/field/types.ts
index 36801a6..26b9434 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/field/types.ts
+++ ALT/react-admin/packages/ra-ui-materialui/src/field/types.ts
@@ -6,8 +6,9 @@ import { TableCellProps } from '@material-ui/core/TableCell';
type TextAlign = TableCellProps['align'];
type SortOrder = 'ASC' | 'DESC';
-export interface FieldProps<RecordType extends Record = Record>
- extends PublicFieldProps,
+export interface FieldProps<
+ RecordType extends Record = Record
+> extends PublicFieldProps,
InjectedFieldProps<RecordType> {}
export interface PublicFieldProps {
diff --git ORI/react-admin/packages/ra-ui-materialui/src/form/Toolbar.tsx ALT/react-admin/packages/ra-ui-materialui/src/form/Toolbar.tsx
index 3f4366a..5fd6df8 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/form/Toolbar.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/form/Toolbar.tsx
@@ -154,15 +154,16 @@ const Toolbar: FC<ToolbarProps> = props => {
saving={saving || validating}
submitOnEnter={submitOnEnter}
/>
- {record && typeof record.id !== 'undefined' && (
- <DeleteButton
- basePath={basePath}
- record={record}
- resource={resource}
- undoable={undoable}
- mutationMode={mutationMode}
- />
- )}
+ {record &&
+ typeof record.id !== 'undefined' && (
+ <DeleteButton
+ basePath={basePath}
+ record={record}
+ resource={resource}
+ undoable={undoable}
+ mutationMode={mutationMode}
+ />
+ )}
</div>
) : (
Children.map(children, (button: ReactElement) =>
diff --git ORI/react-admin/packages/ra-ui-materialui/src/list/ListView.tsx ALT/react-admin/packages/ra-ui-materialui/src/list/ListView.tsx
index 2d02752..41e40cf 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/list/ListView.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/list/ListView.tsx
@@ -62,11 +62,12 @@ export const ListView = (props: ListViewProps) => {
})}
key={version}
>
- {bulkActionButtons !== false && bulkActionButtons && (
- <BulkActionsToolbar {...controllerProps}>
- {bulkActionButtons}
- </BulkActionsToolbar>
- )}
+ {bulkActionButtons !== false &&
+ bulkActionButtons && (
+ <BulkActionsToolbar {...controllerProps}>
+ {bulkActionButtons}
+ </BulkActionsToolbar>
+ )}
{children &&
// @ts-ignore-line
cloneElement(Children.only(children), {
diff --git ORI/react-admin/packages/ra-ui-materialui/src/list/SimpleList.tsx ALT/react-admin/packages/ra-ui-materialui/src/list/SimpleList.tsx
index 95869c9..4c373c8 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/list/SimpleList.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/list/SimpleList.tsx
@@ -224,8 +224,9 @@ export type FunctionToElement<RecordType extends Record = Record> = (
id: Identifier
) => ReactNode;
-export interface SimpleListProps<RecordType extends Record = Record>
- extends Omit<ListProps, 'classes'> {
+export interface SimpleListProps<
+ RecordType extends Record = Record
+> extends Omit<ListProps, 'classes'> {
className?: string;
classes?: ClassesOverride<typeof useStyles>;
hasBulkActions?: boolean;
diff --git ORI/react-admin/packages/ra-ui-materialui/src/list/SingleFieldList.tsx ALT/react-admin/packages/ra-ui-materialui/src/list/SingleFieldList.tsx
index 3727fa4..5709895 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/list/SingleFieldList.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/list/SingleFieldList.tsx
@@ -155,8 +155,9 @@ SingleFieldList.propTypes = {
resource: PropTypes.string,
};
-export interface SingleFieldListProps<RecordType extends Record = Record>
- extends HtmlHTMLAttributes<HTMLDivElement> {
+export interface SingleFieldListProps<
+ RecordType extends Record = Record
+> extends HtmlHTMLAttributes<HTMLDivElement> {
className?: string;
classes?: ClassesOverride<typeof useStyles>;
component?: string | ComponentType<any>;
diff --git ORI/typescript-eslint/packages/experimental-utils/src/ts-eslint/Rule.ts ALT/typescript-eslint/packages/experimental-utils/src/ts-eslint/Rule.ts
index cf3c5b8..1ffd7c5 100644
--- ORI/typescript-eslint/packages/experimental-utils/src/ts-eslint/Rule.ts
+++ ALT/typescript-eslint/packages/experimental-utils/src/ts-eslint/Rule.ts
@@ -136,8 +136,9 @@ interface ReportDescriptorBase<TMessageIds extends string> {
// we disallow this because it's much better to use messageIds for reusable errors that are easily testable
// readonly desc?: string;
}
-interface ReportDescriptorWithSuggestion<TMessageIds extends string>
- extends ReportDescriptorBase<TMessageIds> {
+interface ReportDescriptorWithSuggestion<
+ TMessageIds extends string,
+> extends ReportDescriptorBase<TMessageIds> {
/**
* 6.7's Suggestions API
*/
diff --git ORI/typescript-eslint/packages/typescript-estree/src/create-program/WatchCompilerHostOfConfigFile.ts ALT/typescript-eslint/packages/typescript-estree/src/create-program/WatchCompilerHostOfConfigFile.ts
index 565f584..2783750 100644
--- ORI/typescript-eslint/packages/typescript-estree/src/create-program/WatchCompilerHostOfConfigFile.ts
+++ ALT/typescript-eslint/packages/typescript-estree/src/create-program/WatchCompilerHostOfConfigFile.ts
@@ -27,8 +27,9 @@ interface CachedDirectoryStructureHost extends DirectoryStructureHost {
}
// https://github.com/microsoft/TypeScript/blob/5d36aab06f12b0a3ba6197eb14e98204ec0195fb/src/compiler/watch.ts#L548-L554
-interface WatchCompilerHostOfConfigFile<T extends ts.BuilderProgram>
- extends ts.WatchCompilerHostOfConfigFile<T> {
+interface WatchCompilerHostOfConfigFile<
+ T extends ts.BuilderProgram,
+> extends ts.WatchCompilerHostOfConfigFile<T> {
onCachedDirectoryStructureHostCreate(
host: CachedDirectoryStructureHost,
): void;
diff --git ORI/vega-lite/src/axis.ts ALT/vega-lite/src/axis.ts
index 0a5c6eb..bf83d73 100644
--- ORI/vega-lite/src/axis.ts
+++ ALT/vega-lite/src/axis.ts
@@ -344,8 +344,9 @@ export type AxisConfig<ES extends ExprRef | SignalRef> = Guide &
disable?: boolean;
};
-export interface Axis<ES extends ExprRef | SignalRef = ExprRef | SignalRef>
- extends AxisConfigBaseWithConditionalAndSignal<ES>,
+export interface Axis<
+ ES extends ExprRef | SignalRef = ExprRef | SignalRef
+> extends AxisConfigBaseWithConditionalAndSignal<ES>,
Guide {
/**
* Mark definitions for custom axis encoding.
diff --git ORI/vega-lite/src/spec/facet.ts ALT/vega-lite/src/spec/facet.ts
index 807bf0b..eeaaedd 100644
--- ORI/vega-lite/src/spec/facet.ts
+++ ALT/vega-lite/src/spec/facet.ts
@@ -9,8 +9,10 @@ import {BaseSpec, GenericCompositionLayoutWithColumns, ResolveMixins} from './ba
import {GenericLayerSpec, NormalizedLayerSpec} from './layer';
import {GenericUnitSpec, NormalizedUnitSpec} from './unit';
-export interface FacetFieldDef<F extends Field, ES extends ExprRef | SignalRef = ExprRef | SignalRef>
- extends TypedFieldDef<F, StandardType, boolean | BinParams | null> {
+export interface FacetFieldDef<
+ F extends Field,
+ ES extends ExprRef | SignalRef = ExprRef | SignalRef
+> extends TypedFieldDef<F, StandardType, boolean | BinParams | null> {
/**
* An object defining properties of a facet's header.
*/
@@ -96,8 +98,10 @@ export function isFacetMapping<F extends Field, ES extends ExprRef | SignalRef>(
/**
* Facet mapping for encoding macro
*/
-export interface EncodingFacetMapping<F extends Field, ES extends ExprRef | SignalRef = ExprRef | SignalRef>
- extends FacetMapping<F, RowColumnEncodingFieldDef<F, ES>> {
+export interface EncodingFacetMapping<
+ F extends Field,
+ ES extends ExprRef | SignalRef = ExprRef | SignalRef
+> extends FacetMapping<F, RowColumnEncodingFieldDef<F, ES>> {
/**
* A field definition for the (flexible) facet of trellis plots.
*
@@ -113,8 +117,11 @@ export function isFacetFieldDef<F extends Field>(channelDef: ChannelDef<F>): cha
/**
* Base interface for a facet specification.
*/
-export interface GenericFacetSpec<U extends GenericUnitSpec<any, any>, L extends GenericLayerSpec<any>, F extends Field>
- extends BaseSpec,
+export interface GenericFacetSpec<
+ U extends GenericUnitSpec<any, any>,
+ L extends GenericLayerSpec<any>,
+ F extends Field
+> extends BaseSpec,
GenericCompositionLayoutWithColumns,
ResolveMixins {
/** |
|
prettier/prettier#12362 VS prettier/prettier@main
diff --git ORI/vega-lite/src/mark.ts ALT/vega-lite/src/mark.ts
index 1270686..5a27f5d 100644
--- ORI/vega-lite/src/mark.ts
+++ ALT/vega-lite/src/mark.ts
@@ -599,10 +599,8 @@ export interface RelativeBandSize {
}
// Point/Line OverlayMixins are only for area, line, and trail but we don't want to declare multiple types of MarkDef
-export interface MarkDef<
- M extends string | Mark = Mark,
- ES extends ExprRef | SignalRef = ExprRef | SignalRef
-> extends GenericMarkDef<M>,
+export interface MarkDef<M extends string | Mark = Mark, ES extends ExprRef | SignalRef = ExprRef | SignalRef>
+ extends GenericMarkDef<M>,
Omit<
MarkConfig<ES> &
AreaConfig<ES> & |
|
Run #12362 |
|
prettier/prettier#12362 VS prettier/prettier@main
diff --git ORI/vega-lite/src/mark.ts ALT/vega-lite/src/mark.ts
index 1270686..5a27f5d 100644
--- ORI/vega-lite/src/mark.ts
+++ ALT/vega-lite/src/mark.ts
@@ -599,10 +599,8 @@ export interface RelativeBandSize {
}
// Point/Line OverlayMixins are only for area, line, and trail but we don't want to declare multiple types of MarkDef
-export interface MarkDef<
- M extends string | Mark = Mark,
- ES extends ExprRef | SignalRef = ExprRef | SignalRef
-> extends GenericMarkDef<M>,
+export interface MarkDef<M extends string | Mark = Mark, ES extends ExprRef | SignalRef = ExprRef | SignalRef>
+ extends GenericMarkDef<M>,
Omit<
MarkConfig<ES> &
AreaConfig<ES> & |
|
I added a test for the diff above, why I can't reproduce this? @sosukesuzuki @thorn0 Any clue? |
|
Ah, sorry. I figured out, they use a different |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
No description provided.
The text was updated successfully, but these errors were encountered: