vitrify 0.6.17 → 0.7.1

package/src/node/plugins/quasar.ts

@@ -1,22 +1,13 @@
-import { readFileSync } from 'fs'
 import type { Plugin } from 'vite'
 import { resolvePackageData } from 'vite'
 import Components from 'unplugin-vue-components/vite'
-// import { prepareQuasarConf } from './quasar-conf-file.js'
 import type {
-  BootFunction,
   OnBootHook,
   OnMountedHook,
   VitrifyConfig
 } from '../vitrify-config.js'
-// import { quasarDir as defaultQuasarDir } from '../app-urls.js'
-// import { QuasarResolver } from '../resolver.js';
 import { QuasarResolver } from 'unplugin-vue-components/resolvers'
 import type { VitrifyPlugin } from './index.js'
-import { getPkgJsonDir, resolve } from '../app-urls.js'
-
-// import { resolve } from 'import-meta-resolve'
-
 export interface QuasarConf {
   ctx: Record<string, any>
   css: string[]
@@ -25,6 +16,7 @@ export interface QuasarConf {
     components?: string[]
     directives?: string[]
     plugins?: string[]
+    lang?: string
   }
   animations: string[]
   extras: string[]
@@ -83,6 +75,7 @@ export const QuasarPlugin: VitrifyPlugin = async ({
   pwa = false
 }): Promise<Plugin[]> => {
   let plugins: string[] = []
+  let quasarConf: QuasarConf
   return [
     Components({
       resolvers: [QuasarResolver()]
@@ -148,54 +141,25 @@ export const QuasarPlugin: VitrifyPlugin = async ({
             const quasarPlugins = await import('virtual:quasar-plugins')
             // @ts-ignore
             const directives = await import('virtual:quasar-directives')
+            // @ts-ignore
+            const { default: lang } = await import('virtual:quasar-lang')
 
             app.use(
               staticImports?.Quasar,
               {
                 plugins: quasarPlugins,
-                directives
+                directives,
+                lang
               },
               ssrContext
             )
           }
         ]
 
-        return {
-          vitrify: {
-            urls,
-            globalCss,
-            staticImports: {
-              quasar: ['Quasar']
-            },
-            hooks: {
-              onBoot: onBootHooks,
-              onMounted: onMountedHooks,
-              onRendered: [injectSsrContext]
-            },
-            sass: {
-              global: ['quasar/src/css/index.sass']
-              // additionalData: [`@import 'quasar/src/css/index.sass'`]
-            }
-          }
-        }
-      }
-    },
-    {
-      name: 'vite-plugin-quasar',
-      enforce: 'post',
-      config: async (config: VitrifyConfig, env) => {
-        const { quasar: quasarConf, vitrify: { urls } = {} } = config
+        if (quasar) quasarConf = quasar
+        if (!quasarConf.framework.lang && config.vitrify?.lang)
+          quasarConf.framework.lang = config.vitrify.lang
 
-        // const quasarPkgJsonPath = new URL(
-        //   'package.json',
-        //   urls?.packages?.quasar
-        // ).pathname
-        // const { version } = JSON.parse(
-        //   readFileSync(quasarPkgJsonPath, { encoding: 'utf-8' })
-        // )
-        // const { version } = await import('quasar/package.json', {
-        //   assert: { type: 'json' }
-        // })
         /**
          * Importing package.json is problematic
          */
@@ -213,53 +177,24 @@ export const QuasarPlugin: VitrifyPlugin = async ({
         }
 
         return {
-          // build: {
-          //   rollupOptions: {
-          //     treeshake: {
-          //       moduleSideEffects: 'no-external'
-          //     }
-          //   }
-          // },
+          vitrify: {
+            urls,
+            globalCss,
+            staticImports: {
+              quasar: ['Quasar']
+            },
+            hooks: {
+              onBoot: onBootHooks,
+              onMounted: onMountedHooks,
+              onRendered: [injectSsrContext]
+            },
+            sass: {
+              global: ['quasar/src/css/index.sass']
+              // additionalData: [`@import 'quasar/src/css/index.sass'`]
+            }
+          },
           resolve: {
-            // dedupe: ['quasar', '@quasar/extras'],
             alias: [
-              // {
-              //   find: 'quasar/wrappers',
-              //   replacement: new URL('quasar-wrappers.ts', urls?.cli).pathname
-              // },
-              // {
-              //   find: 'quasar/vue-plugin',
-              //   replacement: new URL(
-              //     'src/vue-plugin.js',
-              //     urls?.packages?.quasar
-              //   ).pathname
-              // },
-              // {
-              //   find: 'quasar/plugins',
-              //   replacement: new URL('src/plugins.js', urls?.packages?.quasar)
-              //     .pathname
-              // },
-              // {
-              //   find: 'quasar/components',
-              //   replacement: new URL(
-              //     'src/components.js',
-              //     urls?.packages?.quasar
-              //   ).pathname
-              // },
-              // {
-              //   find: 'quasar/composables',
-              //   replacement: new URL(
-              //     'src/composables.js',
-              //     urls?.packages?.quasar
-              //   ).pathname
-              // },
-              // {
-              //   find: 'quasar/directives',
-              //   replacement: new URL(
-              //     'src/directives.js',
-              //     urls?.packages?.quasar
-              //   ).pathname
-              // },
               {
                 find: 'quasar/src/',
                 replacement: new URL(
@@ -267,24 +202,6 @@ export const QuasarPlugin: VitrifyPlugin = async ({
                   config.vitrify!.urls!.packages!.quasar
                 ).pathname
               }
-              // {
-              //   find: 'quasar',
-              //   replacement: new URL(
-              //     'node_modules/quasar',
-              //     config.vitrify?.urls?.app
-              //   )
-              // }
-              // {
-              //   find: new RegExp('^quasar$'),
-              //   replacement: new URL('src/index.all.js', urls?.packages?.quasar)
-              //     .pathname
-              // }
-              // {
-              //   find: `@quasar/extras`,
-              //   replacement: new URL('.', urls?.packages?.['@quasar/extras'])
-              //     .pathname
-              // }
-              // { find: new RegExp('^quasar$'), replacement: 'virtual:quasar' }
             ]
           },
           optimizeDeps: {
@@ -293,13 +210,6 @@ export const QuasarPlugin: VitrifyPlugin = async ({
           define: {
             __DEV__: process.env.NODE_ENV !== 'production' || true,
             __QUASAR_VERSION__: `'${version}'`
-            // __QUASAR_SSR__: !!ssr,
-            // // __QUASAR_SSR_SERVER__: ssr === 'server',
-            // __QUASAR_SSR_SERVER__: `import.meta.env.SSR`,
-            // // __QUASAR_SSR_CLIENT__: ssr === 'client',
-            // __QUASAR_SSR_CLIENT__: `!import.meta.env.SSR`,
-            // // __QUASAR_SSR_PWA__: ssr === 'client' && pwa
-            // __QUASAR_SSR_PWA__: pwa ? `!import.meta.env.SSR` : false
           },
           ssr: {
             noExternal: ['quasar']
@@ -327,6 +237,8 @@ export const QuasarPlugin: VitrifyPlugin = async ({
             return 'virtual:quasar-plugins'
           case 'virtual:quasar-directives':
             return 'virtual:quasar-directives'
+          case 'virtual:quasar-lang':
+            return 'virtual:quasar-lang'
           case 'virtual:quasar':
             return { id: 'virtual:quasar', moduleSideEffects: false }
           default:
@@ -338,6 +250,11 @@ export const QuasarPlugin: VitrifyPlugin = async ({
           return `export { ${plugins.join(',')} } from 'quasar'`
         } else if (id === 'virtual:quasar-directives') {
           return `export * from 'quasar/src/directives.js'`
+        } else if (id === 'virtual:quasar-lang') {
+          return `import lang from 'quasar/lang/${
+            quasarConf?.framework?.lang || 'en-US'
+          }';
+          export default lang`
         } else if (id === 'virtual:quasar') {
           return `export * from 'quasar/src/plugins.js';
           export * from 'quasar/src/components.js';

package/src/node/vitrify-config.ts

@@ -1,6 +1,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'
 
 export type BootFunction = ({
   app,
@@ -39,6 +40,7 @@ export type OnRenderedHook = (
 export type OnSetupFile = URL
 export interface VitrifyConfig extends UserConfig {
   vitrify?: {
+    lang?: string
     /**
      * Global CSS imports
      */
@@ -92,6 +94,7 @@ export interface VitrifyConfig extends UserConfig {
      */
     ssr?: {
       serverModules?: string[]
+      fastify?: FastifyServerOptions
     }
     /**
      * Development only configuration

package/src/vite/fastify/entry.ts

@@ -1,5 +1,6 @@
 import type { FastifyInstance } from 'fastify'
 import { onSetup } from 'virtual:vitrify-hooks'
+export { default as vitrifyConfig } from 'virtual:vitrify-config'
 
 export const setup = async ({ fastify }: { fastify: FastifyInstance }) => {
   if (onSetup?.length) {

package/src/vite/fastify/server.ts

@@ -1,8 +1,9 @@
 import Fastify from 'fastify'
-import { setup } from './entry'
+import { setup, vitrifyConfig } from './entry'
 
 const fastify = Fastify({
-  logger: true
+  logger: true,
+  ...vitrifyConfig.vitrify?.ssr.fastify
 })
 await setup({ fastify })
 

package/src/vite/vue/main.ts

@@ -49,7 +49,7 @@ export async function createApp(
   // Workaround to fix hydration errors when serving html files directly
   router.beforeEach((to, from, next) => {
     if (to.path.endsWith('.html')) {
-      next({ path: to.path.replace('.html', '') })
+      return next({ path: to.path.replace('.html', '') })
     }
 
     next()