vitrify 0.17.6 → 0.17.8

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

@@ -300,7 +300,7 @@ export interface QuasarTheme {
     'blue-grey-13 ': string
     'blue-grey-14 ': '#455a64'
   }
-  quasar?: {
+  quasar: {
     components?: {
       'q-icon'?: string
       'q-panel'?: string
@@ -1124,6 +1124,10 @@ export interface QuasarTheme {
       notify: number
       max: number
     }
+    transition: {
+      duration: string
+      easing: string
+    }
   }
 }
 
@@ -1439,6 +1443,10 @@ const defaultTheme: QuasarTheme = {
       tooltip: 9000,
       notify: 9500,
       max: 9998
+    },
+    transition: {
+      duration: '.3s',
+      easing: 'cubic-bezier(0.215,0.61,0.355,1)'
     }
   }
 }

package/src/node/plugins/quasar.ts

@@ -12,7 +12,9 @@ import {
   type QuasarComponents,
   type QuasarDirectives,
   type QuasarIconSets,
-  type QuasarPlugins
+  type QuasarPlugins,
+  type GlobalQuasarIconMapFn,
+  type QuasarIconSet
 } from 'quasar'
 
 export interface QuasarConf {
@@ -21,7 +23,8 @@ export interface QuasarConf {
     directives?: (keyof QuasarDirectives)[]
     plugins?: (keyof QuasarPlugins)[]
     lang?: string
-    iconSet?: QuasarIconSets
+    iconSet?: QuasarIconSets | QuasarIconSet
+    iconMapFn?: GlobalQuasarIconMapFn
   }
   extras?: (QuasarIconSets | QuasarFonts)[]
   disableSass?: boolean
@@ -146,6 +149,10 @@ export const QuasarPlugin: VitrifyPlugin = async ({
             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,
@@ -153,7 +160,10 @@ export const QuasarPlugin: VitrifyPlugin = async ({
                 plugins: quasarPlugins,
                 directives,
                 lang,
-                iconSet
+                iconSet,
+                config: {
+                  iconMapFn
+                }
               },
               ssrContext
             )
@@ -196,111 +206,6 @@ export const QuasarPlugin: VitrifyPlugin = async ({
               ? 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: {
@@ -350,6 +255,8 @@ export const QuasarPlugin: VitrifyPlugin = async ({
             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:
@@ -367,10 +274,22 @@ export const QuasarPlugin: VitrifyPlugin = async ({
           }';
           export default lang`
         } else if (id === 'virtual:quasar-iconSet') {
-          return `import iconSet from 'quasar/icon-set/${
-            quasarConf?.framework.iconSet || 'material-icons'
-          }';
+          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';
           export * from 'quasar/src/components.js';