vitrify 0.5.2 → 0.5.3

package/dist/bin/build.js

@@ -13,7 +13,7 @@ export async function build(opts) {
     });
     config.build = {
         ...config.build,
-        minify: false,
+        minify: !opts.debug,
         outDir: opts.outDir,
         emptyOutDir: !!opts.outDir
     };

package/dist/bin/dev.js

@@ -25,7 +25,6 @@ ssr, framework = 'vue', host, appDir, publicDir, base }) {
         base
     });
     config.logLevel = logLevel;
-    console.log(searchForWorkspaceRoot(appDir.pathname));
     config.server = {
         https: config.server?.https,
         hmr: {

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

@@ -43,7 +43,9 @@ const manualChunks = (id) => {
 export const VIRTUAL_MODULES = [
     'virtual:vitrify-hooks',
     'virtual:global-css',
-    'virtual:static-imports'
+    'virtual:static-imports',
+    'vitrify.sass',
+    'vitrify.css'
 ];
 async function bundleConfigFile(fileName, isESM = false) {
     const result = await build({
@@ -175,6 +177,7 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
     let staticImports;
     let sassVariables;
     let additionalData;
+    let globalSass;
     let serverModules = internalServerModules;
     if (vitrifyConfig.vitrify?.ssr?.serverModules)
         serverModules = [
@@ -215,17 +218,20 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
                 globalCss = config.vitrify?.globalCss || [];
                 staticImports = config.vitrify?.staticImports || {};
                 sassVariables = config.vitrify?.sass?.variables || {};
+                globalSass = config.vitrify?.sass?.global || [];
                 additionalData = config.vitrify?.sass?.additionalData || [];
                 return {
                     css: {
                         preprocessorOptions: {
-                            sass: {
-                                additionalData: [
-                                    ...Object.entries(sassVariables).map(([key, value]) => `${key}: ${value}`),
-                                    ...additionalData
-                                    // config.css?.preprocessorOptions?.sass.additionalData
-                                ].join('\n')
-                            }
+                        // sass: {
+                        //   additionalData: [
+                        //     ...Object.entries(sassVariables).map(
+                        //       ([key, value]) => `${key}: ${value}`
+                        //     )
+                        //     // ...additionalData
+                        //     // config.css?.preprocessorOptions?.sass.additionalData
+                        //   ].join('\n')
+                        // }
                         }
                     }
                 };
@@ -238,7 +244,7 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
             },
             resolveId(id) {
                 if (VIRTUAL_MODULES.includes(id))
-                    return { id, moduleSideEffects: false };
+                    return { id };
                 return;
             },
             transform: (code, id) => {
@@ -281,6 +287,15 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
                         .map(([key, value]) => `export { ${value.join(',')} } from '${key}';`)
                         .join('\n')}`;
                 }
+                else if (id === 'vitrify.sass') {
+                    return [
+                        ...Object.entries(sassVariables).map(([key, value]) => `${key}: ${value}`),
+                        ...globalSass.map((sass) => `@import '${sass}'`)
+                    ].join('\n');
+                }
+                else if (id === 'vitrify.css') {
+                    return `${globalCss.map((css) => `import '${css}'`).join('\n')}`;
+                }
                 return null;
             }
         }
@@ -377,7 +392,7 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
             ],
             external,
             output: {
-                minifyInternalExports: false,
+                minifyInternalExports: !debug,
                 entryFileNames: '[name].mjs',
                 chunkFileNames: '[name].mjs',
                 format: 'es',
@@ -433,7 +448,7 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
             // ],
             external,
             output: {
-                minifyInternalExports: false,
+                minifyInternalExports: !debug,
                 entryFileNames: '[name].mjs',
                 chunkFileNames: '[name].mjs',
                 format: 'es',

package/dist/plugins/quasar.js

@@ -93,7 +93,8 @@ export const QuasarPlugin = async ({ ssr = false, pwa = false }) => {
                             onRendered: [injectSsrContext]
                         },
                         sass: {
-                            additionalData: [`@import 'quasar/src/css/index.sass'`]
+                            global: ['quasar/src/css/index.sass']
+                            // additionalData: [`@import 'quasar/src/css/index.sass'`]
                         }
                     }
                 };
@@ -149,16 +150,17 @@ export const QuasarPlugin = async ({ ssr = false, pwa = false }) => {
                                 find: 'quasar/src',
                                 replacement: new URL('src/', urls?.packages?.quasar).pathname
                             },
-                            {
-                                find: new RegExp('^quasar$'),
-                                replacement: new URL('src/index.all.js', urls?.packages?.quasar)
-                                    .pathname
-                            },
+                            // {
+                            //   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' }
                         ]
                     },
                     define: {
@@ -180,11 +182,11 @@ export const QuasarPlugin = async ({ ssr = false, pwa = false }) => {
         },
         {
             name: 'quasar-virtual-modules',
-            enforce: 'post',
+            enforce: 'pre',
             config: async (config, env) => ({
                 resolve: {
                     alias: [
-                        { find: new RegExp('^quasar$'), replacement: 'virtual:quasar' }
+                    // { find: new RegExp('^quasar$'), replacement: 'virtual:quasar' }
                     ]
                 }
             }),
@@ -192,8 +194,8 @@ export const QuasarPlugin = async ({ ssr = false, pwa = false }) => {
                 switch (id) {
                     case 'virtual:quasar-plugins':
                         return 'virtual:quasar-plugins';
-                    case 'virtual:quasar':
-                        return { id: 'virtual:quasar', moduleSideEffects: false };
+                    case 'quasar':
+                        return { id: 'quasar', moduleSideEffects: false };
                     default:
                         return;
                 }
@@ -202,7 +204,7 @@ export const QuasarPlugin = async ({ ssr = false, pwa = false }) => {
                 if (id === 'virtual:quasar-plugins') {
                     return `export { ${plugins.join(',')} } from 'quasar'`;
                 }
-                else if (id === 'virtual:quasar') {
+                else if (id === 'quasar') {
                     return `export * from 'quasar/src/plugins.js';
           export * from 'quasar/src/components.js';
           export * from 'quasar/src/composables.js';

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

@@ -50,6 +50,7 @@ export interface VitrifyConfig extends UserConfig {
         sass?: {
             variables?: Record<string, string>;
             additionalData?: string[];
+            global?: string[];
         };
         /**
          * Product name of the application. Will be used for the HTML title tag

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vitrify",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "license": "MIT",
   "author": "Stefan van Herwijnen",
   "description": "Pre-configured Vite CLI for your framework",
@@ -93,7 +93,6 @@
   "peerDependencies": {
     "@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",

package/src/node/bin/build.ts

@@ -22,7 +22,7 @@ export async function build(opts: {
 
   config.build = {
     ...config.build,
-    minify: false,
+    minify: !opts.debug,
     outDir: opts.outDir,
     emptyOutDir: !!opts.outDir
   }

package/src/node/bin/dev.ts

@@ -52,7 +52,6 @@ export async function createVitrifyDevServer({
 
   config.logLevel = logLevel
 
-  console.log(searchForWorkspaceRoot(appDir.pathname))
   config.server = {
     https: config.server?.https,
     hmr: {

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

@@ -61,7 +61,9 @@ const manualChunks: ManualChunksOption = (id: string) => {
 export const VIRTUAL_MODULES = [
   'virtual:vitrify-hooks',
   'virtual:global-css',
-  'virtual:static-imports'
+  'virtual:static-imports',
+  'vitrify.sass',
+  'vitrify.css'
 ]
 
 async function bundleConfigFile(
@@ -247,6 +249,7 @@ export const baseConfig = async ({
   let staticImports: StaticImports
   let sassVariables: Record<string, string>
   let additionalData: string[]
+  let globalSass: string[]
   let serverModules: string[] = internalServerModules
 
   if (vitrifyConfig.vitrify?.ssr?.serverModules)
@@ -289,20 +292,21 @@ export const baseConfig = async ({
         globalCss = config.vitrify?.globalCss || []
         staticImports = config.vitrify?.staticImports || {}
         sassVariables = config.vitrify?.sass?.variables || {}
+        globalSass = config.vitrify?.sass?.global || []
         additionalData = config.vitrify?.sass?.additionalData || []
 
         return {
           css: {
             preprocessorOptions: {
-              sass: {
-                additionalData: [
-                  ...Object.entries(sassVariables).map(
-                    ([key, value]) => `${key}: ${value}`
-                  ),
-                  ...additionalData
-                  // config.css?.preprocessorOptions?.sass.additionalData
-                ].join('\n')
-              }
+              // sass: {
+              //   additionalData: [
+              //     ...Object.entries(sassVariables).map(
+              //       ([key, value]) => `${key}: ${value}`
+              //     )
+              //     // ...additionalData
+              //     // config.css?.preprocessorOptions?.sass.additionalData
+              //   ].join('\n')
+              // }
             }
           }
         }
@@ -314,8 +318,7 @@ export const baseConfig = async ({
         }
       },
       resolveId(id) {
-        if (VIRTUAL_MODULES.includes(id))
-          return { id, moduleSideEffects: false }
+        if (VIRTUAL_MODULES.includes(id)) return { id }
         return
       },
       transform: (code, id) => {
@@ -363,6 +366,15 @@ export const baseConfig = async ({
               ([key, value]) => `export { ${value.join(',')} } from '${key}';`
             )
             .join('\n')}`
+        } else if (id === 'vitrify.sass') {
+          return [
+            ...Object.entries(sassVariables).map(
+              ([key, value]) => `${key}: ${value}`
+            ),
+            ...globalSass.map((sass) => `@import '${sass}'`)
+          ].join('\n')
+        } else if (id === 'vitrify.css') {
+          return `${globalCss.map((css) => `import '${css}'`).join('\n')}`
         }
         return null
       }
@@ -465,7 +477,7 @@ export const baseConfig = async ({
       ],
       external,
       output: {
-        minifyInternalExports: false,
+        minifyInternalExports: !debug,
         entryFileNames: '[name].mjs',
         chunkFileNames: '[name].mjs',
         format: 'es',
@@ -519,7 +531,7 @@ export const baseConfig = async ({
       // ],
       external,
       output: {
-        minifyInternalExports: false,
+        minifyInternalExports: !debug,
         entryFileNames: '[name].mjs',
         chunkFileNames: '[name].mjs',
         format: 'es',

package/src/node/plugins/quasar.ts

@@ -168,7 +168,8 @@ export const QuasarPlugin: VitrifyPlugin = async ({
               onRendered: [injectSsrContext]
             },
             sass: {
-              additionalData: [`@import 'quasar/src/css/index.sass'`]
+              global: ['quasar/src/css/index.sass']
+              // additionalData: [`@import 'quasar/src/css/index.sass'`]
             }
           }
         }
@@ -232,7 +233,6 @@ export const QuasarPlugin: VitrifyPlugin = async ({
                   urls?.packages?.quasar
                 ).pathname
               },
-
               {
                 find: 'quasar/directives',
                 replacement: new URL(
@@ -244,16 +244,17 @@ export const QuasarPlugin: VitrifyPlugin = async ({
                 find: 'quasar/src',
                 replacement: new URL('src/', urls?.packages?.quasar).pathname
               },
-              {
-                find: new RegExp('^quasar$'),
-                replacement: new URL('src/index.all.js', urls?.packages?.quasar)
-                  .pathname
-              },
+              // {
+              //   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' }
             ]
           },
           define: {
@@ -275,11 +276,11 @@ export const QuasarPlugin: VitrifyPlugin = async ({
     },
     {
       name: 'quasar-virtual-modules',
-      enforce: 'post',
+      enforce: 'pre',
       config: async (config, env) => ({
         resolve: {
           alias: [
-            { find: new RegExp('^quasar$'), replacement: 'virtual:quasar' }
+            // { find: new RegExp('^quasar$'), replacement: 'virtual:quasar' }
           ]
         }
       }),
@@ -287,8 +288,8 @@ export const QuasarPlugin: VitrifyPlugin = async ({
         switch (id) {
           case 'virtual:quasar-plugins':
             return 'virtual:quasar-plugins'
-          case 'virtual:quasar':
-            return { id: 'virtual:quasar', moduleSideEffects: false }
+          case 'quasar':
+            return { id: 'quasar', moduleSideEffects: false }
           default:
             return
         }
@@ -296,7 +297,7 @@ export const QuasarPlugin: VitrifyPlugin = async ({
       load(id) {
         if (id === 'virtual:quasar-plugins') {
           return `export { ${plugins.join(',')} } from 'quasar'`
-        } else if (id === 'virtual:quasar') {
+        } else if (id === 'quasar') {
           return `export * from 'quasar/src/plugins.js';
           export * from 'quasar/src/components.js';
           export * from 'quasar/src/composables.js';

package/src/node/vitrify-config.ts

@@ -71,6 +71,7 @@ export interface VitrifyConfig extends UserConfig {
     sass?: {
       variables?: Record<string, string>
       additionalData?: string[]
+      global?: string[]
     }
     /**
      * Product name of the application. Will be used for the HTML title tag

package/src/vite/vue/main.ts

@@ -1,3 +1,5 @@
+// import 'vitrify.css'
+import 'vitrify.sass'
 import App from 'src/App.vue'
 import createRouter from 'src/router'
 import {