vitrify 0.11.2 → 0.11.4

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

@@ -20,6 +20,7 @@ const fastifyCsrPlugin = async (fastify, options, done) => {
         console.log('Dev mode');
         if (!('use' in fastify)) {
             const middie = (await import('@fastify/middie')).default;
+            // @ts-ignore
             await fastify.register(middie);
         }
         fastify.use(vite.middlewares);

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

@@ -59,6 +59,7 @@ const fastifySsrPlugin = async (fastify, options, done) => {
         // })
         if (!('use' in fastify)) {
             const middie = (await import('@fastify/middie')).default;
+            // @ts-ignore
             await fastify.register(middie);
         }
         fastify.use(vite.middlewares);

package/dist/index.js

@@ -9,7 +9,6 @@ import { readFileSync } from 'fs';
 import builtinModules from 'builtin-modules';
 import { visualizer } from 'rollup-plugin-visualizer';
 import { resolve } from './app-urls.js';
-import envPlugin from '@vitrify/plugin-env';
 import { addOrReplaceTitle, appendToBody } from './helpers/utils.js';
 import Components from 'unplugin-vue-components/vite';
 const internalServerModules = [
@@ -43,23 +42,52 @@ const moduleChunks = {
     vue: ['vue', '@vue', 'vue-router'],
     quasar: ['quasar', '@quasar']
 };
-const manualChunks = (id) => {
-    const matchedModule = Object.entries(moduleChunks).find(([chunkName, moduleNames]) => moduleNames.some((moduleName) => id.includes(moduleName + '/')));
-    if (id.includes('vitrify/src/')) {
-        const name = id.split('/').at(-1)?.split('.').at(0);
-        if (name && manualChunkNames.includes(name))
-            return name;
-    }
-    else if (VIRTUAL_MODULES.some((virtualModule) => id.includes(virtualModule))) {
-        return VIRTUAL_MODULES.find((name) => id.includes(name));
-    }
-    else if (id.includes('node_modules')) {
-        if (matchedModule) {
-            return matchedModule[0];
+const manualChunksFn = (manualChunkList) => {
+    return (id) => {
+        const matchedModule = Object.entries(moduleChunks).find(([chunkName, moduleNames]) => moduleNames.some((moduleName) => id.includes(moduleName + '/')));
+        if (id.includes('vitrify/src/')) {
+            const name = id.split('/').at(-1)?.split('.').at(0);
+            if (name && manualChunkNames.includes(name))
+                return name;
         }
-        return 'vendor';
-    }
+        else if (VIRTUAL_MODULES.some((virtualModule) => id.includes(virtualModule))) {
+            return VIRTUAL_MODULES.find((name) => id.includes(name));
+        }
+        else if (manualChunkList?.some((file) => id.includes(file))) {
+            return manualChunkList.find((file) => id.includes(file));
+        }
+        else if (id.includes('node_modules')) {
+            if (matchedModule) {
+                return matchedModule[0];
+            }
+            return 'vendor';
+        }
+    };
 };
+// const manualChunks: ManualChunksOption = (
+//   id: string,
+//   manualChunkList?: string[]
+// ) => {
+//   const matchedModule = Object.entries(moduleChunks).find(
+//     ([chunkName, moduleNames]) =>
+//       moduleNames.some((moduleName) => id.includes(moduleName + '/'))
+//   )
+//   if (id.includes('vitrify/src/')) {
+//     const name = id.split('/').at(-1)?.split('.').at(0)
+//     if (name && manualChunkNames.includes(name)) return name
+//   } else if (
+//     VIRTUAL_MODULES.some((virtualModule) => id.includes(virtualModule))
+//   ) {
+//     return VIRTUAL_MODULES.find((name) => id.includes(name))
+//   } else if (manualChunkList?.some((file) => id.includes(file))) {
+//     return manualChunkList.find((file) => id.includes(file))
+//   } else if (id.includes('node_modules')) {
+//     if (matchedModule) {
+//       return matchedModule[0]
+//     }
+//     return 'vendor'
+//   }
+// }
 export const VIRTUAL_MODULES = [
     'virtual:vitrify-hooks',
     'virtual:static-imports',
@@ -175,6 +203,8 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
             ({ productName } = JSON.parse(readFileSync(new URL('package.json', appDir).pathname, {
                 encoding: 'utf-8'
             })));
+            if (!productName)
+                productName = vitrifyConfig.vitrify?.productName;
         }
         catch (e) {
             console.error('package.json not found');
@@ -237,7 +267,6 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
             }
         },
         vuePlugin(),
-        envPlugin(),
         ...frameworkPlugins,
         {
             name: 'vitrify-setup',
@@ -306,7 +335,9 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
                         const varName = url.pathname
                             .replaceAll('/', '')
                             .replaceAll('.', '')
-                            .replaceAll('-', '');
+                            .replaceAll('-', '')
+                            .replaceAll('_', '')
+                            .replaceAll('+', '');
                         return `import ${varName} from '${url.pathname}'; onSetup.push(${varName})`;
                     })
                         .join('\n')}`;
@@ -448,7 +479,7 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
                 entryFileNames: '[name].mjs',
                 chunkFileNames: '[name].mjs',
                 format: 'es',
-                manualChunks
+                manualChunks: manualChunksFn(vitrifyConfig?.vitrify?.manualChunks)
             }
         };
         // Create a SSR bundle
@@ -466,7 +497,7 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
                 entryFileNames: '[name].mjs',
                 chunkFileNames: '[name].mjs',
                 format: 'es',
-                manualChunks
+                manualChunks: manualChunksFn(vitrifyConfig?.vitrify?.manualChunks)
             }
         };
         // Create a SSR bundle
@@ -483,7 +514,7 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
                 entryFileNames: '[name].mjs',
                 chunkFileNames: '[name].mjs',
                 format: 'es',
-                manualChunks
+                manualChunks: manualChunksFn(vitrifyConfig?.vitrify?.manualChunks)
             }
         };
     }

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

@@ -12,4 +12,4 @@ export interface FastifySsrOptions {
 }
 declare const fastifyCsrPlugin: FastifyPluginCallback<FastifySsrOptions>;
 export { fastifyCsrPlugin };
-export declare type FastifyCsrPlugin = typeof fastifyCsrPlugin;
+export type FastifyCsrPlugin = typeof fastifyCsrPlugin;

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

@@ -16,4 +16,4 @@ export interface FastifySsrOptions {
 }
 declare const fastifySsrPlugin: FastifyPluginCallback<FastifySsrOptions>;
 export { fastifySsrPlugin };
-export declare type FastifySsrPlugin = typeof fastifySsrPlugin;
+export type FastifySsrPlugin = typeof fastifySsrPlugin;

package/dist/types/plugins/index.d.ts

@@ -1,5 +1,5 @@
 import type { Plugin } from 'vite';
-export declare type VitrifyPlugin = ({ ssr, mode, command }: {
+export type VitrifyPlugin = ({ ssr, mode, command }: {
     ssr?: 'server' | 'client' | 'ssg' | 'fastify' | false;
     pwa?: boolean;
     mode?: 'production' | 'development';

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

@@ -2,21 +2,21 @@ import type { Alias, UserConfig } from 'vite';
 import type { QuasarConf } from './plugins/quasar.js';
 import type { ComponentInternalInstance } from '@vue/runtime-core';
 import type { FastifyServerOptions } from 'fastify';
-export declare type BootFunction = ({ app, ssrContext, staticImports }: {
+export type BootFunction = ({ app, ssrContext, staticImports }: {
     app: any;
     ssrContext: Record<string, unknown>;
     staticImports: Record<string, any>;
 }) => Promise<void> | void;
-export declare type OnBootHook = ({ app, ssrContext, staticImports }: {
+export type OnBootHook = ({ app, ssrContext, staticImports }: {
     app: any;
     ssrContext: Record<string, unknown>;
     staticImports?: Record<string, any>;
 }) => Promise<void> | void;
-export declare type OnMountedHook = (instance: ComponentInternalInstance) => Promise<void> | void;
-export declare type StaticImports = Record<string, string[]>;
-export declare type SsrFunction = (html: string, ssrContext: Record<string, any>) => string;
-export declare type OnRenderedHook = (html: string, ssrContext: Record<string, any>) => string;
-export declare type OnSetupFile = URL;
+export type OnMountedHook = (instance: ComponentInternalInstance) => Promise<void> | void;
+export type StaticImports = Record<string, string[]>;
+export type SsrFunction = (html: string, ssrContext: Record<string, any>) => string;
+export type OnRenderedHook = (html: string, ssrContext: Record<string, any>) => string;
+export type OnSetupFile = URL;
 export interface VitrifyConfig extends UserConfig {
     vitrify?: {
         lang?: string;
@@ -81,8 +81,12 @@ export interface VitrifyConfig extends UserConfig {
         dev?: {
             alias?: Alias[];
         };
+        /**
+         * Files which should be a seperate chunk
+         */
+        manualChunks?: string[];
     };
     quasar?: QuasarConf;
 }
-export declare type VitrifyConfigAsync = VitrifyConfig | ((mode: string, command: string) => Promise<VitrifyConfig>);
+export type VitrifyConfigAsync = VitrifyConfig | ((mode: string, command: string) => Promise<VitrifyConfig>);
 export declare const defineConfig: (config: VitrifyConfig) => VitrifyConfig;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vitrify",
-  "version": "0.11.2",
+  "version": "0.11.4",
   "license": "MIT",
   "author": "Stefan van Herwijnen",
   "description": "Vite as your Full Stack development tool",
@@ -52,7 +52,6 @@
     "@fastify/static": "^6.5.0",
     "@quasar/extras": "^1.15.2",
     "@vitejs/plugin-vue": "^3.1.0",
-    "@vitrify/plugin-env": "^0.1.1",
     "builtin-modules": "^3.3.0",
     "cac": "^6.7.14",
     "chalk": "^5.0.1",

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

@@ -51,6 +51,7 @@ const fastifyCsrPlugin: FastifyPluginCallback<FastifySsrOptions> = async (
     console.log('Dev mode')
     if (!('use' in fastify)) {
       const middie = (await import('@fastify/middie')).default
+      // @ts-ignore
       await fastify.register(middie)
     }
     fastify.use(vite.middlewares)

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

@@ -98,6 +98,7 @@ const fastifySsrPlugin: FastifyPluginCallback<FastifySsrOptions> = async (
 
     if (!('use' in fastify)) {
       const middie = (await import('@fastify/middie')).default
+      // @ts-ignore
       await fastify.register(middie)
     }
     fastify.use(vite.middlewares)

package/src/node/index.ts

@@ -22,7 +22,6 @@ import type { VitrifyContext } from './bin/run.js'
 import type { VitrifyPlugin } from './plugins/index.js'
 import { resolve } from './app-urls.js'
 import type { ManualChunksOption, RollupOptions } from 'rollup'
-import envPlugin from '@vitrify/plugin-env'
 import { addOrReplaceTitle, appendToBody } from './helpers/utils.js'
 import type { ComponentResolver } from 'unplugin-vue-components'
 import Components from 'unplugin-vue-components/vite'
@@ -69,26 +68,55 @@ const moduleChunks = {
   vue: ['vue', '@vue', 'vue-router'],
   quasar: ['quasar', '@quasar']
 }
-const manualChunks: ManualChunksOption = (id: string) => {
-  const matchedModule = Object.entries(moduleChunks).find(
-    ([chunkName, moduleNames]) =>
-      moduleNames.some((moduleName) => id.includes(moduleName + '/'))
-  )
-  if (id.includes('vitrify/src/')) {
-    const name = id.split('/').at(-1)?.split('.').at(0)
-    if (name && manualChunkNames.includes(name)) return name
-  } else if (
-    VIRTUAL_MODULES.some((virtualModule) => id.includes(virtualModule))
-  ) {
-    return VIRTUAL_MODULES.find((name) => id.includes(name))
-  } else if (id.includes('node_modules')) {
-    if (matchedModule) {
-      return matchedModule[0]
+const manualChunksFn = (manualChunkList?: string[]): ManualChunksOption => {
+  return (id: string) => {
+    const matchedModule = Object.entries(moduleChunks).find(
+      ([chunkName, moduleNames]) =>
+        moduleNames.some((moduleName) => id.includes(moduleName + '/'))
+    )
+    if (id.includes('vitrify/src/')) {
+      const name = id.split('/').at(-1)?.split('.').at(0)
+      if (name && manualChunkNames.includes(name)) return name
+    } else if (
+      VIRTUAL_MODULES.some((virtualModule) => id.includes(virtualModule))
+    ) {
+      return VIRTUAL_MODULES.find((name) => id.includes(name))
+    } else if (manualChunkList?.some((file) => id.includes(file))) {
+      return manualChunkList.find((file) => id.includes(file))
+    } else if (id.includes('node_modules')) {
+      if (matchedModule) {
+        return matchedModule[0]
+      }
+      return 'vendor'
     }
-    return 'vendor'
   }
 }
 
+// const manualChunks: ManualChunksOption = (
+//   id: string,
+//   manualChunkList?: string[]
+// ) => {
+//   const matchedModule = Object.entries(moduleChunks).find(
+//     ([chunkName, moduleNames]) =>
+//       moduleNames.some((moduleName) => id.includes(moduleName + '/'))
+//   )
+//   if (id.includes('vitrify/src/')) {
+//     const name = id.split('/').at(-1)?.split('.').at(0)
+//     if (name && manualChunkNames.includes(name)) return name
+//   } else if (
+//     VIRTUAL_MODULES.some((virtualModule) => id.includes(virtualModule))
+//   ) {
+//     return VIRTUAL_MODULES.find((name) => id.includes(name))
+//   } else if (manualChunkList?.some((file) => id.includes(file))) {
+//     return manualChunkList.find((file) => id.includes(file))
+//   } else if (id.includes('node_modules')) {
+//     if (matchedModule) {
+//       return matchedModule[0]
+//     }
+//     return 'vendor'
+//   }
+// }
+
 export const VIRTUAL_MODULES = [
   'virtual:vitrify-hooks',
   'virtual:static-imports',
@@ -252,6 +280,7 @@ export const baseConfig = async ({
           encoding: 'utf-8'
         })
       ))
+      if (!productName) productName = vitrifyConfig.vitrify?.productName
     } catch (e) {
       console.error('package.json not found')
       productName = 'Product name'
@@ -324,7 +353,6 @@ export const baseConfig = async ({
       }
     },
     vuePlugin(),
-    envPlugin(),
     ...frameworkPlugins,
     {
       name: 'vitrify-setup',
@@ -393,6 +421,8 @@ export const baseConfig = async ({
                   .replaceAll('/', '')
                   .replaceAll('.', '')
                   .replaceAll('-', '')
+                  .replaceAll('_', '')
+                  .replaceAll('+', '')
                 return `import ${varName} from '${url.pathname}'; onSetup.push(${varName})`
               })
               .join('\n')}`
@@ -546,7 +576,7 @@ export const baseConfig = async ({
         entryFileNames: '[name].mjs',
         chunkFileNames: '[name].mjs',
         format: 'es',
-        manualChunks
+        manualChunks: manualChunksFn(vitrifyConfig?.vitrify?.manualChunks)
       }
     }
     // Create a SSR bundle
@@ -563,7 +593,7 @@ export const baseConfig = async ({
         entryFileNames: '[name].mjs',
         chunkFileNames: '[name].mjs',
         format: 'es',
-        manualChunks
+        manualChunks: manualChunksFn(vitrifyConfig?.vitrify?.manualChunks)
       }
     }
     // Create a SSR bundle
@@ -579,7 +609,7 @@ export const baseConfig = async ({
         entryFileNames: '[name].mjs',
         chunkFileNames: '[name].mjs',
         format: 'es',
-        manualChunks
+        manualChunks: manualChunksFn(vitrifyConfig?.vitrify?.manualChunks)
       }
     }
   }

package/src/node/vitrify-config.ts

@@ -103,6 +103,10 @@ export interface VitrifyConfig extends UserConfig {
     dev?: {
       alias?: Alias[]
     }
+    /**
+     * Files which should be a seperate chunk
+     */
+    manualChunks?: string[]
   }
   quasar?: QuasarConf
 }