vitrify 0.17.12 → 0.17.14

package/dist/index.js

@@ -250,6 +250,11 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
     const unoCssContentPipelineInclude = [
         /\.(vue|svelte|[jt]sx|mdx?|astro|elm|php|phtml|html)($|\?)/
     ];
+    if (typeof vitrifyConfig.vitrify?.unocss?.content?.pipeline === 'object' &&
+        vitrifyConfig.vitrify?.unocss?.content?.pipeline?.include &&
+        Array.isArray(vitrifyConfig.vitrify?.unocss?.content?.pipeline?.include)) {
+        unoCssContentPipelineInclude.push(...vitrifyConfig.vitrify.unocss.content.pipeline.include);
+    }
     if (vitrifyConfig.vitrify?.unocss?.presets?.some(async (preset) => {
         if (!Array.isArray(preset)) {
             return (await preset).name === 'quasar';

package/dist/plugins/quasar/unocss/components/QBtn.unocss.js

@@ -2,8 +2,7 @@ const shortcuts = [
     [
         /^q-btn$/,
         ([, c], { theme }) => theme.quasar?.components?.['q-btn'] ??
-            `font-medium items-stretch relative outline-0 border-0 align-middle text-[14px] leading-[1.715em] no-underline [color:inherit] bg-transparent font-medium uppercase text-center w-auto h-auto cursor-default px-[16px] py-[4px] min-h-[2.572em] [&_.q-icon]:(text-[1.715em]) [&_.q-spinner]:(text-[1.715em]) [&.disabled]:(!opacity-70) [&:before]:(content-empty block absolute left-[0] right-[0] top-[0] bottom-[0] [border-radius:inherit] [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)])`
-        // inline-flex flex-col
+            `inline-flex flex-col font-medium items-stretch relative outline-0 border-0 align-middle text-[14px] leading-[1.715em] no-underline [color:inherit] bg-transparent font-medium uppercase text-center w-auto h-auto cursor-default px-[16px] py-[4px] min-h-[2.572em] [&_.q-icon]:(text-[1.715em]) [&_.q-spinner]:(text-[1.715em]) [&.disabled]:(!opacity-70) [&:before]:(content-empty block absolute left-[0] right-[0] top-[0] bottom-[0] [border-radius:inherit] [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)])`
     ],
     [
         /^q-btn--actionable$/,

package/dist/plugins/quasar/unocss/components/QCheckbox.unocss.js

@@ -51,7 +51,7 @@ const shortcuts = [
     [
         /^q-checkbox__inner$/,
         ([, c], { theme }) => theme.quasar?.components?.['q-checkbox__inner'] ??
-            `text-[40px] w-[1em] min-w-[1em] h-[1em] outline-[0] rounded-[50%] layer-dismiss:text-[rgba(0,_0,_0,_0.54)]`
+            `text-[40px] w-[1em] min-w-[1em] h-[1em] outline-[0] rounded-[50%] layer-components:text-[rgba(0,_0,_0,_0.54)]`
     ],
     [
         /^q-checkbox__inner--truthy$/,
@@ -68,10 +68,10 @@ const shortcuts = [
     [
         /^q-checkbox--dark$/,
         ([, c], { theme }) => theme.quasar?.components?.['q-checkbox--dark'] ??
-            `[&_.q-checkbox\\_\\_inner]:(layer-dismiss:text-[rgba(255,_255,_255,_0.7)])
+            `[&_.q-checkbox\\_\\_inner]:(layer-components:text-[rgba(255,_255,_255,_0.7)])
        [&_.q-checkbox\\_\\_inner:before]:(!opacity-[0.32])
-       [&_.q-checkbox\\_\\_inner--truthy]:(layer-dismiss:text-primary)
-       [&_.q-checkbox\\_\\_inner--indet]:(layer-dismiss:text-primary)`
+       [&_.q-checkbox\\_\\_inner--truthy]:(layer-components:text-primary)
+       [&_.q-checkbox\\_\\_inner--indet]:(layer-components:text-primary)`
     ],
     [
         /^q-checkbox--dense$/,

package/dist/plugins/quasar/unocss/components/QChip.unocss.js

@@ -14,7 +14,7 @@ const shortcuts = [
     [
         /^q-chip$/,
         ([, c], { theme }) => theme.quasar?.components?.['q-chip'] ??
-            `align-middle rounded-[16px] outline-[0] relative h-[2em] max-w-full m-[4px] bg-[#e0e0e0] text-[rgba(0,_0,_0,_0.87)] text-[14px] px-[0.9em] py-[0.5em] [&_.q-avatar]:(text-[2em] -ml-[0.45em] mr-[0.2em] rounded-[16px])`
+            `!flex-initial align-middle rounded-[16px] outline-[0] relative h-[2em] max-w-full m-[4px] bg-[#e0e0e0] text-[rgba(0,_0,_0,_0.87)] text-[14px] px-[0.9em] py-[0.5em] [&_.q-avatar]:(text-[2em] -ml-[0.45em] mr-[0.2em] rounded-[16px])`
     ],
     [
         /^q-chip--colored$/,

package/dist/plugins/quasar/unocss/components/QField.unocss.js

@@ -171,16 +171,16 @@ const shortcuts = [
     [
         /^q-field--filled$/,
         ([, c], { theme }) => theme.quasar?.components?.['q-field--filled'] ??
-            `[&_.q-field\\_\\_control]:(px-[12px] py-[0] layer-dismiss:bg-black/5 rounded-tl-[4px] rounded-br-[0] rounded-tr-[4px] rounded-bl-[0]) 
-	[&_.q-field\\_\\_control:before]:(layer-dismiss:bg-black/5 [border-bottom:1px_solid_rgba(0,_0,_0,_0.42)] opacity-0 [transition:opacity_0.36s_cubic-bezier(0.4,_0,_0.2,_1),_background_0.36s_cubic-bezier(0.4,_0,_0.2,_1)]) 
+            `[&_.q-field\\_\\_control]:(px-[12px] py-[0] layer-components:bg-black/5 rounded-tl-[4px] rounded-br-[0] rounded-tr-[4px] rounded-bl-[0]) 
+	[&_.q-field\\_\\_control:before]:(layer-components:bg-black/5 [border-bottom:1px_solid_rgba(0,_0,_0,_0.42)] opacity-0 [transition:opacity_0.36s_cubic-bezier(0.4,_0,_0.2,_1),_background_0.36s_cubic-bezier(0.4,_0,_0.2,_1)]) 
 	[&_.q-field\\_\\_control:hover:before]:(opacity-100) 
 	[&_.q-field\\_\\_control:after]:(h-[2px] top-auto origin-[center_bottom] [transform:scale3d(0,_1,_1)] bg-current [transition:transform_0.36s_cubic-bezier(0.4,_0,_0.2,_1)]) 
 	[&.q-field--rounded_.q-field\\_\\_control]:(rounded-tl-[28px] rounded-br-[0] rounded-tr-[28px] rounded-bl-[0]) 
-	[&.q-field--highlighted_.q-field\\_\\_control:before]:(opacity-100 layer-dismiss:bg-black/12) 
+	[&.q-field--highlighted_.q-field\\_\\_control:before]:(opacity-100 layer-components:bg-black/12) 
 	[&.q-field--highlighted_.q-field\\_\\_control:after]:([transform:scale3d(1,_1,_1)]) 
-	[&.q-field--dark_.q-field\\_\\_control]:(layer-dismiss:bg-white/7) 
-	[&.q-field--dark_.q-field\\_\\_control:before]:(layer-dismiss:bg-white/7) 
-	[&.q-field--dark.q-field--highlighted_.q-field\\_\\_control:before]:(layer-dismiss:bg-white/1) 
+	[&.q-field--dark_.q-field\\_\\_control]:(layer-components:bg-white/7) 
+	[&.q-field--dark_.q-field\\_\\_control:before]:(layer-components:bg-white/7) 
+	[&.q-field--dark.q-field--highlighted_.q-field\\_\\_control:before]:(layer-components:bg-white/1) 
 	[&.q-field--readonly_.q-field\\_\\_control:before]:(opacity-100 bg-transparent [border-bottom-style:dashed])`
     ],
     [
@@ -188,7 +188,7 @@ const shortcuts = [
         ([, c], { theme }) => theme.quasar?.components?.['q-field--outlined'] ??
             `[&_.q-field\\_\\_control]:(rounded-[4px] px-[12px] py-[0]) 
 	[&_.q-field\\_\\_control:before]:(border-[1px] border-solid border-black/24 [transition:border-color_0.36s_cubic-bezier(0.4,_0,_0.2,_1)]) 
-	[&_.q-field\\_\\_control:hover:before]:(layer-dismiss:border-black) 
+	[&_.q-field\\_\\_control:hover:before]:(layer-components:border-black) 
 	[&_.q-field\\_\\_control:after]:([height:inherit] [border-radius:inherit] border-[2px] border-solid border-transparent [transition:border-color_0.36s_cubic-bezier(0.4,_0,_0.2,_1)]) 
 	[&_.q-field\\_\\_native:-webkit-autofill]:(mt-px mb-px) 
 	[&_.q-field\\_\\_input:-webkit-autofill]:(mt-px mb-px) 
@@ -201,7 +201,7 @@ const shortcuts = [
         /^q-field--standard$/,
         ([, c], { theme }) => theme.quasar?.components?.['q-field--standard'] ??
             `[&_.q-field\\_\\_control:before]:([border-bottom:1px_solid_rgba(0,_0,_0,_0.24)] [transition:border-color_0.36s_cubic-bezier(0.4,_0,_0.2,_1)]) 
-	[&_.q-field\\_\\_control:hover:before]:(layer-dismiss:border-black) 
+	[&_.q-field\\_\\_control:hover:before]:(layer-components:border-black) 
 	[&_.q-field\\_\\_control:after]:(h-[2px] top-auto [border-bottom-left-radius:inherit] [border-bottom-right-radius:inherit] origin-[center_bottom] [transform:scale3d(0,_1,_1)] bg-current [transition:transform_0.36s_cubic-bezier(0.4,_0,_0.2,_1)]) 
 	[&.q-field--highlighted_.q-field\\_\\_control:after]:([transform:scale3d(1,_1,_1)]) 
 	[&.q-field--readonly_.q-field\\_\\_control:before]:([border-bottom-style:dashed]) 
@@ -224,11 +224,11 @@ const shortcuts = [
     [
         /^q-field--standout$/,
         ([, c], { theme }) => theme.quasar?.components?.['q-field--standout'] ??
-            `[&_.q-field\\_\\_control]:(px-[12px] py-[0] layer-dismiss:bg-black/5 rounded-[4px] [transition:box-shadow_0.36s_cubic-bezier(0.4,_0,_0.2,_1),_background-color_0.36s_cubic-bezier(0.4,_0,_0.2,_1)]) 
-	[&_.q-field\\_\\_control:before]:(layer-dismiss:bg-black/7 opacity-0 [transition:opacity_0.36s_cubic-bezier(0.4,_0,_0.2,_1),_background_0.36s_cubic-bezier(0.4,_0,_0.2,_1)]) 
+            `[&_.q-field\\_\\_control]:(px-[12px] py-[0] layer-components:bg-black/5 rounded-[4px] [transition:box-shadow_0.36s_cubic-bezier(0.4,_0,_0.2,_1),_background-color_0.36s_cubic-bezier(0.4,_0,_0.2,_1)]) 
+	[&_.q-field\\_\\_control:before]:(layer-components:bg-black/7 opacity-0 [transition:opacity_0.36s_cubic-bezier(0.4,_0,_0.2,_1),_background_0.36s_cubic-bezier(0.4,_0,_0.2,_1)]) 
 	[&_.q-field\\_\\_control:hover:before]:(opacity-100) 
 	[&.q-field--rounded_.q-field\\_\\_control]:(rounded-[28px]) 
-	[&.q-field--highlighted_.q-field\\_\\_control]:([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)] layer-dismiss:bg-white) 
+	[&.q-field--highlighted_.q-field\\_\\_control]:([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)] layer-components:bg-white) 
 	[&.q-field--highlighted_.q-field\\_\\_native]:(text-white) 
 	[&.q-field--highlighted_.q-field\\_\\_prefix]:(text-white) 
 	[&.q-field--highlighted_.q-field\\_\\_suffix]:(text-white) 
@@ -237,8 +237,8 @@ const shortcuts = [
 	[&.q-field--highlighted_.q-field\\_\\_input]:(text-white) 
 	[&.q-field--readonly_.q-field\\_\\_control:before]:(opacity-100 bg-transparent border-[1px] border-dashed border-black/24) 
 	[&.q-field--dark_.q-field\\_\\_control]:(bg-[rgba(255,_255,_255,_0.07)]) 
-	[&.q-field--dark_.q-field\\_\\_control:before]:(layer-dismiss:bg-white/7) 
-	[&.q-field--dark.q-field--highlighted_.q-field\\_\\_control]:(layer-dismiss:bg-white) 
+	[&.q-field--dark_.q-field\\_\\_control:before]:(layer-components:bg-white/7) 
+	[&.q-field--dark.q-field--highlighted_.q-field\\_\\_control]:(layer-components:bg-white) 
 	[&.q-field--dark.q-field--highlighted_.q-field\\_\\_native]:(text-black) 
 	[&.q-field--dark.q-field--highlighted_.q-field\\_\\_prefix]:(text-black) 
 	[&.q-field--dark.q-field--highlighted_.q-field\\_\\_suffix]:(text-black) 

package/dist/plugins/quasar/unocss/components/QTabs.unocss.js

@@ -45,7 +45,7 @@ const shortcuts = [
     [
         /^q-tab__indicator$/,
         ([, c], { theme }) => theme.quasar?.components?.['q-tab__indicator'] ??
-            `opacity-0 h-[2px] bg-current`
+            `!relative opacity-0 h-[2px] bg-current`
     ],
     [
         /^q-tab--active$/,
@@ -59,7 +59,7 @@ const shortcuts = [
     [
         /^q-tabs$/,
         ([, c], { theme }) => theme.quasar?.components?.['q-tabs'] ??
-            `relative [transition:color_0.3s,_background-color_0.3s]`
+            `!flex-initial relative [transition:color_0.3s,_background-color_0.3s]`
     ],
     [
         /^q-tabs--scrollable$/,
@@ -69,7 +69,7 @@ const shortcuts = [
     [
         /^q-tabs--not-scrollable$/,
         ([, c], { theme }) => theme.quasar?.components?.['q-tabs--not-scrollable'] ??
-            `[&.q-tabs__arrows--outside]:(pl-0 pr-0) [&_.q-tabs\\_\\_arrow]:(hidden) [&_.q-tabs\\_\\_content]:([border-radius:inherit])`
+            `[&.q-tabs__arrows--outside]:(pl-0 pr-0) [&_.q-tabs\\_\\_arrow]:(!hidden) [&_.q-tabs\\_\\_content]:([border-radius:inherit])`
     ],
     [
         /^q-tabs__arrow$/,

package/dist/plugins/quasar/unocss/components/QTime.unocss.js

@@ -12,7 +12,7 @@ const shortcuts = [
     [
         /^q-time__header$/,
         ([, c], { theme }) => theme.quasar?.components?.['q-time__header'] ??
-            `[border-top-left-radius:inherit] text-[#fff] p-[16px] font-light`
+            `[border-top-left-radius:inherit] text-[#fff] p-[16px] font-light bg-primary`
     ],
     [
         /^q-time__actions$/,
@@ -22,7 +22,7 @@ const shortcuts = [
     [
         /^q-time__header-label$/,
         ([, c], { theme }) => theme.quasar?.components?.['q-time__header-label'] ??
-            `text-[28px] leading-none tracking-[-0.00833em] [&_>_div_+_div]:(ml-[4px])`
+            `text-[28px] leading-none tracking-[-0.00833em] [&_>_div_+_div]:(ml-[4px]) !flex-initial`
     ],
     [
         /^q-time__link$/,
@@ -36,7 +36,7 @@ const shortcuts = [
     [
         /^q-time__header-ampm$/,
         ([, c], { theme }) => theme.quasar?.components?.['q-time__header-ampm'] ??
-            `text-[16px] tracking-widest`
+            `text-[16px] tracking-widest !flex-initial`
     ],
     [
         /^q-time__content$/,
@@ -55,7 +55,7 @@ const shortcuts = [
     [
         /^q-time__clock$/,
         ([, c], { theme }) => theme.quasar?.components?.['q-time__clock'] ??
-            `p-[24px] w-full h-full max-w-full max-h-full text-[14px]`
+            `p-[24px] w-[calc(100%-48px)] h-[calc(100%-48px)] max-w-full max-h-full text-[14px]`
     ],
     [
         /^q-time__clock-circle$/,

package/dist/plugins/quasar/unocss/components/QToggle.unocss.js

@@ -41,7 +41,7 @@ const shortcuts = [
     [
         /^q-toggle__thumb$/,
         ([, c], { theme }) => theme.quasar?.components?.['q-toggle__thumb'] ??
-            `top-[0.25em] left-[0.25em] w-[0.5em] h-[0.5em] [transition:left_0.22s_cubic-bezier(0.4,_0,_0.2,_1)] select-none z-0 [&:after]:(content-[''] absolute top-[0] right-[0] bottom-[0] left-[0] rounded-[50%] bg-[#fff] [box-shadow:0_3px_1px_-2px_rgba(0,_0,_0,_0.2),_0_2px_2px_0_rgba(0,_0,_0,_0.14),_0_1px_5px_0_rgba(0,_0,_0,_0.12)]) [&_.q-icon]:(text-[0.3em] min-w-[1em] text-[#000] opacity-[0.54])`
+            `top-[0.25em] left-[0.25em] w-[0.5em] h-[0.5em] [transition:left_0.22s_cubic-bezier(0.4,_0,_0.2,_1)] select-none z-0 [&:after]:(content-[''] absolute top-[0] right-[0] bottom-[0] left-[0] rounded-[50%] bg-[#fff] [box-shadow:0_3px_1px_-2px_rgba(0,_0,_0,_0.2),_0_2px_2px_0_rgba(0,_0,_0,_0.14),_0_1px_5px_0_rgba(0,_0,_0,_0.12)]) [&_.q-icon]:(layer-components:text-[0.3em] min-w-[1em] layer-components:text-[#000] opacity-[0.54])`
     ],
     [
         /^q-toggle__inner$/,
@@ -56,12 +56,13 @@ const shortcuts = [
     [
         /^q-toggle__inner--truthy$/,
         ([, c], { theme }) => theme.quasar?.components?.['q-toggle__inner--truthy'] ??
-            ` [&_.q-toggle\\_\\_track]:(opacity-[0.54]) [&_.q-toggle\\_\\_thumb]:(left-[0.65em]) [&_.q-toggle\\_\\_thumb:after]:(bg-current) [&_.q-toggle\\_\\_thumb_.q-icon]:(text-[#fff] opacity-100)`
+            `layer-components:text-primary [&_.q-toggle\\_\\_track]:(opacity-[0.54]) [&_.q-toggle\\_\\_thumb]:(left-[0.65em]) [&_.q-toggle\\_\\_thumb:after]:(bg-current) [&_.q-toggle\\_\\_thumb_.q-icon]:(layer-components:text-[#fff] opacity-100)`
     ],
     [
         /^q-toggle--dark$/,
         ([, c], { theme }) => theme.quasar?.components?.['q-toggle--dark'] ??
-            `[&_.q-toggle\\_\\_inner]:(text-[#fff]) [&_.q-toggle\\_\\_inner--truthy]:(text-primary) [&_.q-toggle\\_\\_thumb:after]:([box-shadow:none]) [&_.q-toggle\\_\\_thumb:before]:(!opacity-[0.32])`
+            `[&_.q-toggle\\_\\_inner--truthy]:() [&_.q-toggle\\_\\_thumb:after]:([box-shadow:none]) [&_.q-toggle\\_\\_thumb:before]:(!opacity-[0.32])`
+        // [&_.q-toggle\\_\\_inner]:(layer-components:text-[#fff])
     ],
     [
         /^q-toggle--dense$/,

package/dist/plugins/quasar/unocss/core/size.unocss.js

@@ -17,13 +17,13 @@ const shortcuts = [
     [/^window-height$/, ([, c], { theme }) => `!mt-0 !mb-0 !h-screen`],
     [/^window-width$/, ([, c], { theme }) => `!ml-0 !mr-0 !w-screen`],
     [
-        /^q-p(a|t|b|l|r)?(?:-)(none|xs|sm|md|lg|xl)$/,
+        /^q-p(a|t|b|l|r|x|y)?(?:-)(none|xs|sm|md|lg|xl)$/,
         ([, side, size], { theme }) => {
             return `p${side}-${theme.quasar?.spaces[size]}`;
         }
     ],
     [
-        /^q-m(a|t|b|l|r)?(?:-)(none|xs|sm|md|lg|xl)$/,
+        /^q-m(a|t|b|l|r|x|y)?(?:-)(none|xs|sm|md|lg|xl)$/,
         ([, side, size], { theme }) => {
             return `m${side}-${theme.quasar?.spaces[size]}`;
         }

package/dist/plugins/quasar/unocss/index.js

@@ -1499,7 +1499,6 @@ export default definePreset((options = {}) => {
         presetIcons({}),
         {
             name: 'quasar',
-            presets: [presetUno(), animatedUno(), presetIcons({})],
             safelist: generateSafelist(options),
             preflights: [
                 {
@@ -1779,9 +1778,11 @@ textarea {
             ].concat(QBreadcrumbsPreflights, QCheckboxPreflights, QChipPreflights, QCircularProgressPreflights, QDialogPreflights, QFieldPreflights, QLayoutPreflights, QLinearProgressPreflights, QRadioPreflights, QSelectPreflights, QSpinnerPreflights, QSkeletonPreflights, QTablePreflights, QTogglePreflights, QTreePreflights, ColorPreflights, DarkPreflights, HelperPreflights, MousePreflights, TypographyPreflights, VisibilityPreflights, TransitionPreflights, SizePreflights),
             rules: [].concat(MouseRules, HelperRules, ElevationRules, VisibilityRules),
             shortcuts: [].concat(QIconShortcuts, QAjaxBarShortcuts, QAvatarShortcuts, QBadgeShortcuts, QBreadcrumbsShortcuts, QBannerShortcuts, QBarShortcuts, QBtnShortcuts, QBtnDropdownShortcuts, QBtnGroupShortcuts, QBtnToggleShortcuts, QCardShortcuts, QCarouselShortcuts, QChatMessageShortcuts, QCheckboxShortcuts, QChipShortcuts, QCircularProgressShortcuts, QColorPickerShortcuts, QDateShortcuts, QDialogShortcuts, QEditorShortcuts, QExpansionItemShortcuts, QFabShortcuts, QFieldShortcuts, QFileShortcuts, QFormShortcuts, QImgShortcuts, QInnerLoadingShortcuts, QInputShortcuts, QIntersectionShortcuts, QItemShortcuts, QKnobShortcuts, QLayoutShortcuts, QLinearProgressShortcuts, QMenuShortcuts, QOptionGroupShortcuts, QPageShortcuts, QPageStickyShortcuts, QPaginationShortcuts, QParallaxShortcuts, QPopupEditShortcuts, QPullToRefreshShortcuts, QRadioShortcuts, QRatingShortcuts, QResponsiveShortcuts, QScrollareaShortcuts, QSelectShortcuts, QSeparatorShortcuts, QSkeletonShortcuts, QSlideItemShortcuts, QSliderShortcuts, QSpaceShortcuts, QSpinnerShortcuts, QSplitterShortcuts, QStepperShortcuts, QTabPanelShortcuts, QTableShortcuts, QTabsShortcuts, QTimeShortcuts, QTimelineShortcuts, QToggleShortcuts, QToolbarShortcuts, QTooltipShortcuts, QTreeShortcuts, QUploaderShortcuts, QVideoShortcuts, QVirtualScrollShortcuts, PanelShortcuts, QMorphShortcuts, QRippleShortcuts, QBottomSheetShortcuts, QDialogPluginShortcuts, QLoadingShortcuts, QNotifyShortcuts, DarkShortcuts, FlexShortcuts, HelperShortcuts, MouseShortcuts, OrientationShortcuts, PositionShortcuts, SizeShortcuts, TouchShortcuts, TransitionsShortcuts, TypographyShortcuts, VisibilityShortcuts, QHeaderShortcuts, QFooterShortcuts, QDrawerShortcuts, ElevationShortcuts),
+            outputToCssLayers: true,
             layers: {
-                dismiss: -1,
-                default: 1
+                components: -1,
+                default: 1,
+                utilities: 2
             },
             theme: defaultTheme,
             variants: [

package/dist/types/bin/dev.d.ts

@@ -71,6 +71,7 @@ export declare function createServer({ port, logLevel, ssr, framework, host, app
             dev: import("vite").ResolvedDevEnvironmentOptions;
             build: import("vite").ResolvedBuildEnvironmentOptions;
         }>;
+        webSocketToken: string;
     } & import("vite").PluginHookUtils>;
     vite: ViteDevServer;
 }>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vitrify",
-  "version": "0.17.12",
+  "version": "0.17.14",
   "license": "MIT",
   "author": "Stefan van Herwijnen",
   "description": "Vite as your Full Stack development tool",
@@ -44,58 +44,59 @@
   },
   "homepage": "https://github.com/simsustech/vitrify/tree/main/#readme",
   "dependencies": {
-    "@fastify/middie": "^9.0.2",
-    "@fastify/static": "^8.0.3",
-    "@unocss/core": "^0.65.2",
-    "@unocss/preset-uno": "^0.65.3",
-    "@unocss/preset-wind": "^0.65.3",
+    "@fastify/middie": "^9.0.3",
+    "@fastify/static": "^8.0.4",
+    "@unocss/core": "^65.4.3",
+    "@unocss/preset-uno": "^65.4.3",
+    "@unocss/preset-wind": "^65.4.3",
     "@vitejs/plugin-vue": "^5.2.1",
     "ajv": "^8.17.1",
     "animated-unocss": "^0.0.6",
     "cac": "^6.7.14",
-    "chalk": "^5.3.0",
+    "chalk": "^5.4.1",
     "cross-env": "^7.0.3",
-    "esbuild": "^0.24.0",
-    "fastify": "^5.2.0",
-    "glob": "^11.0.0",
-    "happy-dom": "^15.11.7",
+    "esbuild": "^0.24.2",
+    "fastify": "^5.2.1",
+    "glob": "^11.0.1",
+    "happy-dom": "^16.8.1",
     "is-port-reachable": "^4.0.0",
     "magic-string": "^0.30.17",
     "merge-deep": "^3.0.3",
     "readline": "^1.3.0",
-    "rollup-plugin-visualizer": "^5.12.0",
-    "sass": "1.83.0",
+    "rollup-plugin-visualizer": "^5.14.0",
+    "sass": "1.83.4",
     "ts-node": "^10.9.2",
-    "unocss": "^0.65.2",
-    "unplugin-vue-components": "^0.28.0",
-    "vite": "^6.0.3",
+    "unocss": "^65.4.3",
+    "unplugin-vue-components": "^28.0.0",
+    "vite": "^6.0.11",
     "vite-plugin-pwa": "^0.21.1",
-    "vitefu": "^1.0.4",
-    "vitest": "^2.1.8",
+    "vitefu": "^1.0.5",
+    "vitest": "^3.0.4",
     "workbox-window": "^7.3.0"
   },
   "devDependencies": {
-    "@quasar/extras": "^1.16.15",
+    "@iconify-json/mdi": "^1.2.3",
+    "@quasar/extras": "^1.16.16",
     "@types/connect": "^3.4.38",
     "@types/glob": "^8.1.0",
     "@types/merge-deep": "^3.0.3",
-    "@types/node": "^22.10.2",
-    "@types/ws": "^8.5.13",
-    "@unocss/preset-icons": "^65.4.2",
+    "@types/node": "^22.13.0",
+    "@types/ws": "^8.5.14",
+    "@unocss/preset-icons": "^65.4.3",
     "@vue/runtime-core": "^3.5.13",
     "beasties": "^0.2.0",
     "css": "^3.0.0",
     "css-to-tailwind-translator": "^1.2.8",
-    "quasar": "^2.17.5",
-    "rollup": "^4.28.1",
-    "typescript": "^5.7.2",
+    "quasar": "^2.17.7",
+    "rollup": "^4.34.0",
+    "typescript": "^5.7.3",
     "vue": "^3.5.13",
     "vue-router": "^4.5.0"
   },
   "peerDependencies": {
-    "@fastify/static": "^8.0.3",
-    "fastify": "^5.2.0",
-    "quasar": "^2.17.5",
+    "@fastify/static": "^8.0.4",
+    "fastify": "^5.2.1",
+    "quasar": "^2.17.7",
     "vue": "^3.5.13",
     "vue-router": "^4.5.0"
   },

package/src/node/index.ts

@@ -329,6 +329,15 @@ export const baseConfig = async ({
   const unoCssContentPipelineInclude = [
     /\.(vue|svelte|[jt]sx|mdx?|astro|elm|php|phtml|html)($|\?)/
   ]
+  if (
+    typeof vitrifyConfig.vitrify?.unocss?.content?.pipeline === 'object' &&
+    vitrifyConfig.vitrify?.unocss?.content?.pipeline?.include &&
+    Array.isArray(vitrifyConfig.vitrify?.unocss?.content?.pipeline?.include)
+  ) {
+    unoCssContentPipelineInclude.push(
+      ...vitrifyConfig.vitrify.unocss.content.pipeline.include
+    )
+  }
   if (
     vitrifyConfig.vitrify?.unocss?.presets?.some(async (preset) => {
       if (!Array.isArray(preset)) {

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

@@ -6,8 +6,7 @@ const shortcuts: UserShortcuts<QuasarTheme> = [
     /^q-btn$/,
     ([, c], { theme }) =>
       theme.quasar?.components?.['q-btn'] ??
-      `font-medium items-stretch relative outline-0 border-0 align-middle text-[14px] leading-[1.715em] no-underline [color:inherit] bg-transparent font-medium uppercase text-center w-auto h-auto cursor-default px-[16px] py-[4px] min-h-[2.572em] [&_.q-icon]:(text-[1.715em]) [&_.q-spinner]:(text-[1.715em]) [&.disabled]:(!opacity-70) [&:before]:(content-empty block absolute left-[0] right-[0] top-[0] bottom-[0] [border-radius:inherit] [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)])`
-    // inline-flex flex-col
+      `inline-flex flex-col font-medium items-stretch relative outline-0 border-0 align-middle text-[14px] leading-[1.715em] no-underline [color:inherit] bg-transparent font-medium uppercase text-center w-auto h-auto cursor-default px-[16px] py-[4px] min-h-[2.572em] [&_.q-icon]:(text-[1.715em]) [&_.q-spinner]:(text-[1.715em]) [&.disabled]:(!opacity-70) [&:before]:(content-empty block absolute left-[0] right-[0] top-[0] bottom-[0] [border-radius:inherit] [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)])`
   ],
 
   [

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

@@ -68,7 +68,7 @@ const shortcuts: UserShortcuts<QuasarTheme> = [
     /^q-checkbox__inner$/,
     ([, c], { theme }) =>
       theme.quasar?.components?.['q-checkbox__inner'] ??
-      `text-[40px] w-[1em] min-w-[1em] h-[1em] outline-[0] rounded-[50%] layer-dismiss:text-[rgba(0,_0,_0,_0.54)]`
+      `text-[40px] w-[1em] min-w-[1em] h-[1em] outline-[0] rounded-[50%] layer-components:text-[rgba(0,_0,_0,_0.54)]`
   ],
 
   [
@@ -91,10 +91,10 @@ const shortcuts: UserShortcuts<QuasarTheme> = [
     /^q-checkbox--dark$/,
     ([, c], { theme }) =>
       theme.quasar?.components?.['q-checkbox--dark'] ??
-      `[&_.q-checkbox\\_\\_inner]:(layer-dismiss:text-[rgba(255,_255,_255,_0.7)])
+      `[&_.q-checkbox\\_\\_inner]:(layer-components:text-[rgba(255,_255,_255,_0.7)])
        [&_.q-checkbox\\_\\_inner:before]:(!opacity-[0.32])
-       [&_.q-checkbox\\_\\_inner--truthy]:(layer-dismiss:text-primary)
-       [&_.q-checkbox\\_\\_inner--indet]:(layer-dismiss:text-primary)`
+       [&_.q-checkbox\\_\\_inner--truthy]:(layer-components:text-primary)
+       [&_.q-checkbox\\_\\_inner--indet]:(layer-components:text-primary)`
   ],
 
   [

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

@@ -19,7 +19,7 @@ const shortcuts: UserShortcuts<QuasarTheme> = [
     /^q-chip$/,
     ([, c], { theme }) =>
       theme.quasar?.components?.['q-chip'] ??
-      `align-middle rounded-[16px] outline-[0] relative h-[2em] max-w-full m-[4px] bg-[#e0e0e0] text-[rgba(0,_0,_0,_0.87)] text-[14px] px-[0.9em] py-[0.5em] [&_.q-avatar]:(text-[2em] -ml-[0.45em] mr-[0.2em] rounded-[16px])`
+      `!flex-initial align-middle rounded-[16px] outline-[0] relative h-[2em] max-w-full m-[4px] bg-[#e0e0e0] text-[rgba(0,_0,_0,_0.87)] text-[14px] px-[0.9em] py-[0.5em] [&_.q-avatar]:(text-[2em] -ml-[0.45em] mr-[0.2em] rounded-[16px])`
   ],
 
   [

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

@@ -219,16 +219,16 @@ const shortcuts: UserShortcuts<QuasarTheme> = [
     /^q-field--filled$/,
     ([, c], { theme }) =>
       theme.quasar?.components?.['q-field--filled'] ??
-      `[&_.q-field\\_\\_control]:(px-[12px] py-[0] layer-dismiss:bg-black/5 rounded-tl-[4px] rounded-br-[0] rounded-tr-[4px] rounded-bl-[0]) 
-	[&_.q-field\\_\\_control:before]:(layer-dismiss:bg-black/5 [border-bottom:1px_solid_rgba(0,_0,_0,_0.42)] opacity-0 [transition:opacity_0.36s_cubic-bezier(0.4,_0,_0.2,_1),_background_0.36s_cubic-bezier(0.4,_0,_0.2,_1)]) 
+      `[&_.q-field\\_\\_control]:(px-[12px] py-[0] layer-components:bg-black/5 rounded-tl-[4px] rounded-br-[0] rounded-tr-[4px] rounded-bl-[0]) 
+	[&_.q-field\\_\\_control:before]:(layer-components:bg-black/5 [border-bottom:1px_solid_rgba(0,_0,_0,_0.42)] opacity-0 [transition:opacity_0.36s_cubic-bezier(0.4,_0,_0.2,_1),_background_0.36s_cubic-bezier(0.4,_0,_0.2,_1)]) 
 	[&_.q-field\\_\\_control:hover:before]:(opacity-100) 
 	[&_.q-field\\_\\_control:after]:(h-[2px] top-auto origin-[center_bottom] [transform:scale3d(0,_1,_1)] bg-current [transition:transform_0.36s_cubic-bezier(0.4,_0,_0.2,_1)]) 
 	[&.q-field--rounded_.q-field\\_\\_control]:(rounded-tl-[28px] rounded-br-[0] rounded-tr-[28px] rounded-bl-[0]) 
-	[&.q-field--highlighted_.q-field\\_\\_control:before]:(opacity-100 layer-dismiss:bg-black/12) 
+	[&.q-field--highlighted_.q-field\\_\\_control:before]:(opacity-100 layer-components:bg-black/12) 
 	[&.q-field--highlighted_.q-field\\_\\_control:after]:([transform:scale3d(1,_1,_1)]) 
-	[&.q-field--dark_.q-field\\_\\_control]:(layer-dismiss:bg-white/7) 
-	[&.q-field--dark_.q-field\\_\\_control:before]:(layer-dismiss:bg-white/7) 
-	[&.q-field--dark.q-field--highlighted_.q-field\\_\\_control:before]:(layer-dismiss:bg-white/1) 
+	[&.q-field--dark_.q-field\\_\\_control]:(layer-components:bg-white/7) 
+	[&.q-field--dark_.q-field\\_\\_control:before]:(layer-components:bg-white/7) 
+	[&.q-field--dark.q-field--highlighted_.q-field\\_\\_control:before]:(layer-components:bg-white/1) 
 	[&.q-field--readonly_.q-field\\_\\_control:before]:(opacity-100 bg-transparent [border-bottom-style:dashed])`
   ],
 
@@ -238,7 +238,7 @@ const shortcuts: UserShortcuts<QuasarTheme> = [
       theme.quasar?.components?.['q-field--outlined'] ??
       `[&_.q-field\\_\\_control]:(rounded-[4px] px-[12px] py-[0]) 
 	[&_.q-field\\_\\_control:before]:(border-[1px] border-solid border-black/24 [transition:border-color_0.36s_cubic-bezier(0.4,_0,_0.2,_1)]) 
-	[&_.q-field\\_\\_control:hover:before]:(layer-dismiss:border-black) 
+	[&_.q-field\\_\\_control:hover:before]:(layer-components:border-black) 
 	[&_.q-field\\_\\_control:after]:([height:inherit] [border-radius:inherit] border-[2px] border-solid border-transparent [transition:border-color_0.36s_cubic-bezier(0.4,_0,_0.2,_1)]) 
 	[&_.q-field\\_\\_native:-webkit-autofill]:(mt-px mb-px) 
 	[&_.q-field\\_\\_input:-webkit-autofill]:(mt-px mb-px) 
@@ -253,7 +253,7 @@ const shortcuts: UserShortcuts<QuasarTheme> = [
     ([, c], { theme }) =>
       theme.quasar?.components?.['q-field--standard'] ??
       `[&_.q-field\\_\\_control:before]:([border-bottom:1px_solid_rgba(0,_0,_0,_0.24)] [transition:border-color_0.36s_cubic-bezier(0.4,_0,_0.2,_1)]) 
-	[&_.q-field\\_\\_control:hover:before]:(layer-dismiss:border-black) 
+	[&_.q-field\\_\\_control:hover:before]:(layer-components:border-black) 
 	[&_.q-field\\_\\_control:after]:(h-[2px] top-auto [border-bottom-left-radius:inherit] [border-bottom-right-radius:inherit] origin-[center_bottom] [transform:scale3d(0,_1,_1)] bg-current [transition:transform_0.36s_cubic-bezier(0.4,_0,_0.2,_1)]) 
 	[&.q-field--highlighted_.q-field\\_\\_control:after]:([transform:scale3d(1,_1,_1)]) 
 	[&.q-field--readonly_.q-field\\_\\_control:before]:([border-bottom-style:dashed]) 
@@ -280,11 +280,11 @@ const shortcuts: UserShortcuts<QuasarTheme> = [
     /^q-field--standout$/,
     ([, c], { theme }) =>
       theme.quasar?.components?.['q-field--standout'] ??
-      `[&_.q-field\\_\\_control]:(px-[12px] py-[0] layer-dismiss:bg-black/5 rounded-[4px] [transition:box-shadow_0.36s_cubic-bezier(0.4,_0,_0.2,_1),_background-color_0.36s_cubic-bezier(0.4,_0,_0.2,_1)]) 
-	[&_.q-field\\_\\_control:before]:(layer-dismiss:bg-black/7 opacity-0 [transition:opacity_0.36s_cubic-bezier(0.4,_0,_0.2,_1),_background_0.36s_cubic-bezier(0.4,_0,_0.2,_1)]) 
+      `[&_.q-field\\_\\_control]:(px-[12px] py-[0] layer-components:bg-black/5 rounded-[4px] [transition:box-shadow_0.36s_cubic-bezier(0.4,_0,_0.2,_1),_background-color_0.36s_cubic-bezier(0.4,_0,_0.2,_1)]) 
+	[&_.q-field\\_\\_control:before]:(layer-components:bg-black/7 opacity-0 [transition:opacity_0.36s_cubic-bezier(0.4,_0,_0.2,_1),_background_0.36s_cubic-bezier(0.4,_0,_0.2,_1)]) 
 	[&_.q-field\\_\\_control:hover:before]:(opacity-100) 
 	[&.q-field--rounded_.q-field\\_\\_control]:(rounded-[28px]) 
-	[&.q-field--highlighted_.q-field\\_\\_control]:([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)] layer-dismiss:bg-white) 
+	[&.q-field--highlighted_.q-field\\_\\_control]:([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)] layer-components:bg-white) 
 	[&.q-field--highlighted_.q-field\\_\\_native]:(text-white) 
 	[&.q-field--highlighted_.q-field\\_\\_prefix]:(text-white) 
 	[&.q-field--highlighted_.q-field\\_\\_suffix]:(text-white) 
@@ -293,8 +293,8 @@ const shortcuts: UserShortcuts<QuasarTheme> = [
 	[&.q-field--highlighted_.q-field\\_\\_input]:(text-white) 
 	[&.q-field--readonly_.q-field\\_\\_control:before]:(opacity-100 bg-transparent border-[1px] border-dashed border-black/24) 
 	[&.q-field--dark_.q-field\\_\\_control]:(bg-[rgba(255,_255,_255,_0.07)]) 
-	[&.q-field--dark_.q-field\\_\\_control:before]:(layer-dismiss:bg-white/7) 
-	[&.q-field--dark.q-field--highlighted_.q-field\\_\\_control]:(layer-dismiss:bg-white) 
+	[&.q-field--dark_.q-field\\_\\_control:before]:(layer-components:bg-white/7) 
+	[&.q-field--dark.q-field--highlighted_.q-field\\_\\_control]:(layer-components:bg-white) 
 	[&.q-field--dark.q-field--highlighted_.q-field\\_\\_native]:(text-black) 
 	[&.q-field--dark.q-field--highlighted_.q-field\\_\\_prefix]:(text-black) 
 	[&.q-field--dark.q-field--highlighted_.q-field\\_\\_suffix]:(text-black) 

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

@@ -67,7 +67,7 @@ const shortcuts: UserShortcuts<QuasarTheme> = [
     /^q-tab__indicator$/,
     ([, c], { theme }) =>
       theme.quasar?.components?.['q-tab__indicator'] ??
-      `opacity-0 h-[2px] bg-current`
+      `!relative opacity-0 h-[2px] bg-current`
   ],
 
   [
@@ -87,7 +87,7 @@ const shortcuts: UserShortcuts<QuasarTheme> = [
     /^q-tabs$/,
     ([, c], { theme }) =>
       theme.quasar?.components?.['q-tabs'] ??
-      `relative [transition:color_0.3s,_background-color_0.3s]`
+      `!flex-initial relative [transition:color_0.3s,_background-color_0.3s]`
   ],
 
   [
@@ -101,7 +101,7 @@ const shortcuts: UserShortcuts<QuasarTheme> = [
     /^q-tabs--not-scrollable$/,
     ([, c], { theme }) =>
       theme.quasar?.components?.['q-tabs--not-scrollable'] ??
-      `[&.q-tabs__arrows--outside]:(pl-0 pr-0) [&_.q-tabs\\_\\_arrow]:(hidden) [&_.q-tabs\\_\\_content]:([border-radius:inherit])`
+      `[&.q-tabs__arrows--outside]:(pl-0 pr-0) [&_.q-tabs\\_\\_arrow]:(!hidden) [&_.q-tabs\\_\\_content]:([border-radius:inherit])`
   ],
 
   [

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

@@ -20,7 +20,7 @@ const shortcuts: UserShortcuts<QuasarTheme> = [
     /^q-time__header$/,
     ([, c], { theme }) =>
       theme.quasar?.components?.['q-time__header'] ??
-      `[border-top-left-radius:inherit] text-[#fff] p-[16px] font-light`
+      `[border-top-left-radius:inherit] text-[#fff] p-[16px] font-light bg-primary`
   ],
 
   [
@@ -34,7 +34,7 @@ const shortcuts: UserShortcuts<QuasarTheme> = [
     /^q-time__header-label$/,
     ([, c], { theme }) =>
       theme.quasar?.components?.['q-time__header-label'] ??
-      `text-[28px] leading-none tracking-[-0.00833em] [&_>_div_+_div]:(ml-[4px])`
+      `text-[28px] leading-none tracking-[-0.00833em] [&_>_div_+_div]:(ml-[4px]) !flex-initial`
   ],
 
   [
@@ -54,7 +54,7 @@ const shortcuts: UserShortcuts<QuasarTheme> = [
     /^q-time__header-ampm$/,
     ([, c], { theme }) =>
       theme.quasar?.components?.['q-time__header-ampm'] ??
-      `text-[16px] tracking-widest`
+      `text-[16px] tracking-widest !flex-initial`
   ],
 
   [
@@ -81,7 +81,7 @@ const shortcuts: UserShortcuts<QuasarTheme> = [
     /^q-time__clock$/,
     ([, c], { theme }) =>
       theme.quasar?.components?.['q-time__clock'] ??
-      `p-[24px] w-full h-full max-w-full max-h-full text-[14px]`
+      `p-[24px] w-[calc(100%-48px)] h-[calc(100%-48px)] max-w-full max-h-full text-[14px]`
   ],
 
   [

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

@@ -51,7 +51,7 @@ const shortcuts: UserShortcuts<QuasarTheme> = [
     /^q-toggle__thumb$/,
     ([, c], { theme }) =>
       theme.quasar?.components?.['q-toggle__thumb'] ??
-      `top-[0.25em] left-[0.25em] w-[0.5em] h-[0.5em] [transition:left_0.22s_cubic-bezier(0.4,_0,_0.2,_1)] select-none z-0 [&:after]:(content-[''] absolute top-[0] right-[0] bottom-[0] left-[0] rounded-[50%] bg-[#fff] [box-shadow:0_3px_1px_-2px_rgba(0,_0,_0,_0.2),_0_2px_2px_0_rgba(0,_0,_0,_0.14),_0_1px_5px_0_rgba(0,_0,_0,_0.12)]) [&_.q-icon]:(text-[0.3em] min-w-[1em] text-[#000] opacity-[0.54])`
+      `top-[0.25em] left-[0.25em] w-[0.5em] h-[0.5em] [transition:left_0.22s_cubic-bezier(0.4,_0,_0.2,_1)] select-none z-0 [&:after]:(content-[''] absolute top-[0] right-[0] bottom-[0] left-[0] rounded-[50%] bg-[#fff] [box-shadow:0_3px_1px_-2px_rgba(0,_0,_0,_0.2),_0_2px_2px_0_rgba(0,_0,_0,_0.14),_0_1px_5px_0_rgba(0,_0,_0,_0.12)]) [&_.q-icon]:(layer-components:text-[0.3em] min-w-[1em] layer-components:text-[#000] opacity-[0.54])`
   ],
 
   [
@@ -72,14 +72,15 @@ const shortcuts: UserShortcuts<QuasarTheme> = [
     /^q-toggle__inner--truthy$/,
     ([, c], { theme }) =>
       theme.quasar?.components?.['q-toggle__inner--truthy'] ??
-      ` [&_.q-toggle\\_\\_track]:(opacity-[0.54]) [&_.q-toggle\\_\\_thumb]:(left-[0.65em]) [&_.q-toggle\\_\\_thumb:after]:(bg-current) [&_.q-toggle\\_\\_thumb_.q-icon]:(text-[#fff] opacity-100)`
+      `layer-components:text-primary [&_.q-toggle\\_\\_track]:(opacity-[0.54]) [&_.q-toggle\\_\\_thumb]:(left-[0.65em]) [&_.q-toggle\\_\\_thumb:after]:(bg-current) [&_.q-toggle\\_\\_thumb_.q-icon]:(layer-components:text-[#fff] opacity-100)`
   ],
 
   [
     /^q-toggle--dark$/,
     ([, c], { theme }) =>
       theme.quasar?.components?.['q-toggle--dark'] ??
-      `[&_.q-toggle\\_\\_inner]:(text-[#fff]) [&_.q-toggle\\_\\_inner--truthy]:(text-primary) [&_.q-toggle\\_\\_thumb:after]:([box-shadow:none]) [&_.q-toggle\\_\\_thumb:before]:(!opacity-[0.32])`
+      `[&_.q-toggle\\_\\_inner--truthy]:() [&_.q-toggle\\_\\_thumb:after]:([box-shadow:none]) [&_.q-toggle\\_\\_thumb:before]:(!opacity-[0.32])`
+    // [&_.q-toggle\\_\\_inner]:(layer-components:text-[#fff])
   ],
 
   [

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

@@ -26,7 +26,7 @@ const shortcuts: UserShortcuts<QuasarTheme> = [
   [/^window-width$/, ([, c], { theme }) => `!ml-0 !mr-0 !w-screen`],
 
   [
-    /^q-p(a|t|b|l|r)?(?:-)(none|xs|sm|md|lg|xl)$/,
+    /^q-p(a|t|b|l|r|x|y)?(?:-)(none|xs|sm|md|lg|xl)$/,
     ([, side, size], { theme }) => {
       return `p${side}-${
         theme.quasar?.spaces[size as 'none' | 'xs' | 'sm' | 'md' | 'lg' | 'xl']
@@ -35,7 +35,7 @@ const shortcuts: UserShortcuts<QuasarTheme> = [
   ],
 
   [
-    /^q-m(a|t|b|l|r)?(?:-)(none|xs|sm|md|lg|xl)$/,
+    /^q-m(a|t|b|l|r|x|y)?(?:-)(none|xs|sm|md|lg|xl)$/,
     ([, side, size], { theme }) => {
       return `m${side}-${
         theme.quasar?.spaces[size as 'none' | 'xs' | 'sm' | 'md' | 'lg' | 'xl']

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

@@ -1607,7 +1607,6 @@ export default definePreset((options: QuasarPresetOptions = {}) => {
     presetIcons({}),
     {
       name: 'quasar',
-      presets: [presetUno(), animatedUno(), presetIcons({})],
       safelist: generateSafelist(options),
       preflights: (
         [
@@ -2010,9 +2009,11 @@ textarea {
         QDrawerShortcuts,
         ElevationShortcuts
       ),
+      outputToCssLayers: true,
       layers: {
-        dismiss: -1,
-        default: 1
+        components: -1,
+        default: 1,
+        utilities: 2
       },
       theme: defaultTheme,
       variants: [