Merge branch 'vlk/split-out-blog-route' of github.com:rescript-lang/rescript-lang.org into vlk/split-out-docs-manual

Author: jderochervlk

app/routes.res

@@ -38,10 +38,18 @@ let docsManualRoutes =
   ->Array.filter(path => !String.includes(path, "docs/manual/api"))
   ->Array.map(path => route(path, "./routes/DocsManualRoute.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"))
-})
+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/")
+    )
+    ->Option.getOr(false)
+  )
+)
 
 let default = [
   index("./routes/LandingPageRoute.jsx"),

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"
 }