vitrify 0.11.5 → 0.11.7

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

@@ -156,9 +156,6 @@ 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)) {
@@ -233,7 +230,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 +276,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) {
@@ -378,16 +373,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) => {

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.5",
+  "version": "0.11.7",
   "license": "MIT",
   "author": "Stefan van Herwijnen",
   "description": "Vite as your Full Stack development tool",
@@ -52,6 +52,7 @@
     "@fastify/static": "^6.9.0",
     "@quasar/extras": "^1.15.11",
     "@vitejs/plugin-vue": "^4.0.0",
+    "ajv": "^8.12.0",
     "builtin-modules": "^3.3.0",
     "cac": "^6.7.14",
     "chalk": "^5.2.0",

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

@@ -14,6 +14,11 @@ import type {
   BootFunction,
   OnMountedHook,
   VitrifyConfig,
+  VitrifyConfigAsync,
+  VitrifyCommands,
+  VitrifyModes,
+  VitrifyUIFrameworks,
+  VitrifySSRModes,
   OnRenderedHook,
   OnBootHook,
   OnSetupFile
@@ -195,13 +200,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,18 +224,8 @@ 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)) {
@@ -311,7 +306,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 +360,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
       },
@@ -465,16 +458,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) => {
@@ -659,4 +642,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/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