vitrify 0.11.0 → 0.11.1

package/dist/index.js

@@ -7,11 +7,11 @@ import path from 'path';
 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 { 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 = [
     'util',
     'vitrify',
@@ -30,6 +30,9 @@ const internalServerModules = [
 const configPluginMap = {
     quasar: () => import('./plugins/quasar.js').then((module) => module.QuasarPlugin)
 };
+const configResolverMap = {
+    quasar: () => import('unplugin-vue-components/resolvers').then((module) => module.QuasarResolver())
+};
 const manualChunkNames = [
     'prerender',
     'fastify-ssr-plugin',
@@ -181,13 +184,16 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
     else {
     }
     const frameworkPlugins = [];
+    const resolvers = [];
     for (const framework of Object.keys(configPluginMap)) {
         if (Object.keys(vitrifyConfig).includes(framework)) {
             const plugin = await configPluginMap[framework]();
+            const resolver = await configResolverMap[framework]();
             frameworkPlugins.push(await plugin({
                 ssr,
                 pwa
             }));
+            resolvers.push(resolver);
         }
     }
     let onBootHooks;
@@ -327,7 +333,15 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
                 }
                 return null;
             }
-        }
+        },
+        Components({
+            exclude: [
+                new RegExp(`[\\/]node_modules[\\/].*[\\/]!(${serverModules.join('|')})`),
+                /[\\/]\.git[\\/]/,
+                /[\\/]\.nuxt[\\/]/
+            ],
+            resolvers
+        })
     ];
     if (command !== 'test') {
         plugins.unshift({

package/dist/plugins/quasar.js

@@ -1,6 +1,4 @@
 import { resolvePackageData } from 'vite';
-import Components from 'unplugin-vue-components/vite';
-import { QuasarResolver } from 'unplugin-vue-components/resolvers';
 export const injectSsrContext = (html, ssrContext) => html
     .replace(/(<html[^>]*)(>)/i, (found, start, end) => {
     let matches;
@@ -31,9 +29,6 @@ export const QuasarPlugin = async ({ ssr = false, pwa = false }) => {
     let plugins = [];
     let quasarConf;
     return [
-        Components({
-            resolvers: [QuasarResolver()]
-        }),
         {
             name: 'vite-plugin-quasar-transform',
             enforce: 'pre',

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

@@ -84,4 +84,5 @@ export interface VitrifyConfig extends UserConfig {
     };
     quasar?: QuasarConf;
 }
+export declare 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.0",
+  "version": "0.11.1",
   "license": "MIT",
   "author": "Stefan van Herwijnen",
   "description": "Vite as your Full Stack development tool",

package/src/node/index.ts

@@ -8,7 +8,6 @@ import path from 'path'
 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,
@@ -25,6 +24,8 @@ 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'
 
 const internalServerModules = [
   'util',
@@ -47,6 +48,16 @@ const configPluginMap: Record<string, () => Promise<VitrifyPlugin>> = {
     import('./plugins/quasar.js').then((module) => module.QuasarPlugin)
 }
 
+const configResolverMap: Record<
+  string,
+  () => Promise<ComponentResolver | ComponentResolver[]>
+> = {
+  quasar: () =>
+    import('unplugin-vue-components/resolvers').then((module) =>
+      module.QuasarResolver()
+    )
+}
+
 const manualChunkNames = [
   'prerender',
   'fastify-ssr-plugin',
@@ -249,15 +260,18 @@ export const baseConfig = async ({
   }
 
   const frameworkPlugins = []
+  const resolvers = []
   for (const framework of Object.keys(configPluginMap)) {
     if (Object.keys(vitrifyConfig).includes(framework)) {
       const plugin = await configPluginMap[framework]()
+      const resolver = await configResolverMap[framework]()
       frameworkPlugins.push(
         await plugin({
           ssr,
           pwa
         })
       )
+      resolvers.push(resolver)
     }
   }
 
@@ -325,6 +339,7 @@ export const baseConfig = async ({
         sassVariables = config.vitrify?.sass?.variables || {}
         globalSass = config.vitrify?.sass?.global || []
         additionalData = config.vitrify?.sass?.additionalData || []
+
         return
       },
       configureServer(server) {
@@ -404,7 +419,17 @@ export const baseConfig = async ({
         }
         return null
       }
-    }
+    },
+    Components({
+      exclude: [
+        new RegExp(
+          `[\\/]node_modules[\\/].*[\\/]!(${serverModules.join('|')})`
+        ),
+        /[\\/]\.git[\\/]/,
+        /[\\/]\.nuxt[\\/]/
+      ],
+      resolvers
+    })
   ]
   if (command !== 'test') {
     plugins.unshift({

package/src/node/plugins/quasar.ts

@@ -6,7 +6,6 @@ import type {
   OnMountedHook,
   VitrifyConfig
 } from '../vitrify-config.js'
-import { QuasarResolver } from 'unplugin-vue-components/resolvers'
 import type { VitrifyPlugin } from './index.js'
 export interface QuasarConf {
   ctx?: Record<string, any>
@@ -78,9 +77,6 @@ export const QuasarPlugin: VitrifyPlugin = async ({
   let plugins: string[] = []
   let quasarConf: QuasarConf
   return [
-    Components({
-      resolvers: [QuasarResolver()]
-    }),
     {
       name: 'vite-plugin-quasar-transform',
       enforce: 'pre',

package/src/node/vitrify-config.ts

@@ -2,6 +2,7 @@ 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'
+import { ComponentResolver } from 'unplugin-vue-components'
 
 export type BootFunction = ({
   app,
@@ -106,4 +107,8 @@ export interface VitrifyConfig extends UserConfig {
   quasar?: QuasarConf
 }
 
+export type VitrifyConfigAsync =
+  | VitrifyConfig
+  | ((mode: string, command: string) => Promise<VitrifyConfig>)
+
 export const defineConfig = (config: VitrifyConfig) => config