f5ba0d5 fix(#5665): rewritten routes get ignored by dynamic and catch…

…All routes (#6101) QwikDev/qwik@f31c865
QwikDev · Apr 9, 2024 · 0dd2579 · 0dd2579
1 parent fb97c02
commit 0dd2579
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@builder.io/qwik-city",
   "description": "The meta-framework for Qwik.",
-  "version": "1.5.1-dev20240409010701",
+  "version": "1.5.1-dev20240409065124",
   "bugs": "https://github.com/BuilderIO/qwik/issues",
   "dependencies": {
     "@mdx-js/mdx": "^3.0.1",

diff --git a/vite/index.cjs b/vite/index.cjs
@@ -24419,7 +24419,8 @@ function rewriteRoutes(ctx, resolved) {
         }
         const translatedPath = translatedPathParts.join("/");
         const translatedRoute = translatedRouteParts.join("/");
-        resolved.routes.push({
+        const originalRouteIndex = resolved.routes.indexOf(rewriteRoute);
+        resolved.routes.splice(originalRouteIndex + 1, 0, {
           ...rewriteRoute,
           id: rewriteRoute.id + (idSuffix || rewriteIndex),
           pathname: pathnamePrefix + translatedPath,

diff --git a/vite/index.mjs b/vite/index.mjs
@@ -24409,7 +24409,8 @@ function rewriteRoutes(ctx, resolved) {
         }
         const translatedPath = translatedPathParts.join("/");
         const translatedRoute = translatedRouteParts.join("/");
-        resolved.routes.push({
+        const originalRouteIndex = resolved.routes.indexOf(rewriteRoute);
+        resolved.routes.splice(originalRouteIndex + 1, 0, {
           ...rewriteRoute,
           id: rewriteRoute.id + (idSuffix || rewriteIndex),
           pathname: pathnamePrefix + translatedPath,