♻️merge confilct solve

src/styled-system/css/css.d.ts

@@ -2,8 +2,8 @@
 import type { SystemStyleObject } from '../types/index';
 
 interface CssFunction {
-  (...styles: Array<SystemStyleObject | undefined | null | false>): string;
-  raw: (...styles: Array<SystemStyleObject | undefined | null | false>) => SystemStyleObject;
+  (...styles: Array<SystemStyleObject | undefined | null | false>): string
+  raw: (...styles: Array<SystemStyleObject | undefined | null | false>) => SystemStyleObject
 }
 
-export declare const css: CssFunction;
+export declare const css: CssFunction;

src/styled-system/css/cva.d.ts

@@ -1,6 +1,6 @@
 /* eslint-disable */
 import type { RecipeCreatorFn } from '../types/recipe';
 
-export declare const cva: RecipeCreatorFn;
+export declare const cva: RecipeCreatorFn
 
-export type { RecipeVariantProps } from '../types/recipe';
+export type { RecipeVariantProps } from '../types/recipe';

src/styled-system/css/cx.d.ts

@@ -1,5 +1,5 @@
 /* eslint-disable */
-type Argument = string | boolean | null | undefined;
+type Argument = string | boolean | null | undefined
 
 /** Conditionally join classNames into a single string */
-export declare function cx(...args: Argument[]): string;
+export declare function cx(...args: Argument[]): string

src/styled-system/css/index.d.ts

@@ -2,4 +2,4 @@
 export * from './css';
 export * from './cx';
 export * from './cva';
-export * from './sva';
+export * from './sva';

src/styled-system/css/sva.d.ts

@@ -1,4 +1,4 @@
 /* eslint-disable */
 import type { SlotRecipeCreatorFn } from '../types/recipe';
 
-export declare const sva: SlotRecipeCreatorFn;
+export declare const sva: SlotRecipeCreatorFn

src/styled-system/jsx/aspect-ratio.d.ts

@@ -1,11 +1,10 @@
 /* eslint-disable */
-import type { FunctionComponent } from 'react';
+import type { FunctionComponent } from 'react'
 import type { AspectRatioProperties } from '../patterns/aspect-ratio';
 import type { HTMLStyledProps } from '../types/jsx';
 import type { DistributiveOmit } from '../types/system-types';
 
-export interface AspectRatioProps
-  extends AspectRatioProperties,
-    DistributiveOmit<HTMLStyledProps<'div'>, keyof AspectRatioProperties | 'aspectRatio'> {}
+export interface AspectRatioProps extends AspectRatioProperties, DistributiveOmit<HTMLStyledProps<'div'>, keyof AspectRatioProperties | 'aspectRatio'> {}
 
-export declare const AspectRatio: FunctionComponent<AspectRatioProps>;
+
+export declare const AspectRatio: FunctionComponent<AspectRatioProps>

src/styled-system/jsx/bleed.d.ts

@@ -1,9 +1,10 @@
 /* eslint-disable */
-import type { FunctionComponent } from 'react';
+import type { FunctionComponent } from 'react'
 import type { BleedProperties } from '../patterns/bleed';
 import type { HTMLStyledProps } from '../types/jsx';
 import type { DistributiveOmit } from '../types/system-types';
 
-export interface BleedProps extends BleedProperties, DistributiveOmit<HTMLStyledProps<'div'>, keyof BleedProperties> {}
+export interface BleedProps extends BleedProperties, DistributiveOmit<HTMLStyledProps<'div'>, keyof BleedProperties > {}
 
-export declare const Bleed: FunctionComponent<BleedProps>;
+
+export declare const Bleed: FunctionComponent<BleedProps>

src/styled-system/jsx/box.d.ts

@@ -1,9 +1,10 @@
 /* eslint-disable */
-import type { FunctionComponent } from 'react';
+import type { FunctionComponent } from 'react'
 import type { BoxProperties } from '../patterns/box';
 import type { HTMLStyledProps } from '../types/jsx';
 import type { DistributiveOmit } from '../types/system-types';
 
-export interface BoxProps extends BoxProperties, DistributiveOmit<HTMLStyledProps<'div'>, keyof BoxProperties> {}
+export interface BoxProps extends BoxProperties, DistributiveOmit<HTMLStyledProps<'div'>, keyof BoxProperties > {}
 
-export declare const Box: FunctionComponent<BoxProps>;
+
+export declare const Box: FunctionComponent<BoxProps>

src/styled-system/jsx/center.d.ts

@@ -1,11 +1,10 @@
 /* eslint-disable */
-import type { FunctionComponent } from 'react';
+import type { FunctionComponent } from 'react'
 import type { CenterProperties } from '../patterns/center';
 import type { HTMLStyledProps } from '../types/jsx';
 import type { DistributiveOmit } from '../types/system-types';
 
-export interface CenterProps
-  extends CenterProperties,
-    DistributiveOmit<HTMLStyledProps<'div'>, keyof CenterProperties> {}
+export interface CenterProps extends CenterProperties, DistributiveOmit<HTMLStyledProps<'div'>, keyof CenterProperties > {}
 
-export declare const Center: FunctionComponent<CenterProps>;
+
+export declare const Center: FunctionComponent<CenterProps>

src/styled-system/jsx/circle.d.ts

@@ -1,11 +1,10 @@
 /* eslint-disable */
-import type { FunctionComponent } from 'react';
+import type { FunctionComponent } from 'react'
 import type { CircleProperties } from '../patterns/circle';
 import type { HTMLStyledProps } from '../types/jsx';
 import type { DistributiveOmit } from '../types/system-types';
 
-export interface CircleProps
-  extends CircleProperties,
-    DistributiveOmit<HTMLStyledProps<'div'>, keyof CircleProperties> {}
+export interface CircleProps extends CircleProperties, DistributiveOmit<HTMLStyledProps<'div'>, keyof CircleProperties > {}
 
-export declare const Circle: FunctionComponent<CircleProps>;
+
+export declare const Circle: FunctionComponent<CircleProps>

src/styled-system/jsx/container.d.ts

@@ -1,11 +1,10 @@
 /* eslint-disable */
-import type { FunctionComponent } from 'react';
+import type { FunctionComponent } from 'react'
 import type { ContainerProperties } from '../patterns/container';
 import type { HTMLStyledProps } from '../types/jsx';
 import type { DistributiveOmit } from '../types/system-types';
 
-export interface ContainerProps
-  extends ContainerProperties,
-    DistributiveOmit<HTMLStyledProps<'div'>, keyof ContainerProperties> {}
+export interface ContainerProps extends ContainerProperties, DistributiveOmit<HTMLStyledProps<'div'>, keyof ContainerProperties > {}
 
-export declare const Container: FunctionComponent<ContainerProps>;
+
+export declare const Container: FunctionComponent<ContainerProps>

src/styled-system/jsx/divider.d.ts

@@ -1,11 +1,10 @@
 /* eslint-disable */
-import type { FunctionComponent } from 'react';
+import type { FunctionComponent } from 'react'
 import type { DividerProperties } from '../patterns/divider';
 import type { HTMLStyledProps } from '../types/jsx';
 import type { DistributiveOmit } from '../types/system-types';
 
-export interface DividerProps
-  extends DividerProperties,
-    DistributiveOmit<HTMLStyledProps<'div'>, keyof DividerProperties> {}
+export interface DividerProps extends DividerProperties, DistributiveOmit<HTMLStyledProps<'div'>, keyof DividerProperties > {}
 
-export declare const Divider: FunctionComponent<DividerProps>;
+
+export declare const Divider: FunctionComponent<DividerProps>

src/styled-system/jsx/factory.d.ts

@@ -1,3 +1,3 @@
 /* eslint-disable */
 import type { Styled } from '../types/jsx';
-export declare const styled: Styled;
+export declare const styled: Styled

src/styled-system/jsx/flex.d.ts

@@ -1,9 +1,10 @@
 /* eslint-disable */
-import type { FunctionComponent } from 'react';
+import type { FunctionComponent } from 'react'
 import type { FlexProperties } from '../patterns/flex';
 import type { HTMLStyledProps } from '../types/jsx';
 import type { DistributiveOmit } from '../types/system-types';
 
-export interface FlexProps extends FlexProperties, DistributiveOmit<HTMLStyledProps<'div'>, keyof FlexProperties> {}
+export interface FlexProps extends FlexProperties, DistributiveOmit<HTMLStyledProps<'div'>, keyof FlexProperties > {}
 
-export declare const Flex: FunctionComponent<FlexProps>;
+
+export declare const Flex: FunctionComponent<FlexProps>

src/styled-system/jsx/float.d.ts

@@ -1,9 +1,10 @@
 /* eslint-disable */
-import type { FunctionComponent } from 'react';
+import type { FunctionComponent } from 'react'
 import type { FloatProperties } from '../patterns/float';
 import type { HTMLStyledProps } from '../types/jsx';
 import type { DistributiveOmit } from '../types/system-types';
 
-export interface FloatProps extends FloatProperties, DistributiveOmit<HTMLStyledProps<'div'>, keyof FloatProperties> {}
+export interface FloatProps extends FloatProperties, DistributiveOmit<HTMLStyledProps<'div'>, keyof FloatProperties > {}
 
-export declare const Float: FunctionComponent<FloatProps>;
+
+export declare const Float: FunctionComponent<FloatProps>

src/styled-system/jsx/grid-item.d.ts

@@ -1,11 +1,10 @@
 /* eslint-disable */
-import type { FunctionComponent } from 'react';
+import type { FunctionComponent } from 'react'
 import type { GridItemProperties } from '../patterns/grid-item';
 import type { HTMLStyledProps } from '../types/jsx';
 import type { DistributiveOmit } from '../types/system-types';
 
-export interface GridItemProps
-  extends GridItemProperties,
-    DistributiveOmit<HTMLStyledProps<'div'>, keyof GridItemProperties> {}
+export interface GridItemProps extends GridItemProperties, DistributiveOmit<HTMLStyledProps<'div'>, keyof GridItemProperties > {}
 
-export declare const GridItem: FunctionComponent<GridItemProps>;
+
+export declare const GridItem: FunctionComponent<GridItemProps>

src/styled-system/jsx/grid.d.ts

@@ -1,9 +1,10 @@
 /* eslint-disable */
-import type { FunctionComponent } from 'react';
+import type { FunctionComponent } from 'react'
 import type { GridProperties } from '../patterns/grid';
 import type { HTMLStyledProps } from '../types/jsx';
 import type { DistributiveOmit } from '../types/system-types';
 
-export interface GridProps extends GridProperties, DistributiveOmit<HTMLStyledProps<'div'>, keyof GridProperties> {}
+export interface GridProps extends GridProperties, DistributiveOmit<HTMLStyledProps<'div'>, keyof GridProperties > {}
 
-export declare const Grid: FunctionComponent<GridProps>;
+
+export declare const Grid: FunctionComponent<GridProps>

src/styled-system/jsx/hstack.d.ts

@@ -1,11 +1,10 @@
 /* eslint-disable */
-import type { FunctionComponent } from 'react';
+import type { FunctionComponent } from 'react'
 import type { HstackProperties } from '../patterns/hstack';
 import type { HTMLStyledProps } from '../types/jsx';
 import type { DistributiveOmit } from '../types/system-types';
 
-export interface HstackProps
-  extends HstackProperties,
-    DistributiveOmit<HTMLStyledProps<'div'>, keyof HstackProperties> {}
+export interface HstackProps extends HstackProperties, DistributiveOmit<HTMLStyledProps<'div'>, keyof HstackProperties > {}
 
-export declare const HStack: FunctionComponent<HstackProps>;
+
+export declare const HStack: FunctionComponent<HstackProps>

src/styled-system/jsx/index.d.ts

@@ -24,4 +24,4 @@ export * from './float';
 export * from './bleed';
 export * from './visually-hidden';
 
-export type { HTMLStyledProps, StyledComponent } from '../types/jsx';
+export type { HTMLStyledProps, StyledComponent } from '../types/jsx';

src/styled-system/jsx/is-valid-prop.d.ts

@@ -1,7 +1,5 @@
 /* eslint-disable */
 declare const isCssProperty: (value: string) => boolean;
-declare const splitCssProps: <TProps extends Record<string, unknown>>(
-  props: TProps,
-) => [Pick<TProps, CssProperty>, Omit<TProps, CssProperty>];
+declare const splitCssProps: <TProps extends Record<string, unknown>>(props: TProps) => [Pick<TProps, CssProperty>, Omit<TProps, CssProperty>]
 
-export { isCssProperty, splitCssProps };
+export { isCssProperty, splitCssProps };

src/styled-system/jsx/link-box.d.ts

@@ -1,11 +1,10 @@
 /* eslint-disable */
-import type { FunctionComponent } from 'react';
+import type { FunctionComponent } from 'react'
 import type { LinkBoxProperties } from '../patterns/link-box';
 import type { HTMLStyledProps } from '../types/jsx';
 import type { DistributiveOmit } from '../types/system-types';
 
-export interface LinkBoxProps
-  extends LinkBoxProperties,
-    DistributiveOmit<HTMLStyledProps<'div'>, keyof LinkBoxProperties> {}
+export interface LinkBoxProps extends LinkBoxProperties, DistributiveOmit<HTMLStyledProps<'div'>, keyof LinkBoxProperties > {}
 
-export declare const LinkBox: FunctionComponent<LinkBoxProps>;
+
+export declare const LinkBox: FunctionComponent<LinkBoxProps>

src/styled-system/jsx/link-overlay.d.ts

@@ -1,11 +1,10 @@
 /* eslint-disable */
-import type { FunctionComponent } from 'react';
+import type { FunctionComponent } from 'react'
 import type { LinkOverlayProperties } from '../patterns/link-overlay';
 import type { HTMLStyledProps } from '../types/jsx';
 import type { DistributiveOmit } from '../types/system-types';
 
-export interface LinkOverlayProps
-  extends LinkOverlayProperties,
-    DistributiveOmit<HTMLStyledProps<'a'>, keyof LinkOverlayProperties> {}
+export interface LinkOverlayProps extends LinkOverlayProperties, DistributiveOmit<HTMLStyledProps<'a'>, keyof LinkOverlayProperties > {}
 
-export declare const LinkOverlay: FunctionComponent<LinkOverlayProps>;
+
+export declare const LinkOverlay: FunctionComponent<LinkOverlayProps>

src/styled-system/jsx/spacer.d.ts

@@ -1,11 +1,10 @@
 /* eslint-disable */
-import type { FunctionComponent } from 'react';
+import type { FunctionComponent } from 'react'
 import type { SpacerProperties } from '../patterns/spacer';
 import type { HTMLStyledProps } from '../types/jsx';
 import type { DistributiveOmit } from '../types/system-types';
 
-export interface SpacerProps
-  extends SpacerProperties,
-    DistributiveOmit<HTMLStyledProps<'div'>, keyof SpacerProperties> {}
+export interface SpacerProps extends SpacerProperties, DistributiveOmit<HTMLStyledProps<'div'>, keyof SpacerProperties > {}
 
-export declare const Spacer: FunctionComponent<SpacerProps>;
+
+export declare const Spacer: FunctionComponent<SpacerProps>

src/styled-system/jsx/square.d.ts

@@ -1,11 +1,10 @@
 /* eslint-disable */
-import type { FunctionComponent } from 'react';
+import type { FunctionComponent } from 'react'
 import type { SquareProperties } from '../patterns/square';
 import type { HTMLStyledProps } from '../types/jsx';
 import type { DistributiveOmit } from '../types/system-types';
 
-export interface SquareProps
-  extends SquareProperties,
-    DistributiveOmit<HTMLStyledProps<'div'>, keyof SquareProperties> {}
+export interface SquareProps extends SquareProperties, DistributiveOmit<HTMLStyledProps<'div'>, keyof SquareProperties > {}
 
-export declare const Square: FunctionComponent<SquareProps>;
+
+export declare const Square: FunctionComponent<SquareProps>

src/styled-system/jsx/stack.d.ts

@@ -1,9 +1,10 @@
 /* eslint-disable */
-import type { FunctionComponent } from 'react';
+import type { FunctionComponent } from 'react'
 import type { StackProperties } from '../patterns/stack';
 import type { HTMLStyledProps } from '../types/jsx';
 import type { DistributiveOmit } from '../types/system-types';
 
-export interface StackProps extends StackProperties, DistributiveOmit<HTMLStyledProps<'div'>, keyof StackProperties> {}
+export interface StackProps extends StackProperties, DistributiveOmit<HTMLStyledProps<'div'>, keyof StackProperties > {}
 
-export declare const Stack: FunctionComponent<StackProps>;
+
+export declare const Stack: FunctionComponent<StackProps>

src/styled-system/jsx/visually-hidden.d.ts

@@ -1,11 +1,10 @@
 /* eslint-disable */
-import type { FunctionComponent } from 'react';
+import type { FunctionComponent } from 'react'
 import type { VisuallyHiddenProperties } from '../patterns/visually-hidden';
 import type { HTMLStyledProps } from '../types/jsx';
 import type { DistributiveOmit } from '../types/system-types';
 
-export interface VisuallyHiddenProps
-  extends VisuallyHiddenProperties,
-    DistributiveOmit<HTMLStyledProps<'div'>, keyof VisuallyHiddenProperties> {}
+export interface VisuallyHiddenProps extends VisuallyHiddenProperties, DistributiveOmit<HTMLStyledProps<'div'>, keyof VisuallyHiddenProperties > {}
 
-export declare const VisuallyHidden: FunctionComponent<VisuallyHiddenProps>;
+
+export declare const VisuallyHidden: FunctionComponent<VisuallyHiddenProps>

src/styled-system/jsx/vstack.d.ts

@@ -1,11 +1,10 @@
 /* eslint-disable */
-import type { FunctionComponent } from 'react';
+import type { FunctionComponent } from 'react'
 import type { VstackProperties } from '../patterns/vstack';
 import type { HTMLStyledProps } from '../types/jsx';
 import type { DistributiveOmit } from '../types/system-types';
 
-export interface VstackProps
-  extends VstackProperties,
-    DistributiveOmit<HTMLStyledProps<'div'>, keyof VstackProperties> {}
+export interface VstackProps extends VstackProperties, DistributiveOmit<HTMLStyledProps<'div'>, keyof VstackProperties > {}
 
-export declare const VStack: FunctionComponent<VstackProps>;
+
+export declare const VStack: FunctionComponent<VstackProps>

src/styled-system/jsx/wrap.d.ts

@@ -1,9 +1,10 @@
 /* eslint-disable */
-import type { FunctionComponent } from 'react';
+import type { FunctionComponent } from 'react'
 import type { WrapProperties } from '../patterns/wrap';
 import type { HTMLStyledProps } from '../types/jsx';
 import type { DistributiveOmit } from '../types/system-types';
 
-export interface WrapProps extends WrapProperties, DistributiveOmit<HTMLStyledProps<'div'>, keyof WrapProperties> {}
+export interface WrapProps extends WrapProperties, DistributiveOmit<HTMLStyledProps<'div'>, keyof WrapProperties > {}
 
-export declare const Wrap: FunctionComponent<WrapProps>;
+
+export declare const Wrap: FunctionComponent<WrapProps>