Skip to content

Commit 5bbdac3

Browse files
committed
Merge branch 'vlk/split-out-docs-manual' of github.com:rescript-lang/rescript-lang.org into vlk/split-out-docs-react
2 parents 0e82c68 + e92cbcd commit 5bbdac3

File tree

2 files changed

+23
-7
lines changed

2 files changed

+23
-7
lines changed

app/routes.res

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,20 @@ let docsReactRoutes =
4343
route(path, "./routes/DocsReactRoute.jsx", ~options={id: path})
4444
)
4545

46-
let mdxRoutes = mdxRoutes("./routes/MdxRoute.jsx")->Array.filter(r => {
47-
let path = r.path->Option.getOr("")
48-
!(path->String.startsWith("blog")) &&
49-
!(path->String.startsWith("docs/manual")) &&
50-
!(path->String.startsWith("docs/react"))
51-
})
46+
let mdxRoutes = mdxRoutes("./routes/MdxRoute.jsx")->Array.filter(r =>
47+
!(
48+
r.path
49+
->Option.map(path =>
50+
path === "blog" ||
51+
String.startsWith(path, "blog/") ||
52+
path === "docs/manual" ||
53+
String.startsWith(path, "docs/manual/") ||
54+
path === "docs/react" ||
55+
String.startsWith(path, "docs/react/")
56+
)
57+
->Option.getOr(false)
58+
)
59+
)
5260

5361
let default = [
5462
index("./routes/LandingPageRoute.jsx"),

src/MdxFile.res

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,15 @@ let resolveFilePath = (pathname, ~dir, ~alias) => {
3030
} else {
3131
pathname
3232
}
33-
let relativePath = path->String.replace(alias, dir)
33+
let relativePath = if path->String.startsWith(alias ++ "/") {
34+
let rest = path->String.slice(~start=String.length(alias) + 1, ~end=String.length(path))
35+
Node.Path.join2(dir, rest)
36+
} else if path->String.startsWith(alias) {
37+
let rest = path->String.slice(~start=String.length(alias), ~end=String.length(path))
38+
Node.Path.join2(dir, rest)
39+
} else {
40+
path
41+
}
3442
relativePath ++ ".mdx"
3543
}
3644

0 commit comments

Comments
 (0)