vitrify 0.17.6 → 0.17.8

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

@@ -307,6 +307,10 @@ const defaultTheme = {
             tooltip: 9000,
             notify: 9500,
             max: 9998
+        },
+        transition: {
+            duration: '.3s',
+            easing: 'cubic-bezier(0.215,0.61,0.355,1)'
         }
     }
 };

package/dist/plugins/quasar.js

@@ -74,11 +74,17 @@ export const QuasarPlugin = async ({ ssr = false, pwa = false }) => {
                         const { default: lang } = await import('virtual:quasar-lang');
                         // @ts-ignore
                         const { default: iconSet } = await import('virtual:quasar-iconSet');
+                        const { default: iconMapFn } = await import(
+                        // @ts-ignore
+                        'virtual:quasar-iconMapFn');
                         app.use(staticImports?.Quasar, {
                             plugins: quasarPlugins,
                             directives,
                             lang,
-                            iconSet
+                            iconSet,
+                            config: {
+                                iconMapFn
+                            }
                         }, ssrContext);
                     }
                 ];
@@ -117,104 +123,6 @@ export const QuasarPlugin = async ({ ssr = false, pwa = false }) => {
                             ? undefined
                             : {
                                 global: ['quasar/src/css/index.sass']
-                                // global: [
-                                //   'quasar/src/css/helpers/string.sass',
-                                //   'quasar/src/css/helpers/math.sass',
-                                //   'quasar/src/css/variables.sass',
-                                //   'quasar/src/css/normalize.sass',
-                                //   // 'quasar/src/components/icon/QIcon.sass',
-                                //   // /* Composables */
-                                //   // 'quasar/src/composables/private.use-panel/use-panel.sass',
-                                //   // /* Components */
-                                //   // 'quasar/src/components/ajax-bar/QAjaxBar.sass',
-                                //   // 'quasar/src/components/avatar/QAvatar.sass',
-                                //   // 'quasar/src/components/badge/QBadge.sass',
-                                //   // 'quasar/src/components/banner/QBanner.sass',
-                                //   // 'quasar/src/components/bar/QBar.sass',
-                                //   // 'quasar/src/components/breadcrumbs/QBreadcrumbs.sass',
-                                //   // 'quasar/src/components/btn/QBtn.sass',
-                                //   // 'quasar/src/components/btn-dropdown/QBtnDropdown.sass',
-                                //   // 'quasar/src/components/btn-group/QBtnGroup.sass',
-                                //   // 'quasar/src/components/btn-toggle/QBtnToggle.sass',
-                                //   // 'quasar/src/components/card/QCard.sass',
-                                //   // 'quasar/src/components/carousel/QCarousel.sass',
-                                //   // 'quasar/src/components/chat/QChatMessage.sass',
-                                //   // 'quasar/src/components/checkbox/QCheckbox.sass',
-                                //   // 'quasar/src/components/chip/QChip.sass',
-                                //   // 'quasar/src/components/circular-progress/QCircularProgress.sass',
-                                //   // 'quasar/src/components/color/QColor.sass',
-                                //   // 'quasar/src/components/date/QDate.sass',
-                                //   // 'quasar/src/components/dialog/QDialog.sass',
-                                //   // 'quasar/src/components/editor/QEditor.sass',
-                                //   // 'quasar/src/components/expansion-item/QExpansionItem.sass',
-                                //   // 'quasar/src/components/fab/QFab.sass',
-                                //   // 'quasar/src/components/field/QField.sass',
-                                //   'quasar/src/components/file/QFile.sass',
-                                //   'quasar/src/components/form/QForm.sass',
-                                //   'quasar/src/components/img/QImg.sass',
-                                //   'quasar/src/components/inner-loading/QInnerLoading.sass',
-                                //   'quasar/src/components/input/QInput.sass',
-                                //   'quasar/src/components/intersection/QIntersection.sass',
-                                //   'quasar/src/components/item/QItem.sass',
-                                //   'quasar/src/components/knob/QKnob.sass',
-                                //   'quasar/src/components/layout/QLayout.sass',
-                                //   'quasar/src/components/linear-progress/QLinearProgress.sass',
-                                //   'quasar/src/components/menu/QMenu.sass',
-                                //   'quasar/src/components/option-group/QOptionGroup.sass',
-                                //   'quasar/src/components/pagination/QPagination.sass',
-                                //   'quasar/src/components/parallax/QParallax.sass',
-                                //   'quasar/src/components/popup-edit/QPopupEdit.sass',
-                                //   'quasar/src/components/pull-to-refresh/QPullToRefresh.sass',
-                                //   'quasar/src/components/radio/QRadio.sass',
-                                //   'quasar/src/components/rating/QRating.sass',
-                                //   'quasar/src/components/responsive/QResponsive.sass',
-                                //   'quasar/src/components/scroll-area/QScrollArea.sass',
-                                //   'quasar/src/components/select/QSelect.sass',
-                                //   'quasar/src/components/separator/QSeparator.sass',
-                                //   'quasar/src/components/skeleton/QSkeleton.sass',
-                                //   'quasar/src/components/slide-item/QSlideItem.sass',
-                                //   'quasar/src/components/slider/QSlider.sass',
-                                //   'quasar/src/components/space/QSpace.sass',
-                                //   'quasar/src/components/spinner/QSpinner.sass',
-                                //   'quasar/src/components/splitter/QSplitter.sass',
-                                //   'quasar/src/components/stepper/QStepper.sass',
-                                //   'quasar/src/components/tab-panels/QTabPanel.sass',
-                                //   'quasar/src/components/table/QTable.sass',
-                                //   'quasar/src/components/tabs/QTabs.sass',
-                                //   'quasar/src/components/time/QTime.sass',
-                                //   'quasar/src/components/timeline/QTimeline.sass',
-                                //   'quasar/src/components/toggle/QToggle.sass',
-                                //   'quasar/src/components/toolbar/QToolbar.sass',
-                                //   'quasar/src/components/tooltip/QTooltip.sass',
-                                //   'quasar/src/components/tree/QTree.sass',
-                                //   'quasar/src/components/uploader/QUploader.sass',
-                                //   'quasar/src/components/video/QVideo.sass',
-                                //   'quasar/src/components/virtual-scroll/QVirtualScroll.sass',
-                                //   /* Directives */
-                                //   'quasar/src/directives/ripple/Ripple.sass',
-                                //   'quasar/src/directives/morph/Morph.sass',
-                                //   /* Plugins */
-                                //   'quasar/src/plugins/bottom-sheet/component/BottomSheetComponent.sass',
-                                //   'quasar/src/plugins/dialog/component/DialogPluginComponent.sass',
-                                //   'quasar/src/plugins/loading/Loading.sass',
-                                //   'quasar/src/plugins/notify/Notify.sass',
-                                //   /* Core */
-                                //   'quasar/src/css/core/animations.sass',
-                                //   'quasar/src/css/core/colors.sass',
-                                //   'quasar/src/css/core/elevation.sass',
-                                //   'quasar/src/css/core/flex.sass',
-                                //   'quasar/src/css/core/helpers.sass',
-                                //   'quasar/src/css/core/mouse.sass',
-                                //   'quasar/src/css/core/orientation.sass',
-                                //   'quasar/src/css/core/positioning.sass',
-                                //   'quasar/src/css/core/size.sass',
-                                //   'quasar/src/css/core/touch.sass',
-                                //   'quasar/src/css/core/transitions.sass',
-                                //   'quasar/src/css/core/typography.sass',
-                                //   'quasar/src/css/core/visibility.sass',
-                                //   'quasar/src/css/core/dark.sass'
-                                // ]
-                                // additionalData: [`@import 'quasar/src/css/index.sass'`]
                             }
                     },
                     resolve: {
@@ -262,6 +170,8 @@ export const QuasarPlugin = async ({ ssr = false, pwa = false }) => {
                         return 'virtual:quasar-lang';
                     case 'virtual:quasar-iconSet':
                         return 'virtual:quasar-iconSet';
+                    case 'virtual:quasar-iconMapFn':
+                        return 'virtual:quasar-iconMapFn';
                     case 'virtual:quasar':
                         return { id: 'virtual:quasar', moduleSideEffects: false };
                     default:
@@ -280,8 +190,15 @@ export const QuasarPlugin = async ({ ssr = false, pwa = false }) => {
           export default lang`;
                 }
                 else if (id === 'virtual:quasar-iconSet') {
-                    return `import iconSet from 'quasar/icon-set/${quasarConf?.framework.iconSet || 'material-icons'}';
-          export default iconSet`;
+                    return `${typeof quasarConf.framework.iconSet === 'string'
+                        ? `import iconSet from 'quasar/icon-set/${quasarConf?.framework.iconSet || 'material-icons'}';
+          export default iconSet`
+                        : `export default ${quasarConf.framework.iconSet
+                            ? JSON.stringify(quasarConf.framework.iconSet)
+                            : null}`}`;
+                }
+                else if (id === 'virtual:quasar-iconMapFn') {
+                    return `export default ${quasarConf?.framework.iconMapFn?.toString() ?? null}`;
                 }
                 else if (id === 'virtual:quasar') {
                     return `export * from 'quasar/src/plugins.js';

package/dist/types/plugins/quasar/unocss/core/elevation.unocss.d.ts

@@ -1,4 +1,5 @@
-import type { Rule } from '@unocss/core';
+import type { Rule, UserShortcuts } from '@unocss/core';
 import type { QuasarTheme } from '../theme.js';
 declare const rules: Rule<QuasarTheme>[];
-export { rules };
+declare const shortcuts: UserShortcuts<QuasarTheme>;
+export { rules, shortcuts };

package/dist/types/plugins/quasar/unocss/core/transitions.unocss.d.ts

@@ -1,4 +1,5 @@
-import type { UserShortcuts } from '@unocss/core';
+import type { Preflight, UserShortcuts } from '@unocss/core';
 import type { QuasarTheme } from '../theme.js';
+declare const preflights: Preflight<QuasarTheme>[];
 declare const shortcuts: UserShortcuts<QuasarTheme>;
-export { shortcuts };
+export { preflights, shortcuts };

package/dist/types/plugins/quasar/unocss/index.d.ts

@@ -1,10 +1,7 @@
-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;
 }
 declare const _default: import("unocss").Preset<object>;
 export default _default;

package/dist/types/plugins/quasar/unocss/theme.d.ts

@@ -295,7 +295,7 @@ export interface QuasarTheme {
         'blue-grey-13 ': string;
         'blue-grey-14 ': '#455a64';
     };
-    quasar?: {
+    quasar: {
         components?: {
             'q-icon'?: string;
             'q-panel'?: string;
@@ -1119,6 +1119,10 @@ export interface QuasarTheme {
             notify: number;
             max: number;
         };
+        transition: {
+            duration: string;
+            easing: string;
+        };
     };
 }
 declare const defaultTheme: QuasarTheme;

package/dist/types/plugins/quasar.d.ts

@@ -1,12 +1,13 @@
 import type { VitrifyPlugin } from './index.js';
-import { type QuasarFonts, type QuasarComponents, type QuasarDirectives, type QuasarIconSets, type QuasarPlugins } from 'quasar';
+import { type QuasarFonts, type QuasarComponents, type QuasarDirectives, type QuasarIconSets, type QuasarPlugins, type GlobalQuasarIconMapFn, type QuasarIconSet } from 'quasar';
 export interface QuasarConf {
     framework: {
         components?: (keyof QuasarComponents)[];
         directives?: (keyof QuasarDirectives)[];
         plugins?: (keyof QuasarPlugins)[];
         lang?: string;
-        iconSet?: QuasarIconSets;
+        iconSet?: QuasarIconSets | QuasarIconSet;
+        iconMapFn?: GlobalQuasarIconMapFn;
     };
     extras?: (QuasarIconSets | QuasarFonts)[];
     disableSass?: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vitrify",
-  "version": "0.17.6",
+  "version": "0.17.8",
   "license": "MIT",
   "author": "Stefan van Herwijnen",
   "description": "Vite as your Full Stack development tool",
@@ -81,6 +81,7 @@
     "@types/merge-deep": "^3.0.3",
     "@types/node": "^22.10.2",
     "@types/ws": "^8.5.13",
+    "@unocss/preset-icons": "^65.4.2",
     "@vue/runtime-core": "^3.5.13",
     "beasties": "^0.2.0",
     "css": "^3.0.0",

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

@@ -6,7 +6,7 @@ const shortcuts: UserShortcuts<QuasarTheme> = [
     /^q-btn-group$/,
     ([, c], { theme }) =>
       theme.quasar?.components?.['q-btn-group'] ??
-      `rounded-[3px] [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)] align-middle [&_>_.q-btn-item]:([border-radius:inherit] self-stretch) [&_>_.q-btn-item:before]:([box-shadow:none]) [&_>_.q-btn-item_.q-badge--floating]:(right-0) [&_>_.q-btn-group]:([box-shadow:none]) [&_>_.q-btn-group:first-child_>_.q-btn:first-child]:([border-top-left-radius:inherit] [border-bottom-left-radius:inherit]) [&_>_.q-btn-group:last-child_>_.q-btn:last-child]:([border-top-right-radius:inherit] [border-bottom-right-radius:inherit]) [&_>_.q-btn-group:not(:first-child)_>_.q-btn:first-child:before]:([border-left:0]) [&_>_.q-btn-group:not(:last-child)_>_.q-btn:last-child:before]:([border-right:0]) [&_>_.q-btn-item:not(:last-child)]:(rounded-tr-none rounded-br-none) [&_>_.q-btn-item:not(:first-child)]:(rounded-tl-none rounded-bl-none) [&_>_.q-btn-item.q-btn--standard:before]:()`
+      `rounded-[3px] [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)] align-middle [&_>_.q-btn-item]:([border-radius:inherit] self-stretch) [&_>_.q-btn-item:before]:([box-shadow:none]) [&_>_.q-btn-item_.q-badge--floating]:(right-0) [&_>_.q-btn-group]:([box-shadow:none]) [&_>_.q-btn-group:first-child_>_.q-btn:first-child]:([border-top-left-radius:inherit] [border-bottom-left-radius:inherit]) [&_>_.q-btn-group:last-child_>_.q-btn:last-child]:([border-top-right-radius:inherit] [border-bottom-right-radius:inherit]) [&_>_.q-btn-group:not(:first-child)_>_.q-btn:first-child:before]:([border-left:0]) [&_>_.q-btn-group:not(:last-child)_>_.q-btn:last-child:before]:([border-right:0]) [&_>_.q-btn-item:not(:last-child)]:(rounded-tr-none rounded-br-none) [&_>_.q-btn-item:not(:first-child)]:(rounded-tl-none rounded-bl-none) [&_>_.q-btn-item.q-btn--standard:before]:(z--1)`
   ],
 
   [

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

@@ -68,7 +68,7 @@ const shortcuts: UserShortcuts<QuasarTheme> = [
     /^q-color-picker__header-bg$/,
     ([, c], { theme }) =>
       theme.quasar?.components?.['q-color-picker__header-bg'] ??
-      `bg-[#fff] bg-[url('data:image/png]`
+      `bg-[#fff] bg-[url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAAH0lEQVQoU2NkYGAwZkAFZ5G5jPRRgOYEVDeB3EBjBQBOZwTVugIGyAAAAABJRU5ErkJggg==')]`
   ],
 
   [

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

@@ -114,7 +114,7 @@ const shortcuts: UserShortcuts<QuasarTheme> = [
     /^q-date__edit-range$/,
     ([, c], { theme }) =>
       theme.quasar?.components?.['q-date__edit-range'] ??
-      `[&:after]:() [&:nth-child(7n-6):after]:(rounded-tl-none rounded-bl-none) [&:nth-child(7n):after]:(rounded-tr-none rounded-br-none)`
+      `[&:after]:(border-[currentColor_transparent]) [&:nth-child(7n-6):after]:(rounded-tl-none rounded-bl-none) [&:nth-child(7n):after]:(rounded-tr-none rounded-br-none)`
   ],
 
   [
@@ -180,7 +180,7 @@ const shortcuts: UserShortcuts<QuasarTheme> = [
     /^q-date--portrait-standard$/,
     ([, c], { theme }) =>
       theme.quasar?.components?.['q-date--portrait-standard'] ??
-      `[&_.q-date\\_\\_content]:(h-[calc(100% - 86px)]) [&_.q-date\\_\\_header]:([border-top-right-radius:inherit] h-[86px]) [&_.q-date\\_\\_header-title]:(items-center h-[30px])`
+      `[&_.q-date\\_\\_content]:(h-[calc(100%-86px)]) [&_.q-date\\_\\_header]:([border-top-right-radius:inherit] h-[86px]) [&_.q-date\\_\\_header-title]:(items-center h-[30px])`
   ],
 
   [

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

@@ -2,68 +2,68 @@ import type { Preflight, Rule, UserShortcuts } from '@unocss/core'
 import type { QuasarTheme } from '../theme.js'
 
 const preflights: Preflight<QuasarTheme>[] = [
-  //   {
-  //     getCSS: ({ theme }) => `
-  // body.q-ios-padding .q-layout--standard .q-header > .q-toolbar:nth-child(1),
-  // body.q-ios-padding .q-layout--standard .q-header > .q-tabs:nth-child(1) .q-tabs__content,
-  // body.q-ios-padding .q-layout--standard .q-drawer--top-padding .q-drawer__content {
-  //   padding-top: 20px;
-  //   min-height: 70px;
-  //   padding-top: env(safe-area-inset-top);
-  //   min-height: calc(env(safe-area-inset-top) + 50px);
-  // }
-  // body.q-ios-padding .q-layout--standard .q-footer > .q-toolbar:last-child,
-  // body.q-ios-padding .q-layout--standard .q-footer > .q-tabs:nth-last-child(1 of :not(.q-layout__shadow)) .q-tabs__content,
-  // body.q-ios-padding .q-layout--standard .q-drawer--top-padding .q-drawer__content {
-  //   padding-bottom: env(safe-area-inset-bottom);
-  //   min-height: calc(env(safe-area-inset-bottom) + 50px);
-  // }
-  // .q-body--layout-animate .q-drawer__backdrop {
-  //   transition: background-color 0.12s !important;
-  // }
-  // .q-body--layout-animate .q-drawer {
-  //   transition: transform 0.12s, width 0.12s, top 0.12s, bottom 0.12s !important;
-  // }
-  // .q-body--layout-animate .q-layout__section--marginal {
-  //   transition: transform 0.12s, left 0.12s, right 0.12s !important;
-  // }
-  // .q-body--layout-animate .q-page-container {
-  //   transition: padding-top 0.12s, padding-right 0.12s, padding-bottom 0.12s, padding-left 0.12s !important;
-  // }
-  // .q-body--layout-animate .q-page-sticky {
-  //   transition: transform 0.12s, left 0.12s, right 0.12s, top 0.12s, bottom 0.12s !important;
-  // }
-  // body:not(.q-body--layout-animate) .q-layout--prevent-focus {
-  //   visibility: hidden;
-  // }
-  // .q-body--drawer-toggle {
-  //   overflow-x: hidden !important;
-  // }
-  // @media (max-width: 599.98px) {
-  //   .q-layout-padding {
-  //     padding: 8px;
-  //   }
-  // }
-  // @media (min-width: 600px) and (max-width: 1439.98px) {
-  //   .q-layout-padding {
-  //     padding: 16px;
-  //   }
-  // }
-  // @media (min-width: 1440px) {
-  //   .q-layout-padding {
-  //     padding: 24px;
-  //   }
-  // }
-  // body.body--dark .q-header, body.body--dark .q-footer, body.body--dark .q-drawer {
-  //   border-color: rgba(255, 255, 255, 0.28);
-  // }
-  // body.body--dark .q-layout__shadow:after {
-  //   box-shadow: 0 0 10px 2px rgba(255, 255, 255, 0.2), 0 0px 10px rgba(255, 255, 255, 0.24);
-  // }
-  // body.platform-ios .q-layout--containerized {
-  //   position: unset !important;
-  // }`
-  //   }
+  {
+    getCSS: ({ theme }) => `
+body.q-ios-padding .q-layout--standard .q-header > .q-toolbar:nth-child(1),
+body.q-ios-padding .q-layout--standard .q-header > .q-tabs:nth-child(1) .q-tabs__content,
+body.q-ios-padding .q-layout--standard .q-drawer--top-padding .q-drawer__content {
+  padding-top: 20px;
+  min-height: 70px;
+  padding-top: env(safe-area-inset-top);
+  min-height: calc(env(safe-area-inset-top) + 50px);
+}
+body.q-ios-padding .q-layout--standard .q-footer > .q-toolbar:last-child,
+body.q-ios-padding .q-layout--standard .q-footer > .q-tabs:nth-last-child(1 of :not(.q-layout__shadow)) .q-tabs__content,
+body.q-ios-padding .q-layout--standard .q-drawer--top-padding .q-drawer__content {
+  padding-bottom: env(safe-area-inset-bottom);
+  min-height: calc(env(safe-area-inset-bottom) + 50px);
+}
+.q-body--layout-animate .q-drawer__backdrop {
+  transition: background-color 0.12s !important;
+}
+.q-body--layout-animate .q-drawer {
+  transition: transform 0.12s, width 0.12s, top 0.12s, bottom 0.12s !important;
+}
+.q-body--layout-animate .q-layout__section--marginal {
+  transition: transform 0.12s, left 0.12s, right 0.12s !important;
+}
+.q-body--layout-animate .q-page-container {
+  transition: padding-top 0.12s, padding-right 0.12s, padding-bottom 0.12s, padding-left 0.12s !important;
+}
+.q-body--layout-animate .q-page-sticky {
+  transition: transform 0.12s, left 0.12s, right 0.12s, top 0.12s, bottom 0.12s !important;
+}
+body:not(.q-body--layout-animate) .q-layout--prevent-focus {
+  visibility: hidden;
+}
+.q-body--drawer-toggle {
+  overflow-x: hidden !important;
+}
+@media (max-width: 599.98px) {
+  .q-layout-padding {
+    padding: 8px;
+  }
+}
+@media (min-width: 600px) and (max-width: 1439.98px) {
+  .q-layout-padding {
+    padding: 16px;
+  }
+}
+@media (min-width: 1440px) {
+  .q-layout-padding {
+    padding: 24px;
+  }
+}
+body.body--dark .q-header, body.body--dark .q-footer, body.body--dark .q-drawer {
+  border-color: rgba(255, 255, 255, 0.28);
+}
+body.body--dark .q-layout__shadow:after {
+  box-shadow: 0 0 10px 2px rgba(255, 255, 255, 0.2), 0 0px 10px rgba(255, 255, 255, 0.24);
+}
+body.platform-ios .q-layout--containerized {
+  position: unset !important;
+}`
+  }
 ]
 
 const shortcuts: UserShortcuts<QuasarTheme> = [

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

@@ -84,7 +84,7 @@ const shortcuts: UserShortcuts<QuasarTheme> = [
     /^q-radio--dark$/,
     ([, c], { theme }) =>
       theme.quasar?.components?.['q-radio--dark'] ??
-      `[&_.q-radio\\_\\_inner]:(text-[rgba(255,_255,_255,_0.7)]) [&_.q-radio\\_\\_inner:before]:(!opacity-[0.32]) [&_.q-radio\\_\\_inner--truthy]:()`
+      `[&_.q-radio\\_\\_inner]:(text-[rgba(255,_255,_255,_0.7)]) [&_.q-radio\\_\\_inner:before]:(!opacity-[0.32]) [&_.q-radio\\_\\_inner--truthy]:(text-primary)`
   ],
 
   [

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

@@ -12,7 +12,7 @@ const shortcuts: UserShortcuts<QuasarTheme> = [
     /^q-slider--editable$/,
     ([, c], { theme }) =>
       theme.quasar?.components?.['q-slider--editable'] ??
-      `[&_.q-slider\\_\\_track-container]:()`
+      `[&_.q-slider\\_\\_track-container]:(cursor-grab)`
   ],
 
   [/^q-slider__track-container$/, ([, c], { theme }) => `outline-0`],
@@ -21,14 +21,14 @@ const shortcuts: UserShortcuts<QuasarTheme> = [
     /^q-slider__track-container--h$/,
     ([, c], { theme }) =>
       theme.quasar?.components?.['q-slider__track-container--h'] ??
-      `w-full px-[0] py-[12px] [&_.q-slider\\_\\_selection]:()`
+      `w-full px-[0] py-[12px] [&_.q-slider\\_\\_selection]:(will-change-width will-change-left)`
   ],
 
   [
     /^q-slider__track-container--v$/,
     ([, c], { theme }) =>
       theme.quasar?.components?.['q-slider__track-container--v'] ??
-      `h-full px-[12px] py-[0] [&_.q-slider\\_\\_selection]:()`
+      `h-full px-[12px] py-[0] [&_.q-slider\\_\\_selection]:(will-change-height will-change-top)`
   ],
 
   [

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

@@ -34,14 +34,14 @@ const shortcuts: UserShortcuts<QuasarTheme> = [
     /^q-splitter--vertical$/,
     ([, c], { theme }) =>
       theme.quasar?.components?.['q-splitter--vertical'] ??
-      `[&_>_.q-splitter\\_\\_panel]:(h-full) [&.q-splitter--active]:() [&_>_.q-splitter\\_\\_separator]:(w-px) [&_>_.q-splitter\\_\\_separator_>_div]:(-left-[6px] -right-[6px]) [&.q-splitter--workable_>_.q-splitter\\_\\_separator]:()`
+      `[&_>_.q-splitter\\_\\_panel]:(h-full) [&.q-splitter--active]:(cursor-col-resize) [&_>_.q-splitter\\_\\_separator]:(w-px) [&_>_.q-splitter\\_\\_separator_>_div]:(-left-[6px] -right-[6px]) [&.q-splitter--workable_>_.q-splitter\\_\\_separator]:(cursor-col-resize)`
   ],
 
   [
     /^q-splitter--horizontal$/,
     ([, c], { theme }) =>
       theme.quasar?.components?.['q-splitter--horizontal'] ??
-      `[&_>_.q-splitter\\_\\_panel]:(w-full) [&.q-splitter--active]:() [&_>_.q-splitter\\_\\_separator]:(h-px) [&_>_.q-splitter\\_\\_separator_>_div]:(-top-[6px] -bottom-[6px]) [&.q-splitter--workable_>_.q-splitter\\_\\_separator]:()`
+      `[&_>_.q-splitter\\_\\_panel]:(w-full) [&.q-splitter--active]:(cursor-row-resize) [&_>_.q-splitter\\_\\_separator]:(h-px) [&_>_.q-splitter\\_\\_separator_>_div]:(-top-[6px] -bottom-[6px]) [&.q-splitter--workable_>_.q-splitter\\_\\_separator]:(cursor-row-resize)`
   ],
 
   [

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

@@ -153,7 +153,7 @@ __.q-stepper\\_\\_tab:last-child]:(items-end) [&_.q-stepper\\_\\_tab]:(px-[0] py
     /^q-stepper--horizontal$/,
     ([, c], { theme }) =>
       theme.quasar?.components?.['q-stepper--horizontal'] ??
-      `[&_.q-stepper\\_\\_step-inner]:(p-[24px]) [&_.q-stepper\\_\\_tab:first-child]:([border-top-left-radius:inherit]) [&_.q-stepper\\_\\_tab:last-child]:([border-top-right-radius:inherit]) [&_.q-stepper\\_\\_tab:first-child_.q-stepper\\_\\_dot:before]:(hidden) [&_.q-stepper\\_\\_tab:last-child_.q-stepper\\_\\_label:after]:(hidden) [&_.q-stepper\\_\\_tab:last-child_.q-stepper\\_\\_dot:after]:(hidden) [&_.q-stepper\\_\\_tab]:(overflow-hidden) [&_.q-stepper\\_\\_line]:() [&_.q-stepper\\_\\_line:before]:(absolute top-2/4 h-px w-screen bg-[rgba(0,_0,_0,_0.12)]) [&_.q-stepper\\_\\_line:after]:(absolute top-2/4 h-px w-screen bg-[rgba(0,_0,_0,_0.12)]) [&_.q-stepper\\_\\_label:after]:(content-[''] left-full ml-[8px]) [&_.q-stepper\\_\\_dot:after]:(content-[''] left-full ml-[8px]) [&_.q-stepper\\_\\_dot:before]:(content-[''] right-full mr-[8px]) [&_>_.q-stepper\\_\\_nav]:(pt-[0] px-[24px] pb-[24px])`
+      `[&_.q-stepper\\_\\_step-inner]:(p-[24px]) [&_.q-stepper\\_\\_tab:first-child]:([border-top-left-radius:inherit]) [&_.q-stepper\\_\\_tab:last-child]:([border-top-right-radius:inherit]) [&_.q-stepper\\_\\_tab:first-child_.q-stepper\\_\\_dot:before]:(hidden) [&_.q-stepper\\_\\_tab:last-child_.q-stepper\\_\\_label:after]:(hidden) [&_.q-stepper\\_\\_tab:last-child_.q-stepper\\_\\_dot:after]:(hidden) [&_.q-stepper\\_\\_tab]:(overflow-hidden) [&_.q-stepper\\_\\_line]:(contain-layout) [&_.q-stepper\\_\\_line:before]:(absolute top-2/4 h-px w-screen bg-[rgba(0,_0,_0,_0.12)]) [&_.q-stepper\\_\\_line:after]:(absolute top-2/4 h-px w-screen bg-[rgba(0,_0,_0,_0.12)]) [&_.q-stepper\\_\\_label:after]:(content-[''] left-full ml-[8px]) [&_.q-stepper\\_\\_dot:after]:(content-[''] left-full ml-[8px]) [&_.q-stepper\\_\\_dot:before]:(content-[''] right-full mr-[8px]) [&_>_.q-stepper\\_\\_nav]:(pt-[0] px-[24px] pb-[24px])`
   ],
 
   [

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

@@ -79,7 +79,7 @@ const shortcuts: UserShortcuts<QuasarTheme> = [
     /^q-toggle--dark$/,
     ([, c], { theme }) =>
       theme.quasar?.components?.['q-toggle--dark'] ??
-      `[&_.q-toggle\\_\\_inner]:(text-[#fff]) [&_.q-toggle\\_\\_inner--truthy]:() [&_.q-toggle\\_\\_thumb:after]:([box-shadow:none]) [&_.q-toggle\\_\\_thumb:before]:(!opacity-[0.32])`
+      `[&_.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])`
   ],
 
   [

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

@@ -20,7 +20,7 @@ const shortcuts: UserShortcuts<QuasarTheme> = [
     /^q-uploader__input$/,
     ([, c], { theme }) =>
       theme.quasar?.components?.['q-uploader__input'] ??
-      `opacity-0 w-full h-full !cursor-pointer [&::-webkit-file-upload-button]:(cursor-pointer)`
+      `opacity-0 w-full h-full cursor-pointer [&::-webkit-file-upload-button]:(cursor-pointer)`
   ],
 
   [

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

@@ -7,8 +7,7 @@ const preflights: Preflight<QuasarTheme>[] = [
 body.body--dark {
   color: #fff;
   background: ${theme.colors['dark-page']};
-}
-    `
+}`
   }
 ]
 

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

@@ -92,4 +92,11 @@ const rules: Rule<QuasarTheme>[] = [
   )
 ]
 
-export { rules }
+const shortcuts: UserShortcuts<QuasarTheme> = [
+  [/^shadow-none$/, ([, c], { theme }) => `shadow-none`],
+  [/^no-shadow$/, ([, c], { theme }) => `shadow-none`],
+  // TODO
+  [/^shadow-(0?[1-9]|1[0-9]|2[0-4])$/, ([, nr], { theme }) => `shadow-md`]
+]
+
+export { rules, shortcuts }

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/core/mouse.unocss.ts

@@ -40,7 +40,7 @@ const shortcuts: UserShortcuts<QuasarTheme> = [
 
   [/^cursor-inherit$/, ([, c], { theme }) => `[cursor:inherit!important]`],
 
-  [/^cursor-none$/, ([, c], { theme }) => ``]
+  ['cursor-pointer', 'cursor-[pointer]!']
 ]
 
 export { preflights, shortcuts }

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

@@ -1,6 +1,16 @@
 import type { Preflight, Rule, UserShortcuts } from '@unocss/core'
 import type { QuasarTheme } from '../theme.js'
 
+const preflights: Preflight<QuasarTheme>[] = [
+  {
+    getCSS: ({ theme }) => `
+:root {
+  --q-transition-duration: ${theme.quasar.transition.duration};
+  --q-transition-easing: ${theme.quasar.transition.easing};
+}`
+  }
+]
+
 const shortcuts: UserShortcuts<QuasarTheme> = [
   [
     /^q-transition--slide-right-enter-active$/,
@@ -389,4 +399,4 @@ const shortcuts: UserShortcuts<QuasarTheme> = [
   ]
 ]
 
-export { shortcuts }
+export { preflights, shortcuts }