vitrify 0.6.0 → 0.6.1

package/dist/bin/cli.js

@@ -15,7 +15,7 @@ cli
     .action(async (options) => {
     const { build } = await import('./build.js');
     let appDir;
-    let prerender, onRenderedHooks;
+    let prerender;
     if (options.appDir) {
         if (options.appDir.slice(-1) !== '/')
             options.appDir += '/';
@@ -68,15 +68,14 @@ cli
                 ...args,
                 outDir: new URL('ssr/server/', baseOutDir).pathname
             });
-            ({ prerender, onRenderedHooks } = await import(new URL('ssr/server/prerender.mjs', baseOutDir).pathname));
+            ({ prerender } = await import(new URL('ssr/server/prerender.mjs', baseOutDir).pathname));
             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,
-                onRenderedHooks
+                    .pathname
             });
             break;
         default:

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

@@ -134,11 +134,6 @@ const fastifySsrPlugin = async (fastify, options, done) => {
             let html = template
                 .replace(`<!--preload-links-->`, preloadLinks)
                 .replace(`<!--app-html-->`, appHtml);
-            if (options.onRendered?.length) {
-                for (const ssrFunction of options.onRendered) {
-                    html = ssrFunction(html, ssrContext);
-                }
-            }
             res.code(200);
             res.type('text/html');
             res.send(html);

package/dist/frameworks/vue/prerender.js

@@ -1,14 +1,13 @@
 import { promises as fs } from 'fs';
 import { routesToPaths } from '../../helpers/routes.js';
-import Critters from 'critters';
-export const prerender = async ({ outDir, templatePath, manifestPath, entryServerPath, onRenderedHooks }) => {
+export const prerender = async ({ outDir, templatePath, manifestPath, entryServerPath }) => {
     const promises = [];
     const template = (await fs.readFile(templatePath)).toString();
     const manifest = await fs.readFile(manifestPath);
     const { render, getRoutes } = await import(entryServerPath);
     const routes = await getRoutes();
     const paths = routesToPaths(routes).filter((i) => !i.includes(':') && !i.includes('*'));
-    const critters = new Critters({
+    const critters = new (await import('critters')).default({
         path: outDir,
         logLevel: 'warn',
         external: true,
@@ -27,11 +26,6 @@ export const prerender = async ({ outDir, templatePath, manifestPath, entryServe
             .replace(`<!--preload-links-->`, preloadLinks)
             .replace(`<!--app-html-->`, appHtml);
         html = await critters.process(html);
-        if (onRenderedHooks?.length) {
-            for (const ssrFunction of onRenderedHooks) {
-                html = ssrFunction(html, ssrContext);
-            }
-        }
         promises.push(fs.writeFile(outDir + filename, html, 'utf-8'));
     }
     return Promise.all(promises);

package/dist/frameworks/vue/server.js

@@ -1,12 +1,11 @@
 import fastify from 'fastify';
-export const createApp = ({ onSetup, appDir, baseUrl, onRendered, fastifyPlugin, vitrifyDir, mode }) => {
+export const createApp = ({ onSetup, appDir, baseUrl, fastifyPlugin, vitrifyDir, mode }) => {
     const app = fastify({
         logger: true
     });
     app.register(fastifyPlugin, {
         baseUrl,
         appDir,
-        onRendered,
         vitrifyDir,
         mode
     });

package/dist/index.js

@@ -30,7 +30,11 @@ const manualChunkNames = [
     'fastify-csr-plugin',
     'server'
 ];
-const manualChunks = (id) => {
+const moduleChunks = {
+    vue: ['vue', '@vue'],
+    quasar: ['quasar']
+};
+const manualChunks = (id, api) => {
     if (id.includes('vitrify/src/vite/')) {
         const name = id.split('/').at(-1)?.split('.').at(0);
         if (name && manualChunkNames.includes(name))
@@ -40,6 +44,9 @@ const manualChunks = (id) => {
         return VIRTUAL_MODULES.find((name) => id.includes(name));
     }
     else if (id.includes('node_modules')) {
+        const name = Object.entries(moduleChunks).find(([chunkName, moduleNames]) => moduleNames.some((name) => id.includes(`${name}/`)));
+        if (name)
+            return name[0];
         return 'vendor';
     }
 };
@@ -133,13 +140,13 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
         console.log('No vitrify.config.(ts|js) file found, using defaults');
         vitrifyConfig = {};
     }
-    // const localPackages = ['vue', 'vue-router', '@vue/server-renderer']
-    const localPackages = [];
+    const localPackages = ['vue', 'vue-router', '@vue/server-renderer'];
+    // const localPackages: string[] = []
     const cliPackages = [];
     const packageUrls = vitrifyConfig.vitrify?.urls?.packages || {};
     await (async () => {
         for (const val of localPackages)
-            packageUrls[val] = getPkgJsonDir(new URL(await resolve(val, appDir)));
+            packageUrls[val] = getPkgJsonDir(new URL(resolve(val, appDir)));
     })();
     // await (async () => {
     //   for (const val of cliPackages)
@@ -529,3 +536,4 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
     return mergeConfig(config, vitrifyConfig);
 };
 export const vitrifyDir = new URL('..', import.meta.url);
+export { prerender } from './frameworks/vue/prerender.js';

package/dist/plugins/quasar.js

@@ -42,9 +42,9 @@ export const QuasarPlugin = async ({ ssr = false, pwa = false }) => {
                 const { ssr: transformSsr } = options || {};
                 code = code
                     .replaceAll('__QUASAR_SSR__', ssr ? 'true' : 'false')
-                    .replaceAll('__QUASAR_SSR_SERVER__', 'import.meta.env.SSR')
-                    .replaceAll('__QUASAR_SSR_CLIENT__', '!import.meta.env.SSR')
-                    .replaceAll('__QUASAR_SSR_PWA__', pwa ? '!import.meta.env.SSR' : 'false');
+                    .replaceAll('__QUASAR_SSR_SERVER__', ssr === 'server' ? 'import.meta.env.SSR' : 'false')
+                    .replaceAll('__QUASAR_SSR_CLIENT__', ssr ? '!import.meta.env.SSR' : 'false')
+                    .replaceAll('__QUASAR_SSR_PWA__', ssr && pwa ? '!import.meta.env.SSR' : 'false');
                 return code;
             }
         },

package/dist/types/frameworks/vue/fastify-csr-plugin.d.ts

@@ -1,5 +1,4 @@
 import type { FastifyPluginCallback, FastifyRequest, FastifyReply } from 'fastify';
-import type { OnRenderedHook } from '../../vitrify-config.js';
 import type { ViteDevServer } from 'vite';
 export interface FastifySsrOptions {
     baseUrl?: string;
@@ -9,7 +8,6 @@ export interface FastifySsrOptions {
     appDir?: URL;
     publicDir?: URL;
     productName?: string;
-    onRendered?: OnRenderedHook[];
     mode?: string;
 }
 declare const fastifyCsrPlugin: FastifyPluginCallback<FastifySsrOptions>;

package/dist/types/frameworks/vue/fastify-ssr-plugin.d.ts

@@ -1,5 +1,4 @@
 import type { FastifyPluginCallback, FastifyRequest, FastifyReply } from 'fastify';
-import type { OnRenderedHook } from '../../vitrify-config.js';
 import type { ViteDevServer } from 'vite';
 export interface FastifySsrOptions {
     baseUrl?: string;
@@ -9,7 +8,6 @@ export interface FastifySsrOptions {
     appDir?: URL;
     publicDir?: URL;
     productName?: string;
-    onRendered?: OnRenderedHook[];
     mode?: string;
 }
 declare const fastifySsrPlugin: FastifyPluginCallback<FastifySsrOptions>;

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

@@ -1,8 +1,6 @@
-import type { OnRenderedHook } from '../../vitrify-config.js';
-export declare const prerender: ({ outDir, templatePath, manifestPath, entryServerPath, onRenderedHooks }: {
+export declare const prerender: ({ outDir, templatePath, manifestPath, entryServerPath }: {
     outDir: string;
     templatePath: string;
     manifestPath: string;
     entryServerPath: string;
-    onRenderedHooks: OnRenderedHook[];
 }) => Promise<void[]>;

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

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

package/dist/types/index.d.ts

@@ -15,4 +15,5 @@ export declare const baseConfig: ({ ssr, appDir, publicDir, base, command, mode,
     debug?: boolean | undefined;
 }) => Promise<InlineConfig>;
 export declare const vitrifyDir: URL;
+export { prerender } from './frameworks/vue/prerender.js';
 export type { VitrifyConfig, VitrifyPlugin, VitrifyContext, BootFunction };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vitrify",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "license": "MIT",
   "author": "Stefan van Herwijnen",
   "description": "Pre-configured Vite CLI for your framework",
@@ -56,6 +56,7 @@
     "@fastify/static": "^6.4.0",
     "@quasar/extras": "^1.14.1",
     "@vitejs/plugin-vue": "^3.0.0-alpha.1",
+    "@vue/server-renderer": "^3.2.37",
     "builtin-modules": "^3.3.0",
     "cac": "^6.7.12",
     "chalk": "^5.0.1",

package/src/node/bin/cli.ts

@@ -24,7 +24,7 @@ cli
   .action(async (options) => {
     const { build } = await import('./build.js')
     let appDir: URL
-    let prerender, onRenderedHooks
+    let prerender
     if (options.appDir) {
       if (options.appDir.slice(-1) !== '/') options.appDir += '/'
       appDir = new URL(`file://${options.appDir}`)
@@ -84,7 +84,7 @@ cli
           ...args,
           outDir: new URL('ssr/server/', baseOutDir).pathname
         })
-        ;({ prerender, onRenderedHooks } = await import(
+        ;({ prerender } = await import(
           new URL('ssr/server/prerender.mjs', baseOutDir).pathname
         ))
         prerender({
@@ -93,8 +93,7 @@ cli
           manifestPath: new URL('static/ssr-manifest.json', baseOutDir)
             .pathname,
           entryServerPath: new URL('ssr/server/entry-server.mjs', baseOutDir)
-            .pathname,
-          onRenderedHooks
+            .pathname
         })
         break
       default:

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

@@ -4,7 +4,6 @@ import type {
   FastifyReply
 } from 'fastify'
 import fastifyStatic from '@fastify/static'
-import type { OnRenderedHook } from '../../vitrify-config.js'
 import type { ViteDevServer } from 'vite'
 
 export interface FastifySsrOptions {
@@ -19,7 +18,6 @@ export interface FastifySsrOptions {
   appDir?: URL
   publicDir?: URL
   productName?: string
-  onRendered?: OnRenderedHook[]
   mode?: string
 }
 

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

@@ -5,7 +5,6 @@ import type {
 } from 'fastify'
 import fastifyStatic from '@fastify/static'
 import { readFileSync } from 'fs'
-import type { OnRenderedHook } from '../../vitrify-config.js'
 import { componentsModules, collectCss } from '../../helpers/collect-css-ssr.js'
 import type { ViteDevServer } from 'vite'
 
@@ -21,7 +20,6 @@ export interface FastifySsrOptions {
   appDir?: URL
   publicDir?: URL
   productName?: string
-  onRendered?: OnRenderedHook[]
   mode?: string
 }
 
@@ -189,12 +187,6 @@ const fastifySsrPlugin: FastifyPluginCallback<FastifySsrOptions> = async (
         .replace(`<!--preload-links-->`, preloadLinks)
         .replace(`<!--app-html-->`, appHtml)
 
-      if (options.onRendered?.length) {
-        for (const ssrFunction of options.onRendered) {
-          html = ssrFunction(html, ssrContext)
-        }
-      }
-
       res.code(200)
       res.type('text/html')
       res.send(html)

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

@@ -1,20 +1,16 @@
 import { promises as fs } from 'fs'
 import { routesToPaths } from '../../helpers/routes.js'
-import type { OnRenderedHook } from '../../vitrify-config.js'
-import Critters from 'critters'
 
 export const prerender = async ({
   outDir,
   templatePath,
   manifestPath,
-  entryServerPath,
-  onRenderedHooks
+  entryServerPath
 }: {
   outDir: string
   templatePath: string
   manifestPath: string
   entryServerPath: string
-  onRenderedHooks: OnRenderedHook[]
 }) => {
   const promises = []
   const template = (await fs.readFile(templatePath)).toString()
@@ -24,7 +20,7 @@ export const prerender = async ({
   const paths = routesToPaths(routes).filter(
     (i) => !i.includes(':') && !i.includes('*')
   )
-  const critters = new Critters({
+  const critters = new (await import('critters')).default({
     path: outDir,
     logLevel: 'warn',
     external: true,
@@ -47,12 +43,6 @@ export const prerender = async ({
 
     html = await critters.process(html)
 
-    if (onRenderedHooks?.length) {
-      for (const ssrFunction of onRenderedHooks) {
-        html = ssrFunction(html, ssrContext)
-      }
-    }
-
     promises.push(fs.writeFile(outDir + filename, html, 'utf-8'))
   }
   return Promise.all(promises)

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

@@ -2,7 +2,7 @@ import type { FastifyInstance } from 'fastify'
 import fastify from 'fastify'
 import type { ViteDevServer } from 'vite'
 import { getCliDir, getCliViteDir } from '../../app-urls.js'
-import type { OnRenderedHook, OnSetupFile } from '../../vitrify-config.js'
+import type { OnSetupFile } from '../../vitrify-config.js'
 import type { FastifyCsrPlugin } from './fastify-csr-plugin.js'
 import type { FastifySsrPlugin } from './fastify-ssr-plugin.js'
 
@@ -10,7 +10,6 @@ export const createApp = ({
   onSetup,
   appDir,
   baseUrl,
-  onRendered,
   fastifyPlugin,
   vitrifyDir,
   mode
@@ -18,7 +17,6 @@ export const createApp = ({
   onSetup: OnSetupFile[]
   appDir: URL
   baseUrl?: string
-  onRendered?: OnRenderedHook[]
   fastifyPlugin: FastifySsrPlugin | FastifyCsrPlugin
   vitrifyDir?: URL
   mode: string
@@ -30,7 +28,6 @@ export const createApp = ({
   app.register(fastifyPlugin, {
     baseUrl,
     appDir,
-    onRendered,
     vitrifyDir,
     mode
   })

package/src/node/index.ts

@@ -48,7 +48,12 @@ const manualChunkNames = [
   'fastify-csr-plugin',
   'server'
 ]
-const manualChunks: ManualChunksOption = (id: string) => {
+
+const moduleChunks = {
+  vue: ['vue', '@vue'],
+  quasar: ['quasar']
+}
+const manualChunks: ManualChunksOption = (id, api) => {
   if (id.includes('vitrify/src/vite/')) {
     const name = id.split('/').at(-1)?.split('.').at(0)
     if (name && manualChunkNames.includes(name)) return name
@@ -57,6 +62,10 @@ const manualChunks: ManualChunksOption = (id: string) => {
   ) {
     return VIRTUAL_MODULES.find((name) => id.includes(name))
   } else if (id.includes('node_modules')) {
+    const name = Object.entries(moduleChunks).find(([chunkName, moduleNames]) =>
+      moduleNames.some((name) => id.includes(`${name}/`))
+    )
+    if (name) return name[0]
     return 'vendor'
   }
 }
@@ -195,14 +204,14 @@ export const baseConfig = async ({
     vitrifyConfig = {}
   }
 
-  // const localPackages = ['vue', 'vue-router', '@vue/server-renderer']
-  const localPackages: string[] = []
+  const localPackages = ['vue', 'vue-router', '@vue/server-renderer']
+  // const localPackages: string[] = []
   const cliPackages = []
   const packageUrls: Record<string, URL> =
     vitrifyConfig.vitrify?.urls?.packages || {}
   await (async () => {
     for (const val of localPackages)
-      packageUrls[val] = getPkgJsonDir(new URL(await resolve(val, appDir)))
+      packageUrls[val] = getPkgJsonDir(new URL(resolve(val, appDir)))
   })()
 
   // await (async () => {
@@ -613,5 +622,5 @@ 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 }

package/src/node/plugins/quasar.ts

@@ -93,11 +93,17 @@ export const QuasarPlugin: VitrifyPlugin = async ({
         const { ssr: transformSsr } = options || {}
         code = code
           .replaceAll('__QUASAR_SSR__', ssr ? 'true' : 'false')
-          .replaceAll('__QUASAR_SSR_SERVER__', 'import.meta.env.SSR')
-          .replaceAll('__QUASAR_SSR_CLIENT__', '!import.meta.env.SSR')
+          .replaceAll(
+            '__QUASAR_SSR_SERVER__',
+            ssr === 'server' ? 'import.meta.env.SSR' : 'false'
+          )
+          .replaceAll(
+            '__QUASAR_SSR_CLIENT__',
+            ssr ? '!import.meta.env.SSR' : 'false'
+          )
           .replaceAll(
             '__QUASAR_SSR_PWA__',
-            pwa ? '!import.meta.env.SSR' : 'false'
+            ssr && pwa ? '!import.meta.env.SSR' : 'false'
           )
 
         return code

package/src/vite/vue/csr/app.ts

@@ -1,7 +1,7 @@
 import { createApp } from '../../../node/frameworks/vue/server.js'
 import { getAppDir } from '../../../node/app-urls.js'
 // import { setup } from 'virtual:fastify-setup'
-import { onRendered, onSetup } from 'virtual:vitrify-hooks'
+import { onSetup } from 'virtual:vitrify-hooks'
 import { fastifyCsrPlugin } from './fastify-csr-plugin.js'
 import type { ViteDevServer } from 'vite'
 
@@ -16,7 +16,6 @@ export const setupApp = async () => {
     onSetup,
     appDir,
     baseUrl,
-    onRendered,
     fastifyPlugin: fastifyCsrPlugin,
     // vitrifyDir,
     mode: import.meta.env.MODE

package/src/vite/vue/ssr/app.ts

@@ -1,7 +1,7 @@
 import { createApp } from '../../../node/frameworks/vue/server.js'
 import { getAppDir } from '../../../node/app-urls.js'
 // import { setup } from 'virtual:fastify-setup'
-import { onRendered, onSetup } from 'virtual:vitrify-hooks'
+import { onSetup } from 'virtual:vitrify-hooks'
 import { fastifySsrPlugin } from './fastify-ssr-plugin.js'
 import type { ViteDevServer } from 'vite'
 
@@ -16,7 +16,6 @@ export const setupApp = async () => {
     onSetup,
     appDir,
     baseUrl,
-    onRendered,
     fastifyPlugin: fastifySsrPlugin,
     // vitrifyDir,
     mode: import.meta.env.MODE

package/src/vite/vue/ssr/entry-server.ts

@@ -5,7 +5,7 @@ import type { FastifyInstance } from 'fastify'
 // import { ApolloClients } from '@vue/apollo-composable'
 // import serialize from 'serialize-javascript'
 
-import { onSetup } from 'virtual:vitrify-hooks'
+import { onSetup, onRendered } from 'virtual:vitrify-hooks'
 
 export const setup = async ({ fastify }: { fastify: FastifyInstance }) => {
   if (onSetup?.length) {
@@ -67,6 +67,12 @@ export async function render(url, manifest, ssrContext) {
   // request.
   const preloadLinks = renderPreloadLinks(ctx.modules, manifest)
 
+  if (onRendered?.length) {
+    for (const ssrFunction of onRendered) {
+      html = ssrFunction(html, ssrContext)
+    }
+  }
+
   return [html, preloadLinks]
 }
 

package/src/vite/vue/ssr/fastify-ssr-plugin.ts

@@ -1,4 +1,3 @@
 import { fastifySsrPlugin } from '../../../node/frameworks/vue/fastify-ssr-plugin.js'
-import { onRendered } from 'virtual:vitrify-hooks'
 
-export { fastifySsrPlugin, onRendered }
+export { fastifySsrPlugin }

package/src/vite/vue/ssr/prerender.ts

@@ -1,4 +1,3 @@
 import { prerender } from '../../../node/frameworks/vue/prerender.js'
-import { onRendered } from 'virtual:vitrify-hooks'
 
-export { prerender, onRendered }
+export { prerender }

package/src/vite/vue/ssr/server.ts

@@ -1,23 +1,4 @@
-// import { createApp } from '../../../node/frameworks/vue/server.js'
-// import { getAppDir } from '../../../node/app-urls.js'
-// import { setup } from 'virtual:fastify-setup'
-// import { onRendered, onSetup } from 'virtual:vitrify-hooks'
-// import { fastifySsrPlugin } from './fastify-ssr-plugin.js'
 import { setupApp } from './app.js'
-// import * as staticImports from 'virtual:static-imports'
-// const appDir = getPkgJsonDir(import.meta.url)
-// const getString = (str?: string) => str
-// let baseUrl = getString(__BASE_URL__)
-// const appDir = getAppDir()
-
-// const app = createApp({
-//   onSetup,
-//   appDir,
-//   baseUrl,
-//   onRendered,
-//   fastifySsrPlugin,
-//   mode: import.meta.env.MODE
-// })
 
 const app = await setupApp()