vitrify 0.25.4 → 0.25.6

package/dist/app-urls.js

@@ -1,6 +1,6 @@
 // import { resolve } from 'import-meta-resolve'
 import { existsSync } from 'fs';
-import { fileURLToPath } from 'url';
+import { fileURLToPath, pathToFileURL } from 'url';
 export const resolve = (packageName, base, counter = 0) => {
     const packageUrl = new URL(`./node_modules/${packageName}/`, base);
     if (existsSync(fileURLToPath(packageUrl))) {
@@ -17,7 +17,7 @@ export const getPkgJsonDir = (dir) => {
     }
     return getPkgJsonDir(new URL('..', dir));
 };
-export const getAppDir = (dir) => getPkgJsonDir(dir ?? new URL(`file://${process.cwd()}/`));
+export const getAppDir = (dir) => getPkgJsonDir(dir ?? pathToFileURL(`${process.cwd()}/`));
 export const getCliDir = () => getPkgJsonDir(new URL('./', import.meta.url));
 export const getCliViteDir = (cliDir) => new URL('src/vite/', cliDir);
 export const getSrcDir = (appDir) => new URL('src/', appDir);

package/dist/bin/cli.js

@@ -17,6 +17,7 @@ cli
     .option('--productName [productName]', 'Product name')
     .option('--debug', 'Debug build')
     .action(async (options) => {
+    console.log('test');
     const { build } = await import('./build.js');
     let appDir;
     let prerender;
@@ -27,8 +28,10 @@ cli
     }
     else {
         appDir = getAppDir();
+        console.log(appDir);
     }
     const baseOutDir = parsePath(options.outDir, appDir) || new URL('dist/', appDir);
+    console.log(new URL('./', appDir).href);
     const args = {
         base: options.base,
         appDir,
@@ -73,7 +76,7 @@ cli
                 ...args,
                 outDir: fileURLToPath(new URL('ssr/server/', baseOutDir))
             });
-            ({ prerender } = await import(new URL('ssr/server/prerender.mjs', baseOutDir).pathname));
+            ({ prerender } = await import(new URL('ssr/server/prerender.mjs', baseOutDir).href));
             const { template, manifest, render, getRoutes, onAppRendered, onTemplateRendered } = await loadSSRAssets({
                 mode: 'ssg',
                 distDir: baseOutDir

package/dist/bin/dev.js

@@ -1,3 +1,4 @@
+import { resolveConfig } from 'vite';
 import { baseConfig } from '../index.js';
 import fastify from 'fastify';
 import { fastifySsrPlugin } from '../frameworks/vue/fastify-ssr-plugin.js';
@@ -22,36 +23,47 @@ ssr, framework = 'vue', host, appDir, publicDir, base }) {
         ssrMode = 'server';
     if (ssr === 'fastify')
         ssrMode = 'fastify';
-    config = await baseConfig({
-        framework,
-        ssr: ssrMode,
-        command: 'dev',
-        mode: 'development',
-        appDir,
-        publicDir,
-        base
-    });
     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 = await resolveConfig({
+        ...(await baseConfig({
+            framework,
+            ssr: ssrMode,
+            command: 'dev',
+            mode: 'development',
+            appDir,
+            publicDir,
+            base
+        })),
+        server: {
+            host,
+            port
+            // hmr: {
+            //   protocol: config.server?.https ? 'wss' : 'ws',
+            //   port: wsPort
+            // }
+        }
+    }, 'serve');
     const vitrifyDevServer = await (await import('vite')).createServer({
+        // @ts-expect-error configFile is defined more than once
         configFile: false,
         ...config,
         logLevel,
         define: {
             ...config.define,
             __HOST__: `'${host}'`
-        },
-        server: {
-            ...config.server,
-            host,
-            port,
-            hmr: {
-                protocol: config.server?.https ? 'wss' : 'ws',
-                port: wsPort
-            }
         }
+        // server: {
+        //   ...config.server,
+        //   host,
+        //   port,
+        //   hmr: {
+        //     protocol: config.server?.https ? 'wss' : 'ws',
+        //     port: wsPort
+        //   }
+        // }
     });
     return vitrifyDevServer;
 }

package/dist/bin/run.js

@@ -1,6 +1,7 @@
 import { promises as fs } from 'fs';
 import readline from 'readline';
 import { getAppDir, getCliDir, getProjectURLs } from '../app-urls.js';
+import { fileURLToPath } from 'url';
 const rl = readline.createInterface({
     input: process.stdin,
     output: process.stdout
@@ -10,7 +11,7 @@ export async function run(filePath) {
     const appDir = getAppDir();
     const cliDir = getCliDir();
     const projectURLs = getProjectURLs(appDir, cliDir);
-    const pkg = JSON.parse((await fs.readFile(projectURLs.cli('package.json'), 'utf-8')).toString());
+    const pkg = JSON.parse((await fs.readFile(fileURLToPath(projectURLs.cli('package.json')), 'utf-8')).toString());
     if (!run)
         throw new Error(`${filePath} does not have an export named run. Aborting...`);
     rl.question(`

package/dist/frameworks/vue/prerender.js

@@ -1,6 +1,7 @@
 import { existsSync, promises as fs, mkdirSync } from 'fs';
 import { routesToPaths } from '../../helpers/routes.js';
 import { renderHtml } from './fastify-ssr-plugin.js';
+import { fileURLToPath } from 'url';
 export const prerender = async ({ outDir, template, manifest, render, routes, onTemplateRendered }) => {
     const promises = [];
     const paths = routesToPaths(routes).filter((i) => !i.includes(':') && !i.includes('*'));
@@ -13,8 +14,8 @@ export const prerender = async ({ outDir, template, manifest, render, routes, on
     });
     for (const url of paths) {
         const directoryUrl = new URL(url.split('/').slice(0, -1).join('/'), `file://${outDir}`);
-        if (!existsSync(directoryUrl.pathname)) {
-            mkdirSync(directoryUrl.pathname, { recursive: true });
+        if (!existsSync(fileURLToPath(directoryUrl))) {
+            mkdirSync(fileURLToPath(directoryUrl), { recursive: true });
         }
         const filename = (url.endsWith('/') ? 'index' : url.replace(/^\//g, '')) + '.html';
         console.log(`Generating ${filename}`);

package/dist/index.js

@@ -37,7 +37,17 @@ const manualChunkNames = [
     'server'
 ];
 const moduleChunks = {
-    vue: ['vue', '@vue', 'vue-router', 'pinia', '@pinia/colada', '@vue/devtools'],
+    vue: [
+        'vue',
+        '@vue',
+        'vue-router',
+        'pinia',
+        '@pinia/colada',
+        '@vue/devtools-api',
+        '@vueuse/core',
+        '@vueuse/metadata',
+        '@vueuse/shared'
+    ],
     quasar: ['quasar'],
     atQuasar: ['@quasar']
 };
@@ -133,16 +143,19 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
         publicDir = new URL('public/', appDir);
     let rawVitrifyConfig;
     let vitrifyConfig;
+    console.log(appDir);
     try {
         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);
+            console.log('kljsdflkjdsf');
+            console.log(configPath);
             rawVitrifyConfig = (await import('file://' + configPath + '.js')).default;
             fs.unlinkSync(configPath + '.js');
         }
         else {
-            rawVitrifyConfig = (await import(fileURLToPath(new URL('vitrify.config.js', appDir)))).default;
+            rawVitrifyConfig = (await import(new URL('vitrify.config.js', appDir).href)).default;
         }
         if (typeof rawVitrifyConfig === 'function') {
             vitrifyConfig = await rawVitrifyConfig({ mode, command });
@@ -326,7 +339,7 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
                             .replaceAll('-', '')
                             .replaceAll('_', '')
                             .replaceAll('+', '');
-                        return `import ${varName} from '${new URL(url, appDir).pathname}'; onAppMounted.push(${varName});`;
+                        return `import ${varName} from '${new URL(url, appDir).href}'; onAppMounted.push(${varName});`;
                     })
                         .join('\n')}
             export const onAppRendered = [${onAppRenderedHooks
@@ -342,7 +355,7 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
                             .replaceAll('-', '')
                             .replaceAll('_', '')
                             .replaceAll('+', '');
-                        return `import ${varName} from '${new URL(url, appDir).pathname}'; onAppRendered.push(${varName});`;
+                        return `import ${varName} from '${new URL(url, appDir).href}'; onAppRendered.push(${varName});`;
                     })
                         .join('\n')}
             export const onTemplateRendered = [${onTemplateRenderedHooks
@@ -358,7 +371,7 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
                             .replaceAll('-', '')
                             .replaceAll('_', '')
                             .replaceAll('+', '');
-                        return `import ${varName} from '${new URL(url, appDir).pathname}'; onTemplateRendered.push(${varName});`;
+                        return `import ${varName} from '${new URL(url, appDir).href}'; onTemplateRendered.push(${varName});`;
                     })
                         .join('\n')}
             export const onAppCreated = [${OnAppCreatedHooks.map((fn) => `${String(fn)}`).join(', ')}]
@@ -372,7 +385,7 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
                             .replaceAll('-', '')
                             .replaceAll('_', '')
                             .replaceAll('+', '');
-                        return `import ${varName} from '${new URL(url, appDir).pathname}'; onAppCreated.push(${varName});`;
+                        return `import ${varName} from '${new URL(url, appDir).href}'; onAppCreated.push(${varName});`;
                     })
                         .join('\n')}
             export const onSetup = []
@@ -386,7 +399,7 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
                             .replaceAll('-', '')
                             .replaceAll('_', '')
                             .replaceAll('+', '');
-                        return `import ${varName} from '${new URL(url, appDir).pathname}'; onSetup.push(${varName});`;
+                        return `import ${varName} from '${new URL(url, appDir).href}'; onSetup.push(${varName});`;
                     })
                         .join('\n')}`;
                 }
@@ -473,14 +486,7 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
                         default:
                             entry = fileURLToPath(new URL('csr/entry.ts', frameworkDir));
                     }
-                    let entryScript;
-                    if (process.platform === 'win32') {
-                        const split = entry.split('node_modules');
-                        entryScript = `<script type="module" src="node_modules${split.at(-1)}"></script>`;
-                    }
-                    else {
-                        entryScript = `<script type="module" src="${entry}"></script>`;
-                    }
+                    const entryScript = `<script type="module" src="${entry}"></script>`;
                     html = appendToBody(entryScript, html);
                     if (productName)
                         html = addOrReplaceTitle(productName, html);
@@ -650,7 +656,7 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
         // environments: {
         // },
         server: {
-            https: vitrifyConfig.server?.https,
+            // https: vitrifyConfig.server?.https,
             // middlewareMode: mode === 'ssr' ? 'ssr' : undefined,
             middlewareMode: ssr ? true : false,
             fs: {

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

@@ -1,4 +1,4 @@
-import type { LogLevel, ViteDevServer } from 'vite';
+import { type LogLevel, type ViteDevServer, ResolvedConfig } from 'vite';
 import type { Server } from 'net';
 import type { FastifyInstance } from 'fastify';
 declare module 'vite' {
@@ -28,6 +28,6 @@ export declare function createServer({ port, logLevel, ssr, framework, host, app
 }): Promise<{
     app: FastifyInstance<import("fastify").RawServerDefault, import("http").IncomingMessage, import("http").ServerResponse<import("http").IncomingMessage>, import("fastify").FastifyBaseLogger, import("fastify").FastifyTypeProviderDefault> | undefined;
     server: Server;
-    config: import("vite").ResolvedConfig;
+    config: ResolvedConfig;
     vite: ViteDevServer;
 }>;

package/package.json

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

package/src/node/app-urls.ts

@@ -1,6 +1,6 @@
 // import { resolve } from 'import-meta-resolve'
 import { existsSync } from 'fs'
-import { fileURLToPath } from 'url'
+import { fileURLToPath, pathToFileURL } from 'url'
 
 export const resolve = (packageName: string, base: URL, counter = 0): URL => {
   const packageUrl = new URL(`./node_modules/${packageName}/`, base)
@@ -20,7 +20,7 @@ export const getPkgJsonDir = (dir: URL): URL => {
   return getPkgJsonDir(new URL('..', dir))
 }
 export const getAppDir = (dir?: URL) =>
-  getPkgJsonDir(dir ?? new URL(`file://${process.cwd()}/`))
+  getPkgJsonDir(dir ?? pathToFileURL(`${process.cwd()}/`))
 export const getCliDir = () => getPkgJsonDir(new URL('./', import.meta.url))
 export const getCliViteDir = (cliDir: URL) => new URL('src/vite/', cliDir)
 export const getSrcDir = (appDir: URL) => new URL('src/', appDir)

package/src/node/bin/cli.ts

@@ -21,6 +21,7 @@ cli
   .option('--productName [productName]', 'Product name')
   .option('--debug', 'Debug build')
   .action(async (options) => {
+    console.log('test')
     const { build } = await import('./build.js')
     let appDir: URL
     let prerender
@@ -29,11 +30,13 @@ cli
       appDir = new URL(`file://${options.appDir}`)
     } else {
       appDir = getAppDir()
+      console.log(appDir)
     }
-
     const baseOutDir =
       parsePath(options.outDir, appDir) || new URL('dist/', appDir)
 
+    console.log(new URL('./', appDir).href)
+
     const args: {
       base: string
       appDir?: URL
@@ -86,7 +89,7 @@ cli
           outDir: fileURLToPath(new URL('ssr/server/', baseOutDir))
         })
         ;({ prerender } = await import(
-          new URL('ssr/server/prerender.mjs', baseOutDir).pathname
+          new URL('ssr/server/prerender.mjs', baseOutDir).href
         ))
 
         const {

package/src/node/bin/dev.ts

@@ -1,4 +1,10 @@
-import type { LogLevel, InlineConfig, ViteDevServer } from 'vite'
+import {
+  type LogLevel,
+  type InlineConfig,
+  type ViteDevServer,
+  resolveConfig,
+  ResolvedConfig
+} from 'vite'
 import { baseConfig } from '../index.js'
 import type { Server } from 'net'
 import fastify from 'fastify'
@@ -53,19 +59,10 @@ export async function createVitrifyDevServer({
   )
 
   if (!appDir) appDir = getAppDir()
-  let config: InlineConfig = {}
+  let config: InlineConfig | ResolvedConfig = {}
   let ssrMode: 'server' | 'fastify' | undefined
   if (ssr === 'ssr') ssrMode = 'server'
   if (ssr === 'fastify') ssrMode = 'fastify'
-  config = await baseConfig({
-    framework,
-    ssr: ssrMode,
-    command: 'dev',
-    mode: 'development',
-    appDir,
-    publicDir,
-    base
-  })
 
   const wsPort = await getFirstOpenPort(24678)
   if (config.server?.https) {
@@ -74,25 +71,49 @@ export async function createVitrifyDevServer({
     )
   }
 
+  config = await resolveConfig(
+    {
+      ...(await baseConfig({
+        framework,
+        ssr: ssrMode,
+        command: 'dev',
+        mode: 'development',
+        appDir,
+        publicDir,
+        base
+      })),
+      server: {
+        host,
+        port
+        // hmr: {
+        //   protocol: config.server?.https ? 'wss' : 'ws',
+        //   port: wsPort
+        // }
+      }
+    },
+    'serve'
+  )
+
   const vitrifyDevServer = await (
     await import('vite')
   ).createServer({
+    // @ts-expect-error configFile is defined more than once
     configFile: false,
     ...config,
     logLevel,
     define: {
       ...config.define,
       __HOST__: `'${host}'`
-    },
-    server: {
-      ...config.server,
-      host,
-      port,
-      hmr: {
-        protocol: config.server?.https ? 'wss' : 'ws',
-        port: wsPort
-      }
     }
+    // server: {
+    //   ...config.server,
+    //   host,
+    //   port,
+    //   hmr: {
+    //     protocol: config.server?.https ? 'wss' : 'ws',
+    //     port: wsPort
+    //   }
+    // }
   })
 
   return vitrifyDevServer

package/src/node/bin/run.ts

@@ -1,6 +1,7 @@
 import { promises as fs } from 'fs'
 import readline from 'readline'
 import { getAppDir, getCliDir, getProjectURLs } from '../app-urls.js'
+import { fileURLToPath } from 'url'
 
 const rl = readline.createInterface({
   input: process.stdin,
@@ -20,7 +21,9 @@ export async function run(filePath: string) {
   const cliDir = getCliDir()
   const projectURLs = getProjectURLs(appDir, cliDir)
   const pkg = JSON.parse(
-    (await fs.readFile(projectURLs.cli('package.json'), 'utf-8')).toString()
+    (
+      await fs.readFile(fileURLToPath(projectURLs.cli('package.json')), 'utf-8')
+    ).toString()
   )
 
   if (!run)

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

@@ -3,6 +3,7 @@ import type { OnTemplateRenderedHook } from 'src/node/vitrify-config.js'
 import { routesToPaths } from '../../helpers/routes.js'
 import { renderHtml } from './fastify-ssr-plugin.js'
 import { type RouteRecordRaw } from 'vue-router'
+import { fileURLToPath } from 'url'
 
 export const prerender = async ({
   outDir,
@@ -36,8 +37,8 @@ export const prerender = async ({
       url.split('/').slice(0, -1).join('/'),
       `file://${outDir}`
     )
-    if (!existsSync(directoryUrl.pathname)) {
-      mkdirSync(directoryUrl.pathname, { recursive: true })
+    if (!existsSync(fileURLToPath(directoryUrl))) {
+      mkdirSync(fileURLToPath(directoryUrl), { recursive: true })
     }
 
     const filename =

package/src/node/index.ts

@@ -67,7 +67,17 @@ const manualChunkNames = [
 ]
 
 const moduleChunks = {
-  vue: ['vue', '@vue', 'vue-router', 'pinia', '@pinia/colada', '@vue/devtools'],
+  vue: [
+    'vue',
+    '@vue',
+    'vue-router',
+    'pinia',
+    '@pinia/colada',
+    '@vue/devtools-api',
+    '@vueuse/core',
+    '@vueuse/metadata',
+    '@vueuse/shared'
+  ],
   quasar: ['quasar'],
   atQuasar: ['@quasar']
 }
@@ -201,6 +211,7 @@ export const baseConfig = async ({
   let rawVitrifyConfig: VitrifyConfig | VitrifyConfigAsync
   let vitrifyConfig: VitrifyConfig
 
+  console.log(appDir)
   try {
     if (fs.existsSync(fileURLToPath(new URL('vitrify.config.ts', appDir)))) {
       const configPath = fileURLToPath(new URL('vitrify.config.ts', appDir))
@@ -209,11 +220,13 @@ export const baseConfig = async ({
       )
       fs.writeFileSync(configPath + '.js', bundledConfig.code)
 
+      console.log('kljsdflkjdsf')
+      console.log(configPath)
       rawVitrifyConfig = (await import('file://' + configPath + '.js')).default
       fs.unlinkSync(configPath + '.js')
     } else {
       rawVitrifyConfig = (
-        await import(fileURLToPath(new URL('vitrify.config.js', appDir)))
+        await import(new URL('vitrify.config.js', appDir).href)
       ).default
     }
     if (typeof rawVitrifyConfig === 'function') {
@@ -417,7 +430,7 @@ export const baseConfig = async ({
                   .replaceAll('+', '')
 
                 return `import ${varName} from '${
-                  new URL(url, appDir).pathname
+                  new URL(url, appDir).href
                 }'; onAppMounted.push(${varName});`
               })
               .join('\n')}
@@ -436,7 +449,7 @@ export const baseConfig = async ({
                   .replaceAll('+', '')
 
                 return `import ${varName} from '${
-                  new URL(url, appDir).pathname
+                  new URL(url, appDir).href
                 }'; onAppRendered.push(${varName});`
               })
               .join('\n')}
@@ -455,7 +468,7 @@ export const baseConfig = async ({
                   .replaceAll('+', '')
 
                 return `import ${varName} from '${
-                  new URL(url, appDir).pathname
+                  new URL(url, appDir).href
                 }'; onTemplateRendered.push(${varName});`
               })
               .join('\n')}
@@ -474,7 +487,7 @@ export const baseConfig = async ({
                   .replaceAll('+', '')
 
                 return `import ${varName} from '${
-                  new URL(url, appDir).pathname
+                  new URL(url, appDir).href
                 }'; onAppCreated.push(${varName});`
               })
               .join('\n')}
@@ -491,7 +504,7 @@ export const baseConfig = async ({
                   .replaceAll('+', '')
 
                 return `import ${varName} from '${
-                  new URL(url, appDir).pathname
+                  new URL(url, appDir).href
                 }'; onSetup.push(${varName});`
               })
               .join('\n')}`
@@ -590,15 +603,7 @@ export const baseConfig = async ({
             default:
               entry = fileURLToPath(new URL('csr/entry.ts', frameworkDir))
           }
-          let entryScript
-          if (process.platform === 'win32') {
-            const split = entry.split('node_modules')
-            entryScript = `<script type="module" src="node_modules${split.at(
-              -1
-            )}"></script>`
-          } else {
-            entryScript = `<script type="module" src="${entry}"></script>`
-          }
+          const entryScript = `<script type="module" src="${entry}"></script>`
           html = appendToBody(entryScript, html)
           if (productName) html = addOrReplaceTitle(productName, html)
           return html
@@ -783,7 +788,7 @@ export const baseConfig = async ({
     // environments: {
     // },
     server: {
-      https: vitrifyConfig.server?.https,
+      // https: vitrifyConfig.server?.https,
       // middlewareMode: mode === 'ssr' ? 'ssr' : undefined,
       middlewareMode: ssr ? true : false,
       fs: {