fix(presets): move content-x utility from preset-wind to preset-mini (

#889)
unocss · Apr 28, 2022 · 9b1d783 · 9b1d783
1 parent 4d5a18e
commit 9b1d783
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 16 deletions.
diff --git a/packages/preset-mini/src/rules/static.ts b/packages/preset-mini/src/rules/static.ts
@@ -50,7 +50,10 @@ export const whitespaces: Rule[] = [
 ]
 
 export const contents: Rule[] = [
-  [/^content-\[(.+)\]$/, ([, v]) => ({ content: `"${v}"` })],
+  [/^content-(.+)$/, ([, v]) => {
+    const c = h.bracket.cssvar(v)
+    return { content: c == null ? `"${v}"` : c }
+  }],
   ['content-empty', { content: '""' }],
   ['content-none', { content: '""' }],
 ]

diff --git a/packages/preset-wind/src/rules/default.ts b/packages/preset-wind/src/rules/default.ts
@@ -8,6 +8,7 @@ import {
   borders,
   boxShadows,
   boxSizing,
+  contents,
   cssProperty,
   cursors,
   displays,
@@ -56,7 +57,7 @@ import { container } from './container'
 import { backgroundStyles } from './background'
 import { filters } from './filters'
 import { spaces } from './spacing'
-import { backgroundBlendModes, contents, hyphens, isolations, mixBlendModes, objectPositions, screenReadersAccess, textTransforms, writingModes, writingOrientations } from './static'
+import { backgroundBlendModes, hyphens, isolations, mixBlendModes, objectPositions, screenReadersAccess, textTransforms, writingModes, writingOrientations } from './static'
 import { tables } from './table'
 import { accents, carets, imageRenderings, listStyle, overscrolls, scrollBehaviors } from './behaviors'
 import { animations } from './animation'

diff --git a/packages/preset-wind/src/rules/static.ts b/packages/preset-wind/src/rules/static.ts
@@ -1,5 +1,5 @@
 import type { Rule } from '@unocss/core'
-import { handler as h, positionMap } from '@unocss/preset-mini/utils'
+import { positionMap } from '@unocss/preset-mini/utils'
 
 export const textTransforms: Rule[] = [
   // tailwind compact
@@ -68,17 +68,6 @@ export const screenReadersAccess: Rule[] = [
   ],
 ]
 
-export const contents: Rule[] = [
-  [/^content-(.+)$/, ([, v]) => {
-    const c = h.bracket.cssvar(v)
-    if (c != null)
-      return { content: c }
-    return { content: `"${v}"` }
-  }],
-  ['content-empty', { content: '""' }],
-  ['content-none', { content: '""' }],
-]
-
 export const isolations: Rule[] = [
   ['isolate', { isolation: 'isolate' }],
   ['isolate-auto', { isolation: 'auto' }],

diff --git a/test/__snapshots__/preset-mini.test.ts.snap b/test/__snapshots__/preset-mini.test.ts.snap
@@ -236,8 +236,9 @@ div:hover .group-\\\\[div\\\\:hover\\\\]-\\\\[combinator\\\\:test-4\\\\]{combina
 .border-block-style-double{border-block-start-style:double;border-block-end-style:double;}
 .border-is-style-double{border-inline-start-style:double;}
 .after\\\\:content-\\\\[unocss\\\\]::after,
-.content-\\\\[unocss\\\\]{content:\\"unocss\\";}
-.content-\\\\[attr\\\\(dashed-attr\\\\)\\\\]{content:\\"attr(dashed-attr)\\";}
+.content-\\\\[unocss\\\\]{content:unocss;}
+.content-\\\\[attr\\\\(dashed-attr\\\\)\\\\]{content:attr(dashed-attr);}
+.content-unocss{content:\\"unocss\\";}
 .content-empty,
 .content-none{content:\\"\\";}
 .font-\\\\[system-ui\\\\]{font-family:system-ui;}

diff --git a/test/assets/preset-mini-targets.ts b/test/assets/preset-mini-targets.ts
@@ -513,6 +513,7 @@ export const presetMiniTargets: string[] = [
   'ws-nowrap',
   'content-empty',
   'content-none',
+  'content-unocss',
   'content-[unocss]',
   'content-[attr(dashed-attr)]',
   'break-normal',