vitrify 0.14.0 → 0.14.2

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

@@ -1,6 +1,6 @@
 import fastifyStatic from '@fastify/static';
 import { fileURLToPath } from 'url';
-const fastifyCsrPlugin = async (fastify, options, done) => {
+const fastifyCsrPlugin = async (fastify, options) => {
     options.vitrifyDir =
         options.vitrifyDir || (await import('vitrify')).vitrifyDir;
     const frameworkDir = new URL('src/vite/vue/', options.vitrifyDir);
@@ -35,6 +35,5 @@ const fastifyCsrPlugin = async (fastify, options, done) => {
             prefix: options.baseUrl
         });
     }
-    done();
 };
 export { fastifyCsrPlugin };

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

@@ -2,7 +2,7 @@ import fastifyStatic from '@fastify/static';
 import { readFileSync } from 'fs';
 import { fileURLToPath } from 'url';
 import { addOrReplaceAppDiv, appendToBody, appendToHead } from '../../helpers/utils.js';
-const fastifySsrPlugin = async (fastify, options, done) => {
+const fastifySsrPlugin = async (fastify, options) => {
     options.baseUrl = options.baseUrl || '/';
     options.mode = options.mode || process.env.MODE || import.meta.env.MODE;
     options.appDir = options.appDir || new URL('../../..', import.meta.url);
@@ -144,6 +144,5 @@ const fastifySsrPlugin = async (fastify, options, done) => {
             res.send(html);
         });
     }
-    done();
 };
 export { fastifySsrPlugin };

package/dist/index.js

@@ -436,16 +436,31 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
         if (debug)
             plugins.push(visualizer());
     }
+    // Vue now only exports CJS for Node
+    // Add the deps as devDependency
+    const vueInternalPkgs = [
+        '@vue/runtime-dom',
+        '@vue/runtime-core',
+        '@vue/reactivity',
+        '@vue/shared',
+        '@vue/server-renderer'
+    ];
+    const vuePkgAliases = [];
+    for (const pkg of vueInternalPkgs) {
+        const specifier = pkg.split('/').at(-1);
+        const pkgJsonPath = await findDepPkgJsonPath(pkg, fileURLToPath(appDir));
+        if (pkgJsonPath)
+            vuePkgAliases.push({
+                find: pkg,
+                replacement: fileURLToPath(new URL(`./dist/${specifier}.esm-bundler.js`, `file://${pkgJsonPath}` || ''))
+            });
+    }
     const alias = [
         { find: 'src', replacement: fileURLToPath(srcDir) },
         { find: 'app', replacement: fileURLToPath(appDir) },
         { find: 'cwd', replacement: fileURLToPath(cwd) },
         { find: 'boot', replacement: fileURLToPath(new URL('boot/', srcDir)) },
         { find: 'assets', replacement: fileURLToPath(new URL('assets/', srcDir)) },
-        // ...Object.entries(packageUrls).map(([key, value]) => ({
-        //   find: key,
-        //   replacement: value.pathname
-        // }))
         {
             find: new RegExp('^vue$'),
             replacement: fileURLToPath(new URL('./dist/vue.runtime.esm-bundler.js', packageUrls['vue']))
@@ -453,7 +468,8 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
         {
             find: new RegExp('^vue-router$'),
             replacement: fileURLToPath(new URL('./dist/vue-router.esm-bundler.js', packageUrls['vue-router']))
-        }
+        },
+        ...vuePkgAliases
     ];
     if (mode === 'development' && vitrifyConfig.vitrify?.dev?.alias)
         alias.push(...vitrifyConfig.vitrify.dev.alias);

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

@@ -1,4 +1,4 @@
-import type { FastifyPluginCallback, FastifyRequest, FastifyReply } from 'fastify';
+import type { FastifyPluginAsync, FastifyRequest, FastifyReply } from 'fastify';
 import type { ViteDevServer } from 'vite';
 export interface FastifySsrOptions {
     baseUrl?: string;
@@ -10,6 +10,6 @@ export interface FastifySsrOptions {
     productName?: string;
     mode?: string;
 }
-declare const fastifyCsrPlugin: FastifyPluginCallback<FastifySsrOptions>;
+declare const fastifyCsrPlugin: FastifyPluginAsync<FastifySsrOptions>;
 export { fastifyCsrPlugin };
 export type FastifyCsrPlugin = typeof fastifyCsrPlugin;

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

@@ -1,4 +1,4 @@
-import type { FastifyPluginCallback, FastifyRequest, FastifyReply } from 'fastify';
+import type { FastifyPluginAsync, FastifyRequest, FastifyReply } from 'fastify';
 import type { ViteDevServer } from 'vite';
 import type { OnRenderedHook } from '../../vitrify-config.js';
 export interface FastifySsrOptions {
@@ -14,6 +14,6 @@ export interface FastifySsrOptions {
     mode?: string;
     host?: string;
 }
-declare const fastifySsrPlugin: FastifyPluginCallback<FastifySsrOptions>;
+declare const fastifySsrPlugin: FastifyPluginAsync<FastifySsrOptions>;
 export { fastifySsrPlugin };
 export type FastifySsrPlugin = typeof fastifySsrPlugin;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vitrify",
-  "version": "0.14.0",
+  "version": "0.14.2",
   "license": "MIT",
   "author": "Stefan van Herwijnen",
   "description": "Vite as your Full Stack development tool",
@@ -49,52 +49,52 @@
   },
   "dependencies": {
     "@fastify/middie": "^8.3.0",
-    "@fastify/static": "^6.12.0",
-    "@quasar/extras": "^1.16.8",
-    "@vitejs/plugin-vue": "^4.5.0",
+    "@fastify/static": "^7.0.1",
+    "@vitejs/plugin-vue": "^5.0.4",
     "ajv": "^8.12.0",
     "builtin-modules": "^3.3.0",
     "cac": "^6.7.14",
     "chalk": "^5.3.0",
     "critters": "^0.0.20",
     "cross-env": "^7.0.3",
-    "esbuild": "^0.19.8",
-    "fastify": "^4.24.3",
+    "esbuild": "^0.20.0",
+    "fastify": "^4.26.1",
     "glob": "^10.3.10",
-    "happy-dom": "^12.10.3",
+    "happy-dom": "^13.3.8",
     "is-port-reachable": "^4.0.0",
-    "magic-string": "^0.30.5",
+    "magic-string": "^0.30.7",
     "merge-deep": "^3.0.3",
     "readline": "^1.3.0",
-    "rollup-plugin-visualizer": "^5.9.3",
-    "sass": "1.69.5",
-    "ts-node": "^10.9.1",
-    "unplugin-vue-components": "^0.25.2",
-    "vite": "^5.0.2",
-    "vite-plugin-pwa": "^0.17.2",
+    "rollup-plugin-visualizer": "^5.12.0",
+    "sass": "1.71.0",
+    "ts-node": "^10.9.2",
+    "unplugin-vue-components": "^0.26.0",
+    "vite": "^5.1.3",
+    "vite-plugin-pwa": "^0.18.2",
     "vitefu": "^0.2.5",
-    "vitest": "^0.34.6",
+    "vitest": "^1.2.2",
     "workbox-window": "^7.0.0"
   },
   "devDependencies": {
+    "@quasar/extras": "^1.16.9",
     "@types/connect": "^3.4.38",
     "@types/glob": "^8.1.0",
     "@types/merge-deep": "^3.0.3",
-    "@types/node": "^20.10.0",
+    "@types/node": "^20.11.19",
     "@types/ws": "^8.5.10",
-    "@vue/runtime-core": "^3.3.9",
-    "quasar": "^2.14.0",
-    "rollup": "^4.6.0",
-    "typescript": "^5.3.2",
-    "vue": "^3.3.9",
+    "@vue/runtime-core": "^3.4.19",
+    "quasar": "^2.14.4",
+    "rollup": "^4.11.0",
+    "typescript": "^5.3.3",
+    "vue": "^3.4.19",
     "vue-router": "^4.2.5"
   },
   "peerDependencies": {
-    "@fastify/static": "^6.5.0",
-    "fastify": "^4.5.3",
-    "quasar": "^2.7.7",
-    "vue": "^3.2.38",
-    "vue-router": "^4.1.5"
+    "@fastify/static": "^6.12.0",
+    "fastify": "^4.26.0",
+    "quasar": "^2.14.3",
+    "vue": "^3.4.15",
+    "vue-router": "^4.2.5"
   },
   "publishConfig": {
     "access": "public",

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

@@ -1,8 +1,4 @@
-import type {
-  FastifyPluginCallback,
-  FastifyRequest,
-  FastifyReply
-} from 'fastify'
+import type { FastifyPluginAsync, FastifyRequest, FastifyReply } from 'fastify'
 import fastifyStatic from '@fastify/static'
 import type { ViteDevServer } from 'vite'
 import { fileURLToPath } from 'url'
@@ -21,10 +17,9 @@ export interface FastifySsrOptions {
   mode?: string
 }
 
-const fastifyCsrPlugin: FastifyPluginCallback<FastifySsrOptions> = async (
+const fastifyCsrPlugin: FastifyPluginAsync<FastifySsrOptions> = async (
   fastify,
-  options,
-  done
+  options
 ) => {
   options.vitrifyDir =
     options.vitrifyDir || (await import('vitrify')).vitrifyDir
@@ -64,7 +59,6 @@ const fastifyCsrPlugin: FastifyPluginCallback<FastifySsrOptions> = async (
       prefix: options.baseUrl
     })
   }
-  done()
 }
 
 export { fastifyCsrPlugin }

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

@@ -1,8 +1,4 @@
-import type {
-  FastifyPluginCallback,
-  FastifyRequest,
-  FastifyReply
-} from 'fastify'
+import type { FastifyPluginAsync, FastifyRequest, FastifyReply } from 'fastify'
 import fastifyStatic from '@fastify/static'
 import { readFileSync } from 'fs'
 import { fileURLToPath } from 'url'
@@ -31,10 +27,9 @@ export interface FastifySsrOptions {
   host?: string
 }
 
-const fastifySsrPlugin: FastifyPluginCallback<FastifySsrOptions> = async (
+const fastifySsrPlugin: FastifyPluginAsync<FastifySsrOptions> = async (
   fastify,
-  options,
-  done
+  options
 ) => {
   options.baseUrl = options.baseUrl || '/'
   options.mode = options.mode || process.env.MODE || import.meta.env.MODE
@@ -223,8 +218,6 @@ const fastifySsrPlugin: FastifyPluginCallback<FastifySsrOptions> = async (
       res.send(html)
     })
   }
-
-  done()
 }
 
 export { fastifySsrPlugin }

package/src/node/index.ts

@@ -531,16 +531,38 @@ export const baseConfig = async ({
     if (debug) plugins.push(visualizer())
   }
 
+  // Vue now only exports CJS for Node
+  // Add the deps as devDependency
+  const vueInternalPkgs = [
+    '@vue/runtime-dom',
+    '@vue/runtime-core',
+    '@vue/reactivity',
+    '@vue/shared',
+    '@vue/server-renderer'
+  ]
+
+  const vuePkgAliases: Alias[] = []
+  for (const pkg of vueInternalPkgs) {
+    const specifier = pkg.split('/').at(-1)
+    const pkgJsonPath = await findDepPkgJsonPath(pkg, fileURLToPath(appDir!))
+    if (pkgJsonPath)
+      vuePkgAliases.push({
+        find: pkg,
+        replacement: fileURLToPath(
+          new URL(
+            `./dist/${specifier}.esm-bundler.js`,
+            `file://${pkgJsonPath}` || ''
+          )
+        )
+      })
+  }
+
   const alias: Alias[] = [
     { find: 'src', replacement: fileURLToPath(srcDir) },
     { find: 'app', replacement: fileURLToPath(appDir) },
     { find: 'cwd', replacement: fileURLToPath(cwd) },
     { find: 'boot', replacement: fileURLToPath(new URL('boot/', srcDir)) },
     { find: 'assets', replacement: fileURLToPath(new URL('assets/', srcDir)) },
-    // ...Object.entries(packageUrls).map(([key, value]) => ({
-    //   find: key,
-    //   replacement: value.pathname
-    // }))
     {
       find: new RegExp('^vue$'),
       replacement: fileURLToPath(
@@ -552,7 +574,8 @@ export const baseConfig = async ({
       replacement: fileURLToPath(
         new URL('./dist/vue-router.esm-bundler.js', packageUrls['vue-router'])
       )
-    }
+    },
+    ...vuePkgAliases
   ]
   if (mode === 'development' && vitrifyConfig.vitrify?.dev?.alias)
     alias.push(...vitrifyConfig.vitrify.dev.alias)