vitrify 0.9.2 → 0.10.1

package/dist/frameworks/vue/server.js

@@ -1,7 +1,9 @@
 import fastify from 'fastify';
 export const createApp = ({ onSetup, appDir, baseUrl, fastifyPlugin, onRendered, vitrifyDir, mode }) => {
     const app = fastify({
-        logger: true
+        logger: {
+            level: process.env.DEBUG ? 'debug' : process.env.PINO_LOG_LEVEL || 'info'
+        }
     });
     app.register(fastifyPlugin, {
         baseUrl,

package/dist/index.js

@@ -141,6 +141,8 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
     }
     catch (e) {
         console.log('No vitrify.config.(ts|js) file found, using defaults');
+        if (process.env.DEBUG)
+            console.error(e);
         vitrifyConfig = {};
     }
     const localPackages = ['vue', 'vue-router', '@vue/server-renderer'];
@@ -338,6 +340,7 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
                 }
             }
         });
+        // @ts-ignore
         if (debug)
             plugins.push(visualizer());
     }

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

@@ -49,5 +49,5 @@ export declare function createServer({ port, logLevel, ssr, framework, host, app
         worker: import("vite").ResolveWorkerOptions;
         appType: import("vite").AppType;
         experimental: import("vite").ExperimentalOptions;
-    }>;
+    } & import("vite").PluginHookUtils>;
 }>;

package/dist/types/frameworks/vue/fastify-ssr-plugin.d.ts

@@ -3,7 +3,9 @@ import type { ViteDevServer } from 'vite';
 import type { OnRenderedHook } from 'src/node/vitrify-config.js';
 export interface FastifySsrOptions {
     baseUrl?: string;
-    provide?: (req: FastifyRequest, res: FastifyReply) => Promise<Record<string, unknown>>;
+    provide?: (req: FastifyRequest, res: FastifyReply) => Promise<Record<string, unknown | {
+        value: unknown;
+    }>>;
     vitrifyDir?: URL;
     vite?: ViteDevServer;
     onRendered?: OnRenderedHook[];

package/dist/types/frameworks/vue/server.d.ts

@@ -11,4 +11,4 @@ export declare const createApp: ({ onSetup, appDir, baseUrl, fastifyPlugin, onRe
     onRendered: OnRenderedHook[];
     vitrifyDir?: URL | undefined;
     mode: string;
-}) => FastifyInstance<import("http").Server, import("http").IncomingMessage, import("http").ServerResponse, pino.Logger, import("fastify").FastifyTypeProviderDefault> & PromiseLike<FastifyInstance<import("http").Server, import("http").IncomingMessage, import("http").ServerResponse, pino.Logger, import("fastify").FastifyTypeProviderDefault>>;
+}) => FastifyInstance<import("http").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse>, import("http").IncomingMessage, import("http").ServerResponse<import("http").IncomingMessage>, any, import("fastify").FastifyTypeProviderDefault> & PromiseLike<FastifyInstance<import("http").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse>, import("http").IncomingMessage, import("http").ServerResponse<import("http").IncomingMessage>, any, import("fastify").FastifyTypeProviderDefault>>;

package/package.json

@@ -1,42 +1,34 @@
 {
   "name": "vitrify",
-  "version": "0.9.2",
+  "version": "0.10.1",
   "license": "MIT",
   "author": "Stefan van Herwijnen",
   "description": "Vite as your Full Stack development tool",
   "type": "module",
+  "types": "./dist/index.d.ts",
   "bin": {
     "vitrify": "./dist/bin/cli.js"
   },
   "exports": {
-    ".": "./dist/index.js",
-    "./*": "./dist/*.js",
-    "./build": "./dist/bin/build.js",
-    "./dev": "./dist/bin/dev.js",
-    "./prerender": "./dist/prerender.js",
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js"
+    },
+    "./build": {
+      "types": "./dist/types/bin/build.d.ts",
+      "import": "./dist/bin/build.js"
+    },
+    "./dev": {
+      "types": "./dist/types/bin/dev.d.ts",
+      "import": "./dist/bin/dev.js"
+    },
+    "./prerender": {
+      "types": "./dist/types/bin/prerender.d.ts",
+      "import": "./dist/bin/prerender.js"
+    },
     "./helpers/*": "./dist/helpers/*.js",
-    "./vite/*": "./src/vite/*"
-  },
-  "typesVersions": {
-    "*": {
-      "*": [
-        "./dist/types/index.d.ts"
-      ],
-      "helpers/*": [
-        "./dist/types/helpers/*.d.ts"
-      ],
-      "build": [
-        "./dist/types/bin/build.d.ts"
-      ],
-      "dev": [
-        "./dist/types/bin/dev.d.ts"
-      ],
-      "prerender": [
-        "./dist/types/prerender.d.ts"
-      ],
-      "help": [
-        "./dist/types/bin/help.d.ts"
-      ]
+    "./client": {
+      "types": "./client.d.ts"
     }
   },
   "engines": {
@@ -58,48 +50,48 @@
   "dependencies": {
     "@fastify/middie": "^8.0.0",
     "@fastify/static": "^6.5.0",
-    "@quasar/extras": "^1.15.1",
-    "@vitejs/plugin-vue": "^3.0.1",
-    "@vitrify/plugin-env": "^0.1.0",
+    "@quasar/extras": "^1.15.2",
+    "@vitejs/plugin-vue": "^3.1.0",
+    "@vitrify/plugin-env": "^0.1.1",
     "builtin-modules": "^3.3.0",
-    "cac": "^6.7.12",
+    "cac": "^6.7.14",
     "chalk": "^5.0.1",
     "critters": "^0.0.16",
     "cross-env": "^7.0.3",
-    "esbuild": "^0.14.53",
-    "fastify": "^4.3.0",
+    "esbuild": "^0.15.7",
+    "fastify": "^4.5.3",
     "glob": "^8.0.3",
     "happy-dom": "^6.0.4",
     "is-port-reachable": "^4.0.0",
-    "magic-string": "^0.26.2",
+    "magic-string": "^0.26.3",
     "merge-deep": "^3.0.3",
     "readline": "^1.3.0",
-    "rollup-plugin-visualizer": "^5.7.1",
-    "sass": "1.54.2",
+    "rollup-plugin-visualizer": "^5.8.1",
+    "sass": "1.54.8",
     "ts-node": "^10.9.1",
-    "unplugin-vue-components": "^0.22.0",
-    "vite": "^3.0.4",
-    "vitest": "^0.20.3"
+    "unplugin-vue-components": "^0.22.4",
+    "vite": "^3.1.0",
+    "vitest": "^0.23.1"
   },
   "devDependencies": {
     "@types/connect": "^3.4.35",
-    "@types/glob": "^7.2.0",
+    "@types/glob": "^8.0.0",
     "@types/merge-deep": "^3.0.0",
-    "@types/node": "^18.6.3",
+    "@types/node": "^18.7.15",
     "@types/ws": "^8.5.3",
-    "@vue/runtime-core": "^3.2.37",
+    "@vue/runtime-core": "^3.2.38",
     "quasar": "^2.7.7",
-    "rollup": "^2.77.2",
-    "typescript": "^4.7.4",
-    "vue": "^3.2.37",
-    "vue-router": "^4.1.3"
+    "rollup": "^2.79.0",
+    "typescript": "^4.8.2",
+    "vue": "^3.2.38",
+    "vue-router": "^4.1.5"
   },
   "peerDependencies": {
     "@fastify/static": "^6.5.0",
-    "fastify": "^4.3.0",
+    "fastify": "^4.5.3",
     "quasar": "^2.7.7",
-    "vue": "^3.2.37",
-    "vue-router": "^4.1.3"
+    "vue": "^3.2.38",
+    "vue-router": "^4.1.5"
   },
   "publishConfig": {
     "access": "public",

package/src/node/bin/test.ts

@@ -8,6 +8,7 @@ export async function test(opts: { appDir: URL }) {
   })
 
   await startVitest(
+    'test',
     [],
     {
       root: opts.appDir.pathname,

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

@@ -13,7 +13,7 @@ export interface FastifySsrOptions {
   provide?: (
     req: FastifyRequest,
     res: FastifyReply
-  ) => Promise<Record<string, unknown>>
+  ) => Promise<Record<string, unknown | { value: unknown }>>
   vitrifyDir?: URL
   vite?: ViteDevServer
   // frameworkDir?: URL

package/src/node/frameworks/vue/server.ts

@@ -24,7 +24,9 @@ export const createApp = ({
   mode: string
 }) => {
   const app = fastify({
-    logger: true
+    logger: {
+      level: process.env.DEBUG ? 'debug' : process.env.PINO_LOG_LEVEL || 'info'
+    }
   })
 
   app.register(fastifyPlugin, {

package/src/node/index.ts

@@ -205,6 +205,7 @@ export const baseConfig = async ({
       vitrifyConfig = await vitrifyConfig({ mode, command })
   } catch (e) {
     console.log('No vitrify.config.(ts|js) file found, using defaults')
+    if (process.env.DEBUG) console.error(e)
     vitrifyConfig = {}
   }
 
@@ -409,6 +410,7 @@ export const baseConfig = async ({
       }
     })
 
+    // @ts-ignore
     if (debug) plugins.push(visualizer())
   }
 

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

@@ -2,7 +2,7 @@ import { createApp } from '../../../node/frameworks/vue/server.js'
 import { getAppDir } from '../../../node/app-urls.js'
 // import { setup } from 'virtual:fastify-setup'
 import { onSetup } from 'virtual:vitrify-hooks'
-import { fastifyCsrPlugin } from './fastify-csr-plugin.js'
+import { fastifyCsrPlugin } from './fastify-csr-plugin'
 import type { ViteDevServer } from 'vite'
 
 // const appDir = getPkgJsonDir(import.meta.url)

package/src/vite/vue/csr/fastify-csr-plugin.ts

@@ -1,3 +1,3 @@
-import { fastifyCsrPlugin } from '../../../node/frameworks/vue/fastify-csr-plugin.js'
+import { fastifyCsrPlugin } from '../../../node/frameworks/vue/fastify-csr-plugin'
 
 export { fastifyCsrPlugin }

package/src/vite/vue/csr/server.ts

@@ -1,4 +1,4 @@
-import { setupApp } from './app.js'
+import { setupApp } from './app'
 
 const app = await setupApp()
 

package/src/vite/vue/main.ts

@@ -1,17 +1,18 @@
-// import 'vitrify.css'
-import 'vitrify.sass'
-import App from 'src/App.vue'
 import createRouter from 'src/router'
 import {
   createSSRApp,
   createApp as createVueApp,
   h,
   onMounted as onMountedVue,
-  getCurrentInstance
+  getCurrentInstance,
+  ref
 } from 'vue'
 import { onBoot, onMounted } from 'virtual:vitrify-hooks'
 import routes from 'src/router/routes'
 import * as staticImports from 'virtual:static-imports'
+import 'vitrify.sass'
+import 'vitrify.css'
+import App from 'src/App.vue'
 
 interface ssrContext {
   ssr: boolean
@@ -19,6 +20,10 @@ interface ssrContext {
   [key: string]: unknown
 }
 
+function capitalizeFirstLetter(string) {
+  return string.charAt(0).toUpperCase() + string.slice(1)
+}
+
 export async function createApp(
   ssr?: 'client' | 'server',
   ssrContext?: ssrContext
@@ -56,7 +61,7 @@ export async function createApp(
   })
 
   let initialState: Record<string, any>
-  let provide: Record<string, unknown> = {}
+  let provide: Record<string, any> = {}
   if (import.meta.env.SSR) {
     if (ssrContext?.provide) {
       provide = ssrContext?.provide
@@ -70,7 +75,16 @@ export async function createApp(
     }
   }
   for (let key in provide) {
-    app.provide(key, provide[key])
+    if (provide[key].value) {
+      const refValue = ref(provide[key].value)
+      app.provide(key, refValue)
+      app.provide(
+        `update${capitalizeFirstLetter(key)}`,
+        (val: any) => (refValue.value = val)
+      )
+    } else {
+      app.provide(key, provide[key])
+    }
   }
 
   for (let fn of onBoot) {

package/src/vite/vue/ssr/entry-client.ts

@@ -1,4 +1,4 @@
-import { createApp } from '../main.js'
+import { createApp } from '../main'
 
 // const { app, router } = createApp()
 createApp('client').then(({ app, router }) => {

package/src/vite/vue/ssr/entry-server.ts

@@ -1,4 +1,4 @@
-import { createApp } from '../main.js'
+import { createApp } from '../main'
 // import { renderToString } from 'vue/server-renderer'
 
 // import { onRendered } from 'virtual:vitrify-hooks'

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

@@ -1,4 +1,4 @@
-import { setupApp } from './app.js'
+import { setupApp } from './app'
 
 const app = await setupApp()