fix(router): ensure that the page has a higher priority (#5886)

web-infra-dev · Jun 26, 2024 · 33e3a95 · 33e3a95
1 parent a5a4fe0
commit 33e3a95
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/packages/runtime/plugin-runtime/src/router/cli/code/nestedRoutes.ts b/packages/runtime/plugin-runtime/src/router/cli/code/nestedRoutes.ts
@@ -262,7 +262,9 @@ export const walk = async (
       if (pageAction) {
         pageRoute.action = pageAction;
       }
-      route.children?.push(pageRoute);
+
+      // Should ensure that the `page.tsx` has a higher priority than `__a/layout.tsx`
+      route.children?.unshift(pageRoute);
     }
 
     if (itemWithoutExt === NESTED_ROUTE.SPLATE_LOADER_FILE) {

diff --git a/packages/runtime/plugin-runtime/tests/router/__snapshots__/nestedRoutes.test.ts.snap b/packages/runtime/plugin-runtime/tests/router/__snapshots__/nestedRoutes.test.ts.snap
@@ -40,6 +40,15 @@ exports[`nested routes walk 1`] = `
       {
         "_component": "@_modern_js_src/user/layout",
         "children": [
+          {
+            "_component": "@_modern_js_src/user/page",
+            "children": undefined,
+            "config": "@_modern_js_src/user/page.config",
+            "id": "user/page",
+            "index": true,
+            "loader": "@_modern_js_src/user/page.loader",
+            "type": "nested",
+          },
           {
             "_component": "@_modern_js_src/user/$",
             "action": "@_modern_js_src/user/$.data",
@@ -58,15 +67,6 @@ exports[`nested routes walk 1`] = `
             "path": ":id",
             "type": "nested",
           },
-          {
-            "_component": "@_modern_js_src/user/page",
-            "children": undefined,
-            "config": "@_modern_js_src/user/page.config",
-            "id": "user/page",
-            "index": true,
-            "loader": "@_modern_js_src/user/page.loader",
-            "type": "nested",
-          },
           {
             "_component": "@_modern_js_src/user/profile/layout",
             "children": [