Update prettier and format (#240)

michaeltaranto · web-flow · commit 58c9d2514794 · 2021-07-19T10:13:18.000+10:00
diff --git a/examples/webpack-react/src/vars.css.ts b/examples/webpack-react/src/vars.css.ts
@@ -58,8 +58,7 @@ export const vars = createGlobalTheme(':root', {
     full: '99999px',
   },
   fontFamily: {
-    body:
-      '-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"',
+    body: '-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"',
   },
   fontSize: {
     '0x': fontSizeScale(0),
diff --git a/fixtures/sprinkles/src/styles.css.ts b/fixtures/sprinkles/src/styles.css.ts
@@ -34,6 +34,5 @@ const responsiveStyles = createAtomicStyles({
 export const atoms = createAtomsFn(responsiveStyles);
 
 export const mapResponsiveValue = createMapValueFn(responsiveStyles);
-export const normalizeResponsiveValue = createNormalizeValueFn(
-  responsiveStyles,
-);
+export const normalizeResponsiveValue =
+  createNormalizeValueFn(responsiveStyles);
diff --git a/package.json b/package.json
@@ -52,7 +52,7 @@
     "babel-jest": "^26.6.3",
     "jest": "^26.6.3",
     "jest-puppeteer": "^4.4.0",
-    "prettier": "^2.2.1",
+    "prettier": "^2.3.2",
     "puppeteer": "^8.0.0",
     "ts-node": "^9.1.1",
     "typescript": "^4.1.3"
diff --git a/packages/babel-plugin/src/index.ts b/packages/babel-plugin/src/index.ts
@@ -114,9 +114,9 @@ const getRelevantCall = (
       t.isIdentifier(callee.property, { name: exportName }),
     );
   } else {
-    const importInfo = Array.from(
-      importIdentifiers.entries(),
-    ).find(([identifier]) => t.isIdentifier(callee, { name: identifier }));
+    const importInfo = Array.from(importIdentifiers.entries()).find(
+      ([identifier]) => t.isIdentifier(callee, { name: identifier }),
+    );
 
     if (importInfo) {
       return importInfo[1];
@@ -201,9 +201,9 @@ export default function (): PluginObj<Context> {
             } else if (t.isImportSpecifier(specifier)) {
               const { imported, local } = specifier;
 
-              const importName = (t.isIdentifier(imported)
-                ? imported.name
-                : imported.value) as StyleFunction;
+              const importName = (
+                t.isIdentifier(imported) ? imported.name : imported.value
+              ) as StyleFunction;
 
               if (styleFunctions.includes(importName)) {
                 this.importIdentifiers.set(local.name, importName);
diff --git a/packages/css/src/style.ts b/packages/css/src/style.ts
@@ -69,7 +69,7 @@ export function globalKeyframes(name: string, rule: CSSKeyframes) {
 }
 
 export function styleVariants<
-  StyleMap extends Record<string | number, StyleRule>
+  StyleMap extends Record<string | number, StyleRule>,
 >(styleMap: StyleMap, debugId?: string): Record<keyof StyleMap, string>;
 export function styleVariants<Data extends Record<string | number, unknown>>(
   data: Data,
diff --git a/packages/css/src/transformCss.ts b/packages/css/src/transformCss.ts
@@ -130,9 +130,8 @@ class Stylesheet {
     this.transformSimplePseudos(root, root.rule);
     this.transformSelectors(root, root.rule);
 
-    const activeConditionalRuleset = this.conditionalRulesets[
-      this.conditionalRulesets.length - 1
-    ];
+    const activeConditionalRuleset =
+      this.conditionalRulesets[this.conditionalRulesets.length - 1];
 
     if (
       !activeConditionalRuleset.mergeIfCompatible(this.currConditionalRuleset)
diff --git a/packages/sprinkles/src/createAtomsFn.ts b/packages/sprinkles/src/createAtomsFn.ts
@@ -10,11 +10,11 @@ import {
 
 type ResponsiveArrayVariant<
   RA extends { length: number },
-  Values extends string | number | symbol
+  Values extends string | number | symbol,
 > = ResponsiveArrayByMaxLength<RA['length'], Values | null>;
 
 type ConditionalStyle<
-  Values extends { [key: string]: ConditionalPropertyValue }
+  Values extends { [key: string]: ConditionalPropertyValue },
 > =
   | (Values[keyof Values]['defaultClass'] extends string ? keyof Values : never)
   | {
@@ -23,7 +23,7 @@ type ConditionalStyle<
 
 type ConditionalStyleWithResponsiveArray<
   Values extends { [key: string]: ConditionalPropertyValue },
-  RA extends { length: number }
+  RA extends { length: number },
 > = ConditionalStyle<Values> | ResponsiveArrayVariant<RA, keyof Values>;
 
 type ChildAtomProps<Atoms extends AtomicStyles['styles']> = {
diff --git a/packages/sprinkles/src/createUtils.ts b/packages/sprinkles/src/createUtils.ts
@@ -9,7 +9,7 @@ type ExtractValue<
     | string
     | number
     | Partial<Record<string, string | number>>
-    | ResponsiveArrayByMaxLength<number, string | number | null>
+    | ResponsiveArrayByMaxLength<number, string | number | null>,
 > = Value extends ResponsiveArrayByMaxLength<number, string | number | null>
   ? NonNullable<Value[number]>
   : Value extends Partial<Record<string, string | number>>
@@ -24,17 +24,15 @@ type Conditions<ConditionName extends string> = {
   };
 };
 
-type ExtractDefaultCondition<
-  AtomicStyles extends Conditions<string>
-> = AtomicStyles['conditions']['defaultCondition'];
+type ExtractDefaultCondition<AtomicStyles extends Conditions<string>> =
+  AtomicStyles['conditions']['defaultCondition'];
 
-type ExtractConditionNames<
-  AtomicStyles extends Conditions<string>
-> = AtomicStyles['conditions']['conditionNames'][number];
+type ExtractConditionNames<AtomicStyles extends Conditions<string>> =
+  AtomicStyles['conditions']['conditionNames'][number];
 
 export type ConditionalValue<
   AtomicStyles extends Conditions<string>,
-  Value extends string | number
+  Value extends string | number,
 > =
   | (ExtractDefaultCondition<AtomicStyles> extends false ? never : Value)
   | Partial<Record<ExtractConditionNames<AtomicStyles>, Value>>
@@ -48,13 +46,13 @@ export type ConditionalValue<
 type RequiredConditionalObject<
   RequiredConditionName extends string,
   OptionalConditionNames extends string,
-  Value extends string | number
+  Value extends string | number,
 > = Record<RequiredConditionName, Value> &
   Partial<Record<OptionalConditionNames, Value>>;
 
 export type RequiredConditionalValue<
   AtomicStyles extends Conditions<string>,
-  Value extends string | number
+  Value extends string | number,
 > = ExtractDefaultCondition<AtomicStyles> extends false
   ? never
   :
@@ -126,7 +124,7 @@ export function createMapValueFn<AtomicStyles extends Conditions<string>>(
   atomicStyles: AtomicStyles,
 ): <
   OutputValue extends string | number,
-  Value extends ConditionalValue<AtomicStyles, string | number>
+  Value extends ConditionalValue<AtomicStyles, string | number>,
 >(
   value: Value,
   fn: (
diff --git a/packages/sprinkles/src/index.ts b/packages/sprinkles/src/index.ts
@@ -26,7 +26,7 @@ type AtomicProperties = {
 
 type ShorthandOptions<
   Properties extends AtomicProperties,
-  Shorthands extends { [shorthandName: string]: Array<keyof Properties> }
+  Shorthands extends { [shorthandName: string]: Array<keyof Properties> },
 > = {
   shorthands: Shorthands;
 };
@@ -37,7 +37,7 @@ type UnconditionalAtomicOptions<Properties extends AtomicProperties> = {
 
 type ResponsiveArrayOptions<
   Conditions extends { [conditionName: string]: Condition },
-  ResponsiveLength extends number
+  ResponsiveLength extends number,
 > = {
   responsiveArray: ResponsiveArrayConfig<keyof Conditions> & {
     length: ResponsiveLength;
@@ -47,7 +47,7 @@ type ResponsiveArrayOptions<
 type ConditionalAtomicOptions<
   Properties extends AtomicProperties,
   Conditions extends { [conditionName: string]: Condition },
-  DefaultCondition extends keyof Conditions | false
+  DefaultCondition extends keyof Conditions | false,
 > = UnconditionalAtomicOptions<Properties> & {
   conditions: Conditions;
   defaultCondition: DefaultCondition;
@@ -73,7 +73,7 @@ type UnconditionalAtomicStyles<Properties extends AtomicProperties> = {
 type ConditionalAtomicStyles<
   Properties extends AtomicProperties,
   Conditions extends { [conditionName: string]: Condition },
-  DefaultCondition extends keyof Conditions | false
+  DefaultCondition extends keyof Conditions | false,
 > = {
   conditions: {
     defaultCondition: DefaultCondition;
@@ -98,7 +98,7 @@ type ConditionalWithResponsiveArrayAtomicStyles<
   Properties extends AtomicProperties,
   Conditions extends { [conditionName: string]: Condition },
   ResponsiveLength extends number,
-  DefaultCondition extends keyof Conditions | false
+  DefaultCondition extends keyof Conditions | false,
 > = {
   conditions: {
     defaultCondition: DefaultCondition;
@@ -124,7 +124,7 @@ type ConditionalWithResponsiveArrayAtomicStyles<
 type ShorthandAtomicStyles<
   Shorthands extends {
     [shorthandName: string]: Array<string | number | symbol>;
-  }
+  },
 > = {
   styles: {
     [Shorthand in keyof Shorthands]: {
@@ -139,7 +139,7 @@ export function createAtomicStyles<
   ResponsiveLength extends number,
   Conditions extends BaseConditions,
   Shorthands extends { [shorthandName: string]: Array<keyof Properties> },
-  DefaultCondition extends keyof Conditions | false
+  DefaultCondition extends keyof Conditions | false,
 >(
   options: ConditionalAtomicOptions<Properties, Conditions, DefaultCondition> &
     ShorthandOptions<Properties, Shorthands> &
@@ -156,7 +156,7 @@ export function createAtomicStyles<
   Properties extends AtomicProperties,
   Conditions extends BaseConditions,
   Shorthands extends { [shorthandName: string]: Array<keyof Properties> },
-  DefaultCondition extends keyof Conditions | false
+  DefaultCondition extends keyof Conditions | false,
 >(
   options: ConditionalAtomicOptions<Properties, Conditions, DefaultCondition> &
     ShorthandOptions<Properties, Shorthands>,
@@ -167,7 +167,7 @@ export function createAtomicStyles<
   Properties extends AtomicProperties,
   Conditions extends BaseConditions,
   ResponsiveLength extends number,
-  DefaultCondition extends keyof Conditions | false
+  DefaultCondition extends keyof Conditions | false,
 >(
   options: ConditionalAtomicOptions<Properties, Conditions, DefaultCondition> &
     ResponsiveArrayOptions<Conditions, ResponsiveLength>,
@@ -181,14 +181,14 @@ export function createAtomicStyles<
 export function createAtomicStyles<
   Properties extends AtomicProperties,
   Conditions extends BaseConditions,
-  DefaultCondition extends keyof Conditions | false
+  DefaultCondition extends keyof Conditions | false,
 >(
   options: ConditionalAtomicOptions<Properties, Conditions, DefaultCondition>,
 ): ConditionalAtomicStyles<Properties, Conditions, DefaultCondition>;
 // Unconditional + Shorthands
 export function createAtomicStyles<
   Properties extends AtomicProperties,
-  Shorthands extends { [shorthandName: string]: Array<keyof Properties> }
+  Shorthands extends { [shorthandName: string]: Array<keyof Properties> },
 >(
   options: UnconditionalAtomicOptions<Properties> &
     ShorthandOptions<Properties, Shorthands>,
diff --git a/packages/sprinkles/src/types.ts b/packages/sprinkles/src/types.ts
@@ -29,7 +29,7 @@ export type ResponsiveArrayByMaxLength<MaxLength extends number, Value> = [
 
 export type RequiredResponsiveArrayByMaxLength<
   MaxLength extends number,
-  Value
+  Value,
 > = [
   never,
   RequiredResponsiveArray<1, Value | null>,
diff --git a/packages/webpack-plugin/src/compiler.ts b/packages/webpack-plugin/src/compiler.ts
@@ -49,11 +49,8 @@ export class ChildCompiler {
       log('Using cached compilation: %s', cacheId);
     }
 
-    const {
-      source,
-      fileDependencies,
-      contextDependencies,
-    } = await compilationPromise;
+    const { source, fileDependencies, contextDependencies } =
+      await compilationPromise;
 
     // Set loader dependencies to dependencies of the child compiler
     fileDependencies.forEach((dep) => {
diff --git a/site/src/system/styles/sprinkles.css.ts b/site/src/system/styles/sprinkles.css.ts
@@ -63,9 +63,8 @@ const responsiveStyles = createAtomicStyles({
 });
 
 export const mapResponsiveValue = createMapValueFn(responsiveStyles);
-export const normalizeResponsiveValue = createNormalizeValueFn(
-  responsiveStyles,
-);
+export const normalizeResponsiveValue =
+  createNormalizeValueFn(responsiveStyles);
 
 export type ResponsiveValue<Value extends string | number> = ConditionalValue<
   typeof responsiveStyles,
diff --git a/site/src/themeUtils.ts b/site/src/themeUtils.ts
@@ -11,14 +11,14 @@ export const breakpoints = {
 
 export type Breakpoint = keyof typeof breakpoints;
 
-const makeMediaQuery = (breakpoint: keyof typeof breakpoints) => (
-  styles: Properties<string | number>,
-) =>
-  !styles || Object.keys(styles).length === 0
-    ? {}
-    : {
-        [`screen and (min-width: ${breakpoints[breakpoint]}px)`]: styles,
-      };
+const makeMediaQuery =
+  (breakpoint: keyof typeof breakpoints) =>
+  (styles: Properties<string | number>) =>
+    !styles || Object.keys(styles).length === 0
+      ? {}
+      : {
+          [`screen and (min-width: ${breakpoints[breakpoint]}px)`]: styles,
+        };
 
 const mediaQuery = {
   tablet: makeMediaQuery('tablet'),
@@ -62,13 +62,15 @@ export const responsiveStyle = ({
   };
 };
 
-export const mapToProperty = <
-  Property extends keyof Properties<string | number>
->(
-  property: Property,
-  breakpoint?: Breakpoint,
-) => (value: string | number) => {
-  const styleRule = { [property]: value };
+export const mapToProperty =
+  <Property extends keyof Properties<string | number>>(
+    property: Property,
+    breakpoint?: Breakpoint,
+  ) =>
+  (value: string | number) => {
+    const styleRule = { [property]: value };
 
-  return breakpoint ? responsiveStyle({ [breakpoint]: styleRule }) : styleRule;
-};
+    return breakpoint
+      ? responsiveStyle({ [breakpoint]: styleRule })
+      : styleRule;
+  };
diff --git a/site/src/themes.css.ts b/site/src/themes.css.ts
@@ -153,8 +153,7 @@ export const vars = createGlobalTheme(':root', {
     brand: 'Shrikhand, "Helvetica Neue", HelveticaNeue, Helvetica, sans-serif',
     heading:
       '"DM Sans", "Helvetica Neue", HelveticaNeue, Helvetica, sans-serif',
-    body:
-      '-apple-system, BlinkMacSystemFont, Roboto, "Helvetica Neue", HelveticaNeue, Helvetica, Arial, sans-serif',
+    body: '-apple-system, BlinkMacSystemFont, Roboto, "Helvetica Neue", HelveticaNeue, Helvetica, Arial, sans-serif',
     code: 'MonoLisa, "Roboto Mono", Menlo, monospace',
   },
   grid: px(grid),
diff --git a/tests/sprinkles/spinkles-type-tests.ts b/tests/sprinkles/spinkles-type-tests.ts
@@ -221,9 +221,8 @@ const noop = (...args: Array<any>) => {};
 
   noop(responsiveValue);
 
-  type RequiredResponsiveValue<
-    Value extends string | number
-  > = RequiredConditionalValue<typeof conditionalAtomicStyles, Value>;
+  type RequiredResponsiveValue<Value extends string | number> =
+    RequiredConditionalValue<typeof conditionalAtomicStyles, Value>;
 
   let requiredValue: RequiredResponsiveValue<'row' | 'column'>;
 
@@ -250,12 +249,11 @@ const noop = (...args: Array<any>) => {};
   noop(requiredValue);
 
   // Ensure type is 'never' when default condition is missing
-  type InvalidRequiredResponsiveValue<
-    Value extends string | number
-  > = RequiredConditionalValue<
-    typeof conditionalStylesWithoutDefaultCondition,
-    Value
-  >;
+  type InvalidRequiredResponsiveValue<Value extends string | number> =
+    RequiredConditionalValue<
+      typeof conditionalStylesWithoutDefaultCondition,
+      Value
+    >;
 
   const invalidRequiredValue: InvalidRequiredResponsiveValue<
     'row' | 'column'
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ export function globalKeyframes(name: string, rule: CSSKeyframes) {`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`export function styleVariants<`
`72`		`- StyleMap extends Record<string \| number, StyleRule>`
	`72`	`+ StyleMap extends Record<string \| number, StyleRule>,`
`73`	`73`	`>(styleMap: StyleMap, debugId?: string): Record<keyof StyleMap, string>;`
`74`	`74`	`export function styleVariants<Data extends Record<string \| number, unknown>>(`
`75`	`75`	`data: Data,`