docs(changeset): fix order of built routers based on base length

nksaraf · Oct 23, 2023 · e87800e · e87800e
1 parent f35dc0a
commit e87800e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/.changeset/six-experts-confess.md b/.changeset/six-experts-confess.md
@@ -0,0 +1,5 @@
+---
+"vinxi": patch
+---
+
+fix order of built routers based on base length
diff --git a/packages/vinxi/lib/app.js b/packages/vinxi/lib/app.js
@@ -20,7 +20,6 @@ export function createApp({
 	devtools = true,
 	root = process.cwd(),
 }) {
-	console.log("devtools", devtools);
 	if (devtools) {
 		routers = [devtoolsClient(), devtoolsRpc(), ...routers];
 	}

diff --git a/packages/vinxi/lib/build.js b/packages/vinxi/lib/build.js
@@ -76,7 +76,9 @@ export async function createBuild(app, buildConfig) {
 			...(app.config.server.plugins ?? []),
 		],
 		handlers: [
-			...app.config.routers
+			...[...app.config.routers]
+				.sort((a, b) => a.base.length - b.base.length)
+				.reverse()
 				.map((router) => {
 					if (router.mode === "handler") {
 						invariant(router.handler, "Missing router.handler");

diff --git a/packages/vinxi/lib/plugins/tree-shake.js b/packages/vinxi/lib/plugins/tree-shake.js
@@ -8,6 +8,7 @@ import plugin from "./tree-shake.babel.js";
  * @returns {import("../vite-dev.d.ts").Plugin}
  */
 export function treeShake() {
+	/** @type {import('../vite-dev.d.ts').ViteConfig} */
 	let config;
 	let cache = {};
 	let server;
@@ -19,7 +20,6 @@ export function treeShake() {
 			const babel = await import("@babel/core");
 			const transformed = babel.transform(code, {
 				plugins: [
-					...(config.router.build?.babel?.plugins ?? []),
 					jsx,
 					[typescript, { isTSX: true }],
 					[plugin, { pick: query.getAll("pick") }],