vitrify 0.17.13 → 0.17.15

package/dist/index.js

@@ -25,7 +25,7 @@ const internalServerModules = [
     '@fastify/middie',
     '@fastify',
     'node',
-    'critters',
+    'beasties',
     'node-fetch',
     'ws',
     'abort-controller'
@@ -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/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/index.js

@@ -1,4 +1,3 @@
-// Import normalize and animate css
 import { definePreset, presetIcons, transformerVariantGroup } from 'unocss';
 import presetUno from '@unocss/preset-uno';
 import { defaultTheme } from './theme.js';
@@ -1499,7 +1498,6 @@ export default definePreset((options = {}) => {
         presetIcons({}),
         {
             name: 'quasar',
-            presets: [presetUno(), animatedUno(), presetIcons({})],
             safelist: generateSafelist(options),
             preflights: [
                 {
@@ -1774,6 +1772,10 @@ textarea {
   margin: 0;
 }
 
+html, body
+  margin: 0
+  box-sizing: border-box
+
 /* beasties:include end */`
                 }
             ].concat(QBreadcrumbsPreflights, QCheckboxPreflights, QChipPreflights, QCircularProgressPreflights, QDialogPreflights, QFieldPreflights, QLayoutPreflights, QLinearProgressPreflights, QRadioPreflights, QSelectPreflights, QSpinnerPreflights, QSkeletonPreflights, QTablePreflights, QTogglePreflights, QTreePreflights, ColorPreflights, DarkPreflights, HelperPreflights, MousePreflights, TypographyPreflights, VisibilityPreflights, TransitionPreflights, SizePreflights),

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.13",
+  "version": "0.17.15",
   "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

@@ -46,7 +46,7 @@ const internalServerModules = [
   '@fastify/middie',
   '@fastify',
   'node',
-  'critters',
+  'beasties',
   'node-fetch',
   'ws',
   'abort-controller'
@@ -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/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/index.ts

@@ -1,4 +1,3 @@
-// Import normalize and animate css
 import {
   definePreset,
   type Preflight,
@@ -1607,7 +1606,6 @@ export default definePreset((options: QuasarPresetOptions = {}) => {
     presetIcons({}),
     {
       name: 'quasar',
-      presets: [presetUno(), animatedUno(), presetIcons({})],
       safelist: generateSafelist(options),
       preflights: (
         [
@@ -1883,6 +1881,10 @@ textarea {
   margin: 0;
 }
 
+html, body
+  margin: 0
+  box-sizing: border-box
+
 /* beasties:include end */`
           }
         ] as Preflight<QuasarTheme>[]