🐛 Fix routify version mismatch bug #13

Author: nicejade

client/.routify/instance.default.js

@@ -1,5 +1,7 @@
 import { Router, createRouter } from '@roxi/routify'
 import routes from './routes.default.js'
 
+// remove previous routers to avoid bumping router names (/path => /1/path)
+globalThis.__routify.reset()
 export const router = createRouter({routes})
 export { Router, routes }

client/.routify/render.js

@@ -1,6 +1,6 @@
 
         import * as module from '../src/App.svelte'
-        import { renderModule } from '@roxi/routify/tools'
+        import { renderModule } from '@roxi/routify/tools/ssr4.js'
         import { map } from './route-map.js'
 
         export const render = url => renderModule(module, { url, routesMap: map })

client/.routify/route-map.js

@@ -1,4 +1,4 @@
 
 export const map = {
-    default: () => import('./routes.default.js').then(m => m.default) 
+    'default': () => import('./routes.default.js').then(m => m.default) 
 }

client/.routify/routes.default.js

@@ -1,10 +1,9 @@
 
 
-export default {
+export const routes = {
   "meta": {},
   "id": "_default",
-  "_regex": {},
-  "_paramKeys": {},
+  "name": "",
   "file": {
     "path": "src/routes",
     "dir": "src",
@@ -18,8 +17,6 @@ export default {
     {
       "meta": {},
       "id": "_default_Advice_svelte",
-      "_regex": {},
-      "_paramKeys": {},
       "name": "Advice",
       "file": {
         "path": "src/routes/Advice.svelte",
@@ -34,8 +31,6 @@ export default {
     {
       "meta": {},
       "id": "_default_Detail_svelte",
-      "_regex": {},
-      "_paramKeys": {},
       "name": "Detail",
       "file": {
         "path": "src/routes/Detail.svelte",
@@ -50,8 +45,6 @@ export default {
     {
       "meta": {},
       "id": "_default_Index_svelte",
-      "_regex": {},
-      "_paramKeys": {},
       "name": "Index",
       "file": {
         "path": "src/routes/Index.svelte",
@@ -66,10 +59,10 @@ export default {
     {
       "meta": {
         "dynamic": true,
-        "dynamicSpread": true
+        "dynamicSpread": true,
+        "order": false,
+        "inline": false
       },
-      "_regex": {},
-      "_paramKeys": {},
       "name": "[...404]",
       "file": {
         "path": ".routify/components/[...404].svelte",
@@ -82,4 +75,5 @@ export default {
       "children": []
     }
   ]
-}
+}
+export default routes

client/.routify/routify-init.js

@@ -7,12 +7,12 @@ appInstance.routeMaps = map
 // We need to import the App module since a router is likely declared here. This saves us pre-creating the router in the preload step below.
 import * as module from '../src/App.svelte'
 
-Promise.all([
+const preloadPromise = Promise.all([
     module.load?.(),
     // PreloadUrl parses the url and preloads each url chunk in a router that matches its name. So for '/hello;widget=/world',
     // it will preload '/hello' in the default router and '/world' in the 'widget' router.
     // If the respective routers don't exist, preloadUrl will use routesMap to pre-create a router and match it with the url chunk.
     preloadUrl({ routesMap: map })
 ])
 
-export const app = import('../src/main.js')
+export const app = preloadPromise.then(() => import('../src/main.js'))

client/package.json

@@ -8,7 +8,6 @@
     "start": "npm run dev",
     "dev": "vite",
     "build": "vite build",
-    "release": "npm run routify && vite build",
     "preview": "vite preview",
     "routify": "npx @roxi/routify build && cp ./src/components/404.svelte .routify/components/[...404].svelte",
     "gen-sitemap": "node scripts/gen-sitemap.js",
@@ -31,7 +30,7 @@
     "tailwind-merge": "^2.2.2"
   },
   "devDependencies": {
-    "@roxi/routify": "^3.0.0-next.160",
+    "@roxi/routify": "3.0.0-next.160",
     "@sveltejs/vite-plugin-svelte": "^2.0.2",
     "@tailwindcss/typography": "^0.5.9",
     "@tsconfig/svelte": "^3.0.0",

package.json

@@ -4,7 +4,7 @@
   "version": "2.0.0",
   "author": "nicejade",
   "scripts": {
-    "build:client": "lerna run release --scope=client",
+    "build:client": "lerna run build --scope=client",
     "build:server": "lerna run build --scope=server",
     "build": "npm run build:client && npm run build:server",
     "start": "lerna run deploy --scope=server",