vitrify 0.7.1 → 0.9.0

package/dist/bin/dev.js

@@ -2,6 +2,13 @@ import { searchForWorkspaceRoot } from 'vite';
 import { baseConfig } from '../index.js';
 import fastify from 'fastify';
 import { fastifySsrPlugin } from '../frameworks/vue/fastify-ssr-plugin.js';
+import isPortReachable from 'is-port-reachable';
+const getFirstOpenPort = async (portNumber) => {
+    if (!(await isPortReachable(portNumber, { host: 'localhost' }))) {
+        return portNumber;
+    }
+    return getFirstOpenPort(portNumber + 1);
+};
 export async function createVitrifyDevServer({ port = 3000, logLevel = 'info', 
 // mode = 'csr',
 ssr, framework = 'vue', host, appDir, publicDir, base }) {
@@ -29,7 +36,7 @@ ssr, framework = 'vue', host, appDir, publicDir, base }) {
         https: config.server?.https,
         hmr: {
             protocol: config.server?.https ? 'wss' : 'ws',
-            port: 24678
+            port: await getFirstOpenPort(24678)
         },
         port,
         // middlewareMode: mode === 'ssr' ? 'ssr' : undefined,

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

@@ -2,9 +2,6 @@ import fastifyStatic from '@fastify/static';
 import { readFileSync } from 'fs';
 import { componentsModules, collectCss } from '../../helpers/collect-css-ssr.js';
 const fastifySsrPlugin = async (fastify, options, done) => {
-    options.vitrifyDir =
-        options.vitrifyDir || (await import('vitrify')).vitrifyDir;
-    const frameworkDir = new URL('src/vite/vue/', options.vitrifyDir);
     options.baseUrl = options.baseUrl || '/';
     options.mode = options.mode || process.env.MODE || import.meta.env.MODE;
     options.appDir = options.appDir || new URL('../../..', import.meta.url);
@@ -12,6 +9,9 @@ const fastifySsrPlugin = async (fastify, options, done) => {
         options.baseUrl.charAt(0) !== '/')
         throw new Error('baseUrl should start and end with a /');
     if (options.mode === 'development') {
+        options.vitrifyDir =
+            options.vitrifyDir || (await import('vitrify')).vitrifyDir;
+        const frameworkDir = new URL('src/vite/vue/', options.vitrifyDir);
         // if (!options.vitrifyDir)
         //   throw new Error('Option vitrifyDir cannot be undefined')
         // if (!options.vite) throw new Error('Option vite cannot be undefined')

package/dist/index.js

@@ -10,6 +10,7 @@ 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';
 const internalServerModules = [
     'util',
     'vitrify',
@@ -196,6 +197,7 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
         ];
     const plugins = [
         vuePlugin(),
+        envPlugin(),
         ...frameworkPlugins,
         {
             name: 'vitrify-setup',

package/dist/plugins/quasar.js

@@ -38,12 +38,12 @@ export const QuasarPlugin = async ({ ssr = false, pwa = false }) => {
             name: 'vite-plugin-quasar-transform',
             enforce: 'pre',
             transform: (code, id, options) => {
-                const { ssr: transformSsr } = options || {};
+                const { ssr } = options || {};
                 code = code
                     .replaceAll('__QUASAR_SSR__', ssr ? 'true' : 'false')
-                    .replaceAll('__QUASAR_SSR_SERVER__', ssr === 'server' ? 'import.meta.env.SSR' : 'false')
-                    .replaceAll('__QUASAR_SSR_CLIENT__', ssr ? '!import.meta.env.SSR' : 'false')
-                    .replaceAll('__QUASAR_SSR_PWA__', ssr && pwa ? '!import.meta.env.SSR' : 'false');
+                    .replaceAll('__QUASAR_SSR_SERVER__', ssr ? '(import.meta.env.SSR === true)' : 'false')
+                    .replaceAll('__QUASAR_SSR_CLIENT__', ssr ? '(import.meta.env.SSR === false)' : 'false')
+                    .replaceAll('__QUASAR_SSR_PWA__', ssr && pwa ? '(import.meta.env.SSR === false)' : 'false');
                 return code;
             }
         },
@@ -52,7 +52,7 @@ export const QuasarPlugin = async ({ ssr = false, pwa = false }) => {
             enforce: 'pre',
             config: async (config, env) => {
                 const { vitrify: { urls } = {}, quasar } = config;
-                const globalCss = quasar?.extras.map((extra) => `@quasar/extras/${extra}/${extra}.css`);
+                const globalCss = quasar?.extras?.map((extra) => `@quasar/extras/${extra}/${extra}.css`);
                 const localPackages = ['@quasar/extras', 'quasar'];
                 // const localPackages: string[] = []
                 await (async () => {
@@ -77,10 +77,13 @@ export const QuasarPlugin = async ({ ssr = false, pwa = false }) => {
                         const directives = await import('virtual:quasar-directives');
                         // @ts-ignore
                         const { default: lang } = await import('virtual:quasar-lang');
+                        // @ts-ignore
+                        const { default: iconSet } = await import('virtual:quasar-iconSet');
                         app.use(staticImports?.Quasar, {
                             plugins: quasarPlugins,
                             directives,
-                            lang
+                            lang,
+                            iconSet
                         }, ssrContext);
                     }
                 ];
@@ -163,6 +166,8 @@ export const QuasarPlugin = async ({ ssr = false, pwa = false }) => {
                         return 'virtual:quasar-directives';
                     case 'virtual:quasar-lang':
                         return 'virtual:quasar-lang';
+                    case 'virtual:quasar-iconSet':
+                        return 'virtual:quasar-iconSet';
                     case 'virtual:quasar':
                         return { id: 'virtual:quasar', moduleSideEffects: false };
                     default:
@@ -179,6 +184,10 @@ export const QuasarPlugin = async ({ ssr = false, pwa = false }) => {
                 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-iconSet') {
+                    return `import iconSet from 'quasar/icon-set/${quasarConf?.framework.iconSet || 'material-icons'}';
+          export default iconSet`;
                 }
                 else if (id === 'virtual:quasar') {
                     return `export * from 'quasar/src/plugins.js';

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

@@ -8,6 +8,7 @@ export interface QuasarConf {
         directives?: string[];
         plugins?: string[];
         lang?: string;
+        iconSet?: string;
     };
     animations: string[];
     extras: string[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vitrify",
-  "version": "0.7.1",
+  "version": "0.9.0",
   "license": "MIT",
   "author": "Stefan van Herwijnen",
   "description": "Pre-configured Vite CLI for your framework",
@@ -60,6 +60,7 @@
     "@fastify/static": "^6.5.0",
     "@quasar/extras": "^1.15.1",
     "@vitejs/plugin-vue": "^3.0.1",
+    "@vitrify/plugin-env": "^0.1.0",
     "builtin-modules": "^3.3.0",
     "cac": "^6.7.12",
     "chalk": "^5.0.1",
@@ -69,6 +70,7 @@
     "fastify": "^4.3.0",
     "glob": "^8.0.3",
     "happy-dom": "^6.0.4",
+    "is-port-reachable": "^4.0.0",
     "magic-string": "^0.26.2",
     "merge-deep": "^3.0.3",
     "readline": "^1.3.0",

package/src/node/bin/dev.ts

@@ -6,6 +6,14 @@ import fastify from 'fastify'
 import type { FastifyServerOptions } from 'fastify'
 import { fastifySsrPlugin } from '../frameworks/vue/fastify-ssr-plugin.js'
 import type { OnRenderedHook, VitrifyConfig } from '../vitrify-config.js'
+import isPortReachable from 'is-port-reachable'
+
+const getFirstOpenPort = async (portNumber: number): Promise<number> => {
+  if (!(await isPortReachable(portNumber, { host: 'localhost' }))) {
+    return portNumber
+  }
+  return getFirstOpenPort(portNumber + 1)
+}
 
 export async function createVitrifyDevServer({
   port = 3000,
@@ -55,7 +63,7 @@ export async function createVitrifyDevServer({
     https: config.server?.https,
     hmr: {
       protocol: config.server?.https ? 'wss' : 'ws',
-      port: 24678
+      port: await getFirstOpenPort(24678)
     },
     port,
     // middlewareMode: mode === 'ssr' ? 'ssr' : undefined,

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

@@ -30,9 +30,6 @@ const fastifySsrPlugin: FastifyPluginCallback<FastifySsrOptions> = async (
   options,
   done
 ) => {
-  options.vitrifyDir =
-    options.vitrifyDir || (await import('vitrify')).vitrifyDir
-  const frameworkDir = new URL('src/vite/vue/', options.vitrifyDir)
   options.baseUrl = options.baseUrl || '/'
   options.mode = options.mode || process.env.MODE || import.meta.env.MODE
   options.appDir = options.appDir || new URL('../../..', import.meta.url)
@@ -43,6 +40,9 @@ const fastifySsrPlugin: FastifyPluginCallback<FastifySsrOptions> = async (
   )
     throw new Error('baseUrl should start and end with a /')
   if (options.mode === 'development') {
+    options.vitrifyDir =
+      options.vitrifyDir || (await import('vitrify')).vitrifyDir
+    const frameworkDir = new URL('src/vite/vue/', options.vitrifyDir)
     // if (!options.vitrifyDir)
     //   throw new Error('Option vitrifyDir cannot be undefined')
     // if (!options.vite) throw new Error('Option vite cannot be undefined')

package/src/node/index.ts

@@ -23,6 +23,7 @@ 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'
 
 const internalServerModules = [
   'util',
@@ -269,6 +270,7 @@ export const baseConfig = async ({
 
   const plugins: UserConfig['plugins'] = [
     vuePlugin(),
+    envPlugin(),
     ...frameworkPlugins,
     {
       name: 'vitrify-setup',

package/src/node/plugins/quasar.ts

@@ -17,6 +17,7 @@ export interface QuasarConf {
     directives?: string[]
     plugins?: string[]
     lang?: string
+    iconSet?: string
   }
   animations: string[]
   extras: string[]
@@ -84,20 +85,20 @@ export const QuasarPlugin: VitrifyPlugin = async ({
       name: 'vite-plugin-quasar-transform',
       enforce: 'pre',
       transform: (code, id, options) => {
-        const { ssr: transformSsr } = options || {}
+        const { ssr } = options || {}
         code = code
           .replaceAll('__QUASAR_SSR__', ssr ? 'true' : 'false')
           .replaceAll(
             '__QUASAR_SSR_SERVER__',
-            ssr === 'server' ? 'import.meta.env.SSR' : 'false'
+            ssr ? '(import.meta.env.SSR === true)' : 'false'
           )
           .replaceAll(
             '__QUASAR_SSR_CLIENT__',
-            ssr ? '!import.meta.env.SSR' : 'false'
+            ssr ? '(import.meta.env.SSR === false)' : 'false'
           )
           .replaceAll(
             '__QUASAR_SSR_PWA__',
-            ssr && pwa ? '!import.meta.env.SSR' : 'false'
+            ssr && pwa ? '(import.meta.env.SSR === false)' : 'false'
           )
 
         return code
@@ -109,7 +110,7 @@ export const QuasarPlugin: VitrifyPlugin = async ({
       config: async (config: VitrifyConfig, env): Promise<VitrifyConfig> => {
         const { vitrify: { urls } = {}, quasar } = config
 
-        const globalCss = quasar?.extras.map(
+        const globalCss = quasar?.extras?.map(
           (extra) => `@quasar/extras/${extra}/${extra}.css`
         )
 
@@ -143,13 +144,16 @@ export const QuasarPlugin: VitrifyPlugin = async ({
             const directives = await import('virtual:quasar-directives')
             // @ts-ignore
             const { default: lang } = await import('virtual:quasar-lang')
+            // @ts-ignore
+            const { default: iconSet } = await import('virtual:quasar-iconSet')
 
             app.use(
               staticImports?.Quasar,
               {
                 plugins: quasarPlugins,
                 directives,
-                lang
+                lang,
+                iconSet
               },
               ssrContext
             )
@@ -239,6 +243,8 @@ export const QuasarPlugin: VitrifyPlugin = async ({
             return 'virtual:quasar-directives'
           case 'virtual:quasar-lang':
             return 'virtual:quasar-lang'
+          case 'virtual:quasar-iconSet':
+            return 'virtual:quasar-iconSet'
           case 'virtual:quasar':
             return { id: 'virtual:quasar', moduleSideEffects: false }
           default:
@@ -255,6 +261,11 @@ export const QuasarPlugin: VitrifyPlugin = async ({
             quasarConf?.framework?.lang || 'en-US'
           }';
           export default lang`
+        } else if (id === 'virtual:quasar-iconSet') {
+          return `import iconSet from 'quasar/icon-set/${
+            quasarConf?.framework.iconSet || 'material-icons'
+          }';
+          export default iconSet`
         } else if (id === 'virtual:quasar') {
           return `export * from 'quasar/src/plugins.js';
           export * from 'quasar/src/components.js';

package/src/vite/vue/ssr/app.ts

@@ -23,4 +23,5 @@ export const setupApp = async () => {
   })
 }
 
+export { default as vitrifyConfig } from 'virtual:vitrify-config'
 export { onRendered }