vitrify 0.6.9 → 0.6.12

package/dist/index.js

@@ -35,10 +35,9 @@ const moduleChunks = {
     quasar: ['quasar']
 };
 const manualChunks = (id, api) => {
-    if (id.includes('vitrify/src/vite/')) {
+    if (id.includes('vitrify/src/')) {
         const name = id.split('/').at(-1)?.split('.').at(0);
-        if (name && manualChunkNames.includes(name))
-            return name;
+        return name;
     }
     else if (VIRTUAL_MODULES.some((virtualModule) => id.includes(virtualModule))) {
         return VIRTUAL_MODULES.find((name) => id.includes(name));
@@ -496,7 +495,7 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
             exclude: ['vue', 'vue-router', ...serverModules, ...builtinModules]
         },
         resolve: {
-            dedupe: ['vue', '@vue/server-renderer', 'vue-router'],
+            dedupe: ['vue', 'vue-router'],
             alias
         },
         build: {

package/dist/types/helpers/routes.d.ts

@@ -1,2 +1,2 @@
-import type { RouteRecord } from 'vue-router';
-export declare const routesToPaths: (routes?: RouteRecord[]) => string[];
+import type { RouteRecordRaw } from 'vue-router';
+export declare const routesToPaths: (routes?: RouteRecordRaw[]) => string[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vitrify",
-  "version": "0.6.9",
+  "version": "0.6.12",
   "license": "MIT",
   "author": "Stefan van Herwijnen",
   "description": "Pre-configured Vite CLI for your framework",
@@ -60,7 +60,6 @@
     "@fastify/static": "^6.4.0",
     "@quasar/extras": "^1.14.2",
     "@vitejs/plugin-vue": "^3.0.0-alpha.1",
-    "@vue/server-renderer": "^3.2.37",
     "builtin-modules": "^3.3.0",
     "cac": "^6.7.12",
     "chalk": "^5.0.1",

package/src/node/helpers/routes.ts

@@ -1,12 +1,12 @@
 // https://github.com/antfu/vite-ssg/blob/462722203dade87365a519d847fcd881ee16a7f4/src/node/utils.ts#L13
-import type { RouteRecord } from 'vue-router'
+import type { RouteRecordRaw } from 'vue-router'
 
-export const routesToPaths = (routes?: RouteRecord[]) => {
+export const routesToPaths = (routes?: RouteRecordRaw[]) => {
   if (!routes) return ['/']
 
   const paths: Set<string> = new Set()
 
-  const getPaths = (routes: RouteRecord[], prefix = '') => {
+  const getPaths = (routes: RouteRecordRaw[], prefix = '') => {
     // remove trailing slash
     prefix = prefix.replace(/\/$/g, '')
     for (const route of routes) {

package/src/node/index.ts

@@ -54,9 +54,9 @@ const moduleChunks = {
   quasar: ['quasar']
 }
 const manualChunks: ManualChunksOption = (id, api) => {
-  if (id.includes('vitrify/src/vite/')) {
+  if (id.includes('vitrify/src/')) {
     const name = id.split('/').at(-1)?.split('.').at(0)
-    if (name && manualChunkNames.includes(name)) return name
+    return name
   } else if (
     VIRTUAL_MODULES.some((virtualModule) => id.includes(virtualModule))
   ) {
@@ -580,7 +580,7 @@ export const baseConfig = async ({
       exclude: ['vue', 'vue-router', ...serverModules, ...builtinModules]
     },
     resolve: {
-      dedupe: ['vue', '@vue/server-renderer', 'vue-router'],
+      dedupe: ['vue', 'vue-router'],
       alias
     },
     build: {

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

@@ -1,5 +1,5 @@
 import { createApp } from '../main.js'
-import { renderToString } from 'vue/server-renderer'
+// import { renderToString } from 'vue/server-renderer'
 
 import { onRendered } from 'virtual:vitrify-hooks'
 
@@ -37,7 +37,9 @@ export const getRoutes = async () =>
     })
   ).routes
 
-export async function render(url, manifest, ssrContext) {
+export async function render(url, manifest, ssrContext, renderToString) {
+  if (!renderToString)
+    renderToString = (await import('vue/server-renderer')).renderToString
   const { app, router } = await initializeApp(url, ssrContext)
 
   const ctx = {