From d37f37a36d01b8d44012e0b03e5602a2d97aff0f Mon Sep 17 00:00:00 2001 From: Padreug Date: Sat, 2 May 2026 10:55:40 +0200 Subject: [PATCH] fix(vite): resolve stranded merge conflict markers in vite.config.ts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Merge commit 13ad692 ("merge: forum standalone") committed vite.config.ts with unresolved <<<<<<< / ||||||| / >>>>>>> markers in the navigateFallbackDenylist regex array. Vite couldn't parse the file, so the hub dev server failed to restart on config changes and kept serving stale code from before the merge — including the old monolithic main app's /market route, which manifested as a mysterious redirect from / → /market for users testing the hub. Resolution: keep the union of all three sides (sortir, castle, wallet, chat, market, cart, checkout, tasks, forum, submit, submission). Recovery for anyone seeing the stale /market redirect after pulling: - hard-reload the browser (Cmd/Ctrl-Shift-R) - DevTools → Application → Service Workers → Unregister - Re-run npm run dev (or dev:all) — the hub now restarts cleanly Co-Authored-By: Claude Opus 4.7 (1M context) --- vite.config.ts | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/vite.config.ts b/vite.config.ts index b681bfa..025ded5 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -25,13 +25,7 @@ export default defineConfig(({ mode }) => ({ '**/*.{js,css,html,ico,png,svg}' ], // Don't intercept standalone app paths — they have their own service workers -<<<<<<< HEAD - navigateFallbackDenylist: [/^\/sortir\//, /^\/castle\//, /^\/wallet\//, /^\/chat\//, /^\/market\//, /^\/cart\//, /^\/checkout\//, /^\/tasks\//], -||||||| af33801 - navigateFallbackDenylist: [/^\/sortir\//, /^\/castle\//], -======= - navigateFallbackDenylist: [/^\/sortir\//, /^\/castle\//, /^\/forum\//, /^\/submit\//, /^\/submission\//], ->>>>>>> feat/forum-standalone + navigateFallbackDenylist: [/^\/sortir\//, /^\/castle\//, /^\/wallet\//, /^\/chat\//, /^\/market\//, /^\/cart\//, /^\/checkout\//, /^\/tasks\//, /^\/forum\//, /^\/submit\//, /^\/submission\//], }, includeAssets: [ 'favicon.ico',