vitrify 0.11.6 → 0.11.8

package/dist/app-urls.js

@@ -1,17 +1,18 @@
 // import { resolve } from 'import-meta-resolve'
 import { existsSync } from 'fs';
+import { fileURLToPath } from 'url';
 export const resolve = (packageName, base, counter = 0) => {
     const packageUrl = new URL(`./node_modules/${packageName}/`, base);
-    if (existsSync(packageUrl.pathname)) {
+    if (existsSync(fileURLToPath(packageUrl))) {
         return new URL('./', packageUrl);
     }
     if (counter < 10)
         return resolve(packageName, new URL('../', base), counter + 1);
-    throw new Error(`Package ${packageName} not found in ${base.pathname}.`);
+    throw new Error(`Package ${packageName} not found in ${fileURLToPath(base)}.`);
 };
 export const getPkgJsonDir = (dir) => {
     const pkgJsonPath = new URL('package.json', dir);
-    if (existsSync(pkgJsonPath.pathname)) {
+    if (existsSync(fileURLToPath(pkgJsonPath))) {
         return new URL('./', pkgJsonPath);
     }
     return getPkgJsonDir(new URL('..', dir));

package/dist/bin/cli.js

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 import cac from 'cac';
+import { fileURLToPath } from 'url';
 import { getAppDir, parsePath } from '../app-urls.js';
 import { printHttpServerUrls, exitLogs } from '../helpers/logger.js';
 const cli = cac('vitrify');
@@ -37,47 +38,45 @@ cli
         case 'csr':
             await build({
                 ...args,
-                outDir: new URL('csr/', baseOutDir).pathname
+                outDir: fileURLToPath(new URL('csr/', baseOutDir))
             });
             break;
         case 'fastify':
             await build({
                 ssr: 'fastify',
                 ...args,
-                outDir: new URL('server/', baseOutDir).pathname
+                outDir: fileURLToPath(new URL('server/', baseOutDir))
             });
             break;
         case 'ssr':
             await build({
                 ssr: 'client',
                 ...args,
-                outDir: new URL('ssr/client/', baseOutDir).pathname
+                outDir: fileURLToPath(new URL('ssr/client/', baseOutDir))
             });
             await build({
                 ssr: 'server',
                 ...args,
-                outDir: new URL('ssr/server/', baseOutDir).pathname
+                outDir: fileURLToPath(new URL('ssr/server/', baseOutDir))
             });
             break;
         case 'ssg':
             await build({
                 ssr: 'client',
                 ...args,
-                outDir: new URL('static/', baseOutDir).pathname
+                outDir: fileURLToPath(new URL('static/', baseOutDir))
             });
             await build({
                 ssr: 'server',
                 ...args,
-                outDir: new URL('ssr/server/', baseOutDir).pathname
+                outDir: fileURLToPath(new URL('ssr/server/', baseOutDir))
             });
-            ({ prerender, onRendered } = await import(new URL('ssr/server/prerender.mjs', baseOutDir).pathname));
+            ({ prerender, onRendered } = await import(fileURLToPath(new URL('ssr/server/prerender.mjs', baseOutDir))));
             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,
+                outDir: fileURLToPath(new URL('static/', baseOutDir)),
+                templatePath: fileURLToPath(new URL('static/index.html', baseOutDir)),
+                manifestPath: fileURLToPath(new URL('static/ssr-manifest.json', baseOutDir)),
+                entryServerPath: fileURLToPath(new URL('ssr/server/entry-server.mjs', baseOutDir)),
                 onRendered
             });
             break;
@@ -102,8 +101,10 @@ cli
     const { createServer } = await import('./dev.js');
     const cwd = (await import('../app-urls.js')).getCwd();
     let app;
-    const appPath = parsePath(options.app, cwd)?.pathname;
-    if (appPath) {
+    const appURL = parsePath(options.app, cwd);
+    let appPath;
+    if (appURL) {
+        appPath = fileURLToPath(appURL);
         app = await import(appPath);
     }
     switch (options.mode) {
@@ -158,7 +159,7 @@ cli.command('test').action(async (options) => {
 cli.command('run <file>').action(async (file, options) => {
     const { run } = await import('./run.js');
     const filePath = new URL(file, `file://${process.cwd()}/`);
-    await run(filePath.pathname);
+    await run(fileURLToPath(filePath));
 });
 // Default
 cli.command('').action((command, options) => {

package/dist/bin/dev.js

@@ -4,6 +4,7 @@ import fastify from 'fastify';
 import { fastifySsrPlugin } from '../frameworks/vue/fastify-ssr-plugin.js';
 import isPortReachable from 'is-port-reachable';
 import { exitLogs } from '../helpers/logger.js';
+import { fileURLToPath } from 'url';
 const getFirstOpenPort = async (portNumber) => {
     if (!(await isPortReachable(portNumber, { host: 'localhost' }))) {
         return portNumber;
@@ -54,9 +55,9 @@ ssr, framework = 'vue', host, appDir, publicDir, base }) {
             strict: false,
             allow: [
                 searchForWorkspaceRoot(process.cwd()),
-                searchForWorkspaceRoot(appDir.pathname),
-                searchForWorkspaceRoot(cliDir.pathname),
-                appDir.pathname
+                searchForWorkspaceRoot(fileURLToPath(appDir)),
+                searchForWorkspaceRoot(fileURLToPath(cliDir)),
+                fileURLToPath(appDir)
             ]
         },
         watch: {
@@ -97,8 +98,8 @@ ssr, framework = 'vue', host, appDir, publicDir }) {
     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;
+            ? 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 app = fastify({
             logger: {

package/dist/bin/test.js

@@ -1,5 +1,6 @@
 import { startVitest } from 'vitest/node';
 import { baseConfig } from '../index.js';
+import { fileURLToPath } from 'url';
 export async function test(opts) {
     const config = await baseConfig({
         appDir: opts.appDir,
@@ -7,8 +8,8 @@ export async function test(opts) {
         mode: 'development'
     });
     await startVitest('test', [], {
-        root: opts.appDir.pathname,
-        dir: opts.appDir.pathname,
+        root: fileURLToPath(opts.appDir),
+        dir: fileURLToPath(opts.appDir),
         globals: true,
         environment: 'happy-dom'
     }, config);

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

@@ -1,4 +1,5 @@
 import fastifyStatic from '@fastify/static';
+import { fileURLToPath } from 'url';
 const fastifyCsrPlugin = async (fastify, options, done) => {
     options.vitrifyDir =
         options.vitrifyDir || (await import('vitrify')).vitrifyDir;
@@ -28,7 +29,7 @@ const fastifyCsrPlugin = async (fastify, options, done) => {
     else {
         options.appDir = options.appDir || new URL('../../..', import.meta.url);
         fastify.register(fastifyStatic, {
-            root: new URL('./dist/csr', options.appDir).pathname,
+            root: fileURLToPath(new URL('./dist/csr', options.appDir)),
             wildcard: false,
             index: false,
             prefix: options.baseUrl

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

@@ -1,5 +1,6 @@
 import fastifyStatic from '@fastify/static';
 import { readFileSync } from 'fs';
+import { fileURLToPath } from 'url';
 import { addOrReplaceAppDiv, appendToBody, appendToHead } from '../../helpers/utils.js';
 const fastifySsrPlugin = async (fastify, options, done) => {
     options.baseUrl = options.baseUrl || '/';
@@ -12,11 +13,6 @@ const fastifySsrPlugin = async (fastify, options, done) => {
         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')
-        // const { resolve } = await import('import-meta-resolve')
-        // const cliDir = new URL('../', await resolve('vitrify', import.meta.url))
         options.appDir = options.appDir || new URL('../../..', import.meta.url);
         const { createVitrifyDevServer } = await import('vitrify/dev');
         const vite = await createVitrifyDevServer({
@@ -26,37 +22,6 @@ const fastifySsrPlugin = async (fastify, options, done) => {
             base: options.baseUrl,
             host: options.host
         });
-        // const { createServer, searchForWorkspaceRoot } = await import('vite')
-        // const { baseConfig } = await import('vitrify')
-        // const cliDir = options.vitrifyDir
-        // const config = await baseConfig({
-        //   ssr: 'server',
-        //   command: 'dev',
-        //   mode: 'development',
-        //   appDir: options.appDir,
-        //   publicDir: options.publicDir || new URL('public', options.appDir)
-        // })
-        // config.server = {
-        //   middlewareMode: true,
-        //   fs: {
-        //     allow: [
-        //       searchForWorkspaceRoot(process.cwd()),
-        //       searchForWorkspaceRoot(options.appDir.pathname),
-        //       searchForWorkspaceRoot(cliDir.pathname)
-        //       // appDir.pathname,
-        //     ]
-        //   },
-        //   watch: {
-        //     // During tests we edit the files too fast and sometimes chokidar
-        //     // misses change events, so enforce polling for consistency
-        //     usePolling: true,
-        //     interval: 100
-        //   }
-        // }
-        // const vite = await createServer({
-        //   configFile: false,
-        //   ...config
-        // })
         if (!('use' in fastify)) {
             const middie = (await import('@fastify/middie')).default;
             // @ts-ignore
@@ -74,7 +39,7 @@ const fastifySsrPlugin = async (fastify, options, done) => {
                 };
                 let template = readFileSync(new URL('index.html', frameworkDir)).toString();
                 template = await vite.transformIndexHtml(url, template);
-                const entryUrl = new URL('ssr/entry-server.ts', frameworkDir).pathname;
+                const entryUrl = fileURLToPath(new URL('ssr/entry-server.ts', frameworkDir));
                 const render = (await vite.ssrLoadModule(entryUrl)).render;
                 let manifest;
                 // TODO: https://github.com/vitejs/vite/issues/2282
@@ -133,7 +98,7 @@ const fastifySsrPlugin = async (fastify, options, done) => {
     else {
         options.appDir = options.appDir || new URL('../../..', import.meta.url);
         fastify.register(fastifyStatic, {
-            root: new URL('./dist/ssr/client', options.appDir).pathname,
+            root: fileURLToPath(new URL('./dist/ssr/client', options.appDir)),
             wildcard: false,
             index: false,
             prefix: options.baseUrl
@@ -146,9 +111,9 @@ const fastifySsrPlugin = async (fastify, options, done) => {
                 res,
                 provide
             };
-            const template = readFileSync(new URL('./dist/ssr/client/index.html', options.appDir).pathname).toString();
+            const template = readFileSync(fileURLToPath(new URL('./dist/ssr/client/index.html', options.appDir))).toString();
             const manifest = JSON.parse(readFileSync(new URL('./dist/ssr/client/ssr-manifest.json', options.appDir)).toString());
-            const render = (await import(new URL('./dist/ssr/server/entry-server.mjs', options.appDir).pathname)).render;
+            const render = (await import(fileURLToPath(new URL('./dist/ssr/server/entry-server.mjs', options.appDir)))).render;
             const [appHtml, preloadLinks] = await render(url, manifest, ssrContext);
             if (!ssrContext.initialState)
                 ssrContext.initialState = {};

package/dist/frameworks/vue/prerender.js

@@ -1,6 +1,6 @@
 import { promises as fs } from 'fs';
 import { routesToPaths } from '../../helpers/routes.js';
-import { appendToHead } from '../../helpers/utils.js';
+import { appendToHead, addOrReplaceAppDiv } from '../../helpers/utils.js';
 export const prerender = async ({ outDir, templatePath, manifestPath, entryServerPath, onRendered }) => {
     const promises = [];
     const template = (await fs.readFile(templatePath)).toString();
@@ -23,9 +23,8 @@ export const prerender = async ({ outDir, templatePath, manifestPath, entryServe
             res: {}
         };
         const [appHtml, preloadLinks] = await render(url, manifest, ssrContext);
-        let html = template.replace(`<!--app-html-->`, appHtml);
+        let html = addOrReplaceAppDiv(appHtml, template);
         html = appendToHead(preloadLinks, html);
-        // html = appendToBody(preloadLinks, html)
         if (onRendered?.length) {
             for (const ssrFunction of onRendered) {
                 html = ssrFunction(html, ssrContext);

package/dist/index.js

@@ -8,6 +8,7 @@ import { pathToFileURL } from 'url';
 import { readFileSync } from 'fs';
 import builtinModules from 'builtin-modules';
 import { visualizer } from 'rollup-plugin-visualizer';
+import { fileURLToPath } from 'url';
 import { resolve } from './app-urls.js';
 import { addOrReplaceTitle, appendToBody } from './helpers/utils.js';
 import Components from 'unplugin-vue-components/vite';
@@ -156,20 +157,17 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
     const fastifyDir = new URL('fastify/', cliViteDir);
     if (!publicDir)
         publicDir = new URL('public/', appDir);
-    /**
-     * TODO:Perform some manual check if command is run inside a Quasar Project
-     */
     let vitrifyConfig;
     try {
-        if (fs.existsSync(new URL('vitrify.config.ts', appDir).pathname)) {
-            const configPath = new URL('vitrify.config.ts', appDir).pathname;
-            const bundledConfig = await bundleConfigFile(new URL('vitrify.config.ts', appDir).pathname);
+        if (fs.existsSync(fileURLToPath(new URL('vitrify.config.ts', appDir)))) {
+            const configPath = fileURLToPath(new URL('vitrify.config.ts', appDir));
+            const bundledConfig = await bundleConfigFile(fileURLToPath(new URL('vitrify.config.ts', appDir)));
             fs.writeFileSync(configPath + '.js', bundledConfig.code);
             vitrifyConfig = (await import(configPath + '.js')).default;
             fs.unlinkSync(configPath + '.js');
         }
         else {
-            vitrifyConfig = (await import(new URL('vitrify.config.js', appDir).pathname)).default;
+            vitrifyConfig = (await import(fileURLToPath(new URL('vitrify.config.js', appDir)))).default;
         }
         if (typeof vitrifyConfig === 'function')
             vitrifyConfig = await vitrifyConfig({ mode, command });
@@ -186,7 +184,7 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
     const packageUrls = vitrifyConfig.vitrify?.urls?.packages || {};
     await (async () => {
         for (const val of localPackages) {
-            const pkg = resolvePackageData(val, appDir.pathname);
+            const pkg = resolvePackageData(val, fileURLToPath(appDir));
             if (pkg)
                 packageUrls[val] = new URL(`file://${pkg.dir}/`);
         }
@@ -200,7 +198,7 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
     if (!productName) {
         try {
             ;
-            ({ productName } = JSON.parse(readFileSync(new URL('package.json', appDir).pathname, {
+            ({ productName } = JSON.parse(readFileSync(fileURLToPath(new URL('package.json', appDir)), {
                 encoding: 'utf-8'
             })));
             if (!productName)
@@ -233,7 +231,6 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
     let globalCss = [];
     let staticImports;
     let sassVariables;
-    let additionalData;
     let globalSass;
     let serverModules = internalServerModules;
     if (vitrifyConfig.vitrify?.ssr?.serverModules)
@@ -280,7 +277,6 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
                 staticImports = config.vitrify?.staticImports || {};
                 sassVariables = config.vitrify?.sass?.variables || {};
                 globalSass = config.vitrify?.sass?.global || [];
-                additionalData = config.vitrify?.sass?.additionalData || [];
                 return;
             },
             configureServer(server) {
@@ -332,13 +328,13 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
             export const onSetup = []
             ${onSetupFiles
                         .map((url, index) => {
-                        const varName = url.pathname
+                        const varName = fileURLToPath(url)
                             .replaceAll('/', '')
                             .replaceAll('.', '')
                             .replaceAll('-', '')
                             .replaceAll('_', '')
                             .replaceAll('+', '');
-                        return `import ${varName} from '${url.pathname}'; onSetup.push(${varName})`;
+                        return `import ${varName} from '${fileURLToPath(url)}'; onSetup.push(${varName})`;
                     })
                         .join('\n')}`;
                 }
@@ -378,16 +374,6 @@ 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
-            //       },
             transformIndexHtml: {
                 enforce: 'pre',
                 transform: (html) => {
@@ -396,13 +382,13 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
                         case 'ssg':
                         case 'server':
                         case 'client':
-                            entry = new URL('ssr/entry-client.ts', frameworkDir).pathname;
+                            entry = fileURLToPath(new URL('ssr/entry-client.ts', frameworkDir));
                             break;
                         case 'fastify':
-                            entry = new URL('entry.ts', fastifyDir).pathname;
+                            entry = fileURLToPath(new URL('entry.ts', fastifyDir));
                             break;
                         default:
-                            entry = new URL('csr/entry.ts', frameworkDir).pathname;
+                            entry = fileURLToPath(new URL('csr/entry.ts', frameworkDir));
                     }
                     const entryScript = `<script type="module" src="${entry}"></script>`;
                     // html = html.replace('<!--entry-script-->', entryScript)
@@ -435,22 +421,22 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
             plugins.push(visualizer());
     }
     const alias = [
-        { find: 'src', replacement: srcDir.pathname },
-        { find: 'app', replacement: appDir.pathname },
-        { find: 'cwd', replacement: cwd.pathname },
-        { find: 'boot', replacement: new URL('boot/', srcDir).pathname },
-        { find: 'assets', replacement: new URL('assets/', srcDir).pathname },
+        { 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)) },
         // ...Object.entries(packageUrls).map(([key, value]) => ({
         //   find: key,
         //   replacement: value.pathname
         // }))
         {
             find: new RegExp('^vue$'),
-            replacement: new URL('./dist/vue.runtime.esm-bundler.js', packageUrls['vue']).pathname
+            replacement: fileURLToPath(new URL('./dist/vue.runtime.esm-bundler.js', packageUrls['vue']))
         },
         {
             find: new RegExp('^vue-router$'),
-            replacement: new URL('./dist/vue-router.esm-bundler.js', packageUrls['vue-router']).pathname
+            replacement: fileURLToPath(new URL('./dist/vue-router.esm-bundler.js', packageUrls['vue-router']))
         }
     ];
     if (mode === 'development' && vitrifyConfig.vitrify?.dev?.alias)
@@ -458,7 +444,7 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
     if (command === 'test')
         alias.push({
             find: 'vitest',
-            replacement: new URL(await resolve('vitest', cliDir)).pathname
+            replacement: fileURLToPath(new URL(await resolve('vitest', cliDir)))
         });
     let rollupOptions = {};
     let noExternal = [
@@ -469,9 +455,9 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
         rollupOptions = {
             ...rollupOptions,
             input: [
-                new URL('ssr/entry-server.ts', frameworkDir).pathname,
-                new URL('ssr/prerender.ts', frameworkDir).pathname,
-                new URL('ssr/server.ts', frameworkDir).pathname
+                fileURLToPath(new URL('ssr/entry-server.ts', frameworkDir)),
+                fileURLToPath(new URL('ssr/prerender.ts', frameworkDir)),
+                fileURLToPath(new URL('ssr/server.ts', frameworkDir))
             ],
             external,
             output: {
@@ -490,7 +476,7 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
     else if (ssr === 'fastify') {
         rollupOptions = {
             ...rollupOptions,
-            input: [new URL('server.ts', fastifyDir).pathname],
+            input: [fileURLToPath(new URL('server.ts', fastifyDir))],
             external,
             output: {
                 minifyInternalExports: false,
@@ -519,10 +505,10 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
         };
     }
     const config = {
-        root: appDir.pathname,
-        publicDir: publicDir.pathname,
+        root: fileURLToPath(appDir),
+        publicDir: fileURLToPath(publicDir),
         base,
-        envDir: appDir.pathname,
+        envDir: fileURLToPath(appDir),
         vitrify: {
             productName,
             urls: {

package/dist/plugins/quasar.js

@@ -1,4 +1,5 @@
 import { resolvePackageData } from 'vite';
+import { fileURLToPath } from 'url';
 export const injectSsrContext = (html, ssrContext) => html
     .replace(/(<html[^>]*)(>)/i, (found, start, end) => {
     let matches;
@@ -51,7 +52,7 @@ export const QuasarPlugin = async ({ ssr = false, pwa = false }) => {
                 // const localPackages: string[] = []
                 await (async () => {
                     for (const val of localPackages) {
-                        const pkg = resolvePackageData(val, config.vitrify.urls.app.pathname);
+                        const pkg = resolvePackageData(val, fileURLToPath(config.vitrify.urls.app));
                         if (pkg)
                             urls.packages[val] = new URL(`file://${pkg.dir}/`);
                     }
@@ -121,7 +122,7 @@ export const QuasarPlugin = async ({ ssr = false, pwa = false }) => {
                         alias: [
                             {
                                 find: 'quasar/src/',
-                                replacement: new URL('./src/', config.vitrify.urls.packages.quasar).pathname
+                                replacement: fileURLToPath(new URL('./src/', config.vitrify.urls.packages.quasar))
                             }
                         ]
                     },

package/dist/types/index.d.ts

@@ -1,15 +1,15 @@
 import type { InlineConfig } from 'vite';
-import type { BootFunction, VitrifyConfig } from './vitrify-config.js';
+import type { BootFunction, VitrifyConfig, VitrifyConfigAsync, VitrifyCommands, VitrifyModes, VitrifyUIFrameworks, VitrifySSRModes } from './vitrify-config.js';
 import type { VitrifyContext } from './bin/run.js';
 import type { VitrifyPlugin } from './plugins/index.js';
 export declare const VIRTUAL_MODULES: string[];
 export declare const baseConfig: ({ ssr, appDir, publicDir, base, command, mode, framework, pwa, debug, productName }: {
-    ssr?: "server" | "client" | "ssg" | "fastify" | undefined;
+    ssr?: VitrifySSRModes | undefined;
     appDir?: URL | undefined;
     publicDir?: URL | undefined;
     base?: string | undefined;
-    command?: "build" | "dev" | "test" | undefined;
-    mode?: "production" | "development" | undefined;
+    command?: VitrifyCommands | undefined;
+    mode?: VitrifyModes | undefined;
     framework?: "vue" | undefined;
     pwa?: boolean | undefined;
     debug?: boolean | undefined;
@@ -17,4 +17,4 @@ export declare const baseConfig: ({ ssr, appDir, publicDir, base, command, mode,
 }) => Promise<InlineConfig>;
 export declare const vitrifyDir: URL;
 export { prerender } from './frameworks/vue/prerender.js';
-export type { VitrifyConfig, VitrifyPlugin, VitrifyContext, BootFunction };
+export type { VitrifyConfig, VitrifyConfigAsync, VitrifyPlugin, VitrifyContext, BootFunction };

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

@@ -51,7 +51,6 @@ export interface VitrifyConfig extends UserConfig {
          */
         sass?: {
             variables?: Record<string, string>;
-            additionalData?: string[];
             global?: string[];
         };
         /**
@@ -88,5 +87,12 @@ export interface VitrifyConfig extends UserConfig {
     };
     quasar?: QuasarConf;
 }
-export type VitrifyConfigAsync = VitrifyConfig | ((mode: string, command: string) => Promise<VitrifyConfig>);
+export type VitrifyCommands = 'build' | 'dev' | 'test';
+export type VitrifyModes = 'production' | 'development';
+export type VitrifyUIFrameworks = 'vue';
+export type VitrifySSRModes = 'client' | 'server' | 'ssg' | 'fastify';
+export type VitrifyConfigAsync = ({ mode, command }: {
+    mode: VitrifyModes;
+    command: VitrifyCommands;
+}) => Promise<VitrifyConfig>;
 export declare const defineConfig: (config: VitrifyConfig) => VitrifyConfig;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vitrify",
-  "version": "0.11.6",
+  "version": "0.11.8",
   "license": "MIT",
   "author": "Stefan van Herwijnen",
   "description": "Vite as your Full Stack development tool",

package/src/node/app-urls.ts

@@ -1,19 +1,20 @@
 // import { resolve } from 'import-meta-resolve'
 import { existsSync } from 'fs'
+import { fileURLToPath } from 'url'
 
 export const resolve = (packageName: string, base: URL, counter = 0): URL => {
   const packageUrl = new URL(`./node_modules/${packageName}/`, base)
-  if (existsSync(packageUrl.pathname)) {
+  if (existsSync(fileURLToPath(packageUrl))) {
     return new URL('./', packageUrl)
   }
   if (counter < 10)
     return resolve(packageName, new URL('../', base), counter + 1)
-  throw new Error(`Package ${packageName} not found in ${base.pathname}.`)
+  throw new Error(`Package ${packageName} not found in ${fileURLToPath(base)}.`)
 }
 
 export const getPkgJsonDir = (dir: URL): URL => {
   const pkgJsonPath = new URL('package.json', dir)
-  if (existsSync(pkgJsonPath.pathname)) {
+  if (existsSync(fileURLToPath(pkgJsonPath))) {
     return new URL('./', pkgJsonPath)
   }
   return getPkgJsonDir(new URL('..', dir))

package/src/node/bin/cli.ts

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 import cac from 'cac'
+import { fileURLToPath } from 'url'
 import { getAppDir, parsePath } from '../app-urls.js'
 import { printHttpServerUrls, exitLogs } from '../helpers/logger.js'
 import type { ResolvedConfig } from 'vite'
@@ -48,50 +49,52 @@ cli
       case 'csr':
         await build({
           ...args,
-          outDir: new URL('csr/', baseOutDir).pathname
+          outDir: fileURLToPath(new URL('csr/', baseOutDir))
         })
         break
       case 'fastify':
         await build({
           ssr: 'fastify',
           ...args,
-          outDir: new URL('server/', baseOutDir).pathname
+          outDir: fileURLToPath(new URL('server/', baseOutDir))
         })
         break
       case 'ssr':
         await build({
           ssr: 'client',
           ...args,
-          outDir: new URL('ssr/client/', baseOutDir).pathname
+          outDir: fileURLToPath(new URL('ssr/client/', baseOutDir))
         })
         await build({
           ssr: 'server',
           ...args,
-          outDir: new URL('ssr/server/', baseOutDir).pathname
+          outDir: fileURLToPath(new URL('ssr/server/', baseOutDir))
         })
         break
       case 'ssg':
         await build({
           ssr: 'client',
           ...args,
-          outDir: new URL('static/', baseOutDir).pathname
+          outDir: fileURLToPath(new URL('static/', baseOutDir))
         })
         await build({
           ssr: 'server',
           ...args,
-          outDir: new URL('ssr/server/', baseOutDir).pathname
+          outDir: fileURLToPath(new URL('ssr/server/', baseOutDir))
         })
         ;({ prerender, onRendered } = await import(
-          new URL('ssr/server/prerender.mjs', baseOutDir).pathname
+          fileURLToPath(new URL('ssr/server/prerender.mjs', baseOutDir))
         ))
 
         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,
+          outDir: fileURLToPath(new URL('static/', baseOutDir)),
+          templatePath: fileURLToPath(new URL('static/index.html', baseOutDir)),
+          manifestPath: fileURLToPath(
+            new URL('static/ssr-manifest.json', baseOutDir)
+          ),
+          entryServerPath: fileURLToPath(
+            new URL('ssr/server/entry-server.mjs', baseOutDir)
+          ),
           onRendered
         })
         break
@@ -121,8 +124,10 @@ cli
     const { createServer } = await import('./dev.js')
     const cwd = (await import('../app-urls.js')).getCwd()
     let app
-    const appPath = parsePath(options.app, cwd)?.pathname
-    if (appPath) {
+    const appURL = parsePath(options.app, cwd)
+    let appPath: string
+    if (appURL) {
+      appPath = fileURLToPath(appURL)
       app = await import(appPath)
     }
 
@@ -176,7 +181,7 @@ cli.command('test').action(async (options) => {
 cli.command('run <file>').action(async (file, options) => {
   const { run } = await import('./run.js')
   const filePath = new URL(file, `file://${process.cwd()}/`)
-  await run(filePath.pathname)
+  await run(fileURLToPath(filePath))
 })
 
 // Default

package/src/node/bin/dev.ts

@@ -8,6 +8,7 @@ import { fastifySsrPlugin } from '../frameworks/vue/fastify-ssr-plugin.js'
 import type { OnRenderedHook, VitrifyConfig } from '../vitrify-config.js'
 import isPortReachable from 'is-port-reachable'
 import { exitLogs } from '../helpers/logger.js'
+import { fileURLToPath } from 'url'
 
 const getFirstOpenPort = async (portNumber: number): Promise<number> => {
   if (!(await isPortReachable(portNumber, { host: 'localhost' }))) {
@@ -84,9 +85,9 @@ export async function createVitrifyDevServer({
       strict: false, // https://github.com/vitejs/vite/issues/8175
       allow: [
         searchForWorkspaceRoot(process.cwd()),
-        searchForWorkspaceRoot(appDir.pathname),
-        searchForWorkspaceRoot(cliDir.pathname),
-        appDir.pathname
+        searchForWorkspaceRoot(fileURLToPath(appDir)),
+        searchForWorkspaceRoot(fileURLToPath(cliDir)),
+        fileURLToPath(appDir)
       ]
     },
     watch: {
@@ -154,8 +155,8 @@ export async function createServer({
   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
+        ? 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 app = fastify({

package/src/node/bin/test.ts

@@ -1,5 +1,6 @@
 import { startVitest } from 'vitest/node'
 import { baseConfig } from '../index.js'
+import { fileURLToPath } from 'url'
 export async function test(opts: { appDir: URL }) {
   const config = await baseConfig({
     appDir: opts.appDir,
@@ -11,8 +12,8 @@ export async function test(opts: { appDir: URL }) {
     'test',
     [],
     {
-      root: opts.appDir.pathname,
-      dir: opts.appDir.pathname,
+      root: fileURLToPath(opts.appDir),
+      dir: fileURLToPath(opts.appDir),
 
       globals: true,
       environment: 'happy-dom'

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

@@ -5,7 +5,7 @@ import type {
 } from 'fastify'
 import fastifyStatic from '@fastify/static'
 import type { ViteDevServer } from 'vite'
-
+import { fileURLToPath } from 'url'
 export interface FastifySsrOptions {
   baseUrl?: string
   provide?: (
@@ -58,7 +58,7 @@ const fastifyCsrPlugin: FastifyPluginCallback<FastifySsrOptions> = async (
   } else {
     options.appDir = options.appDir || new URL('../../..', import.meta.url)
     fastify.register(fastifyStatic, {
-      root: new URL('./dist/csr', options.appDir).pathname,
+      root: fileURLToPath(new URL('./dist/csr', options.appDir)),
       wildcard: false,
       index: false,
       prefix: options.baseUrl

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

@@ -5,6 +5,7 @@ import type {
 } from 'fastify'
 import fastifyStatic from '@fastify/static'
 import { readFileSync } from 'fs'
+import { fileURLToPath } from 'url'
 import { componentsModules, collectCss } from '../../helpers/collect-css-ssr.js'
 import {
   addOrReplaceAppDiv,
@@ -48,11 +49,7 @@ const fastifySsrPlugin: FastifyPluginCallback<FastifySsrOptions> = async (
     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')
-    // const { resolve } = await import('import-meta-resolve')
-    // const cliDir = new URL('../', await resolve('vitrify', import.meta.url))
+
     options.appDir = options.appDir || new URL('../../..', import.meta.url)
 
     const { createVitrifyDevServer } = await import('vitrify/dev')
@@ -63,38 +60,6 @@ const fastifySsrPlugin: FastifyPluginCallback<FastifySsrOptions> = async (
       base: options.baseUrl,
       host: options.host
     })
-    // const { createServer, searchForWorkspaceRoot } = await import('vite')
-    // const { baseConfig } = await import('vitrify')
-    // const cliDir = options.vitrifyDir
-    // const config = await baseConfig({
-    //   ssr: 'server',
-    //   command: 'dev',
-    //   mode: 'development',
-    //   appDir: options.appDir,
-    //   publicDir: options.publicDir || new URL('public', options.appDir)
-    // })
-
-    // config.server = {
-    //   middlewareMode: true,
-    //   fs: {
-    //     allow: [
-    //       searchForWorkspaceRoot(process.cwd()),
-    //       searchForWorkspaceRoot(options.appDir.pathname),
-    //       searchForWorkspaceRoot(cliDir.pathname)
-    //       // appDir.pathname,
-    //     ]
-    //   },
-    //   watch: {
-    //     // During tests we edit the files too fast and sometimes chokidar
-    //     // misses change events, so enforce polling for consistency
-    //     usePolling: true,
-    //     interval: 100
-    //   }
-    // }
-    // const vite = await createServer({
-    //   configFile: false,
-    //   ...config
-    // })
 
     if (!('use' in fastify)) {
       const middie = (await import('@fastify/middie')).default
@@ -120,7 +85,9 @@ const fastifySsrPlugin: FastifyPluginCallback<FastifySsrOptions> = async (
 
         template = await vite.transformIndexHtml(url!, template)
 
-        const entryUrl = new URL('ssr/entry-server.ts', frameworkDir).pathname
+        const entryUrl = fileURLToPath(
+          new URL('ssr/entry-server.ts', frameworkDir)
+        )
         const render = (await vite!.ssrLoadModule(entryUrl)).render
         let manifest
         // TODO: https://github.com/vitejs/vite/issues/2282
@@ -186,7 +153,7 @@ const fastifySsrPlugin: FastifyPluginCallback<FastifySsrOptions> = async (
   } else {
     options.appDir = options.appDir || new URL('../../..', import.meta.url)
     fastify.register(fastifyStatic, {
-      root: new URL('./dist/ssr/client', options.appDir).pathname,
+      root: fileURLToPath(new URL('./dist/ssr/client', options.appDir)),
       wildcard: false,
       index: false,
       prefix: options.baseUrl
@@ -202,7 +169,7 @@ const fastifySsrPlugin: FastifyPluginCallback<FastifySsrOptions> = async (
       }
 
       const template = readFileSync(
-        new URL('./dist/ssr/client/index.html', options.appDir).pathname
+        fileURLToPath(new URL('./dist/ssr/client/index.html', options.appDir))
       ).toString()
       const manifest = JSON.parse(
         readFileSync(
@@ -211,7 +178,9 @@ const fastifySsrPlugin: FastifyPluginCallback<FastifySsrOptions> = async (
       )
       const render = (
         await import(
-          new URL('./dist/ssr/server/entry-server.mjs', options.appDir).pathname
+          fileURLToPath(
+            new URL('./dist/ssr/server/entry-server.mjs', options.appDir)
+          )
         )
       ).render
 

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

@@ -1,7 +1,7 @@
 import { promises as fs } from 'fs'
 import type { OnRenderedHook } from 'src/node/vitrify-config.js'
 import { routesToPaths } from '../../helpers/routes.js'
-import { appendToHead, appendToBody } from '../../helpers/utils.js'
+import { appendToHead, addOrReplaceAppDiv } from '../../helpers/utils.js'
 
 export const prerender = async ({
   outDir,
@@ -31,6 +31,7 @@ export const prerender = async ({
     inlineFonts: true,
     preloadFonts: true
   })
+
   for (const url of paths) {
     const filename =
       (url.endsWith('/') ? 'index' : url.replace(/^\//g, '')) + '.html'
@@ -41,10 +42,8 @@ export const prerender = async ({
     }
     const [appHtml, preloadLinks] = await render(url, manifest, ssrContext)
 
-    let html = template.replace(`<!--app-html-->`, appHtml)
-
+    let html = addOrReplaceAppDiv(appHtml, template)
     html = appendToHead(preloadLinks, html)
-    // html = appendToBody(preloadLinks, html)
 
     if (onRendered?.length) {
       for (const ssrFunction of onRendered) {

package/src/node/index.ts

@@ -9,11 +9,17 @@ import { pathToFileURL } from 'url'
 import { readFileSync } from 'fs'
 import builtinModules from 'builtin-modules'
 import { visualizer } from 'rollup-plugin-visualizer'
+import { fileURLToPath } from 'url'
 import type {
   StaticImports,
   BootFunction,
   OnMountedHook,
   VitrifyConfig,
+  VitrifyConfigAsync,
+  VitrifyCommands,
+  VitrifyModes,
+  VitrifyUIFrameworks,
+  VitrifySSRModes,
   OnRenderedHook,
   OnBootHook,
   OnSetupFile
@@ -195,13 +201,13 @@ export const baseConfig = async ({
   debug = false,
   productName
 }: {
-  ssr?: 'client' | 'server' | 'ssg' | 'fastify'
+  ssr?: VitrifySSRModes
   appDir?: URL
   publicDir?: URL
   base?: string
-  command?: 'build' | 'dev' | 'test'
-  mode?: 'production' | 'development'
-  framework?: 'vue'
+  command?: VitrifyCommands
+  mode?: VitrifyModes
+  framework?: VitrifyUIFrameworks
   pwa?: boolean
   debug?: boolean
   productName?: string
@@ -219,31 +225,21 @@ export const baseConfig = async ({
   const fastifyDir = new URL('fastify/', cliViteDir)
 
   if (!publicDir) publicDir = new URL('public/', appDir)
-  /**
-   * TODO:Perform some manual check if command is run inside a Quasar Project
-   */
-  let vitrifyConfig:
-    | VitrifyConfig
-    | (({
-        mode,
-        command
-      }: {
-        mode: string
-        command: string
-      }) => Promise<VitrifyConfig> | VitrifyConfig)
+
+  let vitrifyConfig: VitrifyConfig | VitrifyConfigAsync
 
   try {
-    if (fs.existsSync(new URL('vitrify.config.ts', appDir).pathname)) {
-      const configPath = new URL('vitrify.config.ts', appDir).pathname
+    if (fs.existsSync(fileURLToPath(new URL('vitrify.config.ts', appDir)))) {
+      const configPath = fileURLToPath(new URL('vitrify.config.ts', appDir))
       const bundledConfig = await bundleConfigFile(
-        new URL('vitrify.config.ts', appDir).pathname
+        fileURLToPath(new URL('vitrify.config.ts', appDir))
       )
       fs.writeFileSync(configPath + '.js', bundledConfig.code)
       vitrifyConfig = (await import(configPath + '.js')).default
       fs.unlinkSync(configPath + '.js')
     } else {
       vitrifyConfig = (
-        await import(new URL('vitrify.config.js', appDir).pathname)
+        await import(fileURLToPath(new URL('vitrify.config.js', appDir)))
       ).default
     }
     if (typeof vitrifyConfig === 'function')
@@ -261,7 +257,7 @@ export const baseConfig = async ({
     vitrifyConfig.vitrify?.urls?.packages || {}
   await (async () => {
     for (const val of localPackages) {
-      const pkg = resolvePackageData(val, appDir.pathname)
+      const pkg = resolvePackageData(val, fileURLToPath(appDir))
       if (pkg) packageUrls![val] = new URL(`file://${pkg.dir}/`)
     }
   })()
@@ -276,7 +272,7 @@ export const baseConfig = async ({
   if (!productName) {
     try {
       ;({ productName } = JSON.parse(
-        readFileSync(new URL('package.json', appDir).pathname, {
+        readFileSync(fileURLToPath(new URL('package.json', appDir)), {
           encoding: 'utf-8'
         })
       ))
@@ -311,7 +307,6 @@ export const baseConfig = async ({
   let globalCss: string[] = []
   let staticImports: StaticImports
   let sassVariables: Record<string, string>
-  let additionalData: string[]
   let globalSass: string[]
   let serverModules: string[] = internalServerModules
 
@@ -366,7 +361,6 @@ export const baseConfig = async ({
         staticImports = config.vitrify?.staticImports || {}
         sassVariables = config.vitrify?.sass?.variables || {}
         globalSass = config.vitrify?.sass?.global || []
-        additionalData = config.vitrify?.sass?.additionalData || []
 
         return
       },
@@ -417,13 +411,15 @@ export const baseConfig = async ({
             export const onSetup = []
             ${onSetupFiles
               .map((url, index) => {
-                const varName = url.pathname
+                const varName = fileURLToPath(url)
                   .replaceAll('/', '')
                   .replaceAll('.', '')
                   .replaceAll('-', '')
                   .replaceAll('_', '')
                   .replaceAll('+', '')
-                return `import ${varName} from '${url.pathname}'; onSetup.push(${varName})`
+                return `import ${varName} from '${fileURLToPath(
+                  url
+                )}'; onSetup.push(${varName})`
               })
               .join('\n')}`
         } else if (id === 'virtual:static-imports') {
@@ -465,16 +461,6 @@ 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
-      //       },
       transformIndexHtml: {
         enforce: 'pre',
         transform: (html) => {
@@ -483,13 +469,15 @@ export const baseConfig = async ({
             case 'ssg':
             case 'server':
             case 'client':
-              entry = new URL('ssr/entry-client.ts', frameworkDir).pathname
+              entry = fileURLToPath(
+                new URL('ssr/entry-client.ts', frameworkDir)
+              )
               break
             case 'fastify':
-              entry = new URL('entry.ts', fastifyDir).pathname
+              entry = fileURLToPath(new URL('entry.ts', fastifyDir))
               break
             default:
-              entry = new URL('csr/entry.ts', frameworkDir).pathname
+              entry = fileURLToPath(new URL('csr/entry.ts', frameworkDir))
           }
           const entryScript = `<script type="module" src="${entry}"></script>`
           // html = html.replace('<!--entry-script-->', entryScript)
@@ -523,28 +511,26 @@ export const baseConfig = async ({
   }
 
   const alias: Alias[] = [
-    { find: 'src', replacement: srcDir.pathname },
-    { find: 'app', replacement: appDir.pathname },
-    { find: 'cwd', replacement: cwd.pathname },
-    { find: 'boot', replacement: new URL('boot/', srcDir).pathname },
-    { find: 'assets', replacement: new URL('assets/', srcDir).pathname },
+    { 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)) },
     // ...Object.entries(packageUrls).map(([key, value]) => ({
     //   find: key,
     //   replacement: value.pathname
     // }))
     {
       find: new RegExp('^vue$'),
-      replacement: new URL(
-        './dist/vue.runtime.esm-bundler.js',
-        packageUrls['vue']
-      ).pathname
+      replacement: fileURLToPath(
+        new URL('./dist/vue.runtime.esm-bundler.js', packageUrls['vue'])
+      )
     },
     {
       find: new RegExp('^vue-router$'),
-      replacement: new URL(
-        './dist/vue-router.esm-bundler.js',
-        packageUrls['vue-router']
-      ).pathname
+      replacement: fileURLToPath(
+        new URL('./dist/vue-router.esm-bundler.js', packageUrls['vue-router'])
+      )
     }
   ]
   if (mode === 'development' && vitrifyConfig.vitrify?.dev?.alias)
@@ -553,7 +539,7 @@ export const baseConfig = async ({
   if (command === 'test')
     alias.push({
       find: 'vitest',
-      replacement: new URL(await resolve('vitest', cliDir)).pathname
+      replacement: fileURLToPath(new URL(await resolve('vitest', cliDir)))
     })
 
   let rollupOptions: RollupOptions = {}
@@ -566,9 +552,9 @@ export const baseConfig = async ({
     rollupOptions = {
       ...rollupOptions,
       input: [
-        new URL('ssr/entry-server.ts', frameworkDir).pathname,
-        new URL('ssr/prerender.ts', frameworkDir).pathname,
-        new URL('ssr/server.ts', frameworkDir).pathname
+        fileURLToPath(new URL('ssr/entry-server.ts', frameworkDir)),
+        fileURLToPath(new URL('ssr/prerender.ts', frameworkDir)),
+        fileURLToPath(new URL('ssr/server.ts', frameworkDir))
       ],
       external,
       output: {
@@ -586,7 +572,7 @@ export const baseConfig = async ({
   } else if (ssr === 'fastify') {
     rollupOptions = {
       ...rollupOptions,
-      input: [new URL('server.ts', fastifyDir).pathname],
+      input: [fileURLToPath(new URL('server.ts', fastifyDir))],
       external,
       output: {
         minifyInternalExports: false,
@@ -615,10 +601,10 @@ export const baseConfig = async ({
   }
 
   const config = {
-    root: appDir.pathname,
-    publicDir: publicDir.pathname,
+    root: fileURLToPath(appDir),
+    publicDir: fileURLToPath(publicDir),
     base,
-    envDir: appDir.pathname,
+    envDir: fileURLToPath(appDir),
     vitrify: {
       productName,
       urls: {
@@ -659,4 +645,10 @@ export const baseConfig = async ({
 
 export const vitrifyDir = new URL('..', import.meta.url)
 export { prerender } from './frameworks/vue/prerender.js'
-export type { VitrifyConfig, VitrifyPlugin, VitrifyContext, BootFunction }
+export type {
+  VitrifyConfig,
+  VitrifyConfigAsync,
+  VitrifyPlugin,
+  VitrifyContext,
+  BootFunction
+}

package/src/node/plugins/quasar.ts

@@ -1,5 +1,6 @@
 import type { Plugin } from 'vite'
 import { resolvePackageData } from 'vite'
+import { fileURLToPath } from 'url'
 import Components from 'unplugin-vue-components/vite'
 import type {
   OnBootHook,
@@ -115,7 +116,7 @@ export const QuasarPlugin: VitrifyPlugin = async ({
           for (const val of localPackages) {
             const pkg = resolvePackageData(
               val,
-              config.vitrify!.urls!.app!.pathname
+              fileURLToPath(config.vitrify!.urls!.app!)
             )
             if (pkg) urls!.packages![val] = new URL(`file://${pkg.dir}/`)
           }
@@ -196,10 +197,9 @@ export const QuasarPlugin: VitrifyPlugin = async ({
             alias: [
               {
                 find: 'quasar/src/',
-                replacement: new URL(
-                  './src/',
-                  config.vitrify!.urls!.packages!.quasar
-                ).pathname
+                replacement: fileURLToPath(
+                  new URL('./src/', config.vitrify!.urls!.packages!.quasar)
+                )
               }
             ]
           },

package/src/node/vitrify-config.ts

@@ -73,7 +73,6 @@ export interface VitrifyConfig extends UserConfig {
      */
     sass?: {
       variables?: Record<string, string>
-      additionalData?: string[]
       global?: string[]
     }
     /**
@@ -111,8 +110,17 @@ export interface VitrifyConfig extends UserConfig {
   quasar?: QuasarConf
 }
 
-export type VitrifyConfigAsync =
-  | VitrifyConfig
-  | ((mode: string, command: string) => Promise<VitrifyConfig>)
+export type VitrifyCommands = 'build' | 'dev' | 'test'
+export type VitrifyModes = 'production' | 'development'
+export type VitrifyUIFrameworks = 'vue'
+export type VitrifySSRModes = 'client' | 'server' | 'ssg' | 'fastify'
+
+export type VitrifyConfigAsync = ({
+  mode,
+  command
+}: {
+  mode: VitrifyModes
+  command: VitrifyCommands
+}) => Promise<VitrifyConfig>
 
 export const defineConfig = (config: VitrifyConfig) => config