vitrify 0.5.1 → 0.5.2

package/dist/bin/build.js

@@ -8,7 +8,8 @@ export async function build(opts) {
         ssr: opts?.ssr,
         appDir: opts.appDir,
         publicDir: opts.publicDir,
-        base: opts.base
+        base: opts.base,
+        debug: opts.debug
     });
     config.build = {
         ...config.build,

package/dist/bin/cli.js

@@ -11,6 +11,7 @@ cli
     .option('--appDir [appDir]', 'App directory')
     .option('--publicDir [publicDir]', 'Public directory')
     .option('--productName [productName]', 'Product name')
+    .option('--debug', 'Debug build')
     .action(async (options) => {
     const { build } = await import('./build.js');
     let appDir;
@@ -27,7 +28,8 @@ cli
     const args = {
         base: options.base,
         appDir,
-        publicDir: parsePath(options.publicDir, appDir)
+        publicDir: parsePath(options.publicDir, appDir),
+        debug: options.debug
     };
     switch (options.mode) {
         case 'csr':

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

@@ -1,4 +1,4 @@
-import fastifyStatic from '@fastify/static';
+import { fastifyStatic } from '@fastify/static';
 const fastifyCsrPlugin = async (fastify, options, done) => {
     options.vitrifyDir =
         options.vitrifyDir || (await import('vitrify')).vitrifyDir;

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

@@ -1,4 +1,4 @@
-import fastifyStatic from '@fastify/static';
+import { fastifyStatic } from '@fastify/static';
 import { readFileSync } from 'fs';
 import { componentsModules, collectCss } from '../../helpers/collect-css-ssr.js';
 const fastifySsrPlugin = async (fastify, options, done) => {

package/dist/index.js

@@ -7,38 +7,16 @@ import { pathToFileURL } from 'url';
 import { readFileSync } from 'fs';
 import builtinModules from 'builtin-modules';
 import { resolve } from 'import-meta-resolve';
+import { visualizer } from 'rollup-plugin-visualizer';
 import { getPkgJsonDir } from './app-urls.js';
 const internalServerModules = [
-    // 'fs',
-    // 'path',
-    // 'url',
-    // 'module',
-    // 'crypto',
-    // 'node:fs',
     'util',
-    'node:url',
-    'node:util',
-    'node:fs',
-    'node:process',
     'vitrify',
     'vitrify/dev',
-    // 'import-meta-resolve',
     'vite',
     'fastify',
-    '@fastify',
+    '@fastify/static',
     'node'
-    // 'middie',
-    // 'knex',
-    // 'bcrypt',
-    // 'objection',
-    // '@fastify/formbody',
-    // '@fastify/static',
-    // '@fastify/cors',
-    // '@fastify/cookie',
-    // 'mercurius',
-    // 'jose',
-    // 'oidc-provider',
-    // 'node-fetch'
 ];
 const configPluginMap = {
     quasar: () => import('./plugins/quasar.js').then((module) => module.QuasarPlugin)
@@ -55,6 +33,9 @@ const manualChunks = (id) => {
         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')) {
         return 'vendor';
     }
@@ -112,7 +93,7 @@ async function bundleConfigFile(fileName, isESM = false) {
         dependencies: result.metafile ? Object.keys(result.metafile.inputs) : []
     };
 }
-export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command = 'build', mode = 'production', framework = 'vue', pwa = false }) => {
+export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command = 'build', mode = 'production', framework = 'vue', pwa = false, debug = false }) => {
     const { getAppDir, getCliDir, getCliViteDir, getSrcDir, getCwd } = await import('./app-urls.js');
     if (!appDir) {
         appDir = getAppDir();
@@ -357,6 +338,8 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
                 }
             }
         });
+        if (debug)
+            plugins.push(visualizer());
     }
     const alias = [
         { find: 'src', replacement: srcDir.pathname },
@@ -386,6 +369,7 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
     const external = [...builtinModules, ...serverModules];
     if (ssr === 'server') {
         rollupOptions = {
+            ...rollupOptions,
             input: [
                 new URL('ssr/entry-server.ts', frameworkDir).pathname,
                 new URL('ssr/prerender.ts', frameworkDir).pathname,
@@ -416,6 +400,7 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
     }
     else if (ssr === 'fastify') {
         rollupOptions = {
+            ...rollupOptions,
             input: [new URL('server.ts', fastifyDir).pathname],
             external,
             output: {
@@ -441,10 +426,11 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
     }
     else {
         rollupOptions = {
-            input: [
-                new URL('index.html', frameworkDir).pathname
-                // new URL('csr/server.ts', frameworkDir).pathname
-            ],
+            ...rollupOptions,
+            // input: [
+            //   new URL('index.html', frameworkDir).pathname
+            //   // new URL('csr/server.ts', frameworkDir).pathname
+            // ],
             external,
             output: {
                 minifyInternalExports: false,

package/dist/plugins/quasar.js

@@ -154,10 +154,6 @@ export const QuasarPlugin = async ({ ssr = false, pwa = false }) => {
                                 replacement: new URL('src/index.all.js', urls?.packages?.quasar)
                                     .pathname
                             },
-                            // {
-                            //   find: 'quasar',
-                            //   replacement: new URL('src/index.all.js', urls?.packages?.quasar).pathname
-                            // },
                             {
                                 find: `@quasar/extras`,
                                 replacement: new URL('.', urls?.packages?.['@quasar/extras'])
@@ -188,7 +184,7 @@ export const QuasarPlugin = async ({ ssr = false, pwa = false }) => {
             config: async (config, env) => ({
                 resolve: {
                     alias: [
-                    // { find: new RegExp('^quasar$'), replacement: 'virtual:quasar' }
+                        { find: new RegExp('^quasar$'), replacement: 'virtual:quasar' }
                     ]
                 }
             }),

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

@@ -5,4 +5,5 @@ export declare function build(opts: {
     outDir: string;
     appDir?: URL;
     publicDir?: URL;
+    debug?: boolean;
 }): Promise<import("rollup").RollupOutput | import("rollup").RollupOutput[] | import("rollup").RollupWatcher>;

package/dist/types/index.d.ts

@@ -3,7 +3,7 @@ import type { BootFunction, VitrifyConfig } 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 }: {
+export declare const baseConfig: ({ ssr, appDir, publicDir, base, command, mode, framework, pwa, debug }: {
     ssr?: "server" | "client" | "ssg" | "fastify" | undefined;
     appDir?: URL | undefined;
     publicDir?: URL | undefined;
@@ -12,6 +12,7 @@ export declare const baseConfig: ({ ssr, appDir, publicDir, base, command, mode,
     mode?: "production" | "development" | undefined;
     framework?: "vue" | undefined;
     pwa?: boolean | undefined;
+    debug?: boolean | undefined;
 }) => Promise<InlineConfig>;
 export declare const vitrifyDir: URL;
 export type { VitrifyConfig, VitrifyPlugin, VitrifyContext, BootFunction };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vitrify",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "license": "MIT",
   "author": "Stefan van Herwijnen",
   "description": "Pre-configured Vite CLI for your framework",
@@ -68,6 +68,7 @@
     "magic-string": "^0.26.2",
     "merge-deep": "^3.0.3",
     "readline": "^1.3.0",
+    "rollup-plugin-visualizer": "^5.6.0",
     "sass": "1.52.3",
     "ts-node": "^10.8.1",
     "unplugin-vue-components": "^0.19.6",
@@ -93,10 +94,10 @@
     "@fastify/static": "^6.4.0",
     "fastify": "^4.0.0",
     "fastify-plugin": "^3.0.1",
+    "import-meta-resolve": "^2.0.3",
     "quasar": "^2.7.1",
     "vue": "^3.2.37",
-    "vue-router": "^4.0.15",
-    "import-meta-resolve": "^2.0.3"
+    "vue-router": "^4.0.15"
   },
   "publishConfig": {
     "access": "public",

package/src/node/bin/build.ts

@@ -8,6 +8,7 @@ export async function build(opts: {
   outDir: string
   appDir?: URL
   publicDir?: URL
+  debug?: boolean
 }) {
   const config = await baseConfig({
     command: 'build',
@@ -15,7 +16,8 @@ export async function build(opts: {
     ssr: opts?.ssr,
     appDir: opts.appDir,
     publicDir: opts.publicDir,
-    base: opts.base
+    base: opts.base,
+    debug: opts.debug
   })
 
   config.build = {

package/src/node/bin/cli.ts

@@ -20,6 +20,7 @@ cli
   .option('--appDir [appDir]', 'App directory')
   .option('--publicDir [publicDir]', 'Public directory')
   .option('--productName [productName]', 'Product name')
+  .option('--debug', 'Debug build')
   .action(async (options) => {
     const { build } = await import('./build.js')
     let appDir: URL
@@ -38,10 +39,12 @@ cli
       base: string
       appDir?: URL
       publicDir?: URL
+      debug?: boolean
     } = {
       base: options.base,
       appDir,
-      publicDir: parsePath(options.publicDir, appDir)
+      publicDir: parsePath(options.publicDir, appDir),
+      debug: options.debug
     }
 
     switch (options.mode) {

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

@@ -3,7 +3,7 @@ import type {
   FastifyRequest,
   FastifyReply
 } from 'fastify'
-import fastifyStatic from '@fastify/static'
+import { fastifyStatic } from '@fastify/static'
 import type { OnRenderedHook } from '../../vitrify-config.js'
 import type { ViteDevServer } from 'vite'
 

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

@@ -3,7 +3,7 @@ import type {
   FastifyRequest,
   FastifyReply
 } from 'fastify'
-import fastifyStatic from '@fastify/static'
+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'

package/src/node/index.ts

@@ -9,6 +9,7 @@ import { pathToFileURL } from 'url'
 import { readFileSync } from 'fs'
 import builtinModules from 'builtin-modules'
 import { resolve } from 'import-meta-resolve'
+import { visualizer } from 'rollup-plugin-visualizer'
 import type {
   StaticImports,
   BootFunction,
@@ -21,39 +22,16 @@ import type {
 import type { VitrifyContext } from './bin/run.js'
 import type { VitrifyPlugin } from './plugins/index.js'
 import { getPkgJsonDir } from './app-urls.js'
-import type { RollupOptions } from 'rollup'
+import type { ManualChunksOption, RollupOptions } from 'rollup'
 
 const internalServerModules = [
-  // 'fs',
-  // 'path',
-  // 'url',
-  // 'module',
-  // 'crypto',
-  // 'node:fs',
   'util',
-  'node:url',
-  'node:util',
-  'node:fs',
-  'node:process',
   'vitrify',
   'vitrify/dev',
-  // 'import-meta-resolve',
   'vite',
   'fastify',
-  '@fastify',
+  '@fastify/static',
   'node'
-  // 'middie',
-  // 'knex',
-  // 'bcrypt',
-  // 'objection',
-  // '@fastify/formbody',
-  // '@fastify/static',
-  // '@fastify/cors',
-  // '@fastify/cookie',
-  // 'mercurius',
-  // 'jose',
-  // 'oidc-provider',
-  // 'node-fetch'
 ]
 
 const configPluginMap: Record<string, () => Promise<VitrifyPlugin>> = {
@@ -67,10 +45,14 @@ const manualChunkNames = [
   'fastify-csr-plugin',
   'server'
 ]
-const manualChunks = (id: string) => {
+const manualChunks: ManualChunksOption = (id: string) => {
   if (id.includes('vitrify/src/vite/')) {
     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')) {
     return 'vendor'
   }
@@ -148,7 +130,8 @@ export const baseConfig = async ({
   command = 'build',
   mode = 'production',
   framework = 'vue',
-  pwa = false
+  pwa = false,
+  debug = false
 }: {
   ssr?: 'client' | 'server' | 'ssg' | 'fastify'
   appDir?: URL
@@ -158,6 +141,7 @@ export const baseConfig = async ({
   mode?: 'production' | 'development'
   framework?: 'vue'
   pwa?: boolean
+  debug?: boolean
 }): Promise<InlineConfig> => {
   const { getAppDir, getCliDir, getCliViteDir, getSrcDir, getCwd } =
     await import('./app-urls.js')
@@ -438,6 +422,8 @@ export const baseConfig = async ({
         }
       }
     })
+
+    if (debug) plugins.push(visualizer())
   }
 
   const alias: Alias[] = [
@@ -471,6 +457,7 @@ export const baseConfig = async ({
 
   if (ssr === 'server') {
     rollupOptions = {
+      ...rollupOptions,
       input: [
         new URL('ssr/entry-server.ts', frameworkDir).pathname,
         new URL('ssr/prerender.ts', frameworkDir).pathname,
@@ -500,6 +487,7 @@ export const baseConfig = async ({
     ]
   } else if (ssr === 'fastify') {
     rollupOptions = {
+      ...rollupOptions,
       input: [new URL('server.ts', fastifyDir).pathname],
       external,
       output: {
@@ -524,10 +512,11 @@ export const baseConfig = async ({
     ]
   } else {
     rollupOptions = {
-      input: [
-        new URL('index.html', frameworkDir).pathname
-        // new URL('csr/server.ts', frameworkDir).pathname
-      ],
+      ...rollupOptions,
+      // input: [
+      //   new URL('index.html', frameworkDir).pathname
+      //   // new URL('csr/server.ts', frameworkDir).pathname
+      // ],
       external,
       output: {
         minifyInternalExports: false,

package/src/node/plugins/quasar.ts

@@ -13,6 +13,7 @@ import type {
 import { QuasarResolver } from 'unplugin-vue-components/resolvers'
 import type { VitrifyPlugin } from './index.js'
 import { getPkgJsonDir } from '../app-urls.js'
+
 import { resolve } from 'import-meta-resolve'
 
 export interface QuasarConf {
@@ -248,10 +249,6 @@ export const QuasarPlugin: VitrifyPlugin = async ({
                 replacement: new URL('src/index.all.js', urls?.packages?.quasar)
                   .pathname
               },
-              // {
-              //   find: 'quasar',
-              //   replacement: new URL('src/index.all.js', urls?.packages?.quasar).pathname
-              // },
               {
                 find: `@quasar/extras`,
                 replacement: new URL('.', urls?.packages?.['@quasar/extras'])
@@ -282,7 +279,7 @@ export const QuasarPlugin: VitrifyPlugin = async ({
       config: async (config, env) => ({
         resolve: {
           alias: [
-            // { find: new RegExp('^quasar$'), replacement: 'virtual:quasar' }
+            { find: new RegExp('^quasar$'), replacement: 'virtual:quasar' }
           ]
         }
       }),

package/src/node/vitrify-config.ts

@@ -1,4 +1,3 @@
-import type { FastifyInstance } from 'fastify'
 import type { Alias, UserConfig } from 'vite'
 import type { QuasarConf } from './plugins/quasar.js'
 import type { ComponentInternalInstance } from '@vue/runtime-core'