vitrify 0.17.0 → 0.17.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vitrify",
-  "version": "0.17.0",
+  "version": "0.17.2",
   "license": "MIT",
   "author": "Stefan van Herwijnen",
   "description": "Vite as your Full Stack development tool",

package/src/node/frameworks/vue/prerender.ts

@@ -28,8 +28,8 @@ export const prerender = async ({
     path: outDir,
     logLevel: 'info',
     external: true,
-    inlineFonts: true,
-    preloadFonts: true
+    fonts: true,
+    compress: false
   })
 
   for (const url of paths) {

package/src/node/index.ts

@@ -341,7 +341,7 @@ export const baseConfig = async ({
       }
     })
   ) {
-    unoCssContentPipelineInclude.push(/quasar\/src\/.*\.js/)
+    // unoCssContentPipelineInclude.push(/quasar\/src\/.*\.js/)
   }
 
   const plugins: ViteUserConfig['plugins'] = [
@@ -482,7 +482,11 @@ export const baseConfig = async ({
     }),
     UnoCSS({
       ...vitrifyConfig.vitrify?.unocss,
-      content: unoCssContentPipelineInclude
+      content: {
+        pipeline: {
+          include: unoCssContentPipelineInclude
+        }
+      }
     })
   ]
   if (isPwa) {

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

@@ -4,60 +4,47 @@ import type { QuasarTheme } from '../theme.js'
 const shortcuts: UserShortcuts<QuasarTheme> = [
   [
     /^q-card$/,
-    ([, c], { theme }) => `shadow-black border-rd-4px v-top bg-white relative
-      [&>div:not(.q--avoid-card-border)]:(border-t-0 border-t-0 border-b-0 border-b-0)
-      [&>img:not(.q--avoid-card-border)]:(border-t-0 border-t-0 border-b-0 border-b-0)
-      [&>div:nth-child(1_of_:not(.q--avoid-card-border))]:(border-t-0 border-t-inherit border-t-inherit)
-      [&>img:nth-child(1_of_:not(.q--avoid-card-border))]:(border-t-0 border-t-inherit border-t-inherit)
-      [&>div:nth-last-child(1_of_:not(.q--avoid-card-border))]:(border-b-0 border-b-inherit border-b-inherit)
-      [&>img:nth-last-child(1_of_:not(.q--avoid-card-border))]:(border-b-0 border-b-inherit border-b-inherit)
-      [&>div:not(.q--avoid-card-border)]:(border-l-0 border-r-0 shadow-none)
-      [&>img]:(block w-full max-w-full border-none)
-    `
+    ([, c], { theme }) =>
+      `[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 [&_>_div:not(.q--avoid-card-border)]:(rounded-tl-none rounded-tr-none rounded-bl-none rounded-br-none) [&_>_img:not(.q--avoid-card-border)]:(rounded-tl-none rounded-tr-none rounded-bl-none rounded-br-none) [&_>_div:nth-child(1_of_:not(.q--avoid-card-border))]:([border-top:0] [border-top-left-radius:inherit] [border-top-right-radius:inherit]) [&_>_img:nth-child(1_of_:not(.q--avoid-card-border))]:([border-top:0] [border-top-left-radius:inherit] [border-top-right-radius:inherit]) [&_>_div:nth-last-child(1_of_:not(.q--avoid-card-border))]:([border-bottom:0] [border-bottom-left-radius:inherit] [border-bottom-right-radius:inherit]) [&_>_img:nth-last-child(1_of_:not(.q--avoid-card-border))]:([border-bottom:0] [border-bottom-left-radius:inherit] [border-bottom-right-radius:inherit]) [&_>_div:not(.q--avoid-card-border)]:([border-left:0] [border-right:0] [box-shadow:none]) [&_>_img]:(block w-full max-w-full border-[0])`
   ],
+
   [
     /^q-card--bordered$/,
-    ([, c], { theme }) => `border-solid border-black border-op-120`
+    ([, c], { theme }) => `border-[1px] border-solid border-[rgba(0,0,0,0.12)]`
   ],
+
   [
     /^q-card--dark$/,
-    ([, c], { theme }) => `border-white border-op-280 shadow-black`
+    ([, c], { theme }) =>
+      `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-card__section$/, ([, c], { theme }) => `relative`],
-  [/^q-card__section--vert$/, ([, c], { theme }) => `p-16px`],
+
+  [/^q-card__section--vert$/, ([, c], { theme }) => `p-[16px]`],
+
   [
     /^q-card__section--horiz$/,
-    (
-      [, c],
-      { theme }
-    ) => `[&>div:not(.q--avoid-card-border)]:(border-t-0 border-b-0 border-t-0 border-b-0)
-    [&>img:not(.q--avoid-card-border)]:(border-t-0 border-b-0 border-t-0 border-b-0)
-    [&>div:nth-child(1_of_:not(.q--avoid-card-border))]:(border-t-inherit border-b-inherit)
-    [&>img:nth-child(1_of_:not(.q--avoid-card-border))]:(border-t-inherit border-b-inherit)
-    [&>div:nth-last-child(1_of_:not(.q--avoid-card-border))]:(border-t-inherit border-b-inherit)
-    [&>img:nth-last-child(1_of_:not(.q--avoid-card-border))]:(border-t-inherit border-b-inherit)
-    [&>div:not(.q--avoid-card-border)]:(border-t-0 border-b-0 shadow-none)
-    `
+    ([, c], { theme }) =>
+      `[&_>_div:not(.q--avoid-card-border)]:(rounded-tl-none rounded-bl-none rounded-tr-none rounded-br-none) [&_>_img:not(.q--avoid-card-border)]:(rounded-tl-none rounded-bl-none rounded-tr-none rounded-br-none) [&_>_div:nth-child(1_of_:not(.q--avoid-card-border))]:([border-top-left-radius:inherit] [border-bottom-left-radius:inherit]) [&_>_img:nth-child(1_of_:not(.q--avoid-card-border))]:([border-top-left-radius:inherit] [border-bottom-left-radius:inherit]) [&_>_div:nth-last-child(1_of_:not(.q--avoid-card-border))]:([border-top-right-radius:inherit] [border-bottom-right-radius:inherit]) [&_>_img:nth-last-child(1_of_:not(.q--avoid-card-border))]:([border-top-right-radius:inherit] [border-bottom-right-radius:inherit]) [&_>_div:not(.q--avoid-card-border)]:([border-top:0] [border-bottom:0] [box-shadow:none])`
   ],
+
   [
-    /^q--card__actions$/,
-    ([, c], { theme }) => `p-8px items-center
-    [&_.q-btn--rectangle]:(px-8px py-0)`
+    /^q-card__actions$/,
+    ([, c], { theme }) =>
+      `p-[8px] items-center [&_.q-btn--rectangle]:(px-[8px] py-[0])`
   ],
+
   [
-    /^q--card__actions--horiz$/,
-    ([, c], { theme }) => `[&>.q-btn-item+.q-btn-item]:(ml-8px)
-    [&>.q-btn-group+.q-btn-item]:(ml-8px)
-    [&>.q-btn-item+.q-btn-group]:(ml-8px)`
+    /^q-card__actions--horiz$/,
+    ([, c], { theme }) =>
+      `[&_>_.q-btn-item_+_.q-btn-item]:(ml-[8px]) [&_>_.q-btn-group_+_.q-btn-item]:(ml-[8px]) [&_>_.q-btn-item_+_.q-btn-group]:(ml-[8px])`
   ],
+
   [
-    /^q--card__actions--vert$/,
-    ([, c], { theme }) => `[&>.q-btn-item.q-btn--round]:(self-center)
-      [&>.q-btn-item+.q-btn-item]:(mt-4px)
-      [&>.q-btn-group+.q-btn-item]:(mt-4px)
-      [&>.q-btn-item+.q-btn-group]:(mt-4px)
-      [&>.q-btn-group>.q-btn-item]:(flex-grow)
-    `
+    /^q-card__actions--vert$/,
+    ([, c], { theme }) =>
+      `[&_>_.q-btn-item.q-btn--round]:(self-center) [&_>_.q-btn-item_+_.q-btn-item]:(mt-[4px]) [&_>_.q-btn-group_+_.q-btn-item]:(mt-[4px]) [&_>_.q-btn-item_+_.q-btn-group]:(mt-[4px]) [&_>_.q-btn-group_>_.q-btn-item]:(flex-grow)`
   ]
 ]
 

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

@@ -18,7 +18,7 @@ const sizes = ['sm', 'md', 'lg', 'xl']
 const shortcuts: UserShortcuts<QuasarTheme> = [
   [
     /^row$/,
-    ([, c], { theme }) => `flex flex-row flex-wrap
+    ([, c], { theme }) => `flex flex-row flex-wrap 
     [&_>_.col]:(grow)
     ${sizes
       .map((size) => `[&_>_.col-${size}]:(${size}:basis-auto ${size}:grow)`)

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

@@ -21,11 +21,11 @@ const preflights: Preflight<QuasarTheme>[] = [
 const shortcuts: UserShortcuts<QuasarTheme> = [
   [/^non-selectable$/, ([, c], { theme }) => `!select-none`],
 
-  [/^scroll$/, ([, c], { theme }) => `overflow-auto `],
+  [/^scroll$/, ([, c], { theme }) => `overflow-auto`],
 
-  [/^scroll-x$/, ([, c], { theme }) => ` overflow-x-auto`],
+  [/^scroll-x$/, ([, c], { theme }) => `overflow-x-auto`],
 
-  [/^scroll-y$/, ([, c], { theme }) => ` overflow-y-auto`],
+  [/^scroll-y$/, ([, c], { theme }) => `overflow-y-auto`],
 
   [/^no-scroll$/, ([, c], { theme }) => `!overflow-hidden`],