replace cssVariables formatter

primer · Apr 24, 2024 · 6c5314a · 6c5314a
1 parent 7815b23
commit 6c5314a
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 83 deletions.
diff --git a/src/PrimerStyleDictionary.ts b/src/PrimerStyleDictionary.ts
@@ -30,12 +30,10 @@ import {
   javascriptEsm,
   typescriptExportDefinition,
   jsonNestedPrefixed,
-  cssThemed,
   cssCustomMedia,
   jsonOneDimensional,
   jsonPostCssFallback,
   cssMediaQuery,
-  cssVariables,
   jsonFigma,
 } from './formats'
 
@@ -49,11 +47,6 @@ StyleDictionary.registerParser(w3cJsonParser)
  * Formats
  *
  */
-StyleDictionary.registerFormat({
-  name: 'css/themed',
-  formatter: cssThemed,
-})
-
 StyleDictionary.registerFormat({
   name: 'css/customMedia',
   formatter: cssCustomMedia,
@@ -64,11 +57,6 @@ StyleDictionary.registerFormat({
   formatter: cssMediaQuery,
 })
 
-StyleDictionary.registerFormat({
-  name: 'css/variables',
-  formatter: cssVariables,
-})
-
 StyleDictionary.registerFormat({
   name: 'javascript/esm',
   formatter: javascriptEsm,

diff --git a/src/formats/cssThemed.ts b/src/formats/cssThemed.ts
diff --git a/src/formats/cssVariables.test.ts b/src/formats/cssVariables.test.ts
@@ -1,4 +1,4 @@
-import {cssVariables} from './cssVariables'
+import {cssMediaQuery} from './cssMediaQuery'
 import {getMockFormatterArguments} from '../test-utilities'
 import {format} from 'prettier'
 
@@ -14,13 +14,17 @@ describe('Format: css/variables', () => {
         printWidth: 500,
       },
     )
-    expect(cssVariables(input)).toStrictEqual(expectedOutput)
+    expect(cssMediaQuery(input)).toStrictEqual(expectedOutput)
   })
 
   it('Formats tokens with custom selectors', () => {
     const input = getMockFormatterArguments({
-      options: {
-        selector: `[data-color-mode="dark"]`,
+      file: {
+        destination: 'test.css',
+        options: {
+          showFileHeader: false,
+          selector: `[data-color-mode="dark"]`,
+        },
       },
     })
     const expectedOutput = format(
@@ -29,13 +33,17 @@ describe('Format: css/variables', () => {
     }`,
       {parser: 'css', printWidth: 500},
     )
-    expect(cssVariables(input)).toStrictEqual(expectedOutput)
+    expect(cssMediaQuery(input)).toStrictEqual(expectedOutput)
   })
 
   it('Formats tokens with only options.selector', () => {
     const input = getMockFormatterArguments({
-      options: {
-        selector: `[data-color-mode="dark"]`,
+      file: {
+        destination: 'test.css',
+        options: {
+          showFileHeader: false,
+          selector: `[data-color-mode="dark"]`,
+        },
       },
     })
     const expectedOutput = format(
@@ -44,6 +52,6 @@ describe('Format: css/variables', () => {
     }`,
       {parser: 'css', printWidth: 500},
     )
-    expect(cssVariables(input)).toStrictEqual(expectedOutput)
+    expect(cssMediaQuery(input)).toStrictEqual(expectedOutput)
   })
 })
diff --git a/src/formats/cssVariables.ts b/src/formats/cssVariables.ts
diff --git a/src/formats/index.ts b/src/formats/index.ts
@@ -1,7 +1,5 @@
-export {cssThemed} from './cssThemed'
 export {cssCustomMedia} from './cssCustomMedia'
 export {cssMediaQuery} from './cssMediaQuery'
-export {cssVariables} from './cssVariables'
 export {jsonFigma} from './jsonFigma'
 export {javascriptCommonJs} from './javascriptCommonJs'
 export {javascriptEsm} from './javascriptEsm'

diff --git a/src/platforms/css.ts b/src/platforms/css.ts
@@ -56,7 +56,7 @@ export const css: PlatformInitializer = (outputFile, prefix, buildPath, options)
       },
       {
         destination: `${outputFile}`,
-        format: `css/variables`,
+        format: `css/mediaQuery`,
         filter: token => isSource(token) && options?.themed !== true,
         options: {
           showFileHeader: false,