vitrify 0.6.7 → 0.6.10

package/dist/index.js

@@ -31,14 +31,15 @@ const manualChunkNames = [
     'server'
 ];
 const moduleChunks = {
-    vue: ['vue', '@vue'],
+    vue: ['vue', '@vue', 'vue-router'],
     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 'vitrify';
     }
     else if (VIRTUAL_MODULES.some((virtualModule) => id.includes(virtualModule))) {
         return VIRTUAL_MODULES.find((name) => id.includes(name));
@@ -380,6 +381,10 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
         {
             find: new RegExp('^vue$'),
             replacement: 'vue/dist/vue.runtime.esm-bundler.js'
+        },
+        {
+            find: new RegExp('^vue-router$'),
+            replacement: 'vue-router/dist/vue-router.esm-bundler.js'
         }
         // { find: 'vue', replacement: packageUrls['vue'].pathname },
         // { find: 'vue-router', replacement: packageUrls['vue-router'].pathname },
@@ -489,7 +494,13 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
         },
         plugins,
         optimizeDeps: {
-            exclude: ['vue', 'vue-router', ...serverModules, ...builtinModules]
+            exclude: [
+                'vue',
+                'vue-router',
+                'vue/server-renderer',
+                ...serverModules,
+                ...builtinModules
+            ]
         },
         resolve: {
             dedupe: ['vue', '@vue/server-renderer', 'vue-router'],

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vitrify",
-  "version": "0.6.7",
+  "version": "0.6.10",
   "license": "MIT",
   "author": "Stefan van Herwijnen",
   "description": "Pre-configured Vite CLI for your framework",
@@ -87,18 +87,18 @@
     "@types/node": "^18.0.1",
     "@types/ws": "^8.5.3",
     "@vue/runtime-core": "^3.2.37",
-    "quasar": "^2.7.4",
+    "quasar": "^2.7.5",
     "rollup": "^2.75.7",
     "typescript": "^4.7.4",
     "vue": "^3.2.37",
-    "vue-router": "^4.0.16"
+    "vue-router": "^4.1.0"
   },
   "peerDependencies": {
     "@fastify/static": "^6.4.0",
     "fastify": "^4.2.0",
-    "quasar": "^2.7.4",
+    "quasar": "^2.7.5",
     "vue": "^3.2.37",
-    "vue-router": "^4.0.16"
+    "vue-router": "^4.1.0"
   },
   "publishConfig": {
     "access": "public",

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 { RouteRecordRaw } from 'vue-router'
+import type { RouteRecord } from 'vue-router'
 
-export const routesToPaths = (routes?: RouteRecordRaw[]) => {
+export const routesToPaths = (routes?: RouteRecord[]) => {
   if (!routes) return ['/']
 
   const paths: Set<string> = new Set()
 
-  const getPaths = (routes: RouteRecordRaw[], prefix = '') => {
+  const getPaths = (routes: RouteRecord[], prefix = '') => {
     // remove trailing slash
     prefix = prefix.replace(/\/$/g, '')
     for (const route of routes) {

package/src/node/index.ts

@@ -50,13 +50,14 @@ const manualChunkNames = [
 ]
 
 const moduleChunks = {
-  vue: ['vue', '@vue'],
+  vue: ['vue', '@vue', 'vue-router'],
   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 'vitrify'
   } else if (
     VIRTUAL_MODULES.some((virtualModule) => id.includes(virtualModule))
   ) {
@@ -462,6 +463,10 @@ export const baseConfig = async ({
     {
       find: new RegExp('^vue$'),
       replacement: 'vue/dist/vue.runtime.esm-bundler.js'
+    },
+    {
+      find: new RegExp('^vue-router$'),
+      replacement: 'vue-router/dist/vue-router.esm-bundler.js'
     }
     // { find: 'vue', replacement: packageUrls['vue'].pathname },
     // { find: 'vue-router', replacement: packageUrls['vue-router'].pathname },
@@ -573,7 +578,13 @@ export const baseConfig = async ({
     },
     plugins,
     optimizeDeps: {
-      exclude: ['vue', 'vue-router', ...serverModules, ...builtinModules]
+      exclude: [
+        'vue',
+        'vue-router',
+        'vue/server-renderer',
+        ...serverModules,
+        ...builtinModules
+      ]
     },
     resolve: {
       dedupe: ['vue', '@vue/server-renderer', 'vue-router'],