vitrify 0.11.10 → 0.12.1

package/dist/bin/cli.js

@@ -95,23 +95,18 @@ cli
     .option('-m, --mode [mode]', 'Development server mode', { default: 'csr' })
     .option('--host [host]', 'Specify which IP addresses the server should listen on', { default: '127.0.0.1' })
     .option('--appDir [appDir]', 'Application directory')
-    .option('--app [app]', 'Fastify app instance path')
+    // .option('--app [app]', 'Fastify app instance path')
     .option('--publicDir [publicDir]', 'Public directory')
     .action(async (options) => {
     let server;
     let config;
+    let vite;
     if (options.host === true) {
         options.host = '0.0.0.0';
     }
     const { createServer } = await import('./dev.js');
     const cwd = (await import('../app-urls.js')).getCwd();
     let app;
-    const appURL = parsePath(options.app, cwd);
-    let appPath;
-    if (appURL) {
-        appPath = fileURLToPath(appURL);
-        app = await import(appPath);
-    }
     switch (options.mode) {
         case 'ssr':
             ;
@@ -124,7 +119,7 @@ cli
             break;
         case 'fastify':
             ;
-            ({ server, config } = await createServer({
+            ({ app, server, config, vite } = await createServer({
                 ssr: 'fastify',
                 host: options.host,
                 appDir: parsePath(options.appDir, cwd),

package/dist/bin/dev.js

@@ -78,20 +78,23 @@ ssr, framework = 'vue', host, appDir, publicDir, base }) {
 }
 export async function createServer({ port = 3000, logLevel = 'info', 
 // mode = 'csr',
-ssr, framework = 'vue', host, appDir, publicDir }) {
+ssr, framework = 'vue', host, appDir, publicDir, vite }) {
     const { getAppDir, getCliDir, getCliViteDir, getCwd } = await import('../app-urls.js');
     appDir = appDir || getAppDir();
     const cliDir = getCliDir();
-    const vite = await createVitrifyDevServer({
-        port,
-        logLevel,
-        ssr,
-        framework,
-        host,
-        appDir,
-        publicDir
-    });
+    if (!vite) {
+        vite = await createVitrifyDevServer({
+            port,
+            logLevel,
+            ssr,
+            framework,
+            host,
+            appDir,
+            publicDir
+        });
+    }
     let setup;
+    let app;
     let server;
     let onRendered;
     let vitrifyConfig;
@@ -101,7 +104,7 @@ ssr, framework = 'vue', host, appDir, publicDir }) {
             ? 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({
+        app = fastify({
             logger: {
                 level: process.env.DEBUG
                     ? 'debug'
@@ -130,9 +133,23 @@ ssr, framework = 'vue', host, appDir, publicDir }) {
             host
         });
         server = app.server;
+        if (ssr === 'fastify') {
+            vite.fastifyRestart = async function () {
+                if (vite && app && (await app.ready())) {
+                    await app.close();
+                    ({ app, server } = await createServer({
+                        ssr: 'fastify',
+                        host: host,
+                        appDir,
+                        publicDir,
+                        vite
+                    }));
+                }
+            };
+        }
     }
     else {
         server = (await vite.listen()).httpServer;
     }
-    return { server, config: vite.config };
+    return { app, server, config: vite.config, vite };
 }

package/dist/index.js

@@ -157,6 +157,7 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
     const fastifyDir = new URL('fastify/', cliViteDir);
     if (!publicDir)
         publicDir = new URL('public/', appDir);
+    let rawVitrifyConfig;
     let vitrifyConfig;
     try {
         if (fs.existsSync(fileURLToPath(new URL('vitrify.config.ts', appDir)))) {
@@ -164,21 +165,23 @@ 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);
             // @ts-ignore
-            vitrifyConfig = (await import('file://' + configPath + '.js')).default;
+            rawVitrifyConfig = (await import('file://' + configPath + '.js')).default;
             // vitrifyConfig = (await import(configPath + '.js')).default
             fs.unlinkSync(configPath + '.js');
         }
         else {
-            vitrifyConfig = (await import(fileURLToPath(new URL('vitrify.config.js', appDir)))).default;
+            rawVitrifyConfig = (await import(fileURLToPath(new URL('vitrify.config.js', appDir)))).default;
+        }
+        if (typeof rawVitrifyConfig === 'function') {
+            vitrifyConfig = await rawVitrifyConfig({ mode, command });
+        }
+        else {
+            vitrifyConfig = rawVitrifyConfig;
         }
-        if (typeof vitrifyConfig === 'function')
-            vitrifyConfig = await vitrifyConfig({ mode, command });
     }
     catch (e) {
-        console.log('No vitrify.config.(ts|js) file found, using defaults');
-        if (process.env.DEBUG)
-            console.error(e);
-        vitrifyConfig = {};
+        console.log('No valid vitrify.config.(ts|js) file found.');
+        throw e;
     }
     const localPackages = ['vue', 'vue-router', '@vue/server-renderer'];
     // const localPackages: string[] = []
@@ -254,7 +257,9 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
                         .map((css) => `@import '${css}';`)
                         .join('\n')}\n`;
                     const sass = [
-                        ...Object.entries(sassVariables).map(([key, value]) => `${key}: ${value}`),
+                        ...Object.entries(sassVariables)
+                            .filter(([key, value]) => value)
+                            .map(([key, value]) => `${key}: ${value}`),
                         ...globalSass.map((sass) => `@import '${sass}'`)
                     ].join('\n');
                     code = code
@@ -281,6 +286,10 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
                 globalSass = config.vitrify?.sass?.global || [];
                 return;
             },
+            async handleHotUpdate({ server }) {
+                if (server.fastifyRestart)
+                    await server.fastifyRestart();
+            },
             configureServer(server) {
                 server.middlewares.use('/', (req, res, next) => {
                     if (req.url?.endsWith('.html'))

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

@@ -1,6 +1,13 @@
 /// <reference types="node" />
-import type { LogLevel, InlineConfig } from 'vite';
+/// <reference types="node" />
+import type { LogLevel, InlineConfig, ViteDevServer } from 'vite';
 import type { Server } from 'net';
+import type { FastifyInstance } from 'fastify';
+declare module 'vite' {
+    interface ViteDevServer {
+        fastifyRestart: () => Promise<void>;
+    }
+}
 export declare function createVitrifyDevServer({ port, logLevel, ssr, framework, host, appDir, publicDir, base }: {
     port?: number;
     logLevel?: LogLevel;
@@ -10,8 +17,8 @@ export declare function createVitrifyDevServer({ port, logLevel, ssr, framework,
     appDir?: URL;
     publicDir?: URL;
     base?: string;
-}): Promise<import("vite").ViteDevServer>;
-export declare function createServer({ port, logLevel, ssr, framework, host, appDir, publicDir }: {
+}): Promise<ViteDevServer>;
+export declare function createServer({ port, logLevel, ssr, framework, host, appDir, publicDir, vite }: {
     port?: number;
     logLevel?: LogLevel;
     ssr?: 'ssr' | 'fastify';
@@ -19,7 +26,9 @@ export declare function createServer({ port, logLevel, ssr, framework, host, app
     host?: string;
     appDir?: URL;
     publicDir?: URL;
+    vite?: ViteDevServer;
 }): 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: Readonly<Omit<import("vite").UserConfig, "plugins" | "assetsInclude" | "optimizeDeps" | "worker"> & {
         configFile: string | undefined;
@@ -33,11 +42,13 @@ export declare function createServer({ port, logLevel, ssr, framework, host, app
         mode: string;
         isWorker: boolean;
         isProduction: boolean;
+        envDir: string;
         env: Record<string, any>;
         resolve: Required<import("vite").ResolveOptions> & {
             alias: import("vite").Alias[];
         };
         plugins: readonly import("vite").Plugin[];
+        esbuild: false | import("vite").ESBuildOptions;
         server: import("vite").ResolvedServerOptions;
         build: import("vite").ResolvedBuildOptions;
         preview: import("vite").ResolvedPreviewOptions;
@@ -50,4 +61,5 @@ export declare function createServer({ port, logLevel, ssr, framework, host, app
         appType: import("vite").AppType;
         experimental: import("vite").ExperimentalOptions;
     } & import("vite").PluginHookUtils>;
+    vite: ViteDevServer;
 }>;

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

@@ -11,4 +11,4 @@ export declare const createApp: ({ onSetup, appDir, baseUrl, fastifyPlugin, onRe
     onRendered: OnRenderedHook[];
     vitrifyDir?: URL | undefined;
     mode: string;
-}) => FastifyInstance<import("http").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse>, import("http").IncomingMessage, import("http").ServerResponse<import("http").IncomingMessage>, any, import("fastify").FastifyTypeProviderDefault> & PromiseLike<FastifyInstance<import("http").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse>, import("http").IncomingMessage, import("http").ServerResponse<import("http").IncomingMessage>, any, import("fastify").FastifyTypeProviderDefault>>;
+}) => FastifyInstance<import("http").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse>, import("http").IncomingMessage, import("http").ServerResponse<import("http").IncomingMessage>, import("fastify").FastifyBaseLogger, import("fastify").FastifyTypeProviderDefault> & PromiseLike<FastifyInstance<import("http").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse>, import("http").IncomingMessage, import("http").ServerResponse<import("http").IncomingMessage>, import("fastify").FastifyBaseLogger, import("fastify").FastifyTypeProviderDefault>>;

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

@@ -50,7 +50,7 @@ export interface VitrifyConfig extends UserConfig {
          * Global SASS variables
          */
         sass?: {
-            variables?: Record<string, string>;
+            variables?: Record<string, string | undefined>;
             global?: string[];
         };
         /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vitrify",
-  "version": "0.11.10",
+  "version": "0.12.1",
   "license": "MIT",
   "author": "Stefan van Herwijnen",
   "description": "Vite as your Full Stack development tool",
@@ -48,41 +48,41 @@
     "test": "vitest test/"
   },
   "dependencies": {
-    "@fastify/middie": "^8.1.0",
-    "@fastify/static": "^6.9.0",
-    "@quasar/extras": "^1.15.11",
-    "@vitejs/plugin-vue": "^4.0.0",
+    "@fastify/middie": "^8.2.0",
+    "@fastify/static": "^6.10.1",
+    "@quasar/extras": "^1.16.3",
+    "@vitejs/plugin-vue": "^4.2.1",
     "ajv": "^8.12.0",
     "builtin-modules": "^3.3.0",
     "cac": "^6.7.14",
     "chalk": "^5.2.0",
     "critters": "^0.0.16",
     "cross-env": "^7.0.3",
-    "esbuild": "^0.17.8",
-    "fastify": "^4.13.0",
-    "glob": "^8.1.0",
-    "happy-dom": "^8.4.0",
+    "esbuild": "^0.17.18",
+    "fastify": "^4.17.0",
+    "glob": "^10.2.2",
+    "happy-dom": "^9.10.7",
     "is-port-reachable": "^4.0.0",
-    "magic-string": "^0.29.0",
+    "magic-string": "^0.30.0",
     "merge-deep": "^3.0.3",
     "readline": "^1.3.0",
     "rollup-plugin-visualizer": "^5.9.0",
-    "sass": "1.58.1",
+    "sass": "1.62.1",
     "ts-node": "^10.9.1",
-    "unplugin-vue-components": "^0.23.0",
-    "vite": "^4.1.1",
-    "vitest": "^0.28.5"
+    "unplugin-vue-components": "^0.24.1",
+    "vite": "^4.3.4",
+    "vitest": "^0.30.1"
   },
   "devDependencies": {
     "@types/connect": "^3.4.35",
-    "@types/glob": "^8.0.1",
+    "@types/glob": "^8.1.0",
     "@types/merge-deep": "^3.0.0",
-    "@types/node": "^18.13.0",
+    "@types/node": "^18.16.3",
     "@types/ws": "^8.5.4",
     "@vue/runtime-core": "^3.2.47",
-    "quasar": "^2.11.6",
-    "rollup": "^3.15.0",
-    "typescript": "^4.9.5",
+    "quasar": "^2.11.10",
+    "rollup": "^3.21.3",
+    "typescript": "^5.0.4",
     "vue": "^3.2.47",
     "vue-router": "^4.1.6"
   },

package/src/node/bin/cli.ts

@@ -3,8 +3,9 @@ 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'
+import type { ResolvedConfig, ViteDevServer } from 'vite'
 import type { Server } from 'net'
+import type { FastifyInstance } from 'fastify'
 
 const cli = cac('vitrify')
 cli
@@ -116,23 +117,18 @@ cli
     { default: '127.0.0.1' }
   )
   .option('--appDir [appDir]', 'Application directory')
-  .option('--app [app]', 'Fastify app instance path')
+  // .option('--app [app]', 'Fastify app instance path')
   .option('--publicDir [publicDir]', 'Public directory')
   .action(async (options) => {
     let server: Server
     let config: ResolvedConfig
+    let vite: ViteDevServer
     if (options.host === true) {
       options.host = '0.0.0.0'
     }
     const { createServer } = await import('./dev.js')
     const cwd = (await import('../app-urls.js')).getCwd()
-    let app
-    const appURL = parsePath(options.app, cwd)
-    let appPath: string
-    if (appURL) {
-      appPath = fileURLToPath(appURL)
-      app = await import(appPath)
-    }
+    let app: FastifyInstance | undefined
 
     switch (options.mode) {
       case 'ssr':
@@ -144,7 +140,7 @@ cli
         }))
         break
       case 'fastify':
-        ;({ server, config } = await createServer({
+        ;({ app, server, config, vite } = await createServer({
           ssr: 'fastify',
           host: options.host,
           appDir: parsePath(options.appDir, cwd),

package/src/node/bin/dev.ts

@@ -1,4 +1,4 @@
-import type { LogLevel, InlineConfig } from 'vite'
+import type { LogLevel, InlineConfig, ViteDevServer } from 'vite'
 import { searchForWorkspaceRoot } from 'vite'
 import { baseConfig } from '../index.js'
 import type { Server } from 'net'
@@ -9,6 +9,13 @@ import type { OnRenderedHook, VitrifyConfig } from '../vitrify-config.js'
 import isPortReachable from 'is-port-reachable'
 import { exitLogs } from '../helpers/logger.js'
 import { fileURLToPath } from 'url'
+import type { FastifyInstance } from 'fastify'
+
+declare module 'vite' {
+  interface ViteDevServer {
+    fastifyRestart: () => Promise<void>
+  }
+}
 
 const getFirstOpenPort = async (portNumber: number): Promise<number> => {
   if (!(await isPortReachable(portNumber, { host: 'localhost' }))) {
@@ -118,7 +125,8 @@ export async function createServer({
   framework = 'vue',
   host,
   appDir,
-  publicDir
+  publicDir,
+  vite
 }: {
   port?: number
   logLevel?: LogLevel
@@ -128,6 +136,7 @@ export async function createServer({
   host?: string
   appDir?: URL
   publicDir?: URL
+  vite?: ViteDevServer
 }) {
   const { getAppDir, getCliDir, getCliViteDir, getCwd } = await import(
     '../app-urls.js'
@@ -136,17 +145,20 @@ export async function createServer({
   appDir = appDir || getAppDir()
   const cliDir = getCliDir()
 
-  const vite = await createVitrifyDevServer({
-    port,
-    logLevel,
-    ssr,
-    framework,
-    host,
-    appDir,
-    publicDir
-  })
+  if (!vite) {
+    vite = await createVitrifyDevServer({
+      port,
+      logLevel,
+      ssr,
+      framework,
+      host,
+      appDir,
+      publicDir
+    })
+  }
 
   let setup
+  let app: FastifyInstance | undefined
   let server: Server
   let onRendered: OnRenderedHook[]
   let vitrifyConfig: VitrifyConfig
@@ -159,7 +171,7 @@ export async function createServer({
         : fileURLToPath(new URL(`src/vite/${framework}/ssr/app.ts`, cliDir))
 
     ;({ setup, onRendered, vitrifyConfig } = await vite.ssrLoadModule(entryUrl))
-    const app = fastify({
+    app = fastify({
       logger: {
         level: process.env.DEBUG
           ? 'debug'
@@ -187,8 +199,23 @@ export async function createServer({
       host
     })
     server = app.server
+
+    if (ssr === 'fastify') {
+      vite.fastifyRestart = async function () {
+        if (vite && app && (await app.ready())) {
+          await app.close()
+          ;({ app, server } = await createServer({
+            ssr: 'fastify',
+            host: host,
+            appDir,
+            publicDir,
+            vite
+          }))
+        }
+      }
+    }
   } else {
     server = (await vite.listen()).httpServer as Server
   }
-  return { server, config: vite.config }
+  return { app, server, config: vite.config, vite }
 }

package/src/node/index.ts

@@ -226,7 +226,8 @@ export const baseConfig = async ({
 
   if (!publicDir) publicDir = new URL('public/', appDir)
 
-  let vitrifyConfig: VitrifyConfig | VitrifyConfigAsync
+  let rawVitrifyConfig: VitrifyConfig | VitrifyConfigAsync
+  let vitrifyConfig: VitrifyConfig
 
   try {
     if (fs.existsSync(fileURLToPath(new URL('vitrify.config.ts', appDir)))) {
@@ -236,20 +237,22 @@ export const baseConfig = async ({
       )
       fs.writeFileSync(configPath + '.js', bundledConfig.code)
       // @ts-ignore
-      vitrifyConfig = (await import('file://' + configPath + '.js')).default
+      rawVitrifyConfig = (await import('file://' + configPath + '.js')).default
       // vitrifyConfig = (await import(configPath + '.js')).default
       fs.unlinkSync(configPath + '.js')
     } else {
-      vitrifyConfig = (
+      rawVitrifyConfig = (
         await import(fileURLToPath(new URL('vitrify.config.js', appDir)))
       ).default
     }
-    if (typeof vitrifyConfig === 'function')
-      vitrifyConfig = await vitrifyConfig({ mode, command })
+    if (typeof rawVitrifyConfig === 'function') {
+      vitrifyConfig = await rawVitrifyConfig({ mode, command })
+    } else {
+      vitrifyConfig = rawVitrifyConfig
+    }
   } catch (e) {
-    console.log('No vitrify.config.(ts|js) file found, using defaults')
-    if (process.env.DEBUG) console.error(e)
-    vitrifyConfig = {}
+    console.log('No valid vitrify.config.(ts|js) file found.')
+    throw e
   }
 
   const localPackages = ['vue', 'vue-router', '@vue/server-renderer']
@@ -308,7 +311,7 @@ export const baseConfig = async ({
   let onSetupFiles: OnSetupFile[]
   let globalCss: string[] = []
   let staticImports: StaticImports
-  let sassVariables: Record<string, string>
+  let sassVariables: Record<string, string | undefined>
   let globalSass: string[]
   let serverModules: string[] = internalServerModules
 
@@ -333,9 +336,9 @@ export const baseConfig = async ({
             .join('\n')}\n`
 
           const sass = [
-            ...Object.entries(sassVariables).map(
-              ([key, value]) => `${key}: ${value}`
-            ),
+            ...Object.entries(sassVariables)
+              .filter(([key, value]) => value)
+              .map(([key, value]) => `${key}: ${value}`),
             ...globalSass.map((sass) => `@import '${sass}'`)
           ].join('\n')
           code = code
@@ -366,6 +369,9 @@ export const baseConfig = async ({
 
         return
       },
+      async handleHotUpdate({ server }) {
+        if (server.fastifyRestart) await server.fastifyRestart()
+      },
       configureServer(server) {
         server.middlewares.use('/', (req, res, next) => {
           if (req.url?.endsWith('.html')) req.url = req.url.replace('.html', '')

package/src/node/vitrify-config.ts

@@ -72,7 +72,7 @@ export interface VitrifyConfig extends UserConfig {
      * Global SASS variables
      */
     sass?: {
-      variables?: Record<string, string>
+      variables?: Record<string, string | undefined>
       global?: string[]
     }
     /**