Merge branch 'vlk/split-out-docs-react' of github.com:rescript-lang/rescript-lang.org into vlk/split-out-docs-guidelines

Author: jderochervlk

app/routes.res

@@ -49,13 +49,22 @@ let docsGuidelinesRoutes =
     ~alias="docs/guidelines",
   )->Array.map(path => route(path, "./routes/DocsGuidelinesRoute.jsx", ~options={id: path}))
 
-let mdxRoutes = mdxRoutes("./routes/MdxRoute.jsx")->Array.filter(r => {
-  let path = r.path->Option.getOr("")
-  !(path->String.startsWith("blog")) &&
-  !(path->String.startsWith("docs/manual")) &&
-  !(path->String.startsWith("docs/react")) &&
-  !(path->String.startsWith("docs/guidelines"))
-})
+let mdxRoutes = mdxRoutes("./routes/MdxRoute.jsx")->Array.filter(r =>
+  !(
+    r.path
+    ->Option.map(path =>
+      path === "blog" ||
+      String.startsWith(path, "blog/") ||
+      path === "docs/manual" ||
+      String.startsWith(path, "docs/manual/") ||
+      path === "docs/react" ||
+      String.startsWith(path, "docs/react/") ||
+      path === "docs/guidelines" ||
+      String.startsWith(path, "docs/guidelines/")
+    )
+    ->Option.getOr(false)
+  )
+)
 
 let default = [
   index("./routes/LandingPageRoute.jsx"),

app/routes/MdxRoute.res

@@ -99,22 +99,6 @@ let manualTableOfContents = async () => {
   categories
 }
 
-let reactTableOfContents = async () => {
-  let groups =
-    (await allMdx(~filterByPaths=["markdown-pages/docs"]))
-    ->filterMdxPages("docs/react")
-    ->groupBySection
-    ->Dict.mapValues(values => values->sortSection->convertToNavItems("/docs/react"))
-
-  // these are the categories that appear in the sidebar
-  let categories: array<SidebarLayout.Sidebar.Category.t> = getAllGroups(
-    groups,
-    ["Overview", "Main Concepts", "Hooks & State Management", "Guides"],
-  )
-
-  categories
-}
-
 let communityTableOfContents = async () => {
   let groups =
     (await allMdx(~filterByPaths=["markdown-pages/community"]))
@@ -163,8 +147,6 @@ let loader: ReactRouter.Loader.t<loaderData> = async ({request}) => {
         []
       } else if pathname->String.includes("docs/manual") {
         await manualTableOfContents()
-      } else if pathname->String.includes("docs/react") {
-        await reactTableOfContents()
       } else if pathname->String.includes("community") {
         await communityTableOfContents()
       } else {
@@ -222,21 +204,11 @@ let loader: ReactRouter.Loader.t<loaderData> = async ({request}) => {
               href: "/docs/manual/" ++ "introduction",
             },
           })
-        : pathname->String.includes("docs/react")
-        ? Some(list{
-          {Url.name: "Docs", href: "/docs/"},
-          {
-            Url.name: "rescript-react",
-            href: "/docs/react/" ++ "introduction",
-          },
-        })
         : None
 
     let metaTitleCategory = {
       let path = (pathname :> string)
-      let title = if path->String.includes("docs/react") {
-        "ReScript React"
-      } else if path->String.includes("docs/manual/api") {
+      let title = if path->String.includes("docs/manual/api") {
         "ReScript API"
       } else if path->String.includes("docs/manual") {
         "ReScript Language Manual"
@@ -322,7 +294,8 @@ let default = () => {
       </>
     } else if (
       (pathname :> string)->String.includes("docs/manual") ||
-        (pathname :> string)->String.includes("docs/react")
+      (pathname :> string)->String.includes("docs/react") ||
+      (pathname :> string)->String.includes("docs/guidelines")
     ) {
       <>
         <Meta title=title description={attributes.description->Nullable.getOr("")} />
@@ -333,8 +306,6 @@ let default = () => {
               if index === 0 {
                 if (pathname :> string)->String.includes("docs/manual") {
                   {...item, href: "/docs/manual/introduction"}
-                } else if (pathname :> string)->String.includes("docs/react") {
-                  {...item, href: "/docs/react/introduction"}
                 } else {
                   item
                 }

src/MdxFile.res

@@ -30,7 +30,15 @@ let resolveFilePath = (pathname, ~dir, ~alias) => {
   } else {
     pathname
   }
-  let relativePath = path->String.replace(alias, dir)
+  let relativePath = if path->String.startsWith(alias ++ "/") {
+    let rest = path->String.slice(~start=String.length(alias) + 1, ~end=String.length(path))
+    Node.Path.join2(dir, rest)
+  } else if path->String.startsWith(alias) {
+    let rest = path->String.slice(~start=String.length(alias), ~end=String.length(path))
+    Node.Path.join2(dir, rest)
+  } else {
+    path
+  }
   relativePath ++ ".mdx"
 }