Merge pull request #189 from nksaraf/run-command

fix: catch errors in fs-router fixes #100
nksaraf · Feb 12, 2024 · 8a396cf · 8a396cf
2 parents 94684d5 + fd2d5e4
commit 8a396cf
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 8 deletions.
diff --git a/.changeset/friendly-points-rhyme.md b/.changeset/friendly-points-rhyme.md
@@ -0,0 +1,5 @@
+---
+"vinxi": patch
+---
+
+fix: catch errors in fs-router fixes #100
diff --git a/.changeset/wise-wasps-kick.md b/.changeset/wise-wasps-kick.md
@@ -0,0 +1,5 @@
+---
+"vinxi": patch
+---
+
+fix: separate vite cache dirs for different routers
diff --git a/packages/vinxi/lib/fs-router.js b/packages/vinxi/lib/fs-router.js
@@ -162,10 +162,14 @@ export class BaseFileSystemRouter extends EventTarget {
 	async addRoute(src) {
 		src = normalize(src);
 		if (this.isRoute(src)) {
-			const route = await this.toRoute(src);
-			if (route) {
-				this._addRoute(route);
-				this.reload(route);
+			try {
+				const route = await this.toRoute(src);
+				if (route) {
+					this._addRoute(route);
+					this.reload(route);
+				}
+			} catch (e) {
+				console.error(e);
 			}
 		}
 	}
@@ -192,10 +196,14 @@ export class BaseFileSystemRouter extends EventTarget {
 	async updateRoute(src) {
 		src = normalize(src);
 		if (this.isRoute(src)) {
-			const route = await this.toRoute(src);
-			if (route) {
-				this._addRoute(route);
-				this.reload(route);
+			try {
+				const route = await this.toRoute(src);
+				if (route) {
+					this._addRoute(route);
+					this.reload(route);
+				}
+			} catch (e) {
+				console.error(e);
 			}
 			// this.update?.();
 		}

diff --git a/packages/vinxi/lib/router-dev-plugins.js b/packages/vinxi/lib/router-dev-plugins.js
@@ -20,6 +20,7 @@ export const ROUTER_MODE_DEV_PLUGINS = {
 			ssr: {
 				noExternal: ["vinxi"],
 			},
+			cacheDir: `.vinxi/cache/${router.name}`,
 			optimizeDeps: {
 				exclude: ["vinxi"],
 			},
@@ -63,6 +64,7 @@ export const ROUTER_MODE_DEV_PLUGINS = {
 			ssr: {
 				noExternal: ["vinxi"],
 			},
+			cacheDir: `.vinxi/cache/${router.name}`,
 			define: {
 				"process.env.TARGET": JSON.stringify(process.env.TARGET ?? "node"),
 			},
@@ -99,6 +101,7 @@ export const ROUTER_MODE_DEV_PLUGINS = {
 		manifest(),
 		config("appType", {
 			appType: "custom",
+			cacheDir: `.vinxi/cache/${router.name}`,
 			ssr: {
 				noExternal: ["vinxi"],
 			},