vitrify 0.17.15 → 0.17.17

package/dist/bin/cli.js

@@ -71,9 +71,7 @@ cli
                 ...args,
                 outDir: fileURLToPath(new URL('ssr/server/', baseOutDir))
             });
-            ({ prerender, onRendered } = await import(
-            // @ts-ignore
-            new URL('ssr/server/prerender.mjs', baseOutDir)));
+            ({ prerender, onRendered } = await import(new URL('ssr/server/prerender.mjs', baseOutDir).pathname));
             // ;({ prerender, onRendered } = await import(
             //   fileURLToPath(new URL('ssr/server/prerender.mjs', baseOutDir))
             // ))

package/dist/frameworks/vue/fastify-csr-plugin.js

@@ -21,7 +21,7 @@ const fastifyCsrPlugin = async (fastify, options) => {
         console.log('Dev mode');
         if (!('use' in fastify)) {
             const middie = (await import('@fastify/middie')).default;
-            // @ts-ignore
+            // @ts-expect-error undefined
             await fastify.register(middie);
         }
         fastify.use(vite.middlewares);

package/dist/frameworks/vue/fastify-ssr-plugin.js

@@ -24,7 +24,7 @@ const fastifySsrPlugin = async (fastify, options) => {
         });
         if (!('use' in fastify)) {
             const middie = (await import('@fastify/middie')).default;
-            // @ts-ignore
+            // @ts-expect-error undefined
             await fastify.register(middie);
         }
         fastify.use(vite.middlewares);
@@ -89,7 +89,8 @@ const fastifySsrPlugin = async (fastify, options) => {
             }
             catch (e) {
                 console.error(e.stack);
-                vite && vite.ssrFixStacktrace(e);
+                if (vite)
+                    vite.ssrFixStacktrace(e);
                 res.code(500);
                 res.send(e.stack);
             }

package/dist/index.js

@@ -167,7 +167,6 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
             const configPath = fileURLToPath(new URL('vitrify.config.ts', appDir));
             const bundledConfig = await bundleConfigFile(fileURLToPath(new URL('vitrify.config.ts', appDir)));
             fs.writeFileSync(configPath + '.js', bundledConfig.code);
-            // @ts-ignore
             rawVitrifyConfig = (await import('file://' + configPath + '.js')).default;
             // vitrifyConfig = (await import(configPath + '.js')).default
             fs.unlinkSync(configPath + '.js');
@@ -457,7 +456,6 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
         //     }
         //   }
         // })
-        // @ts-ignore
         if (debug)
             plugins.push(visualizer());
     }

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

@@ -4,7 +4,7 @@ const preflights = [
 body {
   min-width: 100px;
   min-height: 100%;
-  font-family: "Roboto", "-apple-system", "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-family: ${theme.typography.fontFamily};
   -ms-text-size-adjust: 100%;
   -webkit-text-size-adjust: 100%;
   -webkit-font-smoothing: antialiased;
@@ -12,6 +12,8 @@ body {
   font-smoothing: antialiased;
   line-height: 1.5;
   font-size: 14px;
+  margin: 0;
+  box-sizing: border-box
 }
 
 h1 {

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

@@ -1772,10 +1772,6 @@ 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/plugins/quasar/unocss/theme.js

@@ -1,4 +1,7 @@
 const defaultTheme = {
+    typography: {
+        fontFamily: '"Roboto", "-apple-system", "Helvetica Neue", Helvetica, Arial, sans-serif'
+    },
     breakpoints: {
         xs: '0',
         sm: '600px',

package/dist/plugins/quasar.js

@@ -59,23 +59,23 @@ export const QuasarPlugin = async ({ ssr = false, pwa = false }) => {
                 })();
                 const onMountedHooks = [
                     async (instance) => {
-                        // @ts-ignore
                         const { proxy: { $q } } = instance;
-                        $q.onSSRHydrated !== void 0 && $q.onSSRHydrated();
+                        if ($q.onSSRHydrated !== void 0)
+                            $q.onSSRHydrated();
                     }
                 ];
                 const onBootHooks = [
                     async ({ app, ssrContext, staticImports }) => {
-                        // @ts-ignore
+                        // @ts-expect-error undefined
                         const quasarPlugins = await import('virtual:quasar-plugins');
-                        // @ts-ignore
+                        // @ts-expect-error undefined
                         const directives = await import('virtual:quasar-directives');
-                        // @ts-ignore
+                        // @ts-expect-error undefined
                         const { default: lang } = await import('virtual:quasar-lang');
-                        // @ts-ignore
+                        // @ts-expect-error undefined
                         const { default: iconSet } = await import('virtual:quasar-iconSet');
                         const { default: iconMapFn } = await import(
-                        // @ts-ignore
+                        // @ts-expect-error undefined
                         'virtual:quasar-iconMapFn');
                         app.use(staticImports?.Quasar, {
                             plugins: quasarPlugins,

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

@@ -1,4 +1,7 @@
 export interface QuasarTheme {
+    typography: {
+        fontFamily: string;
+    };
     breakpoints: {
         xs: string;
         sm: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vitrify",
-  "version": "0.17.15",
+  "version": "0.17.17",
   "license": "MIT",
   "author": "Stefan van Herwijnen",
   "description": "Vite as your Full Stack development tool",
@@ -45,7 +45,7 @@
   "homepage": "https://github.com/simsustech/vitrify/tree/main/#readme",
   "dependencies": {
     "@fastify/middie": "^9.0.3",
-    "@fastify/static": "^8.0.4",
+    "@fastify/static": "^8.1.0",
     "@unocss/core": "^65.4.3",
     "@unocss/preset-uno": "^65.4.3",
     "@unocss/preset-wind": "^65.4.3",
@@ -71,16 +71,18 @@
     "vite": "^6.0.11",
     "vite-plugin-pwa": "^0.21.1",
     "vitefu": "^1.0.5",
-    "vitest": "^3.0.4",
+    "vitest": "^3.0.5",
     "workbox-window": "^7.3.0"
   },
   "devDependencies": {
     "@iconify-json/mdi": "^1.2.3",
     "@quasar/extras": "^1.16.16",
+    "@quasar/quasar-ui-qmarkdown": "^2.0.4",
+    "@quasar/quasar-ui-qmediaplayer": "^2.0.0-beta.0",
     "@types/connect": "^3.4.38",
     "@types/glob": "^8.1.0",
     "@types/merge-deep": "^3.0.3",
-    "@types/node": "^22.13.0",
+    "@types/node": "^22.13.1",
     "@types/ws": "^8.5.14",
     "@unocss/preset-icons": "^65.4.3",
     "@vue/runtime-core": "^3.5.13",
@@ -88,13 +90,13 @@
     "css": "^3.0.0",
     "css-to-tailwind-translator": "^1.2.8",
     "quasar": "^2.17.7",
-    "rollup": "^4.34.0",
+    "rollup": "^4.34.2",
     "typescript": "^5.7.3",
     "vue": "^3.5.13",
     "vue-router": "^4.5.0"
   },
   "peerDependencies": {
-    "@fastify/static": "^8.0.4",
+    "@fastify/static": "^8.1.0",
     "fastify": "^5.2.1",
     "quasar": "^2.17.7",
     "vue": "^3.5.13",

package/src/node/bin/cli.ts

@@ -84,8 +84,7 @@ cli
           outDir: fileURLToPath(new URL('ssr/server/', baseOutDir))
         })
         ;({ prerender, onRendered } = await import(
-          // @ts-ignore
-          new URL('ssr/server/prerender.mjs', baseOutDir)
+          new URL('ssr/server/prerender.mjs', baseOutDir).pathname
         ))
 
         // ;({ prerender, onRendered } = await import(

package/src/node/frameworks/vue/fastify-csr-plugin.ts

@@ -46,7 +46,7 @@ const fastifyCsrPlugin: FastifyPluginAsync<FastifySsrOptions> = async (
     console.log('Dev mode')
     if (!('use' in fastify)) {
       const middie = (await import('@fastify/middie')).default
-      // @ts-ignore
+      // @ts-expect-error undefined
       await fastify.register(middie)
     }
     fastify.use(vite.middlewares)

package/src/node/frameworks/vue/fastify-ssr-plugin.ts

@@ -56,7 +56,7 @@ const fastifySsrPlugin: FastifyPluginAsync<FastifySsrOptions> = async (
 
     if (!('use' in fastify)) {
       const middie = (await import('@fastify/middie')).default
-      // @ts-ignore
+      // @ts-expect-error undefined
       await fastify.register(middie)
     }
     fastify.use(vite.middlewares)
@@ -138,7 +138,7 @@ const fastifySsrPlugin: FastifyPluginAsync<FastifySsrOptions> = async (
         // res.status(200).set({ 'Content-Type': 'text/html' }).end(html)
       } catch (e: any) {
         console.error(e.stack)
-        vite && vite.ssrFixStacktrace(e)
+        if (vite) vite.ssrFixStacktrace(e)
         res.code(500)
         res.send(e.stack)
       }

package/src/node/index.ts

@@ -238,7 +238,7 @@ export const baseConfig = async ({
         fileURLToPath(new URL('vitrify.config.ts', appDir))
       )
       fs.writeFileSync(configPath + '.js', bundledConfig.code)
-      // @ts-ignore
+
       rawVitrifyConfig = (await import('file://' + configPath + '.js')).default
       // vitrifyConfig = (await import(configPath + '.js')).default
       fs.unlinkSync(configPath + '.js')
@@ -561,7 +561,6 @@ export const baseConfig = async ({
     //   }
     // })
 
-    // @ts-ignore
     if (debug) plugins.push(visualizer())
   }
 

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

@@ -7,7 +7,7 @@ const preflights: Preflight<QuasarTheme>[] = [
 body {
   min-width: 100px;
   min-height: 100%;
-  font-family: "Roboto", "-apple-system", "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-family: ${theme.typography.fontFamily};
   -ms-text-size-adjust: 100%;
   -webkit-text-size-adjust: 100%;
   -webkit-font-smoothing: antialiased;
@@ -15,6 +15,8 @@ body {
   font-smoothing: antialiased;
   line-height: 1.5;
   font-size: 14px;
+  margin: 0;
+  box-sizing: border-box
 }
 
 h1 {

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

@@ -1881,10 +1881,6 @@ textarea {
   margin: 0;
 }
 
-html, body
-  margin: 0
-  box-sizing: border-box
-
 /* beasties:include end */`
           }
         ] as Preflight<QuasarTheme>[]

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

@@ -1,4 +1,7 @@
 export interface QuasarTheme {
+  typography: {
+    fontFamily: string
+  }
   breakpoints: {
     xs: string
     sm: string
@@ -1145,6 +1148,10 @@ export interface QuasarTheme {
 }
 
 const defaultTheme: QuasarTheme = {
+  typography: {
+    fontFamily:
+      '"Roboto", "-apple-system", "Helvetica Neue", Helvetica, Arial, sans-serif'
+  },
   breakpoints: {
     xs: '0',
     sm: '600px',

package/src/node/plugins/quasar.ts

@@ -131,26 +131,25 @@ export const QuasarPlugin: VitrifyPlugin = async ({
 
         const onMountedHooks: OnMountedHook[] = [
           async (instance) => {
-            // @ts-ignore
             const {
               proxy: { $q }
             } = instance
-            $q.onSSRHydrated !== void 0 && $q.onSSRHydrated()
+            if ($q.onSSRHydrated !== void 0) $q.onSSRHydrated()
           }
         ]
 
         const onBootHooks: OnBootHook[] = [
           async ({ app, ssrContext, staticImports }) => {
-            // @ts-ignore
+            // @ts-expect-error undefined
             const quasarPlugins = await import('virtual:quasar-plugins')
-            // @ts-ignore
+            // @ts-expect-error undefined
             const directives = await import('virtual:quasar-directives')
-            // @ts-ignore
+            // @ts-expect-error undefined
             const { default: lang } = await import('virtual:quasar-lang')
-            // @ts-ignore
+            // @ts-expect-error undefined
             const { default: iconSet } = await import('virtual:quasar-iconSet')
             const { default: iconMapFn } = await import(
-              // @ts-ignore
+              // @ts-expect-error undefined
               'virtual:quasar-iconMapFn'
             )
 

package/src/vite/vue/csr/app.ts

@@ -7,7 +7,7 @@ import type { ViteDevServer } from 'vite'
 
 // const appDir = getPkgJsonDir(import.meta.url)
 const getString = (str?: string) => str
-let baseUrl = getString(__BASE_URL__)
+const baseUrl = getString(__BASE_URL__)
 const appDir = getAppDir()
 
 export const setupApp = async () => {

package/src/vite/vue/index.html

@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta charset="UTF-8" />

package/src/vite/vue/main.ts

@@ -46,14 +46,14 @@ export async function createApp(
       provide = ssrContext?.provide
     }
   } else {
-    // @ts-ignore
+    // @ts-expect-error undefined
     if (window.__INITIAL_STATE__) {
-      // @ts-ignore
+      // @ts-expect-error undefined
       initialState = JSON.parse(window.__INITIAL_STATE__)
       provide = initialState.provide
     }
   }
-  for (let key in provide) {
+  for (const key in provide) {
     if (provide[key]?.value) {
       const refValue = ref(provide[key].value)
       app.provide(key, refValue)
@@ -66,11 +66,12 @@ export async function createApp(
     }
   }
 
-  for (let fn of onBoot) {
+  for (const fn of onBoot) {
     await fn({ app, ssrContext, staticImports })
   }
 
   // @vitrify-pwa-only
+  // @ts-expect-error undefined
   if (__IS_PWA__) {
     if (typeof window !== 'undefined') {
       const { registerPWA } = await import('./pwa.js')

package/src/vite/vue/ssr/app.ts

@@ -2,10 +2,9 @@ import { createApp } from '../../../node/frameworks/vue/server.js'
 import { getAppDir } from '../../../node/app-urls.js'
 import { onSetup, onRendered } from 'virtual:vitrify-hooks'
 import { fastifySsrPlugin } from './fastify-ssr-plugin.js'
-import type { ViteDevServer } from 'vite'
 
 const getString = (str?: string) => str
-let baseUrl = getString(__BASE_URL__)
+const baseUrl = getString(__BASE_URL__)
 const appDir = getAppDir()
 
 export const setupApp = async () => {

package/src/vite/vue/ssr/entry-server.ts

@@ -41,7 +41,7 @@ export async function render(url, manifest, ssrContext, renderToString) {
   const ctx = {
     __qMetaList: []
   }
-  let html = await renderToString(app, ctx)
+  const html = await renderToString(app, ctx)
 
   const preloadLinks = renderPreloadLinks(ctx.modules, manifest)