vitrify 0.17.5 → 0.17.7

package/src/node/plugins/quasar/unocss/components/QTree.unocss.ts

@@ -17,106 +17,141 @@ const shortcuts: UserShortcuts<QuasarTheme> = [
   [
     /^q-tree$/,
     ([, c], { theme }) =>
+      theme.quasar?.components?.['q-tree'] ??
       `relative text-[#9e9e9e] [&_>_.q-tree\\_\\_node]:(p-0) [&_>_.q-tree\\_\\_node:after]:(hidden) [&_>_.q-tree\\_\\_node_>_.q-tree\\_\\_node-header:before]:(hidden) [&_>_.q-tree\\_\\_node--child_>_.q-tree\\_\\_node-header]:(pl-[24px])`
   ],
 
-  [/^q-tree__node$/, ([, c], { theme }) => `pt-[0] pr-[0] pb-[3px] pl-[22px]`],
-
   [
-    /^q-tree__node:after$/,
+    /^q-tree__node$/,
     ([, c], { theme }) =>
-      `content-empty absolute -top-[3px] bottom-0 w-[2px] right-auto -left-[13px] [border-left:1px_solid_currentColor]`
+      theme.quasar?.components?.['q-tree__node'] ??
+      `pt-[0] pr-[0] pb-[3px] pl-[22px] [&:after]:(content-[''] absolute -top-[3px] bottom-[0] w-[2px] right-auto -left-[13px] [border-left:1px_solid_currentColor]) [&:last-child:after]:(hidden)`
   ],
 
-  [/^q-tree__node:last-child:after$/, ([, c], { theme }) => `hidden`],
-
   [
     /^q-tree__node--disabled$/,
     ([, c], { theme }) =>
+      theme.quasar?.components?.['q-tree__node--disabled'] ??
       `pointer-events-none [&_.disabled]:(!opacity-100) [&_>_div]:(!opacity-60) [&_>_i]:(!opacity-60) [&_>_.disabled]:(!opacity-60) [&_>_div_.q-tree\\_\\_node--disabled_>_div]:(!opacity-100) [&_>_div_.q-tree\\_\\_node--disabled_>_i]:(!opacity-100) [&_>_div_.q-tree\\_\\_node--disabled_>_.disabled]:(!opacity-100) [&_>_i_.q-tree\\_\\_node--disabled_>_div]:(!opacity-100) [&_>_i_.q-tree\\_\\_node--disabled_>_i]:(!opacity-100) [&_>_i_.q-tree\\_\\_node--disabled_>_.disabled]:(!opacity-100) [&_>_.disabled_.q-tree\\_\\_node--disabled_>_div]:(!opacity-100) [&_>_.disabled_.q-tree\\_\\_node--disabled_>_i]:(!opacity-100) [&_>_.disabled_.q-tree\\_\\_node--disabled_>_.disabled]:(!opacity-100)`
   ],
 
   [
-    /^q-tree__node-header:before$/,
+    /^q-tree__node-header$/,
     ([, c], { theme }) =>
-      `content-empty absolute -top-[3px] bottom-2/4 w-[31px] -left-[35px] [border-left:1px_solid_currentColor] [border-bottom:1px_solid_currentColor]`
+      theme.quasar?.components?.['q-tree__node-header'] ??
+      `[&:before]:(content-[''] absolute -top-[3px] bottom-2/4 w-[31px] -left-[35px] [border-left:1px_solid_currentColor] [border-bottom:1px_solid_currentColor]) p-[4px] mt-[3px] rounded-[4px] outline-[0]`
   ],
 
-  [/^q-tree__children$/, ([, c], { theme }) => `pl-[25px]`],
+  [
+    /^q-tree__children$/,
+    ([, c], { theme }) =>
+      theme.quasar?.components?.['q-tree__children'] ?? `pl-[25px]`
+  ],
 
   [
     /^q-tree__node-body$/,
-    ([, c], { theme }) => `pt-[5px] pr-[0] pb-[8px] pl-[5px]`
+    ([, c], { theme }) =>
+      theme.quasar?.components?.['q-tree__node-body'] ??
+      `pt-[5px] pr-[0] pb-[8px] pl-[5px]`
   ],
 
   [
     /^q-tree__node--parent$/,
     ([, c], { theme }) =>
-      `pl-[2px] [&_>_.q-tree\\_\\_node-header:before]:(w-[15px] -left-[15px]) [&_>_.q-tree\\_\\_node-collapsible_>_.q-tree\\_\\_node-body]:(pt-[5px] pr-[0] pb-[8px] pl-[27px]) [&_>_.q-tree\\_\\_node-collapsible_>_.q-tree\\_\\_node-body:after]:(content-empty absolute top-0 w-[2px] h-full right-auto left-[12px] [border-left:1px_solid_currentColor] bottom-[50px])`
+      theme.quasar?.components?.['q-tree__node--parent'] ??
+      `pl-[2px] [&_>_.q-tree\\_\\_node-header:before]:(w-[15px] -left-[15px]) [&_>_.q-tree\\_\\_node-collapsible_>_.q-tree\\_\\_node-body]:(pt-[5px] pr-[0] pb-[8px] pl-[27px]) [&_>_.q-tree\\_\\_node-collapsible_>_.q-tree\\_\\_node-body:after]:(content-[''] absolute top-[0] w-[2px] h-full right-auto left-[12px] [border-left:1px_solid_currentColor] bottom-[50px])`
   ],
 
-  [/^q-tree__node--link$/, ([, c], { theme }) => `cursor-pointer`],
-
   [
-    /^q-tree__node-header$/,
-    ([, c], { theme }) => `p-[4px] mt-[3px] rounded-[4px] outline-0`
+    /^q-tree__node--link$/,
+    ([, c], { theme }) =>
+      theme.quasar?.components?.['q-tree__node--link'] ?? `cursor-pointer`
   ],
 
   [
     /^q-tree__node-header-content$/,
     ([, c], { theme }) =>
+      theme.quasar?.components?.['q-tree__node-header-content'] ??
       `text-[#000] [transition:color_0.3s] [&_.q-icon]:(text-[21px]) [&_.q-avatar]:(text-[28px] rounded-[50%] w-[28px] h-[28px])`
   ],
 
   [
     /^q-tree__node--selected$/,
     ([, c], { theme }) =>
+      theme.quasar?.components?.['q-tree__node--selected'] ??
       `[&_.q-tree\\_\\_node-header-content]:(text-[#9e9e9e])`
   ],
 
-  [/^q-tree__icon$/, ([, c], { theme }) => `text-[21px]`],
+  [
+    /^q-tree__icon$/,
+    ([, c], { theme }) =>
+      theme.quasar?.components?.['q-tree__icon'] ?? `text-[21px]`
+  ],
 
-  [/^q-tree__img$/, ([, c], { theme }) => `h-[42px] rounded-[2px]`],
+  [
+    /^q-tree__img$/,
+    ([, c], { theme }) =>
+      theme.quasar?.components?.['q-tree__img'] ?? `h-[42px] rounded-[2px]`
+  ],
 
   [
     /^q-tree__avatar$/,
-    ([, c], { theme }) => `text-[28px] rounded-[50%] w-[28px] h-[28px]`
+    ([, c], { theme }) =>
+      theme.quasar?.components?.['q-tree__avatar'] ??
+      `text-[28px] rounded-[50%] w-[28px] h-[28px]`
   ],
 
   [
     /^q-tree__arrow$/,
-    ([, c], { theme }) => `text-[16px] mr-[4px] [transition:transform_0.3s]`
+    ([, c], { theme }) =>
+      theme.quasar?.components?.['q-tree__arrow'] ??
+      `text-[16px] mr-[4px] [transition:transform_0.3s]`
   ],
 
-  [/^q-tree__spinner$/, ([, c], { theme }) => `text-[16px] mr-[4px]`],
+  [
+    /^q-tree__spinner$/,
+    ([, c], { theme }) =>
+      theme.quasar?.components?.['q-tree__spinner'] ?? `text-[16px] mr-[4px]`
+  ],
 
   [
     /^q-tree__arrow--rotate$/,
-    ([, c], { theme }) => `[transform:rotate3d(0,_0,_1,_90deg)]`
+    ([, c], { theme }) =>
+      theme.quasar?.components?.['q-tree__arrow--rotate'] ??
+      `[transform:rotate3d(0,_0,_1,_90deg)]`
   ],
 
-  [/^q-tree__tickbox$/, ([, c], { theme }) => `mr-[4px]`],
+  [
+    /^q-tree__tickbox$/,
+    ([, c], { theme }) =>
+      theme.quasar?.components?.['q-tree__tickbox'] ?? `mr-[4px]`
+  ],
 
   [
     /^q-tree--dark$/,
-    ([, c], { theme }) => `[&_.q-tree\\_\\_node-header-content]:(text-[#fff])`
+    ([, c], { theme }) =>
+      theme.quasar?.components?.['q-tree--dark'] ??
+      `[&_.q-tree\\_\\_node-header-content]:(text-[#fff])`
   ],
 
   [
     /^q-tree--no-connectors$/,
     ([, c], { theme }) =>
+      theme.quasar?.components?.['q-tree--no-connectors'] ??
       `[&_.q-tree\\_\\_node:after]:(!hidden) [&_.q-tree\\_\\_node-header:before]:(!hidden) [&_.q-tree\\_\\_node-body:after]:(!hidden)`
   ],
 
   [
     /^q-tree--dense$/,
     ([, c], { theme }) =>
-      `[&_>_.q-tree\\_\\_node--child_>_.q-tree\\_\\_node-header]:(pl-px) [&_.q-tree\\_\\_arrow]:(mr-px) [&_.q-tree\\_\\_spinner]:(mr-px) [&_.q-tree\\_\\_img]:(h-[32px]) [&_.q-tree\\_\\_tickbox]:(mr-[3px]) [&_.q-tree\\_\\_node]:(p-0) [&_.q-tree\\_\\_node:after]:(top-0 -left-[8px]) [&_.q-tree\\_\\_node-header]:(mt-0 p-px) [&_.q-tree\\_\\_node-header:before]:(top-0 -left-[8px] w-[8px]) [&_.q-tree\\_\\_node--child]:(pl-[17px]) [&_.q-tree\\_\\_node--child_>_.q-tree\\_\\_node-header:before]:(-left-[25px] w-[21px]) [&_.q-tree\\_\\_node-body]:(pt-[0] px-[0] pb-[2px]) [&_.q-tree\\_\\_children]:(pl-[16px])`
+      theme.quasar?.components?.['q-tree--dense'] ??
+      `[&_>_.q-tree\\_\\_node--child_>_.q-tree\\_\\_node-header]:(pl-px) [&_.q-tree\\_\\_arrow]:(mr-px) [&_.q-tree\\_\\_spinner]:(mr-px) [&_.q-tree\\_\\_img]:(h-[32px]) [&_.q-tree\\_\\_tickbox]:(mr-[3px]) [&_.q-tree\\_\\_node]:(p-0) [&_.q-tree\\_\\_node:after]:(top-[0] -left-[8px]) [&_.q-tree\\_\\_node-header]:(mt-0 p-px) [&_.q-tree\\_\\_node-header:before]:(top-[0] -left-[8px] w-[8px]) [&_.q-tree\\_\\_node--child]:(pl-[17px]) [&_.q-tree\\_\\_node--child_>_.q-tree\\_\\_node-header:before]:(-left-[25px] w-[21px]) [&_.q-tree\\_\\_node-body]:(pt-[0] px-[0] pb-[2px]) [&_.q-tree\\_\\_children]:(pl-[16px])`
   ],
 
   [
     /^q-tree--dense$/,
     ([, c], { theme }) =>
+      theme.quasar?.components?.['q-tree--dense'] ??
       `[&__.q-tree\\_\\_node--parent__>_.q-tree\\_\\_node-collapsible__>_.q-tree\\_\\_node-body]:(pt-[0] pr-[0] pb-[2px] pl-[20px]) [&__.q-tree\\_\\_node--parent__>_.q-tree\\_\\_node-collapsible__>_.q-tree\\_\\_node-body:after]:(left-[8px])`
   ]
 ]

package/src/node/plugins/quasar/unocss/components/QUploader.unocss.ts

@@ -5,75 +5,83 @@ const shortcuts: UserShortcuts<QuasarTheme> = [
   [
     /^q-uploader$/,
     ([, c], { theme }) =>
+      theme.quasar?.components?.['q-uploader'] ??
       `[box-shadow:0_1px_5px_rgba(0,_0,_0,_0.2),_0_2px_2px_rgba(0,_0,_0,_0.14),_0_3px_1px_-2px_rgba(0,_0,_0,_0.12)] rounded-[4px] align-top bg-[#fff] relative w-[320px] max-h-[320px]`
   ],
 
   [
     /^q-uploader--bordered$/,
-    ([, c], { theme }) => `border-[1px] border-solid border-[rgba(0,0,0,0.12)]`
+    ([, c], { theme }) =>
+      theme.quasar?.components?.['q-uploader--bordered'] ??
+      `border-[1px] border-solid border-[rgba(0,0,0,0.12)]`
   ],
 
   [
     /^q-uploader__input$/,
-    ([, c], { theme }) => `opacity-0 w-full h-full !cursor-pointer`
+    ([, c], { theme }) =>
+      theme.quasar?.components?.['q-uploader__input'] ??
+      `opacity-0 w-full h-full !cursor-pointer [&::-webkit-file-upload-button]:(cursor-pointer)`
   ],
 
   [
-    /^q-uploader__input::-webkit-file-upload-button$/,
-    ([, c], { theme }) => `cursor-pointer`
+    /^q-uploader__file$/,
+    ([, c], { theme }) =>
+      theme.quasar?.components?.['q-uploader__file'] ??
+      `[&:before]:(content-[''] [border-top-left-radius:inherit] [border-top-right-radius:inherit] absolute top-[0] right-[0] bottom-[0] left-[0] pointer-events-none bg-current opacity-[0.04]) rounded-tl-[4px] rounded-br-[0] rounded-tr-[4px] rounded-bl-[0] border-[1px] border-solid border-[rgba(0,0,0,0.12)] [&_.q-circular-progress]:(text-[24px]) [&_+_.q-uploader\\_\\_file]:(mt-[8px])`
   ],
 
   [
-    /^q-uploader__file:before$/,
+    /^q-uploader__header$/,
     ([, c], { theme }) =>
-      `content-empty [border-top-left-radius:inherit] [border-top-right-radius:inherit] absolute top-0 right-0 bottom-0 left-0 pointer-events-none bg-current opacity-[0.04]`
+      theme.quasar?.components?.['q-uploader__header'] ??
+      `relative [border-top-left-radius:inherit] [border-top-right-radius:inherit] text-[#fff] w-full`
   ],
 
   [
-    /^q-uploader__header$/,
+    /^q-uploader__spinner$/,
     ([, c], { theme }) =>
-      `relative [border-top-left-radius:inherit] [border-top-right-radius:inherit] text-[#fff] w-full bg-primary`
+      theme.quasar?.components?.['q-uploader__spinner'] ??
+      `text-[24px] mr-[4px]`
   ],
 
-  [/^q-uploader__spinner$/, ([, c], { theme }) => `text-[24px] mr-[4px]`],
-
-  [/^q-uploader__header-content$/, ([, c], { theme }) => `p-[8px]`],
+  [
+    /^q-uploader__header-content$/,
+    ([, c], { theme }) =>
+      theme.quasar?.components?.['q-uploader__header-content'] ?? `p-[8px]`
+  ],
 
   [
     /^q-uploader__dnd$/,
     ([, c], { theme }) =>
+      theme.quasar?.components?.['q-uploader__dnd'] ??
       `outline-[1px_dashed_currentColor] outline-offset-[-4px] bg-[rgba(255,_255,_255,_0.6)]`
   ],
 
   [
     /^q-uploader__overlay$/,
     ([, c], { theme }) =>
+      theme.quasar?.components?.['q-uploader__overlay'] ??
       `text-[36px] text-[#000] bg-[rgba(255,_255,_255,_0.6)]`
   ],
 
   [
     /^q-uploader__list$/,
     ([, c], { theme }) =>
+      theme.quasar?.components?.['q-uploader__list'] ??
       `relative [border-bottom-left-radius:inherit] [border-bottom-right-radius:inherit] p-[8px] min-h-[60px] flex-auto`
   ],
 
-  [
-    /^q-uploader__file$/,
-    ([, c], { theme }) =>
-      `rounded-tl-[4px] rounded-br-[0] rounded-tr-[4px] rounded-bl-[0] border-[1px] border-solid border-[rgba(0,0,0,0.12)] [&_.q-circular-progress]:(text-[24px]) [&_+_.q-uploader\\_\\_file]:(mt-[8px])`
-  ],
-
   [
     /^q-uploader__file--img$/,
     ([, c], { theme }) =>
-      `text-[#fff] h-[200px] min-w-[200px] bg-[50%_50%] bg-no-repeat [&_.q-circular-progress]:(text-[#fff]) [&_.q-uploader\\_\\_file-header]:(pb-[24px] bg-[linear-gradient(_to_bottom,_rgba(0,_0,_0,_0.7)_20%,_rgba(255,_255,_255,_0)_)])`
+      theme.quasar?.components?.['q-uploader__file--img'] ??
+      `text-[#fff] h-[200px] min-w-[200px] bg-[50%_50%] bg-no-repeat [&:before]:(content-[none]) [&_.q-circular-progress]:(text-[#fff]) [&_.q-uploader\\_\\_file-header]:(pb-[24px] bg-[linear-gradient(_to_bottom,_rgba(0,_0,_0,_0.7)_20%,_rgba(255,_255,_255,_0)_)])`
   ],
 
-  [/^q-uploader__file--img:before$/, ([, c], { theme }) => `content-[none]`],
-
   [
     /^q-uploader__file-header$/,
     ([, c], { theme }) =>
+      theme.quasar?.components?.['q-uploader__file-header'] ??
       `relative px-[8px] py-[4px] [border-top-left-radius:inherit] [border-top-right-radius:inherit]`
   ],
 
@@ -83,23 +91,29 @@ const shortcuts: UserShortcuts<QuasarTheme> = [
 
   [
     /^q-uploader__title$/,
-    ([, c], { theme }) => `text-[14px] font-bold leading-[1.285714]`
+    ([, c], { theme }) =>
+      theme.quasar?.components?.['q-uploader__title'] ??
+      `text-[14px] font-bold leading-[1.285714]`
   ],
 
   [
     /^q-uploader__subtitle$/,
-    ([, c], { theme }) => `text-[12px] leading-normal`
+    ([, c], { theme }) =>
+      theme.quasar?.components?.['q-uploader__subtitle'] ??
+      `text-[12px] leading-normal`
   ],
 
   [
     /^q-uploader--disable$/,
     ([, c], { theme }) =>
+      theme.quasar?.components?.['q-uploader--disable'] ??
       `[&_.q-uploader\\_\\_header]:(pointer-events-none) [&_.q-uploader\\_\\_list]:(pointer-events-none)`
   ],
 
   [
     /^q-uploader--dark$/,
     ([, c], { theme }) =>
+      theme.quasar?.components?.['q-uploader--dark'] ??
       `border-[rgba(255,_255,_255,_0.28)] [box-shadow:0_1px_5px_rgba(255,_255,_255,_0.2),_0_2px_2px_rgba(255,_255,_255,_0.14),_0_3px_1px_-2px_rgba(255,_255,_255,_0.12)] [&_.q-uploader\\_\\_file]:(border-[rgba(255,_255,_255,_0.28)]) [&_.q-uploader\\_\\_dnd]:(bg-[rgba(255,_255,_255,_0.3)]) [&_.q-uploader\\_\\_overlay]:(bg-[rgba(255,_255,_255,_0.3)]) [&_.q-uploader\\_\\_overlay]:(text-[#fff])`
   ]
 ]

package/src/node/plugins/quasar/unocss/components/QVideo.unocss.ts

@@ -5,12 +5,14 @@ const shortcuts: UserShortcuts<QuasarTheme> = [
   [
     /^q-video$/,
     ([, c], { theme }) =>
+      theme.quasar?.components?.['q-video'] ??
       `relative overflow-hidden [border-radius:inherit] [&_iframe]:(w-full h-full) [&_object]:(w-full h-full) [&_embed]:(w-full h-full)`
   ],
 
   [
     /^q-video--responsive$/,
     ([, c], { theme }) =>
+      theme.quasar?.components?.['q-video--responsive'] ??
       `h-[0] [&_iframe]:(absolute top-0 left-0) [&_object]:(absolute top-0 left-0) [&_embed]:(absolute top-0 left-0)`
   ]
 ]

package/src/node/plugins/quasar/unocss/components/QVirtualScroll.unocss.ts

@@ -7,18 +7,21 @@ const shortcuts: UserShortcuts<QuasarTheme> = [
   [
     /^q-virtual-scroll__content$/,
     ([, c], { theme }) =>
+      theme.quasar?.components?.['q-virtual-scroll__content'] ??
       `outline-[none] [&_>_*]:([overflow-anchor:none]) [&_>_[data-q-vs-anchor]]:([overflow-anchor:auto])`
   ],
 
   [
     /^q-virtual-scroll__padding$/,
     ([, c], { theme }) =>
+      theme.quasar?.components?.['q-virtual-scroll__padding'] ??
       `bg-[linear-gradient(_rgba(255,_255,_255,_0),_rgba(255,_255,_255,_0)_20%,_rgba(128,_128,_128,_0.03)_20%,_rgba(128,_128,_128,_0.08)_50%,_rgba(128,_128,_128,_0.03)_80%,_rgba(255,_255,_255,_0)_80%,_rgba(255,_255,_255,_0)_)] [background-size:var(--q-virtual-scroll-item-width,_100%)_var(--q-virtual-scroll-item-height,_50px)]`
   ],
 
   [
     /^q-virtual-scroll--horizontal$/,
     ([, c], { theme }) =>
+      theme.quasar?.components?.['q-virtual-scroll--horizontal'] ??
       `flex flex-row flex-nowrap items-stretch [&_.q-virtual-scroll\\_\\_content]:(flex flex-row flex-nowrap) [&_.q-virtual-scroll\\_\\_padding]:(flex-[0_0_auto]) [&_.q-virtual-scroll\\_\\_content]:(flex-[0_0_auto]) [&_.q-virtual-scroll\\_\\_content_>_*]:(flex-[0_0_auto]) [&_.q-virtual-scroll\\_\\_padding]:(bg-[linear-gradient(_to_left,_rgba(255,_255,_255,_0),_rgba(255,_255,_255,_0)_20%,_rgba(128,_128,_128,_0.03)_20%,_rgba(128,_128,_128,_0.08)_50%,_rgba(128,_128,_128,_0.03)_80%,_rgba(255,_255,_255,_0)_80%,_rgba(255,_255,_255,_0)_)] [background-size:var(--q-virtual-scroll-item-width,_50px)_var(--q-virtual-scroll-item-height,_100%)])`
   ]
 ]

package/src/node/plugins/quasar/unocss/core/elevation.unocss.ts

@@ -1,4 +1,4 @@
-import type { Rule } from '@unocss/core'
+import type { Rule, UserShortcuts } from '@unocss/core'
 import type { QuasarTheme } from '../theme.js'
 
 type Enumerate<
@@ -13,67 +13,67 @@ type IntRange<F extends number, T extends number> = Exclude<
   Enumerate<F>
 >
 
-const shadows = (mode: 'light' | 'dark'): Rule<QuasarTheme>[] => [
-  ...Array.from({ length: 24 }, (_, i) => i + 1).reduce((acc, z) => {
-    acc.push([
-      new RegExp(`shadow-${z}`),
-      ([, c], { symbols, theme }) => ({
-        [symbols.parent]: mode === 'dark' ? 'body.body--dark' : undefined,
-        'box-shadow': theme['shadows'][z as IntRange<0, 24>]
-      })
-    ])
-    acc.push([
-      new RegExp(`shadow-up-${z}`),
-      ([, c], { symbols, theme }) => ({
-        [symbols.parent]: mode === 'dark' ? 'body.body--dark' : undefined,
+// const shadows = (mode: 'light' | 'dark'): Rule<QuasarTheme>[] => [
+//   ...Array.from({ length: 24 }, (_, i) => i + 1).reduce((acc, z) => {
+//     acc.push([
+//       new RegExp(`shadow-${z}`),
+//       ([, c], { symbols, theme }) => ({
+//         [symbols.parent]: mode === 'dark' ? 'body.body--dark' : undefined,
+//         'box-shadow': theme['shadows'][z as IntRange<0, 24>]
+//       })
+//     ])
+//     acc.push([
+//       new RegExp(`shadow-up-${z}`),
+//       ([, c], { symbols, theme }) => ({
+//         [symbols.parent]: mode === 'dark' ? 'body.body--dark' : undefined,
 
-        'box-shadow': theme['shadows']['up'][z as IntRange<0, 24>]
-      })
-    ])
-    return acc
-  }, [] as Rule<QuasarTheme>[]),
-  [
-    /^inset-shadow$/,
-    function* ([, color], { symbols, theme }) {
-      yield {
-        [symbols.parent]: mode === 'dark' ? 'body.body--dark' : undefined,
-        'box-shadow': theme['insetShadow']
-      }
-    }
-  ] as Rule<QuasarTheme>,
-  [
-    /^inset-shadow-down$/,
-    function* ([, color], { symbols, theme }) {
-      yield {
-        [symbols.parent]: mode === 'dark' ? 'body.body--dark' : undefined,
-        'box-shadow': theme['insetShadowDown']
-      }
-    }
-  ] as Rule<QuasarTheme>
-]
+//         'box-shadow': theme['shadows']['up'][z as IntRange<0, 24>]
+//       })
+//     ])
+//     return acc
+//   }, [] as Rule<QuasarTheme>[]),
+//   [
+//     /^inset-shadow$/,
+//     function* ([, color], { symbols, theme }) {
+//       yield {
+//         [symbols.parent]: mode === 'dark' ? 'body.body--dark' : undefined,
+//         'box-shadow': theme['insetShadow']
+//       }
+//     }
+//   ] as Rule<QuasarTheme>,
+//   [
+//     /^inset-shadow-down$/,
+//     function* ([, color], { symbols, theme }) {
+//       yield {
+//         [symbols.parent]: mode === 'dark' ? 'body.body--dark' : undefined,
+//         'box-shadow': theme['insetShadowDown']
+//       }
+//     }
+//   ] as Rule<QuasarTheme>
+// ]
 
 const rules: Rule<QuasarTheme>[] = [
-  [
-    /^shadow-transition$/,
-    function* ([, color], { theme }) {
-      yield {
-        transition: `${theme['shadowTransition']} !important`
-      }
-    }
-  ] as Rule<QuasarTheme>,
-  ...shadows('light'),
-  ...shadows('dark'),
-  ...['no-shadow', 'shadow-0'].map(
-    (c) =>
-      [
-        new RegExp(`${c}`),
-        function* ([, color], { theme }) {
-          yield {
-            'box-shadow': `none !important`
-          }
-        }
-      ] as Rule<QuasarTheme>
-  ),
+  // [
+  //   /^shadow-transition$/,
+  //   function* ([, color], { theme }) {
+  //     yield {
+  //       transition: `${theme['shadowTransition']} !important`
+  //     }
+  //   }
+  // ] as Rule<QuasarTheme>,
+  // ...shadows('light'),
+  // ...shadows('dark'),
+  // ...['no-shadow', 'shadow-0'].map(
+  //   (c) =>
+  //     [
+  //       new RegExp(`${c}`),
+  //       function* ([, color], { theme }) {
+  //         yield {
+  //           'box-shadow': `none !important`
+  //         }
+  //       }
+  //     ] as Rule<QuasarTheme>
+  // ),
   ...(['z-marginals', 'z-notify', 'z-fullscreen', 'z-inherit'] as const).map(
     (c) =>
       [
@@ -84,7 +84,8 @@ const rules: Rule<QuasarTheme>[] = [
             | 'notify'
             | 'fullscreen'
           yield {
-            'z-index': c === 'z-inherit' ? 'inherit' : theme['z'][selector]
+            'z-index':
+              c === 'z-inherit' ? 'inherit' : theme.quasar?.['z'][selector]
           }
         }
       ] as Rule<QuasarTheme>

package/src/node/plugins/quasar/unocss/core/flex.unocss.ts

@@ -16,39 +16,20 @@ const colGutter = {
 const sizes = ['sm', 'md', 'lg', 'xl']
 
 const shortcuts: UserShortcuts<QuasarTheme> = [
+  [/^row$/, ([, c], { theme }) => `flex flex-row flex-wrap`],
+  [/^column$/, ([, c], { theme }) => `flex flex-col flex-wrap`],
   [
-    /^row$/,
-    ([, c], { theme }) => `flex flex-row flex-wrap 
-    [&_>_.col]:(grow)
-    ${sizes
-      .map((size) => `[&_>_.col-${size}]:(${size}:basis-auto ${size}:grow)`)
-      .join(' ')}
-    ${grid.map((nr) => `[&_>_.col-${nr}]:(basis-${nr}/12)`).join(' ')}
-    ${sizes
-      .map((size) =>
-        grid
-          .map((nr) => `[&_>_.col-${size}-${nr}]:(${size}:basis-${nr}/12)`)
-          .join(' ')
-      )
-      .join(' ')}
-  `
-  ],
-  [
-    /^column$/,
-    ([, c], { theme }) => `flex flex-col flex-wrap
-      [&_>_.col]:(grow)
-      ${sizes
-        .map((size) => `[&_>_.col-${size}]:(${size}:basis-auto ${size}:grow)`)
-        .join(' ')}
-      ${grid.map((nr) => `[&_>_.col-${nr}]:(basis-${nr}/12)`).join(' ')}
-    ${sizes
-      .map((size) =>
-        grid
-          .map((nr) => `[&_>_.col-${size}-${nr}]:(${size}:basis-${nr}/12)`)
-          .join(' ')
-      )
-      .join(' ')}
-  `
+    /^col(?:-)?(none|xs|sm|md|lg|xl)?(?:-)?([2-9]|1[0-2]?)?$/,
+    ([, size, nr], { theme }) => {
+      if (size && nr) {
+        return `${size}:basis-${nr}/12)`
+      } else if (nr) {
+        return `basis-${nr}/12`
+      } else if (size) {
+        return `${size}:basis-auto ${size}:grow`
+      }
+      return `grow`
+    }
   ],
   [
     /^q-col-gutter-(none|xs|sm|md|lg|xl)$/,

package/src/node/plugins/quasar/unocss/index.ts

@@ -2,12 +2,13 @@
 import {
   definePreset,
   type Preflight,
+  presetIcons,
   type Rule,
   transformerVariantGroup,
   type UserShortcuts
 } from 'unocss'
 import presetUno from '@unocss/preset-uno'
-import theme, { type QuasarTheme } from './theme.js'
+import { defaultTheme, type QuasarTheme } from './theme.js'
 import { animatedUno } from 'animated-unocss'
 
 import { shortcuts as QIconShortcuts } from './components/QIcon.unocss.js'
@@ -166,16 +167,20 @@ import {
 import { shortcuts as QHeaderShortcuts } from './components/QHeader.unocss.js'
 import { shortcuts as QFooterShortcuts } from './components/QFooter.unocss.js'
 import { shortcuts as QDrawerShortcuts } from './components/QDrawer.unocss.js'
-import { type QuasarPlugins } from 'quasar'
+import { type QuasarIconSet, type QuasarPlugins } from 'quasar'
 
 export interface QuasarPresetOptions {
   plugins?: (keyof QuasarPlugins)[]
-  theme?: {
-    shadowColor?: string
-    darkShadowColor?: string
-  }
+  iconSet?: QuasarIconSet
 }
 
+const extractKeys = (obj: Record<string, any>) =>
+  Object.values(obj).reduce((acc, cur) => {
+    if (typeof cur === 'string') acc.push(cur)
+    else if (typeof cur === 'object') acc = acc.concat(extractKeys(cur))
+    return acc
+  }, [] as string[])
+
 const toKebabCase = (str: string) =>
   str
     .match(/[A-Z]{2,}(?=[A-Z][a-z]+[0-9]*|\b)|[A-Z]?[a-z]+[0-9]*|[A-Z]|[0-9]+/g)
@@ -1420,7 +1425,13 @@ const qClasses = [
   'q-notification--bottom-right-leave-active'
 ]
 
-const generateSafelist = (plugins?: (keyof QuasarPlugins)[]) => {
+const generateSafelist = ({
+  plugins,
+  iconSet
+}: {
+  plugins?: (keyof QuasarPlugins)[]
+  iconSet?: QuasarIconSet
+}) => {
   let safelist = baseSafelist
   if (plugins) {
     for (const plugin of plugins) {
@@ -1428,14 +1439,18 @@ const generateSafelist = (plugins?: (keyof QuasarPlugins)[]) => {
       if (pluginSafelist) safelist = safelist.concat(pluginSafelist)
     }
   }
+  if (iconSet) {
+    const iconSetSafelist = extractKeys(iconSet)
+    if (iconSetSafelist) safelist = safelist.concat(iconSetSafelist)
+  }
   return safelist
 }
 
 export default definePreset((options: QuasarPresetOptions = {}) => {
   return {
     name: 'quasar',
-    presets: [presetUno(), animatedUno()],
-    safelist: generateSafelist(options?.plugins),
+    presets: [presetUno(), animatedUno(), presetIcons({})],
+    safelist: generateSafelist(options),
     preflights: (
       [
         {
@@ -1820,7 +1835,7 @@ export default definePreset((options: QuasarPresetOptions = {}) => {
       QFooterShortcuts,
       QDrawerShortcuts
     ),
-    theme: theme(options),
+    theme: defaultTheme,
     variants: [
       // ...
     ],