vitrify 0.2.5 → 0.3.0

package/dist/app-urls.js

@@ -12,7 +12,6 @@ export const getCliDir = () => getPkgJsonDir(new URL('./', import.meta.url));
 export const getCliViteDir = (cliDir) => new URL('src/vite/', cliDir);
 export const getSrcDir = (appDir) => new URL('src/', appDir);
 export const getCwd = () => new URL(`file://${process.cwd()}/`);
-// export const quasarDir = getPkgJsonDir(new URL('./', await resolve('quasar', appDir.href)))
 export const parsePath = (path, basePath) => {
     if (path) {
         if (path.slice(-1) !== '/')

package/dist/bin/build.js

@@ -1,49 +1,6 @@
 #!/usr/bin/node --experimental-specifier-resolution=node
 import { baseConfig } from '../index.js';
-// import { promises as fs } from 'fs'
-// import { routesToPaths } from '../helpers/routes.js'
 import { build as viteBuild } from 'vite';
-// import { SsrFunction } from '../vitrify-config.js'
-// export const prerender = async ({
-//   outDir,
-//   templatePath,
-//   manifestPath,
-//   entryServerPath,
-//   injectSsrContext
-// }: {
-//   outDir: string
-//   templatePath: string
-//   manifestPath: string
-//   entryServerPath: string
-//   injectSsrContext: SsrFunction
-// }) => {
-//   let template
-//   let manifest
-//   const promises = []
-//   template = (await fs.readFile(templatePath)).toString()
-//   manifest = await fs.readFile(manifestPath)
-//   let { render, getRoutes } = await import(entryServerPath)
-//   const routes = await getRoutes()
-//   const paths = routesToPaths(routes).filter(
-//     (i) => !i.includes(':') && !i.includes('*')
-//   )
-//   for (let url of paths) {
-//     const filename =
-//       (url.endsWith('/') ? 'index' : url.replace(/^\//g, '')) + '.html'
-//     console.log(`Generating ${filename}`)
-//     const ssrContext = {
-//       req: { headers: {}, url },
-//       res: {}
-//     }
-//     const [appHtml, preloadLinks] = await render(url, manifest, ssrContext)
-//     let html = template
-//       .replace(`<!--preload-links-->`, preloadLinks)
-//       .replace(`<!--app-html-->`, appHtml)
-//     html = injectSsrContext(html, ssrContext)
-//     promises.push(fs.writeFile(outDir + filename, html, 'utf-8'))
-//   }
-//   return Promise.all(promises)
-// }
 export async function build(opts) {
     const config = await baseConfig({
         command: 'build',

package/dist/bin/cli.js

@@ -14,7 +14,7 @@ cli
     .action(async (options) => {
     const { build } = await import('./build.js');
     let appDir;
-    let prerender, ssrFunctions;
+    let prerender, onRenderedHooks;
     if (options.appDir) {
         if (options.appDir.slice(-1) !== '/')
             options.appDir += '/';
@@ -59,7 +59,7 @@ cli
                 ...args,
                 outDir: new URL('ssr/server/', baseOutDir).pathname
             });
-            ({ prerender, ssrFunctions } = await import(new URL('ssr/server/prerender.mjs', baseOutDir).pathname));
+            ({ prerender, onRenderedHooks } = await import(new URL('ssr/server/prerender.mjs', baseOutDir).pathname));
             prerender({
                 outDir: new URL('static/', baseOutDir).pathname,
                 templatePath: new URL('static/index.html', baseOutDir).pathname,
@@ -67,7 +67,7 @@ cli
                     .pathname,
                 entryServerPath: new URL('ssr/server/entry-server.mjs', baseOutDir)
                     .pathname,
-                ssrFunctions
+                onRenderedHooks
             });
             break;
         default:

package/dist/bin/dev.js

@@ -8,7 +8,7 @@ export async function createServer({ port = 3000, logLevel = 'info', mode = 'csr
     const cliDir = getCliDir();
     if (!appDir)
         appDir = getAppDir();
-    const { fastifySsrPlugin } = await import(`../${framework}/fastify-ssr-plugin.js`);
+    const { fastifySsrPlugin } = await import(`../frameworks/${framework}/fastify-ssr-plugin.js`);
     /**
      * @type {import('vite').ViteDevServer}
      */
@@ -57,47 +57,6 @@ export async function createServer({ port = 3000, logLevel = 'info', mode = 'csr
             vite,
             productName
         });
-        // await app.register(middie)
-        // app.use(vite.middlewares)
-        // app.get('*', async (req, res) => {
-        //   try {
-        //     // const url = req.originalUrl
-        //     const url = req.raw.url
-        //     let template
-        //     let render
-        //     const ssrContext = {
-        //       req,
-        //       res
-        //     }
-        //     // always read fresh template in dev
-        //     // template = readFileSync(resolve('index.html'), 'utf-8')
-        //     template = readFileSync(new URL('index.html', cliDir)).toString()
-        //     // template = await vite.transformIndexHtml(url, template)
-        //     const entryUrl = new URL('ssr/entry-server.ts', cliDir).pathname
-        //     render = (await vite.ssrLoadModule(entryUrl)).render
-        //     let manifest
-        //     // TODO: https://github.com/vitejs/vite/issues/2282
-        //     try {
-        //       manifest = {}
-        //     } catch (e) {
-        //       manifest = {}
-        //     }
-        //     const [appHtml, preloadLinks] = await render(url, manifest, ssrContext)
-        //     const html = template
-        //       .replace(`<!--preload-links-->`, preloadLinks)
-        //       .replace(`<!--app-html-->`, appHtml)
-        //       .replace('<!--product-name-->', productName)
-        //     res.code(200)
-        //     res.type('text/html')
-        //     res.send(html)
-        //     // res.status(200).set({ 'Content-Type': 'text/html' }).end(html)
-        //   } catch (e: any) {
-        //     console.error(e.stack)
-        //     vite && vite.ssrFixStacktrace(e)
-        //     res.code(500)
-        //     res.send(e.stack)
-        //   }
-        // })
         await app.listen(port || 3000, host);
         server = app.server;
     }

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

@@ -9,16 +9,12 @@ const fastifySsrPlugin = async (fastify, options, done) => {
         fastify.use(options.vite.middlewares);
         fastify.get('*', async (req, res) => {
             try {
-                // const url = req.originalUrl
                 const url = req.raw.url;
                 const ssrContext = {
                     req,
                     res
                 };
-                // always read fresh template in dev
-                // template = readFileSync(resolve('index.html'), 'utf-8')
                 const template = readFileSync(new URL('index.html', options.cliDir)).toString();
-                // template = await vite.transformIndexHtml(url, template)
                 const entryUrl = new URL('ssr/entry-server.ts', options.cliDir).pathname;
                 const render = (await options.vite.ssrLoadModule(entryUrl)).render;
                 let manifest;
@@ -63,9 +59,6 @@ const fastifySsrPlugin = async (fastify, options, done) => {
                 res,
                 provide
             };
-            // template = readFileSync(new URL('../client/index.html', import.meta.url).pathname).toString()
-            // manifest = JSON.parse(readFileSync(new URL('../client/ssr-manifest.json', import.meta.url)).toString())
-            // render = (await import(new URL('./entry-server.mjs', import.meta.url).pathname)).render
             const template = readFileSync(new URL('./dist/ssr/client/index.html', options.appDir).pathname).toString();
             const manifest = JSON.parse(readFileSync(new URL('./dist/ssr/client/ssr-manifest.json', options.appDir)).toString());
             const render = (await import(new URL('./dist/ssr/server/entry-server.mjs', options.appDir).pathname)).render;
@@ -76,8 +69,8 @@ const fastifySsrPlugin = async (fastify, options, done) => {
             let html = template
                 .replace(`<!--preload-links-->`, preloadLinks)
                 .replace(`<!--app-html-->`, appHtml);
-            if (options.ssrFunctions?.length) {
-                for (const ssrFunction of options.ssrFunctions) {
+            if (options.onRenderedHooks?.length) {
+                for (const ssrFunction of options.onRenderedHooks) {
                     html = ssrFunction(html, ssrContext);
                 }
             }

package/dist/frameworks/vue/prerender.js

@@ -1,6 +1,6 @@
 import { promises as fs } from 'fs';
 import { routesToPaths } from '../../helpers/routes.js';
-export const prerender = async ({ outDir, templatePath, manifestPath, entryServerPath, ssrFunctions }) => {
+export const prerender = async ({ outDir, templatePath, manifestPath, entryServerPath, onRenderedHooks }) => {
     const promises = [];
     const template = (await fs.readFile(templatePath)).toString();
     const manifest = await fs.readFile(manifestPath);
@@ -18,8 +18,8 @@ export const prerender = async ({ outDir, templatePath, manifestPath, entryServe
         let html = template
             .replace(`<!--preload-links-->`, preloadLinks)
             .replace(`<!--app-html-->`, appHtml);
-        if (ssrFunctions?.length) {
-            for (const ssrFunction of ssrFunctions) {
+        if (onRenderedHooks?.length) {
+            for (const ssrFunction of onRenderedHooks) {
                 html = ssrFunction(html, ssrContext);
             }
         }

package/dist/frameworks/vue/server.js

@@ -1,20 +1,14 @@
 import fastify from 'fastify';
-// import { setup } from 'virtual:fastify-setup'
 import { fastifySsrPlugin } from './fastify-ssr-plugin.js';
-// import { getPkgJsonDir } from '../app-urls.js'
-export const createApp = ({ setup, appDir, baseUrl, ssrFunctions }) => {
+export const createApp = ({ setup, appDir, baseUrl, onRenderedHooks }) => {
     const app = fastify({
         logger: true
     });
     app.register(fastifySsrPlugin, {
         baseUrl,
         appDir,
-        ssrFunctions
+        onRenderedHooks
     });
     setup(app);
     return app;
 };
-// const app = createApp({
-//   setup
-// })
-// app.listen(process.env.PORT || 3000, process.env.HOST || '127.0.0.1')

package/dist/helpers/logger.js

@@ -1,79 +1,7 @@
 // https://github.com/quasarframework/quasar/blob/dev/app/lib/helpers/logger.js
 import chalk from 'chalk';
-const { bgGreen, green, inverse, bgRed, red, bgYellow, yellow } = chalk;
-import readline from 'readline';
 import os from 'os';
 import { resolveHostname } from '../helpers/utils.js';
-/**
- * Main approach - App CLI related
- */
-const dot = '•';
-const banner = 'App ' + dot;
-const greenBanner = green(banner);
-const redBanner = red(banner);
-const yellowBanner = yellow(banner);
-export const clearConsole = process.stdout.isTTY
-    ? () => {
-        // Fill screen with blank lines. Then move to 0 (beginning of visible part) and clear it
-        const blank = '\n'.repeat(process.stdout.rows);
-        console.log(blank);
-        readline.cursorTo(process.stdout, 0, 0);
-        readline.clearScreenDown(process.stdout);
-    }
-    : () => { };
-export const log = function (msg) {
-    console.log(msg ? ` ${greenBanner} ${msg}` : '');
-};
-export const warn = function (msg, pill) {
-    if (msg !== void 0) {
-        const pillBanner = pill !== void 0 ? bgYellow.black('', pill, '') + ' ' : '';
-        console.warn(` ${yellowBanner} ⚠️  ${pillBanner}${msg}`);
-    }
-    else {
-        console.warn();
-    }
-};
-export const fatal = function (msg, pill) {
-    if (msg !== void 0) {
-        const pillBanner = pill !== void 0 ? errorPill(pill) + ' ' : '';
-        console.error(`\n ${redBanner} ⚠️  ${pillBanner}${msg}\n`);
-    }
-    else {
-        console.error();
-    }
-    process.exit(1);
-};
-/**
- * Extended approach - Compilation status & pills
- */
-export const successPill = (msg) => bgGreen.black('', msg, '');
-export const infoPill = (msg) => inverse('', msg, '');
-export const errorPill = (msg) => bgRed.white('', msg, '');
-export const warningPill = (msg) => bgYellow.black('', msg, '');
-export const success = function (msg, title = 'SUCCESS') {
-    console.log(` ${greenBanner} ${successPill(title)} ${green(dot + ' ' + msg)}`);
-};
-export const getSuccess = function (msg, title) {
-    return ` ${greenBanner} ${successPill(title)} ${green(dot + ' ' + msg)}`;
-};
-export const info = function (msg, title = 'INFO') {
-    console.log(` ${greenBanner} ${infoPill(title)} ${green(dot)} ${msg}`);
-};
-export const getInfo = function (msg, title) {
-    return ` ${greenBanner} ${infoPill(title)} ${green(dot)} ${msg}`;
-};
-export const error = function (msg, title = 'ERROR') {
-    console.log(` ${redBanner} ${errorPill(title)} ${red(dot + ' ' + msg)}`);
-};
-export const getError = function (msg, title = 'ERROR') {
-    return ` ${redBanner} ${errorPill(title)} ${red(dot + ' ' + msg)}`;
-};
-export const warning = function (msg, title = 'WARNING') {
-    console.log(` ${yellowBanner} ${warningPill(title)} ${yellow(dot + ' ' + msg)}`);
-};
-export const getWarning = function (msg, title = 'WARNING') {
-    return ` ${yellowBanner} ${warningPill(title)} ${yellow(dot + ' ' + msg)}`;
-};
 export function printHttpServerUrls(server, config) {
     const address = server.address();
     const isAddressInfo = (x) => x?.address;

package/dist/index.js

@@ -10,10 +10,7 @@ const configPluginMap = {
 };
 const manualChunks = ['prerender', 'fastify-ssr-plugin', 'server'];
 export const VIRTUAL_MODULES = [
-    'virtual:fastify-setup',
-    'virtual:boot-functions',
-    'virtual:ssr-functions',
-    'virtual:on-mounted-hooks',
+    'virtual:vitrify-hooks',
     'virtual:global-css',
     'virtual:static-imports'
 ];
@@ -26,15 +23,7 @@ export const baseConfig = async ({ ssr, appDir, publicDir, command = 'build', mo
     const cwd = getCwd();
     const cliDir = getCliDir();
     const cliViteDir = getCliViteDir(cliDir);
-    // const {
-    //   appDir: tempAppDir,
-    //   cliDir,
-    //   cliViteDir,
-    //   srcDir
-    // } = await import('./app-urls.js')
-    // const cwd = appDir || tempAppDir
     const frameworkDir = new URL(`${framework}/`, cliViteDir);
-    // const localPackages = ['vue', 'vue-router', 'quasar']
     const localPackages = ['vue', 'vue-router'];
     const cliPackages = ['vitest'];
     const packageUrls = {};
@@ -46,17 +35,6 @@ export const baseConfig = async ({ ssr, appDir, publicDir, command = 'build', mo
         for (const val of cliPackages)
             packageUrls[val] = getPkgJsonDir(new URL(await resolve(val, cliDir.href)));
     })();
-    // if (appDir) {
-    //   srcDir = new URL('src/', appDir);
-    //   quasarDir = new URL(await resolve('quasar/', appDir.href));
-    //   ({ appDir: cwd, cliDir } = await import('./app-urls.js'))
-    // } else {
-    //   ({ appDir, cliDir, srcDir, quasarDir } = await import('./app-urls.js'))
-    //   cwd = appDir
-    // }
-    // vueDir = new URL('./', await resolve('vue', appDir.href));
-    // vueRouterDir = new URL('../', await resolve('vue-router', appDir.href));
-    // vitestDir = new URL('../', await resolve('vitest', cliDir.href));
     if (!publicDir)
         publicDir = new URL('public/', appDir);
     /**
@@ -76,7 +54,6 @@ export const baseConfig = async ({ ssr, appDir, publicDir, command = 'build', mo
     let { productName = 'Product name' } = JSON.parse(readFileSync(new URL('package.json', appDir).pathname, {
         encoding: 'utf-8'
     }));
-    const fastifySetup = vitrifyConfig.vitrify?.fastify?.setup || ((fastify) => { });
     const ssrTransformCustomDir = () => {
         return {
             props: [],
@@ -93,9 +70,10 @@ export const baseConfig = async ({ ssr, appDir, publicDir, command = 'build', mo
             }));
         }
     }
-    let bootFunctions;
-    let ssrFunctions;
+    let onBootHooks;
+    let onRenderedHooks;
     let onMountedHooks;
+    let onSetupHooks;
     let globalCss;
     let staticImports;
     let sassVariables;
@@ -122,18 +100,14 @@ export const baseConfig = async ({ ssr, appDir, publicDir, command = 'build', mo
             }
         }),
         ...frameworkPlugins,
-        // await QuasarPlugin({
-        //   ssr: ssr,
-        //   pwa: pwa
-        //   // quasarDir: packageUrls.quasar
-        // }),
         {
             name: 'vitrify-setup',
             enforce: 'post',
             config: async (config, env) => {
-                bootFunctions = config.vitrify?.bootFunctions || [];
-                ssrFunctions = config.vitrify?.ssrFunctions || [];
+                onBootHooks = config.vitrify?.hooks?.onBoot || [];
+                onRenderedHooks = config.vitrify?.hooks?.onRendered || [];
                 onMountedHooks = config.vitrify?.hooks?.onMounted || [];
+                onSetupHooks = config?.vitrify?.hooks?.onSetup || [];
                 globalCss = config.vitrify?.globalCss || [];
                 staticImports = config.vitrify?.staticImports || {};
                 sassVariables = config.vitrify?.sass?.variables || {};
@@ -164,21 +138,17 @@ export const baseConfig = async ({ ssr, appDir, publicDir, command = 'build', mo
                 return;
             },
             load(id) {
-                if (id === 'virtual:fastify-setup') {
-                    return `export const setup = ${String(fastifySetup)}`;
-                }
-                else if (id === 'virtual:boot-functions') {
-                    return `export default [${bootFunctions
+                if (id === 'virtual:vitrify-hooks') {
+                    return `export const onBoot = [${onBootHooks
                         .map((fn) => `${String(fn)}`)
-                        .join(', ')}]`;
-                }
-                else if (id === 'virtual:ssr-functions') {
-                    return `export default [${ssrFunctions
+                        .join(', ')}]
+            export const onMounted = [${onMountedHooks
                         .map((fn) => `${String(fn)}`)
-                        .join(', ')}]`;
-                }
-                else if (id === 'virtual:on-mounted-hooks') {
-                    return `export default [${onMountedHooks
+                        .join(', ')}]
+            export const onRendered = [${onRenderedHooks
+                        .map((fn) => `${String(fn)}`)
+                        .join(', ')}]
+            export const onSetup = [${onSetupHooks
                         .map((fn) => `${String(fn)}`)
                         .join(', ')}]`;
                 }
@@ -251,9 +221,6 @@ export const baseConfig = async ({ ssr, appDir, publicDir, command = 'build', mo
         { find: 'cwd', replacement: cwd.pathname },
         { find: 'boot', replacement: new URL('boot/', srcDir).pathname },
         { find: 'assets', replacement: new URL('assets/', srcDir).pathname },
-        // ...Object.entries(packageUrls).map(([key, value]) => ({
-        //   find: key, replacement: value.pathname
-        // })),
         { find: 'vue', replacement: packageUrls['vue'].pathname },
         { find: 'vue-router', replacement: packageUrls['vue-router'].pathname },
         { find: 'vitrify', replacement: cliDir.pathname }
@@ -269,7 +236,6 @@ export const baseConfig = async ({ ssr, appDir, publicDir, command = 'build', mo
         vitrify: {
             productName,
             urls: {
-                // @ts-ignore
                 app: appDir,
                 cli: cliDir,
                 src: srcDir,
@@ -324,13 +290,6 @@ export const baseConfig = async ({ ssr, appDir, publicDir, command = 'build', mo
                     }
                 }
         },
-        // css: {
-        //   preprocessorOptions: {
-        //     sass: {
-        //       additionalData: sass ? [...sass].join('\n') : undefined
-        //     }
-        //   }
-        // },
         ssr: {
             // Create a SSR bundle
             noExternal: [

package/dist/plugins/quasar.js

@@ -31,38 +31,9 @@ export const injectSsrContext = (html, ssrContext) => html
     }
     return `${start} class="${classes.trim()}" ${ssrContext._meta.bodyAttrs || ''}${end}${ssrContext._meta.bodyTags || ''}`;
 });
-// export interface Configuration {
-//   ssr?: 'server' | 'client' | 'ssg' | false
-// }
 export const QuasarPlugin = async ({ ssr = false, pwa = false }) => {
-    // const extraPlugins: Plugin[] = []
-    // const ctx = {
-    //   prod: process.env.MODE === 'production',
-    //   dev: process.env.MODE === 'development',
-    //   mode: {
-    //     ssr: !!ssr,
-    //     pwa: !!pwa
-    //   }
-    // }
-    // let bootFilePaths: Record<string, any> = {}
-    // let components: string[] = []
     let plugins = [];
-    // let css: string[] = []
-    let extras = [];
     return [
-        // {
-        //   name: 'legacy-support',
-        //   enforce: 'pre',
-        //   transform (code, id) {
-        //     /**
-        //      * ESM does not resolve an import to .default when there are multiple exports. The following is required to make the VuePlugin import of QCalendar work.
-        //      */
-        //     if (code.includes('app.use(VuePlugin)')) {
-        //       code = code.replace(/app\.use\(VuePlugin\)/g, `app.use(VuePlugin.install ? VuePlugin : VuePlugin.default)`)
-        //     }
-        //     return code
-        //   }
-        // },
         Components({
             resolvers: [QuasarResolver()]
         }),
@@ -84,10 +55,8 @@ export const QuasarPlugin = async ({ ssr = false, pwa = false }) => {
                         $q.onSSRHydrated !== void 0 && $q.onSSRHydrated();
                     }
                 ];
-                const bootFunctions = [
+                const onBootHooks = [
                     async ({ app, ssrContext, staticImports }) => {
-                        // @ts-ignore
-                        // const quasarVuePlugin = (await import('quasar/vue-plugin')).default
                         // @ts-ignore
                         const quasarPlugins = await import('virtual:quasar-plugins');
                         // @ts-ignore
@@ -101,14 +70,14 @@ export const QuasarPlugin = async ({ ssr = false, pwa = false }) => {
                 return {
                     vitrify: {
                         urls,
-                        bootFunctions,
-                        ssrFunctions: [injectSsrContext],
                         globalCss,
                         staticImports: {
                             quasar: ['Quasar']
                         },
                         hooks: {
-                            onMounted: onMountedHooks
+                            onBoot: onBootHooks,
+                            onMounted: onMountedHooks,
+                            onRendered: [injectSsrContext]
                         },
                         sass: {
                             additionalData: [`@import 'quasar/src/css/index.sass'`]
@@ -120,50 +89,10 @@ export const QuasarPlugin = async ({ ssr = false, pwa = false }) => {
         {
             name: 'vite-plugin-quasar',
             enforce: 'post',
-            // transformIndexHtml: {
-            //   enforce: 'post',
-            //   transform: (html) => {
-            //     return html.replace(
-            //       '<!--product-name-->',
-            //       productName
-            //     )
-            //   }
-            // },
             config: async (config, env) => {
-                // let appDir: URL
-                // let cliDir: URL
-                // let cwd: URL
-                // let quasarDir: URL
-                // let quasarConf: QuasarConf | undefined
                 const { quasar: quasarConf, vitrify: { urls } = {} } = config;
                 const quasarPkgJsonPath = new URL('package.json', urls?.packages?.quasar).pathname;
                 const { version } = JSON.parse(readFileSync(quasarPkgJsonPath, { encoding: 'utf-8' }));
-                // if (quasarConf?.boot) {
-                //   bootFilePaths = (quasarConf.boot as (Record<string, any> | string)[])
-                //     .filter(entry => {
-                //       if (typeof entry === 'object') return (entry.server && (ssr === 'server'))
-                //       else if (entry !== '') return true
-                //     })
-                //     .map(entry => {
-                //       if (typeof entry === 'string') return entry
-                //       else if (typeof entry === 'object') return entry.path
-                //     })
-                //     .reduce((acc, entry) => {
-                //       if (entry[0] === '~') {
-                //         const split = entry.substring(1).split('/')
-                //         const name = split[0].replace(/[|&;$%@"<>()+,]/g, "");
-                //         acc[name] = {
-                //           path: new URL(`node_modules/${entry.substring(1)}`, urls?.app).pathname
-                //         }
-                //       } else {
-                //         const name = entry.split('.')[0]
-                //         acc[name] = {
-                //           path: `src/boot/${entry}`
-                //         }
-                //       }
-                //       return acc
-                //     }, {})
-                // }
                 /**
                  * All components should have been auto-imported
                  */
@@ -175,13 +104,6 @@ export const QuasarPlugin = async ({ ssr = false, pwa = false }) => {
                     ];
                     plugins = quasarConf?.framework.plugins;
                 }
-                // css = (quasarConf?.css || []).map((v => {
-                //   if (v[0] === '~') {
-                //     return v.slice(1)
-                //   }
-                //   return v
-                // })).map((v) => `@import '${v}'`)
-                extras = quasarConf?.extras || [];
                 return {
                     resolve: {
                         alias: [
@@ -214,11 +136,6 @@ export const QuasarPlugin = async ({ ssr = false, pwa = false }) => {
                                 find: 'quasar/src',
                                 replacement: new URL('src/', urls?.packages?.quasar).pathname
                             },
-                            // ...extras.map(extra => ({
-                            //   find: `@quasar/extras/${extra}/${extra}.css`,
-                            //   replacement: new URL(`${extra}/${extra}.css`, urls?.packages?.['@quasar/extras']).pathname
-                            // })
-                            // ),
                             {
                                 find: 'quasar',
                                 replacement: new URL('src/', urls?.packages?.quasar).pathname
@@ -228,8 +145,6 @@ export const QuasarPlugin = async ({ ssr = false, pwa = false }) => {
                                 replacement: new URL('.', urls?.packages?.['@quasar/extras'])
                                     .pathname
                             }
-                            // { find: new RegExp('^quasar$'), replacement: new URL('src/index.all.js', urls?.packages?.quasar).pathname },
-                            // { find: new RegExp('^quasar$'), replacement: 'virtual:quasar' },
                         ]
                     },
                     define: {
@@ -240,19 +155,6 @@ export const QuasarPlugin = async ({ ssr = false, pwa = false }) => {
                         __QUASAR_SSR_CLIENT__: ssr === 'client',
                         __QUASAR_SSR_PWA__: ssr === 'client' && pwa
                     },
-                    // css: {
-                    //   preprocessorOptions: {
-                    //     sass: {
-                    //       additionalData: `@import 'quasar/src/css/index.sass'`
-                    //       // [
-                    //       //   // ...extras.map(extra => `@import "@quasar/extras/${extra}/${extra}.css"`),
-                    //       //   // ...extras.map(extra => `@import ${new URL(`${extra}/${extra}.css`, urls?.packages?.['@quasar/extras']).pathname}`) || [],
-                    //       //   // config.css?.preprocessorOptions?.sass?.additionalData,
-                    //       //   `@import 'quasar/src/css/index.sass'`
-                    //       // ].join('\n')
-                    //     }
-                    //   }
-                    // },
                     ssr: {
                         noExternal: ['quasar']
                     }

package/dist/types/frameworks/vue/fastify-ssr-plugin.d.ts

@@ -1,6 +1,6 @@
 import type { FastifyPluginCallback, FastifyRequest, FastifyReply } from 'fastify';
 import type { ViteDevServer } from 'vite';
-import type { SsrFunction } from '../../vitrify-config.js';
+import type { OnRenderedHook } from '../../vitrify-config.js';
 export interface FastifySsrOptions {
     baseUrl?: string;
     provide?: (req: FastifyRequest, res: FastifyReply) => Promise<Record<string, unknown>>;
@@ -8,7 +8,7 @@ export interface FastifySsrOptions {
     cliDir?: URL;
     appDir?: URL;
     productName?: string;
-    ssrFunctions?: SsrFunction[];
+    onRenderedHooks?: OnRenderedHook[];
 }
 declare const fastifySsrPlugin: FastifyPluginCallback<FastifySsrOptions>;
 export { fastifySsrPlugin };

package/dist/types/frameworks/vue/prerender.d.ts

@@ -1,8 +1,8 @@
-import type { SsrFunction } from '../../vitrify-config.js';
-export declare const prerender: ({ outDir, templatePath, manifestPath, entryServerPath, ssrFunctions }: {
+import type { OnRenderedHook } from '../../vitrify-config.js';
+export declare const prerender: ({ outDir, templatePath, manifestPath, entryServerPath, onRenderedHooks }: {
     outDir: string;
     templatePath: string;
     manifestPath: string;
     entryServerPath: string;
-    ssrFunctions: SsrFunction[];
+    onRenderedHooks: OnRenderedHook[];
 }) => Promise<void[]>;