vitrify 0.21.0 → 0.23.0

package/dist/bin/cli.js

@@ -20,7 +20,6 @@ cli
     const { build } = await import('./build.js');
     let appDir;
     let prerender;
-    let onRendered;
     if (options.appDir) {
         if (options.appDir.slice(-1) !== '/')
             options.appDir += '/';
@@ -75,7 +74,7 @@ cli
                 outDir: fileURLToPath(new URL('ssr/server/', baseOutDir))
             });
             ({ prerender } = await import(new URL('ssr/server/prerender.mjs', baseOutDir).pathname));
-            const { template, manifest, render, getRoutes, onRendered } = await loadSSRAssets({
+            const { template, manifest, render, getRoutes, onRendered, onTemplateRendered } = await loadSSRAssets({
                 mode: 'ssg',
                 distDir: baseOutDir
             });
@@ -86,7 +85,8 @@ cli
                 manifest,
                 render,
                 routes,
-                onRendered
+                onRendered,
+                onTemplateRendered
             });
             break;
         default:

package/dist/bin/dev.js

@@ -1,4 +1,3 @@
-import { searchForWorkspaceRoot } from 'vite';
 import { baseConfig } from '../index.js';
 import fastify from 'fastify';
 import { fastifySsrPlugin } from '../frameworks/vue/fastify-ssr-plugin.js';
@@ -15,7 +14,6 @@ export async function createVitrifyDevServer({ port = 3000, logLevel = 'info',
 // mode = 'csr',
 ssr, framework = 'vue', host, appDir, publicDir, base }) {
     const { getAppDir, getCliDir, getCliViteDir, getCwd } = await import('../app-urls.js');
-    const cliDir = getCliDir();
     if (!appDir)
         appDir = getAppDir();
     let config = {};
@@ -33,46 +31,27 @@ ssr, framework = 'vue', host, appDir, publicDir, base }) {
         publicDir,
         base
     });
-    config.logLevel = logLevel;
-    config.define = {
-        ...config.define,
-        __HOST__: `'${host}'`
-    };
     const wsPort = await getFirstOpenPort(24678);
     if (config.server?.https) {
         exitLogs.push(`[warning] HTTPS mode enabled. Visit https://{hostname}:${wsPort} to enable a security exception for HMR.`);
     }
-    config.server = {
-        https: config.server?.https,
-        hmr: {
-            protocol: config.server?.https ? 'wss' : 'ws',
-            port: wsPort
-        },
-        port,
-        // middlewareMode: mode === 'ssr' ? 'ssr' : undefined,
-        middlewareMode: ssr ? true : false,
-        fs: {
-            strict: false, // https://github.com/vitejs/vite/issues/8175
-            allow: [
-                searchForWorkspaceRoot(process.cwd()),
-                searchForWorkspaceRoot(fileURLToPath(appDir)),
-                searchForWorkspaceRoot(fileURLToPath(cliDir)),
-                fileURLToPath(appDir)
-            ]
-        },
-        watch: {
-            // During tests we edit the files too fast and sometimes chokidar
-            // misses change events, so enforce polling for consistency
-            usePolling: true,
-            interval: 100
-        },
-        host
-    };
-    if (ssr)
-        config.appType = 'custom';
     const vitrifyDevServer = await (await import('vite')).createServer({
         configFile: false,
-        ...config
+        ...config,
+        logLevel,
+        define: {
+            ...config.define,
+            __HOST__: `'${host}'`
+        },
+        server: {
+            ...config.server,
+            host,
+            port,
+            hmr: {
+                protocol: config.server?.https ? 'wss' : 'ws',
+                port: wsPort
+            }
+        }
     });
     return vitrifyDevServer;
 }
@@ -96,16 +75,24 @@ ssr, framework = 'vue', host, appDir, publicDir, vite }) {
     let setup;
     let app;
     let server;
-    let onRendered;
+    let onTemplateRendered;
     let vitrifyConfig;
     console.log(`Development mode: ${ssr ? ssr : 'csr'}`);
     if (ssr) {
         const entryUrl = ssr === 'fastify'
             ? fileURLToPath(new URL('src/vite/fastify/entry.ts', cliDir))
             : fileURLToPath(new URL(`src/vite/${framework}/ssr/app.ts`, cliDir));
-        ({ setup, onRendered, vitrifyConfig } = await vite.ssrLoadModule(entryUrl));
+        const environment = vite.environments.ssr;
+        ({ setup, onTemplateRendered, vitrifyConfig } =
+            // @ts-expect-error missing types
+            await environment.runner.import(entryUrl));
+        // console.log(module)
+        // ;({ setup, onRendered, vitrifyConfig } = await vite.ssrLoadModule(entryUrl))
         app = fastify({
             logger: {
+                transport: {
+                    target: '@fastify/one-line-logger'
+                },
                 level: process.env.DEBUG
                     ? 'debug'
                     : process.env.PINO_LOG_LEVEL || 'info'
@@ -125,7 +112,7 @@ ssr, framework = 'vue', host, appDir, publicDir, vite }) {
             await app.register(fastifySsrPlugin, {
                 appDir,
                 mode: 'development',
-                onRendered,
+                onTemplateRendered,
                 host
             });
         }

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

@@ -3,6 +3,8 @@ import { readFileSync } from 'fs';
 import { fileURLToPath } from 'url';
 import { addOrReplaceAppDiv, appendToBody, appendToHead } from '../../helpers/utils.js';
 import { getAppDir } from '../../app-urls.js';
+import { stringify } from 'devalue';
+import stringifyObject from 'stringify-object';
 const fastifySsrPlugin = async (fastify, options) => {
     options.baseUrl = options.baseUrl || '/';
     options.mode = options.mode || process.env.MODE || import.meta.env.MODE;
@@ -36,7 +38,10 @@ const fastifySsrPlugin = async (fastify, options) => {
                 let template = readFileSync(new URL('index.html', frameworkDir)).toString();
                 template = await vite.transformIndexHtml(url, template);
                 const entryUrl = fileURLToPath(new URL('ssr/entry-server.ts', frameworkDir));
-                const render = (await vite.ssrLoadModule(entryUrl)).render;
+                const environment = vite.environments.ssr;
+                // @ts-expect-error missing type
+                const { render } = await environment.runner.import(entryUrl);
+                // const render = (await vite!.ssrLoadModule(entryUrl)).render
                 let manifest;
                 // TODO: https://github.com/vitejs/vite/issues/2282
                 try {
@@ -46,11 +51,12 @@ const fastifySsrPlugin = async (fastify, options) => {
                     manifest = {};
                 }
                 const html = await renderHtml({
-                    request: req,
-                    reply: res,
+                    req,
+                    res,
                     url: url ?? '/',
                     provide,
                     onRendered: options.onRendered,
+                    onTemplateRendered: options.onTemplateRendered,
                     template,
                     manifest,
                     render
@@ -81,15 +87,16 @@ const fastifySsrPlugin = async (fastify, options) => {
         fastify.get(`${options.baseUrl}*`, async (req, res) => {
             const url = req.raw.url?.replace(options.baseUrl, '/');
             const provide = options.provide ? await options.provide(req, res) : {};
-            const { template, manifest, render, onRendered } = await loadSSRAssets({
+            const { template, manifest, render, onRendered, onTemplateRendered } = await loadSSRAssets({
                 distDir: new URL('./dist/', options.appDir)
             });
             const html = await renderHtml({
-                request: req,
-                reply: res,
+                req,
+                res,
                 url: url ?? '/',
                 provide,
                 onRendered,
+                onTemplateRendered,
                 template,
                 manifest,
                 render
@@ -104,19 +111,50 @@ const renderTemplate = ({ template, initialStateScript, appHtml, preloadLinks })
     return appendToHead(preloadLinks, appendToBody(initialStateScript, addOrReplaceAppDiv(appHtml, template)));
 };
 const renderHtml = async (options) => {
+    const ssrContextOnRendered = [];
     const ssrContext = {
-        req: options.request,
-        res: options.reply,
-        provide: options.provide
+        req: options.req,
+        res: options.res,
+        provide: options.provide,
+        initialState: {},
+        _modules: new Set(),
+        _meta: {},
+        __qMetaList: [],
+        onRenderedList: ssrContextOnRendered,
+        onRendered: (fn) => {
+            ssrContextOnRendered.push(fn);
+        }
     };
     const onRendered = options.onRendered ?? [];
-    const [appHtml, preloadLinks] = await options.render(options.url, options.manifest, ssrContext);
-    if (!ssrContext.initialState)
-        ssrContext.initialState = {};
+    const onTemplateRendered = options.onTemplateRendered ?? [];
+    const { html: appHtml, preloadLinks, app } = await options.render(options.url, options.manifest, ssrContext);
+    if (ssrContextOnRendered?.length) {
+        for (const ssrFunction of ssrContextOnRendered) {
+            await ssrFunction();
+        }
+    }
+    if (onRendered?.length) {
+        for (const ssrFunction of onRendered) {
+            await ssrFunction({ app, ssrContext });
+        }
+    }
+    // if (!ssrContext.initialState) ssrContext.initialState = {}
     ssrContext.initialState.provide = options.provide;
+    const ssrContextInitialStateStringified = {};
+    for (const key in ssrContext.initialState) {
+        if (key === 'provide') {
+            ssrContextInitialStateStringified[key] = JSON.stringify(ssrContext.initialState.provide);
+        }
+        else if (key === 'piniaColada') {
+            ssrContextInitialStateStringified[key] = JSON.stringify(ssrContext.initialState.piniaColada);
+        }
+        else {
+            ssrContextInitialStateStringified[key] = stringify(ssrContext.initialState[key]);
+        }
+    }
     const initialStateScript = `
   <script>
-  __INITIAL_STATE__ = '${JSON.stringify(ssrContext.initialState)}'
+  __INITIAL_STATE__ = ${stringifyObject(ssrContextInitialStateStringified)}
   </script>`;
     let html = renderTemplate({
         template: options.template,
@@ -124,9 +162,9 @@ const renderHtml = async (options) => {
         initialStateScript,
         preloadLinks
     });
-    if (onRendered?.length) {
-        for (const ssrFunction of onRendered) {
-            html = ssrFunction(html, ssrContext);
+    if (onTemplateRendered?.length) {
+        for (const ssrFunction of onTemplateRendered) {
+            html = await ssrFunction({ html, ssrContext });
         }
     }
     return html;
@@ -137,7 +175,7 @@ const loadSSRAssets = async ({ mode, distDir } = {
     const appDir = getAppDir(new URL(import.meta.url));
     const baseOutDir = distDir || new URL('dist/', appDir);
     let templatePath, manifestPath, entryServerPath;
-    const onRenderedPath = fileURLToPath(new URL('ssr/server/virtual_vitrify-hooks.mjs', baseOutDir));
+    const vitrifyHooksPath = fileURLToPath(new URL('ssr/server/virtual_vitrify-hooks.mjs', baseOutDir));
     if (mode === 'ssg') {
         templatePath = fileURLToPath(new URL('static/index.html', baseOutDir));
         manifestPath = fileURLToPath(new URL('static/.vite/ssr-manifest.json', baseOutDir));
@@ -153,13 +191,14 @@ const loadSSRAssets = async ({ mode, distDir } = {
         const manifest = JSON.parse(readFileSync(manifestPath).toString());
         const entryServer = await import(entryServerPath);
         const { render, getRoutes } = entryServer;
-        const onRendered = (await import(onRenderedPath)).onRendered;
+        const { onTemplateRendered, onRendered } = await import(vitrifyHooksPath);
         return {
             template,
             manifest,
             render,
             getRoutes,
-            onRendered
+            onRendered,
+            onTemplateRendered
         };
     }
     catch (e) {

package/dist/frameworks/vue/prerender.js

@@ -1,7 +1,7 @@
 import { existsSync, promises as fs, mkdirSync } from 'fs';
 import { routesToPaths } from '../../helpers/routes.js';
 import { renderHtml } from './fastify-ssr-plugin.js';
-export const prerender = async ({ outDir, template, manifest, render, routes, onRendered }) => {
+export const prerender = async ({ outDir, template, manifest, render, routes, onTemplateRendered }) => {
     const promises = [];
     const paths = routesToPaths(routes).filter((i) => !i.includes(':') && !i.includes('*'));
     const beasties = new (await import('beasties')).default({
@@ -23,10 +23,10 @@ export const prerender = async ({ outDir, template, manifest, render, routes, on
             manifest,
             provide: {},
             render,
-            request: { headers: {}, url },
-            reply: {},
+            req: { headers: {}, url },
+            res: {},
             template,
-            onRendered
+            onTemplateRendered
         });
         html = await beasties.process(html);
         promises.push(fs.writeFile(outDir + filename, html, 'utf-8'));

package/dist/frameworks/vue/server.js

@@ -1,7 +1,10 @@
 import fastify from 'fastify';
-export const createApp = ({ onSetup, appDir, baseUrl, fastifyPlugin, onRendered, vitrifyDir, mode }) => {
+export const createApp = ({ onSetup, appDir, baseUrl, fastifyPlugin, onRendered, onTemplateRendered, vitrifyDir, mode }) => {
     const app = fastify({
         logger: {
+            transport: {
+                target: '@fastify/one-line-logger'
+            },
             level: process.env.DEBUG ? 'debug' : process.env.PINO_LOG_LEVEL || 'info'
         }
     });
@@ -10,6 +13,7 @@ export const createApp = ({ onSetup, appDir, baseUrl, fastifyPlugin, onRendered,
         appDir,
         vitrifyDir,
         onRendered,
+        onTemplateRendered,
         mode
     });
     if (onSetup?.length) {

package/dist/hooks/index.js

@@ -0,0 +1 @@
+export {};

package/dist/index.js

@@ -14,6 +14,7 @@ import { addOrReplaceTitle, appendToBody } from './helpers/utils.js';
 import Components from 'unplugin-vue-components/vite';
 import { VitePWA } from 'vite-plugin-pwa';
 import UnoCSS from 'unocss/vite';
+import { searchForWorkspaceRoot } from 'vite';
 const internalServerModules = [
     'util',
     'vitrify',
@@ -29,12 +30,6 @@ const internalServerModules = [
     'ws',
     'abort-controller'
 ];
-const configPluginMap = {
-    quasar: () => import('./plugins/quasar.js').then((module) => module.QuasarPlugin)
-};
-const configResolverMap = {
-    quasar: () => import('unplugin-vue-components/resolvers').then((module) => module.QuasarResolver())
-};
 const manualChunkNames = [
     'prerender',
     'fastify-ssr-plugin',
@@ -42,7 +37,7 @@ const manualChunkNames = [
     'server'
 ];
 const moduleChunks = {
-    vue: ['vue', '@vue', 'vue-router'],
+    vue: ['vue', '@vue', 'vue-router', 'pinia', '@pinia/colada', '@vue/devtools'],
     quasar: ['quasar'],
     atQuasar: ['@quasar']
 };
@@ -68,30 +63,6 @@ const manualChunksFn = (manualChunkList) => {
         }
     };
 };
-// const manualChunks: ManualChunksOption = (
-//   id: string,
-//   manualChunkList?: string[]
-// ) => {
-//   const matchedModule = Object.entries(moduleChunks).find(
-//     ([chunkName, moduleNames]) =>
-//       moduleNames.some((moduleName) => id.includes(moduleName + '/'))
-//   )
-//   if (id.includes('vitrify/src/')) {
-//     const name = id.split('/').at(-1)?.split('.').at(0)
-//     if (name && manualChunkNames.includes(name)) return name
-//   } else if (
-//     VIRTUAL_MODULES.some((virtualModule) => id.includes(virtualModule))
-//   ) {
-//     return VIRTUAL_MODULES.find((name) => id.includes(name))
-//   } else if (manualChunkList?.some((file) => id.includes(file))) {
-//     return manualChunkList.find((file) => id.includes(file))
-//   } else if (id.includes('node_modules')) {
-//     if (matchedModule) {
-//       return matchedModule[0]
-//     }
-//     return 'vendor'
-//   }
-// }
 export const VIRTUAL_MODULES = [
     'virtual:vitrify-hooks',
     'virtual:static-imports',
@@ -168,7 +139,6 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
             const bundledConfig = await bundleConfigFile(fileURLToPath(new URL('vitrify.config.ts', appDir)));
             fs.writeFileSync(configPath + '.js', bundledConfig.code);
             rawVitrifyConfig = (await import('file://' + configPath + '.js')).default;
-            // vitrifyConfig = (await import(configPath + '.js')).default
             fs.unlinkSync(configPath + '.js');
         }
         else {
@@ -185,8 +155,9 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
         console.log('No valid vitrify.config.(ts|js) file found.');
         throw e;
     }
-    const localPackages = ['vue', 'vue-router', '@vue/server-renderer'];
-    // const localPackages: string[] = []
+    const localPackages = [];
+    if (framework === 'vue')
+        localPackages.push('vue', 'vue-router', '@vue/server-renderer');
     const cliPackages = [];
     const packageUrls = vitrifyConfig.vitrify?.urls?.packages || {};
     await (async () => {
@@ -196,12 +167,6 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
                 packageUrls[val] = new URL(`file://${pkgDir}`);
         }
     })();
-    // await (async () => {
-    //   for (const val of cliPackages)
-    //     packageUrls[val] = getPkgJsonDir(
-    //       new URL(await resolve(val, cliDir!.href))
-    //     )
-    // })()
     if (!productName) {
         try {
             ;
@@ -220,21 +185,33 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
     }
     const isPwa = !!vitrifyConfig.vitrify?.pwa || false;
     const frameworkPlugins = [];
-    const resolvers = [];
-    for (const framework of Object.keys(configPluginMap)) {
-        if (Object.keys(vitrifyConfig).includes(framework)) {
-            const plugin = await configPluginMap[framework]();
-            const resolver = await configResolverMap[framework]();
-            frameworkPlugins.push(await plugin({
+    if (framework === 'vue') {
+        frameworkPlugins.push(vuePlugin());
+    }
+    const vitrifyPlugins = [];
+    if (vitrifyConfig.vitrify?.plugins) {
+        for (const vitrifyPluginConfig of vitrifyConfig.vitrify.plugins) {
+            const vitrifyPlugin = await vitrifyPluginConfig.plugin({
                 ssr,
-                pwa: isPwa
-            }));
-            resolvers.push(resolver);
+                pwa: isPwa,
+                options: vitrifyPluginConfig.options
+            });
+            if ('plugin' in vitrifyPlugin) {
+                vitrifyPlugins.push(vitrifyPlugin.plugin);
+            }
+            else if ('plugins' in vitrifyPlugin) {
+                vitrifyPlugins.push(...vitrifyPlugin.plugins);
+            }
+            if (vitrifyPlugin.config) {
+                vitrifyConfig = mergeConfig(vitrifyConfig, vitrifyPlugin.config);
+            }
         }
     }
     let onBootHooks;
     let onRenderedHooks;
+    let onTemplateRenderedHooks;
     let onMountedHooks;
+    let onAppCreatedHooks;
     let onSetupFiles;
     let globalCss = [];
     let staticImports;
@@ -283,20 +260,22 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
                     code = code
                         .replace(/<style>(.*?)<\/style>/, '<style>' + css + '</style>')
                         .replace(/<style lang="sass">(.*?)<\/style>/, '<style lang="sass">' + sass + '</style>');
-                    // code = code.replace(/<\/style>/, sass + '</style>')
                 }
                 return code;
             }
         },
-        vuePlugin(),
         ...frameworkPlugins,
+        ...vitrifyPlugins,
         {
             name: 'vitrify-setup',
             enforce: 'post',
             config: (config, env) => {
                 onBootHooks = config.vitrify?.hooks?.onBoot || [];
                 onRenderedHooks = config.vitrify?.hooks?.onRendered || [];
+                onTemplateRenderedHooks =
+                    config.vitrify?.hooks?.onTemplateRendered || [];
                 onMountedHooks = config.vitrify?.hooks?.onMounted || [];
+                onAppCreatedHooks = config.vitrify?.hooks?.onAppCreated || [];
                 onSetupFiles = config?.vitrify?.hooks?.onSetup || [];
                 globalCss = config.vitrify?.globalCss || [];
                 staticImports = config.vitrify?.staticImports || {};
@@ -336,6 +315,12 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
             export const onRendered = [${onRenderedHooks
                         .map((fn) => `${String(fn)}`)
                         .join(', ')}]
+            export const onTemplateRendered = [${onTemplateRenderedHooks
+                        .map((fn) => `${String(fn)}`)
+                        .join(', ')}]
+            export const onAppCreated = [${onAppCreatedHooks
+                        .map((fn) => `${String(fn)}`)
+                        .join(', ')}]
             export const onSetup = []
             ${onSetupFiles
                         .map((url, index) => {
@@ -348,9 +333,6 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
                             .replaceAll('_', '')
                             .replaceAll('+', '');
                         return `import ${varName} from '${new URL(url, appDir).pathname}'; onSetup.push(${varName})`;
-                        // return `import ${varName} from '${fileURLToPath(
-                        //   url
-                        // )}'; onSetup.push(${varName})`
                     })
                         .join('\n')}`;
                 }
@@ -368,9 +350,6 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
                         ...globalSass.map((sass) => `@import '${sass}'`)
                     ].join('\n');
                 }
-                // else if (id === 'vitrify.css') {
-                //   return `${globalCss.map((css) => `@import '${css}'`).join('\n')}`
-                // }
                 else if (id === 'virtual:vitrify-config') {
                     return `export default ${JSON.stringify(vitrifyConfig)}`;
                 }
@@ -395,12 +374,12 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
             }
         },
         Components({
+            ...vitrifyConfig.vitrify?.unpluginVueComponents,
             exclude: [
                 new RegExp(`[\\/]node_modules[\\/].*[\\/]!(${serverModules.join('|')})`),
                 /[\\/]\.git[\\/]/,
                 /[\\/]\.nuxt[\\/]/
-            ],
-            resolvers
+            ]
         }),
         UnoCSS({
             ...vitrifyConfig.vitrify?.unocss,
@@ -448,31 +427,13 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
                     else {
                         entryScript = `<script type="module" src="${entry}"></script>`;
                     }
-                    // html = html.replace('<!--entry-script-->', entryScript)
                     html = appendToBody(entryScript, html);
                     if (productName)
                         html = addOrReplaceTitle(productName, html);
-                    // html = html.replace('<!--product-name-->', productName)
                     return html;
                 }
             }
         });
-        // plugins.unshift({
-        //   name: 'product-name',
-        //   enforce: 'post',
-        //   config: (config: VitrifyConfig, env) => {
-        //     if (config.vitrify?.productName)
-        //       productName = config.vitrify?.productName
-        //     return
-        //   },
-        //   transformIndexHtml: {
-        //     enforce: 'post',
-        //     transform: (html) => {
-        //       html = html.replace('<!--product-name-->', productName)
-        //       return html
-        //     }
-        //   }
-        // })
         if (debug)
             plugins.push(visualizer());
     }
@@ -486,31 +447,33 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
         '@vue/server-renderer'
     ];
     const vuePkgAliases = [];
-    for (const pkg of vueInternalPkgs) {
-        const specifier = pkg.split('/').at(-1);
-        const pkgJsonPath = await findDepPkgJsonPath(pkg, fileURLToPath(appDir));
-        if (pkgJsonPath)
+    if (packageUrls['vue']) {
+        for (const pkg of vueInternalPkgs) {
+            const specifier = pkg.split('/').at(-1);
+            const pkgJsonPath = await findDepPkgJsonPath(pkg, fileURLToPath(appDir));
+            if (pkgJsonPath)
+                vuePkgAliases.push({
+                    find: pkg,
+                    replacement: fileURLToPath(new URL(`./dist/${specifier}.esm-bundler.js`, `file://${pkgJsonPath}` || ''))
+                });
             vuePkgAliases.push({
-                find: pkg,
-                replacement: fileURLToPath(new URL(`./dist/${specifier}.esm-bundler.js`, `file://${pkgJsonPath}` || ''))
-            });
+                find: new RegExp('^vue$'),
+                replacement: fileURLToPath(new URL('./dist/vue.runtime.esm-bundler.js', packageUrls['vue']))
+            }, {
+                find: new RegExp('^vue-router$'),
+                replacement: fileURLToPath(new URL('./dist/vue-router.esm-bundler.js', packageUrls['vue-router']))
+            }, ...vuePkgAliases);
+        }
     }
     const alias = [
         { find: 'src', replacement: fileURLToPath(srcDir) },
         { find: 'app', replacement: fileURLToPath(appDir) },
         { find: 'cwd', replacement: fileURLToPath(cwd) },
         { find: 'boot', replacement: fileURLToPath(new URL('boot/', srcDir)) },
-        { find: 'assets', replacement: fileURLToPath(new URL('assets/', srcDir)) },
-        {
-            find: new RegExp('^vue$'),
-            replacement: fileURLToPath(new URL('./dist/vue.runtime.esm-bundler.js', packageUrls['vue']))
-        },
-        {
-            find: new RegExp('^vue-router$'),
-            replacement: fileURLToPath(new URL('./dist/vue-router.esm-bundler.js', packageUrls['vue-router']))
-        },
-        ...vuePkgAliases
+        { find: 'assets', replacement: fileURLToPath(new URL('assets/', srcDir)) }
     ];
+    if (framework === 'vue')
+        alias.push(...vuePkgAliases);
     if (mode === 'development' && vitrifyConfig.vitrify?.dev?.alias)
         alias.push(...vitrifyConfig.vitrify.dev.alias);
     if (command === 'test')
@@ -579,6 +542,7 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
     }
     const config = {
         root: fileURLToPath(appDir),
+        appType: ssr ? 'custom' : 'spa',
         publicDir: fileURLToPath(publicDir),
         base,
         envDir: fileURLToPath(appDir),
@@ -615,6 +579,28 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
             __HOST__: `'localhost'`,
             __BASE_URL__: `'${base}'`,
             __IS_PWA__: `${isPwa}`
+        },
+        // environments: {
+        // },
+        server: {
+            https: vitrifyConfig.server?.https,
+            // middlewareMode: mode === 'ssr' ? 'ssr' : undefined,
+            middlewareMode: ssr ? true : false,
+            fs: {
+                strict: false, // https://github.com/vitejs/vite/issues/8175
+                allow: [
+                    searchForWorkspaceRoot(process.cwd()),
+                    searchForWorkspaceRoot(fileURLToPath(appDir)),
+                    searchForWorkspaceRoot(fileURLToPath(cliDir)),
+                    fileURLToPath(appDir)
+                ]
+            },
+            watch: {
+                // During tests we edit the files too fast and sometimes chokidar
+                // misses change events, so enforce polling for consistency
+                usePolling: true,
+                interval: 100
+            }
         }
     };
     return mergeConfig(config, vitrifyConfig);

package/dist/plugins/index.js

@@ -1 +1,2 @@
-export {};
+export * from './quasar/index.js';
+export * from './pinia/index.js';