vitrify 0.6.16 → 0.7.0

package/dist/bin/cli.js

@@ -16,6 +16,7 @@ cli
     const { build } = await import('./build.js');
     let appDir;
     let prerender;
+    let onRendered;
     if (options.appDir) {
         if (options.appDir.slice(-1) !== '/')
             options.appDir += '/';
@@ -68,14 +69,15 @@ cli
                 ...args,
                 outDir: new URL('ssr/server/', baseOutDir).pathname
             });
-            ({ prerender } = await import(new URL('ssr/server/prerender.mjs', baseOutDir).pathname));
+            ({ prerender, onRendered } = 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,
                 manifestPath: new URL('static/ssr-manifest.json', baseOutDir)
                     .pathname,
                 entryServerPath: new URL('ssr/server/entry-server.mjs', baseOutDir)
-                    .pathname
+                    .pathname,
+                onRendered
             });
             break;
         default:

package/dist/bin/dev.js

@@ -77,15 +77,18 @@ ssr, framework = 'vue', host, appDir, publicDir }) {
     let setup;
     let server;
     let onRendered;
+    let vitrifyConfig;
     console.log(`Development mode: ${ssr ? ssr : 'csr'}`);
     if (ssr) {
         const entryUrl = ssr === 'fastify'
             ? new URL('src/vite/fastify/entry.ts', cliDir).pathname
             : new URL(`src/vite/${framework}/ssr/app.ts`, cliDir).pathname;
-        ({ setup, onRendered } = await vite.ssrLoadModule(entryUrl));
+        ({ setup, onRendered, vitrifyConfig } = await vite.ssrLoadModule(entryUrl));
+        console.log(vitrifyConfig);
         const app = fastify({
             logger: false,
-            https: vite.config.server.https
+            https: vite.config.server.https,
+            ...vitrifyConfig.vitrify?.ssr?.fastify
         });
         if (process.env)
             process.env.MODE = 'development';

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 }) => {
+export const prerender = async ({ outDir, templatePath, manifestPath, entryServerPath, onRendered }) => {
     const promises = [];
     const template = (await fs.readFile(templatePath)).toString();
     const manifest = await fs.readFile(manifestPath);
@@ -25,6 +25,11 @@ export const prerender = async ({ outDir, templatePath, manifestPath, entryServe
         let html = template
             .replace(`<!--preload-links-->`, preloadLinks)
             .replace(`<!--app-html-->`, appHtml);
+        if (onRendered?.length) {
+            for (const ssrFunction of onRendered) {
+                html = ssrFunction(html, ssrContext);
+            }
+        }
         html = await critters.process(html);
         promises.push(fs.writeFile(outDir + filename, html, 'utf-8'));
     }

package/dist/index.js

@@ -54,8 +54,8 @@ const manualChunks = (id) => {
 };
 export const VIRTUAL_MODULES = [
     'virtual:vitrify-hooks',
-    'virtual:global-css',
     'virtual:static-imports',
+    'virtual:vitrify-config',
     'vitrify.sass',
     'vitrify.css'
 ];
@@ -169,12 +169,6 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
     catch (e) {
         console.error('package.json not found');
     }
-    const ssrTransformCustomDir = () => {
-        return {
-            props: [],
-            needRuntime: true
-        };
-    };
     const frameworkPlugins = [];
     for (const framework of Object.keys(configPluginMap)) {
         if (Object.keys(vitrifyConfig).includes(framework)) {
@@ -201,27 +195,7 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
             ...vitrifyConfig.vitrify.ssr.serverModules
         ];
     const plugins = [
-        vuePlugin({
-        // compiler: await import('vue/compiler-sfc'),
-        // template: {
-        //   ssr: !!ssr,
-        //   compilerOptions: {
-        //     directiveTransforms: {
-        //       'close-popup': ssrTransformCustomDir,
-        //       intersection: ssrTransformCustomDir,
-        //       ripple: ssrTransformCustomDir,
-        //       mutation: ssrTransformCustomDir,
-        //       morph: ssrTransformCustomDir,
-        //       scroll: ssrTransformCustomDir,
-        //       'scroll-fire': ssrTransformCustomDir,
-        //       'touch-hold': ssrTransformCustomDir,
-        //       'touch-pan': ssrTransformCustomDir,
-        //       'touch-repeat': ssrTransformCustomDir,
-        //       'touch-swipe': ssrTransformCustomDir
-        //     }
-        //   }
-        // }
-        }),
+        vuePlugin(),
         ...frameworkPlugins,
         {
             name: 'vitrify-setup',
@@ -236,21 +210,14 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
                 sassVariables = config.vitrify?.sass?.variables || {};
                 globalSass = config.vitrify?.sass?.global || [];
                 additionalData = config.vitrify?.sass?.additionalData || [];
-                return {
-                    css: {
-                        preprocessorOptions: {
-                        // sass: {
-                        //   additionalData: [
-                        //     ...Object.entries(sassVariables).map(
-                        //       ([key, value]) => `${key}: ${value}`
-                        //     )
-                        //     // ...additionalData
-                        //     // config.css?.preprocessorOptions?.sass.additionalData
-                        //   ].join('\n')
-                        // }
-                        }
-                    }
-                };
+                return {};
+            },
+            configureServer(server) {
+                server.middlewares.use('/', (req, res, next) => {
+                    if (req.url?.endsWith('.html'))
+                        req.url = req.url.replace('.html', '');
+                    next();
+                });
             },
             configResolved: (config) => {
                 if (process.env.DEBUG) {
@@ -283,24 +250,21 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
                         .join(', ')}]
             export const onSetup = []
             ${onSetupFiles
-                        .map((url, index) => `import ${url.pathname
-                        .replaceAll('/', '')
-                        .replaceAll('.', '')} from '${url.pathname}'; onSetup.push(${url.pathname
-                        .replaceAll('/', '')
-                        .replaceAll('.', '')})`)
+                        .map((url, index) => {
+                        const varName = url.pathname
+                            .replaceAll('/', '')
+                            .replaceAll('.', '')
+                            .replaceAll('-', '');
+                        return `import ${varName} from '${url.pathname}'; onSetup.push(${varName})`;
+                    })
                         .join('\n')}`;
-                    // export const onSetup = [${onSetupHooks
-                    //   .map((fn) => `${String(fn)}`)
-                    //   .join(', ')}]`
-                    /**
-                     * CSS imports in virtual files do not seem to work. Using transform() instead
-                     */
-                    // } else if (id === 'virtual:global-css') {
-                    //   return `${globalCss.map((css) => `import '${css}'`).join('\n')}`
                 }
                 else if (id === 'virtual:static-imports') {
                     return `${Object.entries(staticImports)
-                        .map(([key, value]) => `export { ${value.join(',')} } from '${key}';`)
+                        .map(([key, value]) => {
+                        const deduped = [...new Set(value)];
+                        return `export { ${deduped.join(',')} } from '${key}';`;
+                    })
                         .join('\n')}`;
                 }
                 else if (id === 'vitrify.sass') {
@@ -310,7 +274,10 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
                     ].join('\n');
                 }
                 else if (id === 'vitrify.css') {
-                    return `${globalCss.map((css) => `import '${css}'`).join('\n')}`;
+                    return `${globalCss.map((css) => `@import '${css}'`).join('\n')}`;
+                }
+                else if (id === 'virtual:vitrify-config') {
+                    return `export default ${JSON.stringify(vitrifyConfig)}`;
                 }
                 return null;
             }
@@ -320,16 +287,16 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
         plugins.unshift({
             name: 'html-transform',
             enforce: 'pre',
-            transform: (code, id) => {
-                if (id.endsWith('App.vue')) {
-                    code =
-                        code +
-                            `<style lang="sass">
-// do not remove, required for additionalData import
-</style>`;
-                }
-                return code;
-            },
+            //       transform: (code, id) => {
+            //         if (id.endsWith('App.vue')) {
+            //           code =
+            //             code +
+            //             `<style lang="sass">
+            // // do not remove, required for additionalData import
+            // </style>`
+            //         }
+            //         return code
+            //       },
             transformIndexHtml: {
                 enforce: 'pre',
                 transform: (html) => {
@@ -386,17 +353,10 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
             find: new RegExp('^vue$'),
             replacement: new URL('./dist/vue.runtime.esm-bundler.js', packageUrls['vue']).pathname
         },
-        // {
-        //   find: new RegExp('^vue/server-renderer$'),
-        //   replacement: 'vue/server-renderer/index.mjs'
-        // },
         {
             find: new RegExp('^vue-router$'),
             replacement: new URL('./dist/vue-router.esm-bundler.js', packageUrls['vue-router']).pathname
         }
-        // { find: 'vue', replacement: packageUrls['vue'].pathname },
-        // { find: 'vue-router', replacement: packageUrls['vue-router'].pathname },
-        // { find: 'vitrify', replacement: cliDir.pathname }
     ];
     if (mode === 'development' && vitrifyConfig.vitrify?.dev?.alias)
         alias.push(...vitrifyConfig.vitrify.dev.alias);
@@ -420,25 +380,16 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
             ],
             external,
             output: {
-                minifyInternalExports: !debug,
+                minifyInternalExports: false,
                 entryFileNames: '[name].mjs',
                 chunkFileNames: '[name].mjs',
                 format: 'es',
                 manualChunks
-                // manualChunks: (id) => {
-                //   if (id.includes('vitrify/src/vite/')) {
-                //     const name = id.split('/').at(-1)?.split('.').at(0)
-                //     if (name && manualChunks.includes(name)) return name
-                //   } else if (id.includes('node_modules')) {
-                //     return 'vendor'
-                //   }
-                // }
             }
         };
         // Create a SSR bundle
         noExternal = [
             new RegExp(`^(?!(${[...builtinModules, ...serverModules].join('|')}))`)
-            // new RegExp(`^(?!.*(${[...builtinModules, ...serverModules].join('|')}))`)
         ];
     }
     else if (ssr === 'fastify') {
@@ -452,14 +403,6 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
                 chunkFileNames: '[name].mjs',
                 format: 'es',
                 manualChunks
-                // manualChunks: (id) => {
-                //   if (id.includes('vitrify/src/vite/')) {
-                //     const name = id.split('/').at(-1)?.split('.').at(0)
-                //     if (name && manualChunks.includes(name)) return name
-                //   } else if (id.includes('node_modules')) {
-                //     return 'vendor'
-                //   }
-                // }
             }
         };
         // Create a SSR bundle
@@ -470,13 +413,9 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
     else {
         rollupOptions = {
             ...rollupOptions,
-            // input: [
-            //   new URL('index.html', frameworkDir).pathname
-            //   // new URL('csr/server.ts', frameworkDir).pathname
-            // ],
             external,
             output: {
-                minifyInternalExports: !debug,
+                minifyInternalExports: false,
                 entryFileNames: '[name].mjs',
                 chunkFileNames: '[name].mjs',
                 format: 'es',
@@ -485,7 +424,6 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
         };
     }
     const config = {
-        // root: ssr === 'fastify' ? appDir.pathname : frameworkDir.pathname,
         root: appDir.pathname,
         publicDir: publicDir.pathname,
         base,
@@ -513,33 +451,6 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
             ssr: ssr === 'server' || ssr === 'fastify' ? true : false,
             ssrManifest: ssr === 'client' || ssr === 'ssg',
             rollupOptions
-            // ssr === 'server'
-            //   ? {
-            //       input: [
-            //         new URL('ssr/entry-server.ts', frameworkDir).pathname,
-            //         new URL('ssr/prerender.ts', frameworkDir).pathname,
-            //         new URL('ssr/server.ts', frameworkDir).pathname
-            //       ],
-            //       output: {
-            //         minifyInternalExports: false,
-            //         entryFileNames: '[name].mjs',
-            //         chunkFileNames: '[name].mjs',
-            //         format: 'es',
-            //         manualChunks: (id) => {
-            //           if (id.includes('vitrify/src/vite/')) {
-            //             const name = id.split('/').at(-1)?.split('.').at(0)
-            //             if (name && manualChunks.includes(name)) return name
-            //           } else if (id.includes('node_modules')) {
-            //             return 'vendor'
-            //           }
-            //         }
-            //       }
-            //     }
-            //   : {
-            //       output: {
-            //         format: 'es'
-            //       }
-            //     }
         },
         ssr: {
             // Create a SSR bundle

package/dist/plugins/quasar.js

@@ -31,6 +31,7 @@ export const injectSsrContext = (html, ssrContext) => html
 });
 export const QuasarPlugin = async ({ ssr = false, pwa = false }) => {
     let plugins = [];
+    let quasarConf;
     return [
         Components({
             resolvers: [QuasarResolver()]
@@ -76,9 +77,12 @@ export const QuasarPlugin = async ({ ssr = false, pwa = false }) => {
                         const quasarPlugins = await import('virtual:quasar-plugins');
                         // @ts-ignore
                         const directives = await import('virtual:quasar-directives');
+                        // @ts-ignore
+                        const { default: lang } = await import('virtual:quasar-lang');
                         app.use(staticImports?.Quasar, {
                             plugins: quasarPlugins,
-                            directives
+                            directives,
+                            lang
                         }, ssrContext);
                     }
                 ];
@@ -106,7 +110,11 @@ export const QuasarPlugin = async ({ ssr = false, pwa = false }) => {
             name: 'vite-plugin-quasar',
             enforce: 'post',
             config: async (config, env) => {
-                const { quasar: quasarConf, vitrify: { urls } = {} } = config;
+                const { quasar, vitrify: { urls } = {} } = config;
+                if (quasar)
+                    quasarConf = quasar;
+                if (!quasarConf.framework.lang && config.vitrify?.lang)
+                    quasarConf.framework.lang = config.vitrify.lang;
                 // const quasarPkgJsonPath = new URL(
                 //   'package.json',
                 //   urls?.packages?.quasar
@@ -244,6 +252,8 @@ export const QuasarPlugin = async ({ ssr = false, pwa = false }) => {
                         return 'virtual:quasar-plugins';
                     case 'virtual:quasar-directives':
                         return 'virtual:quasar-directives';
+                    case 'virtual:quasar-lang':
+                        return 'virtual:quasar-lang';
                     case 'virtual:quasar':
                         return { id: 'virtual:quasar', moduleSideEffects: false };
                     default:
@@ -257,6 +267,10 @@ export const QuasarPlugin = async ({ ssr = false, pwa = false }) => {
                 else if (id === 'virtual:quasar-directives') {
                     return `export * from 'quasar/src/directives.js'`;
                 }
+                else if (id === 'virtual:quasar-lang') {
+                    return `import lang from 'quasar/lang/${quasarConf?.framework?.lang || 'en-US'}';
+          export default lang`;
+                }
                 else if (id === 'virtual:quasar') {
                     return `export * from 'quasar/src/plugins.js';
           export * from 'quasar/src/components.js';

package/dist/types/bin/dev.d.ts

@@ -1,6 +1,5 @@
 /// <reference types="node" />
 import type { LogLevel, InlineConfig } from 'vite';
-import { ViteDevServer } from 'vite';
 import type { Server } from 'net';
 export declare function createVitrifyDevServer({ port, logLevel, ssr, framework, host, appDir, publicDir, base }: {
     port?: number;
@@ -11,7 +10,7 @@ export declare function createVitrifyDevServer({ port, logLevel, ssr, framework,
     appDir?: URL;
     publicDir?: URL;
     base?: string;
-}): Promise<ViteDevServer>;
+}): Promise<import("vite").ViteDevServer>;
 export declare function createServer({ port, logLevel, ssr, framework, host, appDir, publicDir }: {
     port?: number;
     logLevel?: LogLevel;
@@ -42,7 +41,7 @@ export declare function createServer({ port, logLevel, ssr, framework, host, app
         server: import("vite").ResolvedServerOptions;
         build: Required<import("vite").BuildOptions>;
         preview: import("vite").ResolvedPreviewOptions;
-        ssr: import("vite").ResolvedSSROptions | undefined;
+        ssr: import("vite").ResolvedSSROptions;
         assetsInclude: (file: string) => boolean;
         logger: import("vite").Logger;
         createResolver: (options?: Partial<import("vite").InternalResolveOptions> | undefined) => import("vite").ResolveFn;

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

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

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

@@ -7,6 +7,7 @@ export interface QuasarConf {
         components?: string[];
         directives?: string[];
         plugins?: string[];
+        lang?: string;
     };
     animations: string[];
     extras: string[];

package/dist/types/vitrify-config.d.ts

@@ -1,6 +1,7 @@
 import type { Alias, UserConfig } from 'vite';
 import type { QuasarConf } from './plugins/quasar.js';
 import type { ComponentInternalInstance } from '@vue/runtime-core';
+import type { FastifyServerOptions } from 'fastify';
 export declare type BootFunction = ({ app, ssrContext, staticImports }: {
     app: any;
     ssrContext: Record<string, unknown>;
@@ -18,6 +19,7 @@ export declare type OnRenderedHook = (html: string, ssrContext: Record<string, a
 export declare type OnSetupFile = URL;
 export interface VitrifyConfig extends UserConfig {
     vitrify?: {
+        lang?: string;
         /**
          * Global CSS imports
          */
@@ -71,6 +73,7 @@ export interface VitrifyConfig extends UserConfig {
          */
         ssr?: {
             serverModules?: string[];
+            fastify?: FastifyServerOptions;
         };
         /**
          * Development only configuration

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vitrify",
-  "version": "0.6.16",
+  "version": "0.7.0",
   "license": "MIT",
   "author": "Stefan van Herwijnen",
   "description": "Pre-configured Vite CLI for your framework",
@@ -57,47 +57,47 @@
   },
   "dependencies": {
     "@fastify/middie": "^8.0.0",
-    "@fastify/static": "^6.4.0",
-    "@quasar/extras": "^1.14.2",
-    "@vitejs/plugin-vue": "^3.0.0-alpha.1",
+    "@fastify/static": "^6.5.0",
+    "@quasar/extras": "^1.15.1",
+    "@vitejs/plugin-vue": "^3.0.1",
     "builtin-modules": "^3.3.0",
     "cac": "^6.7.12",
     "chalk": "^5.0.1",
     "critters": "^0.0.16",
     "cross-env": "^7.0.3",
-    "esbuild": "^0.14.48",
-    "fastify": "^4.2.0",
+    "esbuild": "^0.14.51",
+    "fastify": "^4.3.0",
     "glob": "^8.0.3",
-    "happy-dom": "^6.0.0",
+    "happy-dom": "^6.0.4",
     "magic-string": "^0.26.2",
     "merge-deep": "^3.0.3",
     "readline": "^1.3.0",
-    "rollup-plugin-visualizer": "^5.6.0",
-    "sass": "1.53.0",
-    "ts-node": "^10.8.2",
-    "unplugin-vue-components": "^0.21.0",
-    "vite": "3.0.0-beta.6",
-    "vitest": "^0.17.0"
+    "rollup-plugin-visualizer": "^5.7.1",
+    "sass": "1.54.0",
+    "ts-node": "^10.9.1",
+    "unplugin-vue-components": "^0.21.2",
+    "vite": "^3.0.4",
+    "vitest": "^0.20.2"
   },
   "devDependencies": {
     "@types/connect": "^3.4.35",
     "@types/glob": "^7.2.0",
     "@types/merge-deep": "^3.0.0",
-    "@types/node": "^18.0.1",
+    "@types/node": "^18.6.3",
     "@types/ws": "^8.5.3",
     "@vue/runtime-core": "^3.2.37",
-    "quasar": "^2.7.5",
-    "rollup": "^2.75.7",
+    "quasar": "^2.7.6",
+    "rollup": "^2.77.2",
     "typescript": "^4.7.4",
     "vue": "^3.2.37",
-    "vue-router": "^4.1.0"
+    "vue-router": "^4.1.3"
   },
   "peerDependencies": {
-    "@fastify/static": "^6.4.0",
-    "fastify": "^4.2.0",
-    "quasar": "^2.7.5",
+    "@fastify/static": "^6.5.0",
+    "fastify": "^4.3.0",
+    "quasar": "^2.7.6",
     "vue": "^3.2.37",
-    "vue-router": "^4.1.0"
+    "vue-router": "^4.1.3"
   },
   "publishConfig": {
     "access": "public",

package/src/node/bin/cli.ts

@@ -25,6 +25,7 @@ cli
     const { build } = await import('./build.js')
     let appDir: URL
     let prerender
+    let onRendered
     if (options.appDir) {
       if (options.appDir.slice(-1) !== '/') options.appDir += '/'
       appDir = new URL(`file://${options.appDir}`)
@@ -84,16 +85,18 @@ cli
           ...args,
           outDir: new URL('ssr/server/', baseOutDir).pathname
         })
-        ;({ prerender } = await import(
+        ;({ prerender, onRendered } = 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,
           manifestPath: new URL('static/ssr-manifest.json', baseOutDir)
             .pathname,
           entryServerPath: new URL('ssr/server/entry-server.mjs', baseOutDir)
-            .pathname
+            .pathname,
+          onRendered
         })
         break
       default:

package/src/node/bin/dev.ts

@@ -1,13 +1,11 @@
 import type { LogLevel, InlineConfig } from 'vite'
-import { ViteDevServer, mergeConfig } from 'vite'
 import { searchForWorkspaceRoot } from 'vite'
 import { baseConfig } from '../index.js'
 import type { Server } from 'net'
-import type { FastifyInstance } from 'fastify/types/instance'
 import fastify from 'fastify'
+import type { FastifyServerOptions } from 'fastify'
 import { fastifySsrPlugin } from '../frameworks/vue/fastify-ssr-plugin.js'
-import type { ServerOptions } from 'https'
-import type { OnRenderedHook } from '../vitrify-config.js'
+import type { OnRenderedHook, VitrifyConfig } from '../vitrify-config.js'
 
 export async function createVitrifyDevServer({
   port = 3000,
@@ -130,6 +128,7 @@ export async function createServer({
   let setup
   let server: Server
   let onRendered: OnRenderedHook[]
+  let vitrifyConfig: VitrifyConfig
 
   console.log(`Development mode: ${ssr ? ssr : 'csr'}`)
   if (ssr) {
@@ -138,11 +137,13 @@ export async function createServer({
         ? new URL('src/vite/fastify/entry.ts', cliDir).pathname
         : new URL(`src/vite/${framework}/ssr/app.ts`, cliDir).pathname
 
-    ;({ setup, onRendered } = await vite.ssrLoadModule(entryUrl))
+    ;({ setup, onRendered, vitrifyConfig } = await vite.ssrLoadModule(entryUrl))
+    console.log(vitrifyConfig)
     const app = fastify({
       logger: false,
-      https: vite.config.server.https as ServerOptions
-    })
+      https: vite.config.server.https,
+      ...vitrifyConfig.vitrify?.ssr?.fastify
+    } as FastifyServerOptions)
     if (process.env) process.env.MODE = 'development'
     if (setup) {
       await setup({

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

@@ -1,16 +1,19 @@
 import { promises as fs } from 'fs'
+import type { OnRenderedHook } from 'src/node/vitrify-config.js'
 import { routesToPaths } from '../../helpers/routes.js'
 
 export const prerender = async ({
   outDir,
   templatePath,
   manifestPath,
-  entryServerPath
+  entryServerPath,
+  onRendered
 }: {
   outDir: string
   templatePath: string
   manifestPath: string
   entryServerPath: string
+  onRendered: OnRenderedHook[]
 }) => {
   const promises = []
   const template = (await fs.readFile(templatePath)).toString()
@@ -41,6 +44,12 @@ export const prerender = async ({
       .replace(`<!--preload-links-->`, preloadLinks)
       .replace(`<!--app-html-->`, appHtml)
 
+    if (onRendered?.length) {
+      for (const ssrFunction of onRendered) {
+        html = ssrFunction(html, ssrContext)
+      }
+    }
+
     html = await critters.process(html)
 
     promises.push(fs.writeFile(outDir + filename, html, 'utf-8'))

package/src/node/index.ts

@@ -21,7 +21,7 @@ import type {
 } from './vitrify-config.js'
 import type { VitrifyContext } from './bin/run.js'
 import type { VitrifyPlugin } from './plugins/index.js'
-import { getPkgJsonDir, resolve } from './app-urls.js'
+import { resolve } from './app-urls.js'
 import type { ManualChunksOption, RollupOptions } from 'rollup'
 
 const internalServerModules = [
@@ -75,8 +75,8 @@ const manualChunks: ManualChunksOption = (id: string) => {
 
 export const VIRTUAL_MODULES = [
   'virtual:vitrify-hooks',
-  'virtual:global-css',
   'virtual:static-imports',
+  'virtual:vitrify-config',
   'vitrify.sass',
   'vitrify.css'
 ]
@@ -237,13 +237,6 @@ export const baseConfig = async ({
     console.error('package.json not found')
   }
 
-  const ssrTransformCustomDir = () => {
-    return {
-      props: [],
-      needRuntime: true
-    }
-  }
-
   const frameworkPlugins = []
   for (const framework of Object.keys(configPluginMap)) {
     if (Object.keys(vitrifyConfig).includes(framework)) {
@@ -275,27 +268,7 @@ export const baseConfig = async ({
     ]
 
   const plugins: UserConfig['plugins'] = [
-    vuePlugin({
-      // compiler: await import('vue/compiler-sfc'),
-      // template: {
-      //   ssr: !!ssr,
-      //   compilerOptions: {
-      //     directiveTransforms: {
-      //       'close-popup': ssrTransformCustomDir,
-      //       intersection: ssrTransformCustomDir,
-      //       ripple: ssrTransformCustomDir,
-      //       mutation: ssrTransformCustomDir,
-      //       morph: ssrTransformCustomDir,
-      //       scroll: ssrTransformCustomDir,
-      //       'scroll-fire': ssrTransformCustomDir,
-      //       'touch-hold': ssrTransformCustomDir,
-      //       'touch-pan': ssrTransformCustomDir,
-      //       'touch-repeat': ssrTransformCustomDir,
-      //       'touch-swipe': ssrTransformCustomDir
-      //     }
-      //   }
-      // }
-    }),
+    vuePlugin(),
     ...frameworkPlugins,
     {
       name: 'vitrify-setup',
@@ -311,21 +284,13 @@ export const baseConfig = async ({
         globalSass = config.vitrify?.sass?.global || []
         additionalData = config.vitrify?.sass?.additionalData || []
 
-        return {
-          css: {
-            preprocessorOptions: {
-              // sass: {
-              //   additionalData: [
-              //     ...Object.entries(sassVariables).map(
-              //       ([key, value]) => `${key}: ${value}`
-              //     )
-              //     // ...additionalData
-              //     // config.css?.preprocessorOptions?.sass.additionalData
-              //   ].join('\n')
-              // }
-            }
-          }
-        }
+        return {}
+      },
+      configureServer(server) {
+        server.middlewares.use('/', (req, res, next) => {
+          if (req.url?.endsWith('.html')) req.url = req.url.replace('.html', '')
+          next()
+        })
       },
       configResolved: (config) => {
         if (process.env.DEBUG) {
@@ -357,30 +322,20 @@ export const baseConfig = async ({
               .join(', ')}]
             export const onSetup = []
             ${onSetupFiles
-              .map(
-                (url, index) =>
-                  `import ${url.pathname
-                    .replaceAll('/', '')
-                    .replaceAll('.', '')} from '${
-                    url.pathname
-                  }'; onSetup.push(${url.pathname
-                    .replaceAll('/', '')
-                    .replaceAll('.', '')})`
-              )
+              .map((url, index) => {
+                const varName = url.pathname
+                  .replaceAll('/', '')
+                  .replaceAll('.', '')
+                  .replaceAll('-', '')
+                return `import ${varName} from '${url.pathname}'; onSetup.push(${varName})`
+              })
               .join('\n')}`
-          // export const onSetup = [${onSetupHooks
-          //   .map((fn) => `${String(fn)}`)
-          //   .join(', ')}]`
-          /**
-           * CSS imports in virtual files do not seem to work. Using transform() instead
-           */
-          // } else if (id === 'virtual:global-css') {
-          //   return `${globalCss.map((css) => `import '${css}'`).join('\n')}`
         } else if (id === 'virtual:static-imports') {
           return `${Object.entries(staticImports)
-            .map(
-              ([key, value]) => `export { ${value.join(',')} } from '${key}';`
-            )
+            .map(([key, value]) => {
+              const deduped = [...new Set(value)]
+              return `export { ${deduped.join(',')} } from '${key}';`
+            })
             .join('\n')}`
         } else if (id === 'vitrify.sass') {
           return [
@@ -390,7 +345,9 @@ export const baseConfig = async ({
             ...globalSass.map((sass) => `@import '${sass}'`)
           ].join('\n')
         } else if (id === 'vitrify.css') {
-          return `${globalCss.map((css) => `import '${css}'`).join('\n')}`
+          return `${globalCss.map((css) => `@import '${css}'`).join('\n')}`
+        } else if (id === 'virtual:vitrify-config') {
+          return `export default ${JSON.stringify(vitrifyConfig)}`
         }
         return null
       }
@@ -400,16 +357,16 @@ export const baseConfig = async ({
     plugins.unshift({
       name: 'html-transform',
       enforce: 'pre',
-      transform: (code, id) => {
-        if (id.endsWith('App.vue')) {
-          code =
-            code +
-            `<style lang="sass">
-// do not remove, required for additionalData import
-</style>`
-        }
-        return code
-      },
+      //       transform: (code, id) => {
+      //         if (id.endsWith('App.vue')) {
+      //           code =
+      //             code +
+      //             `<style lang="sass">
+      // // do not remove, required for additionalData import
+      // </style>`
+      //         }
+      //         return code
+      //       },
       transformIndexHtml: {
         enforce: 'pre',
         transform: (html) => {
@@ -471,10 +428,6 @@ export const baseConfig = async ({
         packageUrls['vue']
       ).pathname
     },
-    // {
-    //   find: new RegExp('^vue/server-renderer$'),
-    //   replacement: 'vue/server-renderer/index.mjs'
-    // },
     {
       find: new RegExp('^vue-router$'),
       replacement: new URL(
@@ -482,9 +435,6 @@ export const baseConfig = async ({
         packageUrls['vue-router']
       ).pathname
     }
-    // { find: 'vue', replacement: packageUrls['vue'].pathname },
-    // { find: 'vue-router', replacement: packageUrls['vue-router'].pathname },
-    // { find: 'vitrify', replacement: cliDir.pathname }
   ]
   if (mode === 'development' && vitrifyConfig.vitrify?.dev?.alias)
     alias.push(...vitrifyConfig.vitrify.dev.alias)
@@ -511,25 +461,16 @@ export const baseConfig = async ({
       ],
       external,
       output: {
-        minifyInternalExports: !debug,
+        minifyInternalExports: false,
         entryFileNames: '[name].mjs',
         chunkFileNames: '[name].mjs',
         format: 'es',
         manualChunks
-        // manualChunks: (id) => {
-        //   if (id.includes('vitrify/src/vite/')) {
-        //     const name = id.split('/').at(-1)?.split('.').at(0)
-        //     if (name && manualChunks.includes(name)) return name
-        //   } else if (id.includes('node_modules')) {
-        //     return 'vendor'
-        //   }
-        // }
       }
     }
     // Create a SSR bundle
     noExternal = [
       new RegExp(`^(?!(${[...builtinModules, ...serverModules].join('|')}))`)
-      // new RegExp(`^(?!.*(${[...builtinModules, ...serverModules].join('|')}))`)
     ]
   } else if (ssr === 'fastify') {
     rollupOptions = {
@@ -542,14 +483,6 @@ export const baseConfig = async ({
         chunkFileNames: '[name].mjs',
         format: 'es',
         manualChunks
-        // manualChunks: (id) => {
-        //   if (id.includes('vitrify/src/vite/')) {
-        //     const name = id.split('/').at(-1)?.split('.').at(0)
-        //     if (name && manualChunks.includes(name)) return name
-        //   } else if (id.includes('node_modules')) {
-        //     return 'vendor'
-        //   }
-        // }
       }
     }
     // Create a SSR bundle
@@ -559,13 +492,9 @@ export const baseConfig = async ({
   } else {
     rollupOptions = {
       ...rollupOptions,
-      // input: [
-      //   new URL('index.html', frameworkDir).pathname
-      //   // new URL('csr/server.ts', frameworkDir).pathname
-      // ],
       external,
       output: {
-        minifyInternalExports: !debug,
+        minifyInternalExports: false,
         entryFileNames: '[name].mjs',
         chunkFileNames: '[name].mjs',
         format: 'es',
@@ -575,7 +504,6 @@ export const baseConfig = async ({
   }
 
   const config = {
-    // root: ssr === 'fastify' ? appDir.pathname : frameworkDir.pathname,
     root: appDir.pathname,
     publicDir: publicDir.pathname,
     base,
@@ -603,33 +531,6 @@ export const baseConfig = async ({
       ssr: ssr === 'server' || ssr === 'fastify' ? true : false,
       ssrManifest: ssr === 'client' || ssr === 'ssg',
       rollupOptions
-      // ssr === 'server'
-      //   ? {
-      //       input: [
-      //         new URL('ssr/entry-server.ts', frameworkDir).pathname,
-      //         new URL('ssr/prerender.ts', frameworkDir).pathname,
-      //         new URL('ssr/server.ts', frameworkDir).pathname
-      //       ],
-      //       output: {
-      //         minifyInternalExports: false,
-      //         entryFileNames: '[name].mjs',
-      //         chunkFileNames: '[name].mjs',
-      //         format: 'es',
-      //         manualChunks: (id) => {
-      //           if (id.includes('vitrify/src/vite/')) {
-      //             const name = id.split('/').at(-1)?.split('.').at(0)
-      //             if (name && manualChunks.includes(name)) return name
-      //           } else if (id.includes('node_modules')) {
-      //             return 'vendor'
-      //           }
-      //         }
-      //       }
-      //     }
-      //   : {
-      //       output: {
-      //         format: 'es'
-      //       }
-      //     }
     },
     ssr: {
       // Create a SSR bundle

package/src/node/plugins/quasar.ts

@@ -25,6 +25,7 @@ export interface QuasarConf {
     components?: string[]
     directives?: string[]
     plugins?: string[]
+    lang?: string
   }
   animations: string[]
   extras: string[]
@@ -83,6 +84,7 @@ export const QuasarPlugin: VitrifyPlugin = async ({
   pwa = false
 }): Promise<Plugin[]> => {
   let plugins: string[] = []
+  let quasarConf: QuasarConf
   return [
     Components({
       resolvers: [QuasarResolver()]
@@ -148,12 +150,15 @@ export const QuasarPlugin: VitrifyPlugin = async ({
             const quasarPlugins = await import('virtual:quasar-plugins')
             // @ts-ignore
             const directives = await import('virtual:quasar-directives')
+            // @ts-ignore
+            const { default: lang } = await import('virtual:quasar-lang')
 
             app.use(
               staticImports?.Quasar,
               {
                 plugins: quasarPlugins,
-                directives
+                directives,
+                lang
               },
               ssrContext
             )
@@ -184,8 +189,10 @@ export const QuasarPlugin: VitrifyPlugin = async ({
       name: 'vite-plugin-quasar',
       enforce: 'post',
       config: async (config: VitrifyConfig, env) => {
-        const { quasar: quasarConf, vitrify: { urls } = {} } = config
-
+        const { quasar, vitrify: { urls } = {} } = config
+        if (quasar) quasarConf = quasar
+        if (!quasarConf.framework.lang && config.vitrify?.lang)
+          quasarConf.framework.lang = config.vitrify.lang
         // const quasarPkgJsonPath = new URL(
         //   'package.json',
         //   urls?.packages?.quasar
@@ -327,6 +334,8 @@ export const QuasarPlugin: VitrifyPlugin = async ({
             return 'virtual:quasar-plugins'
           case 'virtual:quasar-directives':
             return 'virtual:quasar-directives'
+          case 'virtual:quasar-lang':
+            return 'virtual:quasar-lang'
           case 'virtual:quasar':
             return { id: 'virtual:quasar', moduleSideEffects: false }
           default:
@@ -338,6 +347,11 @@ export const QuasarPlugin: VitrifyPlugin = async ({
           return `export { ${plugins.join(',')} } from 'quasar'`
         } else if (id === 'virtual:quasar-directives') {
           return `export * from 'quasar/src/directives.js'`
+        } else if (id === 'virtual:quasar-lang') {
+          return `import lang from 'quasar/lang/${
+            quasarConf?.framework?.lang || 'en-US'
+          }';
+          export default lang`
         } else if (id === 'virtual:quasar') {
           return `export * from 'quasar/src/plugins.js';
           export * from 'quasar/src/components.js';

package/src/node/vitrify-config.ts

@@ -1,6 +1,7 @@
 import type { Alias, UserConfig } from 'vite'
 import type { QuasarConf } from './plugins/quasar.js'
 import type { ComponentInternalInstance } from '@vue/runtime-core'
+import type { FastifyServerOptions } from 'fastify'
 
 export type BootFunction = ({
   app,
@@ -39,6 +40,7 @@ export type OnRenderedHook = (
 export type OnSetupFile = URL
 export interface VitrifyConfig extends UserConfig {
   vitrify?: {
+    lang?: string
     /**
      * Global CSS imports
      */
@@ -92,6 +94,7 @@ export interface VitrifyConfig extends UserConfig {
      */
     ssr?: {
       serverModules?: string[]
+      fastify?: FastifyServerOptions
     }
     /**
      * Development only configuration

package/src/vite/fastify/entry.ts

@@ -1,5 +1,6 @@
 import type { FastifyInstance } from 'fastify'
 import { onSetup } from 'virtual:vitrify-hooks'
+export { default as vitrifyConfig } from 'virtual:vitrify-config'
 
 export const setup = async ({ fastify }: { fastify: FastifyInstance }) => {
   if (onSetup?.length) {

package/src/vite/fastify/server.ts

@@ -1,8 +1,9 @@
 import Fastify from 'fastify'
-import { setup } from './entry'
+import { setup, vitrifyConfig } from './entry'
 
 const fastify = Fastify({
-  logger: true
+  logger: true,
+  ...vitrifyConfig.vitrify?.ssr.fastify
 })
 await setup({ fastify })
 

package/src/vite/vue/main.ts

@@ -49,7 +49,7 @@ export async function createApp(
   // Workaround to fix hydration errors when serving html files directly
   router.beforeEach((to, from, next) => {
     if (to.path.endsWith('.html')) {
-      next({ path: to.path.replace('.html', '') })
+      return next({ path: to.path.replace('.html', '') })
     }
 
     next()

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

@@ -1,3 +1,4 @@
 import { prerender } from '../../../node/frameworks/vue/prerender.js'
+import { onRendered } from 'virtual:vitrify-hooks'
 
-export { prerender }
+export { prerender, onRendered }