Merge remote-tracking branch 'upstream/main' into fix/buildlocation-href-rewrite

Author: leesb971204

docs/router/config.json

@@ -17,10 +17,6 @@
               "label": "Overview",
               "to": "framework/react/overview"
             },
-            {
-              "label": "Installation",
-              "to": "framework/react/installation"
-            },
             {
               "label": "Quick Start",
               "to": "framework/react/quick-start"
@@ -29,18 +25,6 @@
               "label": "Devtools",
               "to": "framework/react/devtools"
             },
-            {
-              "label": "Comparison",
-              "to": "framework/react/comparison"
-            },
-            {
-              "label": "Migrate from React Router",
-              "to": "framework/react/migrate-from-react-router"
-            },
-            {
-              "label": "Migrate from React Location",
-              "to": "framework/react/migrate-from-react-location"
-            },
             {
               "label": "Decisions on DX",
               "to": "framework/react/decisions-on-dx"
@@ -58,10 +42,6 @@
               "label": "Overview",
               "to": "framework/solid/overview"
             },
-            {
-              "label": "Installation",
-              "to": "framework/solid/installation"
-            },
             {
               "label": "Quick Start",
               "to": "framework/solid/quick-start"
@@ -82,6 +62,66 @@
         }
       ]
     },
+    {
+      "label": "Installation Guides",
+      "children": [],
+      "frameworks": [
+        {
+          "label": "react",
+          "children": [
+            {
+              "label": "Manual Setup",
+              "to": "framework/react/installation/manual"
+            },
+            {
+              "label": "Vite",
+              "to": "framework/react/installation/with-vite"
+            },
+            {
+              "label": "Rspack/Rsbuild",
+              "to": "framework/react/installation/with-rspack"
+            },
+            {
+              "label": "Webpack",
+              "to": "framework/react/installation/with-webpack"
+            },
+            {
+              "label": "Esbuild",
+              "to": "framework/react/installation/with-esbuild"
+            },
+            {
+              "label": "Router CLI",
+              "to": "framework/react/installation/with-router-cli"
+            },
+            {
+              "label": "Migrate from React Router",
+              "to": "framework/react/installation/migrate-from-react-router"
+            },
+            {
+              "label": "Migrate from React Location",
+              "to": "framework/react/installation/migrate-from-react-location"
+            }
+          ]
+        },
+        {
+          "label": "solid",
+          "children": [
+            {
+              "label": "Manual Setup",
+              "to": "framework/solid/installation/manual"
+            },
+            {
+              "label": "Installation with Vite",
+              "to": "framework/solid/routing/installation-with-vite"
+            },
+            {
+              "label": "Installation with the Router CLI",
+              "to": "framework/solid/routing/installation/with-router-cli"
+            }
+          ]
+        }
+      ]
+    },
     {
       "label": "Routing",
       "children": [],
@@ -113,26 +153,6 @@
               "label": "Code-Based Routing",
               "to": "framework/react/routing/code-based-routing"
             },
-            {
-              "label": "Installation with Vite",
-              "to": "framework/react/routing/installation-with-vite"
-            },
-            {
-              "label": "Installation with Rspack/Rsbuild",
-              "to": "framework/react/routing/installation-with-rspack"
-            },
-            {
-              "label": "Installation with Webpack",
-              "to": "framework/react/routing/installation-with-webpack"
-            },
-            {
-              "label": "Installation with Esbuild",
-              "to": "framework/react/routing/installation-with-esbuild"
-            },
-            {
-              "label": "Installation with the Router CLI",
-              "to": "framework/react/routing/installation-with-router-cli"
-            },
             {
               "label": "File Naming Conventions",
               "to": "framework/react/routing/file-naming-conventions"
@@ -166,14 +186,6 @@
               "label": "Code-Based Routing",
               "to": "framework/solid/routing/code-based-routing"
             },
-            {
-              "label": "Installation with Vite",
-              "to": "framework/solid/routing/installation-with-vite"
-            },
-            {
-              "label": "Installation with the Router CLI",
-              "to": "framework/solid/routing/installation-with-router-cli"
-            },
             {
               "label": "File Naming Conventions",
               "to": "framework/solid/routing/file-naming-conventions"
@@ -418,25 +430,6 @@
         }
       ]
     },
-    {
-      "label": "How-To",
-      "children": [],
-      "frameworks": [
-        {
-          "label": "react",
-          "children": [
-            {
-              "label": "Install TanStack Router",
-              "to": "framework/react/how-to/install"
-            }
-          ]
-        },
-        {
-          "label": "solid",
-          "children": []
-        }
-      ]
-    },
     {
       "label": "API",
       "children": [