vitrify 0.6.18 → 0.7.2

package/dist/bin/dev.js

@@ -77,15 +77,17 @@ 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));
         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/fastify-ssr-plugin.js

@@ -2,9 +2,6 @@ import fastifyStatic from '@fastify/static';
 import { readFileSync } from 'fs';
 import { componentsModules, collectCss } from '../../helpers/collect-css-ssr.js';
 const fastifySsrPlugin = async (fastify, options, done) => {
-    options.vitrifyDir =
-        options.vitrifyDir || (await import('vitrify')).vitrifyDir;
-    const frameworkDir = new URL('src/vite/vue/', options.vitrifyDir);
     options.baseUrl = options.baseUrl || '/';
     options.mode = options.mode || process.env.MODE || import.meta.env.MODE;
     options.appDir = options.appDir || new URL('../../..', import.meta.url);
@@ -12,6 +9,9 @@ const fastifySsrPlugin = async (fastify, options, done) => {
         options.baseUrl.charAt(0) !== '/')
         throw new Error('baseUrl should start and end with a /');
     if (options.mode === 'development') {
+        options.vitrifyDir =
+            options.vitrifyDir || (await import('vitrify')).vitrifyDir;
+        const frameworkDir = new URL('src/vite/vue/', options.vitrifyDir);
         // if (!options.vitrifyDir)
         //   throw new Error('Option vitrifyDir cannot be undefined')
         // if (!options.vite) throw new Error('Option vite cannot be undefined')

package/dist/frameworks/vue/server.js

@@ -10,10 +10,10 @@ export const createApp = ({ onSetup, appDir, baseUrl, fastifyPlugin, onRendered,
         onRendered,
         mode
     });
-    // if (onSetup?.length) {
-    //   for (const setup of onSetup) {
-    //     setup(app)
-    //   }
-    // }
+    if (onSetup?.length) {
+        for (const setup of onSetup) {
+            setup(app);
+        }
+    }
     return app;
 };

package/dist/index.js

@@ -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)) {
@@ -189,7 +183,7 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
     let onRenderedHooks;
     let onMountedHooks;
     let onSetupFiles;
-    let globalCss;
+    let globalCss = [];
     let staticImports;
     let sassVariables;
     let additionalData;
@@ -201,32 +195,12 @@ 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',
             enforce: 'post',
-            config: async (config, env) => {
+            config: (config, env) => {
                 onBootHooks = config.vitrify?.hooks?.onBoot || [];
                 onRenderedHooks = config.vitrify?.hooks?.onRendered || [];
                 onMountedHooks = config.vitrify?.hooks?.onMounted || [];
@@ -236,21 +210,7 @@ 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) => {
@@ -261,8 +221,7 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
             },
             configResolved: (config) => {
                 if (process.env.DEBUG) {
-                    console.log(config.css?.preprocessorOptions?.sass.additionalData);
-                    console.log(config.optimizeDeps);
+                    console.log(config);
                 }
             },
             resolveId(id) {
@@ -290,24 +249,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') {
@@ -330,16 +286,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) => {
@@ -370,6 +326,7 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
             config: (config, env) => {
                 if (config.vitrify?.productName)
                     productName = config.vitrify?.productName;
+                return;
             },
             transformIndexHtml: {
                 enforce: 'post',
@@ -396,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);
@@ -430,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') {
@@ -462,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
@@ -480,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',
@@ -495,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,
@@ -523,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

@@ -1,7 +1,5 @@
 import { resolvePackageData } from 'vite';
 import Components from 'unplugin-vue-components/vite';
-// import { quasarDir as defaultQuasarDir } from '../app-urls.js'
-// import { QuasarResolver } from '../resolver.js';
 import { QuasarResolver } from 'unplugin-vue-components/resolvers';
 export const injectSsrContext = (html, ssrContext) => html
     .replace(/(<html[^>]*)(>)/i, (found, start, end) => {
@@ -79,7 +77,6 @@ export const QuasarPlugin = async ({ ssr = false, pwa = false }) => {
                         const directives = await import('virtual:quasar-directives');
                         // @ts-ignore
                         const { default: lang } = await import('virtual:quasar-lang');
-                        console.log(lang);
                         app.use(staticImports?.Quasar, {
                             plugins: quasarPlugins,
                             directives,
@@ -87,45 +84,10 @@ export const QuasarPlugin = async ({ ssr = false, pwa = false }) => {
                         }, ssrContext);
                     }
                 ];
-                return {
-                    vitrify: {
-                        urls,
-                        globalCss,
-                        staticImports: {
-                            quasar: ['Quasar']
-                        },
-                        hooks: {
-                            onBoot: onBootHooks,
-                            onMounted: onMountedHooks,
-                            onRendered: [injectSsrContext]
-                        },
-                        sass: {
-                            global: ['quasar/src/css/index.sass']
-                            // additionalData: [`@import 'quasar/src/css/index.sass'`]
-                        }
-                    }
-                };
-            }
-        },
-        {
-            name: 'vite-plugin-quasar',
-            enforce: 'post',
-            config: async (config, env) => {
-                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
-                // ).pathname
-                // const { version } = JSON.parse(
-                //   readFileSync(quasarPkgJsonPath, { encoding: 'utf-8' })
-                // )
-                // const { version } = await import('quasar/package.json', {
-                //   assert: { type: 'json' }
-                // })
                 /**
                  * Importing package.json is problematic
                  */
@@ -142,75 +104,28 @@ export const QuasarPlugin = async ({ ssr = false, pwa = false }) => {
                     plugins = quasarConf?.framework.plugins;
                 }
                 return {
-                    // build: {
-                    //   rollupOptions: {
-                    //     treeshake: {
-                    //       moduleSideEffects: 'no-external'
-                    //     }
-                    //   }
-                    // },
+                    vitrify: {
+                        urls,
+                        globalCss,
+                        staticImports: {
+                            quasar: ['Quasar']
+                        },
+                        hooks: {
+                            onBoot: onBootHooks,
+                            onMounted: onMountedHooks,
+                            onRendered: [injectSsrContext]
+                        },
+                        sass: {
+                            global: ['quasar/src/css/index.sass']
+                            // additionalData: [`@import 'quasar/src/css/index.sass'`]
+                        }
+                    },
                     resolve: {
-                        // dedupe: ['quasar', '@quasar/extras'],
                         alias: [
-                            // {
-                            //   find: 'quasar/wrappers',
-                            //   replacement: new URL('quasar-wrappers.ts', urls?.cli).pathname
-                            // },
-                            // {
-                            //   find: 'quasar/vue-plugin',
-                            //   replacement: new URL(
-                            //     'src/vue-plugin.js',
-                            //     urls?.packages?.quasar
-                            //   ).pathname
-                            // },
-                            // {
-                            //   find: 'quasar/plugins',
-                            //   replacement: new URL('src/plugins.js', urls?.packages?.quasar)
-                            //     .pathname
-                            // },
-                            // {
-                            //   find: 'quasar/components',
-                            //   replacement: new URL(
-                            //     'src/components.js',
-                            //     urls?.packages?.quasar
-                            //   ).pathname
-                            // },
-                            // {
-                            //   find: 'quasar/composables',
-                            //   replacement: new URL(
-                            //     'src/composables.js',
-                            //     urls?.packages?.quasar
-                            //   ).pathname
-                            // },
-                            // {
-                            //   find: 'quasar/directives',
-                            //   replacement: new URL(
-                            //     'src/directives.js',
-                            //     urls?.packages?.quasar
-                            //   ).pathname
-                            // },
                             {
                                 find: 'quasar/src/',
                                 replacement: new URL('./src/', config.vitrify.urls.packages.quasar).pathname
                             }
-                            // {
-                            //   find: 'quasar',
-                            //   replacement: new URL(
-                            //     'node_modules/quasar',
-                            //     config.vitrify?.urls?.app
-                            //   )
-                            // }
-                            // {
-                            //   find: new RegExp('^quasar$'),
-                            //   replacement: new URL('src/index.all.js', urls?.packages?.quasar)
-                            //     .pathname
-                            // }
-                            // {
-                            //   find: `@quasar/extras`,
-                            //   replacement: new URL('.', urls?.packages?.['@quasar/extras'])
-                            //     .pathname
-                            // }
-                            // { find: new RegExp('^quasar$'), replacement: 'virtual:quasar' }
                         ]
                     },
                     optimizeDeps: {
@@ -219,13 +134,6 @@ export const QuasarPlugin = async ({ ssr = false, pwa = false }) => {
                     define: {
                         __DEV__: process.env.NODE_ENV !== 'production' || true,
                         __QUASAR_VERSION__: `'${version}'`
-                        // __QUASAR_SSR__: !!ssr,
-                        // // __QUASAR_SSR_SERVER__: ssr === 'server',
-                        // __QUASAR_SSR_SERVER__: `import.meta.env.SSR`,
-                        // // __QUASAR_SSR_CLIENT__: ssr === 'client',
-                        // __QUASAR_SSR_CLIENT__: `!import.meta.env.SSR`,
-                        // // __QUASAR_SSR_PWA__: ssr === 'client' && pwa
-                        // __QUASAR_SSR_PWA__: pwa ? `!import.meta.env.SSR` : false
                     },
                     ssr: {
                         noExternal: ['quasar']

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;
@@ -22,7 +21,7 @@ export declare function createServer({ port, logLevel, ssr, framework, host, app
     publicDir?: URL;
 }): Promise<{
     server: Server;
-    config: Readonly<Omit<import("vite").UserConfig, "optimizeDeps" | "plugins" | "assetsInclude" | "worker"> & {
+    config: Readonly<Omit<import("vite").UserConfig, "plugins" | "assetsInclude" | "optimizeDeps" | "worker"> & {
         configFile: string | undefined;
         configFileDependencies: string[];
         inlineConfig: InlineConfig;
@@ -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/server.d.ts

@@ -1,10 +1,10 @@
 /// <reference types="node" />
 import type { FastifyInstance } from 'fastify';
-import type { OnRenderedHook, OnSetupFile } from '../../vitrify-config.js';
+import type { OnRenderedHook } from '../../vitrify-config.js';
 import type { FastifyCsrPlugin } from './fastify-csr-plugin.js';
 import type { FastifySsrPlugin } from './fastify-ssr-plugin.js';
 export declare const createApp: ({ onSetup, appDir, baseUrl, fastifyPlugin, onRendered, vitrifyDir, mode }: {
-    onSetup: OnSetupFile[];
+    onSetup: ((fastify: FastifyInstance) => void)[];
     appDir: URL;
     baseUrl?: string | undefined;
     fastifyPlugin: FastifySsrPlugin | FastifyCsrPlugin;

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>;
@@ -72,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.18",
+  "version": "0.7.2",
   "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.53",
+    "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.2",
+    "ts-node": "^10.9.1",
+    "unplugin-vue-components": "^0.22.0",
+    "vite": "^3.0.4",
+    "vitest": "^0.20.3"
   },
   "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.7",
+    "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.7",
     "vue": "^3.2.37",
-    "vue-router": "^4.1.0"
+    "vue-router": "^4.1.3"
   },
   "publishConfig": {
     "access": "public",

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,12 @@ 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))
     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/fastify-ssr-plugin.ts

@@ -30,9 +30,6 @@ const fastifySsrPlugin: FastifyPluginCallback<FastifySsrOptions> = async (
   options,
   done
 ) => {
-  options.vitrifyDir =
-    options.vitrifyDir || (await import('vitrify')).vitrifyDir
-  const frameworkDir = new URL('src/vite/vue/', options.vitrifyDir)
   options.baseUrl = options.baseUrl || '/'
   options.mode = options.mode || process.env.MODE || import.meta.env.MODE
   options.appDir = options.appDir || new URL('../../..', import.meta.url)
@@ -43,6 +40,9 @@ const fastifySsrPlugin: FastifyPluginCallback<FastifySsrOptions> = async (
   )
     throw new Error('baseUrl should start and end with a /')
   if (options.mode === 'development') {
+    options.vitrifyDir =
+      options.vitrifyDir || (await import('vitrify')).vitrifyDir
+    const frameworkDir = new URL('src/vite/vue/', options.vitrifyDir)
     // if (!options.vitrifyDir)
     //   throw new Error('Option vitrifyDir cannot be undefined')
     // if (!options.vite) throw new Error('Option vite cannot be undefined')

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

@@ -15,7 +15,7 @@ export const createApp = ({
   vitrifyDir,
   mode
 }: {
-  onSetup: OnSetupFile[]
+  onSetup: ((fastify: FastifyInstance) => void)[]
   appDir: URL
   baseUrl?: string
   fastifyPlugin: FastifySsrPlugin | FastifyCsrPlugin
@@ -35,11 +35,11 @@ export const createApp = ({
     mode
   })
 
-  // if (onSetup?.length) {
-  //   for (const setup of onSetup) {
-  //     setup(app)
-  //   }
-  // }
+  if (onSetup?.length) {
+    for (const setup of onSetup) {
+      setup(app)
+    }
+  }
 
   return app
 }

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 = [
@@ -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)) {
@@ -261,7 +254,7 @@ export const baseConfig = async ({
   let onRenderedHooks: OnRenderedHook[]
   let onMountedHooks: OnMountedHook[]
   let onSetupFiles: OnSetupFile[]
-  let globalCss: string[]
+  let globalCss: string[] = []
   let staticImports: StaticImports
   let sassVariables: Record<string, string>
   let additionalData: string[]
@@ -275,32 +268,12 @@ 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',
       enforce: 'post',
-      config: async (config: VitrifyConfig, env) => {
+      config: (config: VitrifyConfig, env) => {
         onBootHooks = config.vitrify?.hooks?.onBoot || []
         onRenderedHooks = config.vitrify?.hooks?.onRendered || []
         onMountedHooks = config.vitrify?.hooks?.onMounted || []
@@ -310,22 +283,7 @@ export const baseConfig = async ({
         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) => {
@@ -335,8 +293,7 @@ export const baseConfig = async ({
       },
       configResolved: (config) => {
         if (process.env.DEBUG) {
-          console.log(config.css?.preprocessorOptions?.sass.additionalData)
-          console.log(config.optimizeDeps)
+          console.log(config)
         }
       },
       resolveId(id) {
@@ -363,30 +320,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 [
@@ -408,16 +355,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) => {
@@ -449,6 +396,7 @@ export const baseConfig = async ({
       config: (config: VitrifyConfig, env) => {
         if (config.vitrify?.productName)
           productName = config.vitrify?.productName
+        return
       },
       transformIndexHtml: {
         enforce: 'post',
@@ -479,10 +427,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(
@@ -490,9 +434,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)
@@ -519,25 +460,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 = {
@@ -550,14 +482,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
@@ -567,13 +491,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',
@@ -583,7 +503,6 @@ export const baseConfig = async ({
   }
 
   const config = {
-    // root: ssr === 'fastify' ? appDir.pathname : frameworkDir.pathname,
     root: appDir.pathname,
     publicDir: publicDir.pathname,
     base,
@@ -611,33 +530,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

@@ -1,22 +1,13 @@
-import { readFileSync } from 'fs'
 import type { Plugin } from 'vite'
 import { resolvePackageData } from 'vite'
 import Components from 'unplugin-vue-components/vite'
-// import { prepareQuasarConf } from './quasar-conf-file.js'
 import type {
-  BootFunction,
   OnBootHook,
   OnMountedHook,
   VitrifyConfig
 } from '../vitrify-config.js'
-// import { quasarDir as defaultQuasarDir } from '../app-urls.js'
-// import { QuasarResolver } from '../resolver.js';
 import { QuasarResolver } from 'unplugin-vue-components/resolvers'
 import type { VitrifyPlugin } from './index.js'
-import { getPkgJsonDir, resolve } from '../app-urls.js'
-
-// import { resolve } from 'import-meta-resolve'
-
 export interface QuasarConf {
   ctx: Record<string, any>
   css: string[]
@@ -152,7 +143,7 @@ export const QuasarPlugin: VitrifyPlugin = async ({
             const directives = await import('virtual:quasar-directives')
             // @ts-ignore
             const { default: lang } = await import('virtual:quasar-lang')
-            console.log(lang)
+
             app.use(
               staticImports?.Quasar,
               {
@@ -165,44 +156,10 @@ export const QuasarPlugin: VitrifyPlugin = async ({
           }
         ]
 
-        return {
-          vitrify: {
-            urls,
-            globalCss,
-            staticImports: {
-              quasar: ['Quasar']
-            },
-            hooks: {
-              onBoot: onBootHooks,
-              onMounted: onMountedHooks,
-              onRendered: [injectSsrContext]
-            },
-            sass: {
-              global: ['quasar/src/css/index.sass']
-              // additionalData: [`@import 'quasar/src/css/index.sass'`]
-            }
-          }
-        }
-      }
-    },
-    {
-      name: 'vite-plugin-quasar',
-      enforce: 'post',
-      config: async (config: VitrifyConfig, env) => {
-        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
-        // ).pathname
-        // const { version } = JSON.parse(
-        //   readFileSync(quasarPkgJsonPath, { encoding: 'utf-8' })
-        // )
-        // const { version } = await import('quasar/package.json', {
-        //   assert: { type: 'json' }
-        // })
+
         /**
          * Importing package.json is problematic
          */
@@ -220,53 +177,24 @@ export const QuasarPlugin: VitrifyPlugin = async ({
         }
 
         return {
-          // build: {
-          //   rollupOptions: {
-          //     treeshake: {
-          //       moduleSideEffects: 'no-external'
-          //     }
-          //   }
-          // },
+          vitrify: {
+            urls,
+            globalCss,
+            staticImports: {
+              quasar: ['Quasar']
+            },
+            hooks: {
+              onBoot: onBootHooks,
+              onMounted: onMountedHooks,
+              onRendered: [injectSsrContext]
+            },
+            sass: {
+              global: ['quasar/src/css/index.sass']
+              // additionalData: [`@import 'quasar/src/css/index.sass'`]
+            }
+          },
           resolve: {
-            // dedupe: ['quasar', '@quasar/extras'],
             alias: [
-              // {
-              //   find: 'quasar/wrappers',
-              //   replacement: new URL('quasar-wrappers.ts', urls?.cli).pathname
-              // },
-              // {
-              //   find: 'quasar/vue-plugin',
-              //   replacement: new URL(
-              //     'src/vue-plugin.js',
-              //     urls?.packages?.quasar
-              //   ).pathname
-              // },
-              // {
-              //   find: 'quasar/plugins',
-              //   replacement: new URL('src/plugins.js', urls?.packages?.quasar)
-              //     .pathname
-              // },
-              // {
-              //   find: 'quasar/components',
-              //   replacement: new URL(
-              //     'src/components.js',
-              //     urls?.packages?.quasar
-              //   ).pathname
-              // },
-              // {
-              //   find: 'quasar/composables',
-              //   replacement: new URL(
-              //     'src/composables.js',
-              //     urls?.packages?.quasar
-              //   ).pathname
-              // },
-              // {
-              //   find: 'quasar/directives',
-              //   replacement: new URL(
-              //     'src/directives.js',
-              //     urls?.packages?.quasar
-              //   ).pathname
-              // },
               {
                 find: 'quasar/src/',
                 replacement: new URL(
@@ -274,24 +202,6 @@ export const QuasarPlugin: VitrifyPlugin = async ({
                   config.vitrify!.urls!.packages!.quasar
                 ).pathname
               }
-              // {
-              //   find: 'quasar',
-              //   replacement: new URL(
-              //     'node_modules/quasar',
-              //     config.vitrify?.urls?.app
-              //   )
-              // }
-              // {
-              //   find: new RegExp('^quasar$'),
-              //   replacement: new URL('src/index.all.js', urls?.packages?.quasar)
-              //     .pathname
-              // }
-              // {
-              //   find: `@quasar/extras`,
-              //   replacement: new URL('.', urls?.packages?.['@quasar/extras'])
-              //     .pathname
-              // }
-              // { find: new RegExp('^quasar$'), replacement: 'virtual:quasar' }
             ]
           },
           optimizeDeps: {
@@ -300,13 +210,6 @@ export const QuasarPlugin: VitrifyPlugin = async ({
           define: {
             __DEV__: process.env.NODE_ENV !== 'production' || true,
             __QUASAR_VERSION__: `'${version}'`
-            // __QUASAR_SSR__: !!ssr,
-            // // __QUASAR_SSR_SERVER__: ssr === 'server',
-            // __QUASAR_SSR_SERVER__: `import.meta.env.SSR`,
-            // // __QUASAR_SSR_CLIENT__: ssr === 'client',
-            // __QUASAR_SSR_CLIENT__: `!import.meta.env.SSR`,
-            // // __QUASAR_SSR_PWA__: ssr === 'client' && pwa
-            // __QUASAR_SSR_PWA__: pwa ? `!import.meta.env.SSR` : false
           },
           ssr: {
             noExternal: ['quasar']

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,
@@ -93,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 })