update

unocss · Jan 9, 2023 · 2ce7a56 · 2ce7a56
1 parent 961c19d
commit 2ce7a56
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 15 deletions.
diff --git a/packages/preset-mini/src/_variants/aria.ts b/packages/preset-mini/src/_variants/aria.ts
@@ -4,11 +4,11 @@ import { handler as h, variantGetParameter } from '../utils'
 
 export const variantAria: VariantObject = {
   name: 'aria',
-  match(matcher, { theme }: VariantContext<Theme>) {
-    const variant = variantGetParameter('aria-', matcher, [':', '-'])
+  match(matcher, ctx: VariantContext<Theme>) {
+    const variant = variantGetParameter('aria-', matcher, ctx.generator.config.separators)
     if (variant) {
       const [match, rest] = variant
-      const aria = h.bracket(match) ?? theme.aria?.[match] ?? ''
+      const aria = h.bracket(match) ?? ctx.theme.aria?.[match] ?? ''
       if (aria) {
         return {
           matcher: rest,

diff --git a/packages/preset-mini/src/_variants/container.ts b/packages/preset-mini/src/_variants/container.ts
@@ -5,11 +5,11 @@ import { handler as h, variantGetParameter } from '../utils'
 
 export const variantContainerQuery: VariantObject = {
   name: '@',
-  match(matcher, { theme }: VariantContext<Theme>) {
+  match(matcher, ctx: VariantContext<Theme>) {
     if (matcher.startsWith('@container'))
       return
 
-    const variant = variantGetParameter('@', matcher, [':', '-'])
+    const variant = variantGetParameter('@', matcher, ctx.generator.config.separators)
     if (variant) {
       const [match, rest, label] = variant
       const unbracket = h.bracket(match)
@@ -20,7 +20,7 @@ export const variantContainerQuery: VariantObject = {
           container = `(min-width: ${minWidth})`
       }
       else {
-        container = theme.containers?.[match] ?? ''
+        container = ctx.theme.containers?.[match] ?? ''
       }
 
       if (container) {

diff --git a/packages/preset-mini/src/_variants/data.ts b/packages/preset-mini/src/_variants/data.ts
@@ -4,11 +4,11 @@ import { handler as h, variantGetParameter } from '../utils'
 
 export const variantDataAttribute: VariantObject = {
   name: 'data',
-  match(matcher, { theme }: VariantContext<Theme>) {
-    const variant = variantGetParameter('data-', matcher, [':', '-'])
+  match(matcher, ctx: VariantContext<Theme>) {
+    const variant = variantGetParameter('data-', matcher, ctx.generator.config.separators)
     if (variant) {
       const [match, rest] = variant
-      const dataAttribute = h.bracket(match) ?? theme.data?.[match] ?? ''
+      const dataAttribute = h.bracket(match) ?? ctx.theme.data?.[match] ?? ''
       if (dataAttribute) {
         return {
           matcher: rest,

diff --git a/test/__snapshots__/svelte-scoped.test.ts.snap b/test/__snapshots__/svelte-scoped.test.ts.snap
@@ -132,12 +132,10 @@ exports[`svelte-scoped > everything 2`] = `
     margin-left: calc(0.25rem * calc(1 - var(--un-space-x-reverse)));
     margin-right: calc(0.25rem * var(--un-space-x-reverse));
   }
-  :global(
-      [dir=\\"rtl\\"]
-        ._rtl\\\\:space-x-reverse_7dkb0w
-        > :not([hidden])
-        ~ :not([hidden])
-    ) {
+  :global([dir=\\"rtl\\"]
+      ._rtl\\\\:space-x-reverse_7dkb0w
+      > :not([hidden])
+      ~ :not([hidden])) {
     --un-space-x-reverse: 1;
   }
   :global(._bg-red-500_7dkb0w) {