fix: resolve merge conflicts with master

Author: jderochervlk

.github/workflows/deploy.yml

@@ -53,6 +53,7 @@ jobs:
         env:
           VITE_DEPLOYMENT_URL: ${{ env.VITE_DEPLOYMENT_URL }}
       - name: Deploy
+        if: ${{ github.actor != 'dependabot[bot]' }}
         id: deploy
         uses: cloudflare/wrangler-action@v3
         with:
@@ -64,6 +65,7 @@ jobs:
         env:
           FORCE_COLOR: 0
       - name: Comment PR with deployment link
+        if: ${{ github.actor != 'dependabot[bot]' }}
         uses: marocchino/sticky-pull-request-comment@v2
         with:
           recreate: true

app/routes.res

@@ -38,14 +38,21 @@ let docsManualRoutes =
   ->Array.filter(path => !String.includes(path, "docs/manual/api"))
   ->Array.map(path => route(path, "./routes/DocsManualRoute.jsx", ~options={id: path}))
 
+let communityRoutes =
+  MdxFile.scanPaths(~dir="markdown-pages/community", ~alias="community")->Array.map(path =>
+    route(path, "./routes/CommunityRoute.jsx", ~options={id: path})
+  )
+
 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/manual/api")
+      (path === "docs/manual" || String.startsWith(path, "docs/manual/")) &&
+        path !== "docs/manual/api" ||
+      path === "community" ||
+      String.startsWith(path, "community/")
     )
     ->Option.getOr(false)
   )
@@ -67,6 +74,7 @@ let default = [
   ...beltRoutes,
   ...blogArticleRoutes,
   ...docsManualRoutes,
+  ...communityRoutes,
   ...mdxRoutes,
   route("*", "./routes/NotFoundRoute.jsx"),
 ]

app/routes/CommunityRoute.res

@@ -0,0 +1,119 @@
+type loaderData = {
+  compiledMdx: CompiledMdx.t,
+  entries: array<TableOfContents.entry>,
+  title: string,
+  description: string,
+  filePath: string,
+  categories: array<SidebarLayout.Sidebar.Category.t>,
+}
+
+let convertToNavItems = (items, rootPath) =>
+  Array.map(items, (item): SidebarLayout.Sidebar.NavItem.t => {
+    let href = switch item.Mdx.slug {
+    | Some(slug) => `${rootPath}/${slug}`
+    | None => rootPath
+    }
+    {
+      name: item.title,
+      href,
+    }
+  })
+
+let getGroup = (groups, groupName): SidebarLayout.Sidebar.Category.t => {
+  {
+    name: groupName,
+    items: groups
+    ->Dict.get(groupName)
+    ->Option.getOr([]),
+  }
+}
+
+let getAllGroups = (groups, groupNames): array<SidebarLayout.Sidebar.Category.t> =>
+  groupNames->Array.map(item => getGroup(groups, item))
+
+let communityTableOfContents = async () => {
+  let groups =
+    (await Mdx.allMdx(~filterByPaths=["markdown-pages/community"]))
+    ->Mdx.filterMdxPages("community")
+    ->Mdx.groupBySection
+    ->Dict.mapValues(values => values->Mdx.sortSection->convertToNavItems("/community"))
+
+  getAllGroups(groups, ["Resources"])
+}
+
+let loader: ReactRouter.Loader.t<loaderData> = async ({request}) => {
+  let {pathname} = WebAPI.URL.make(~url=request.url)
+  let filePath = MdxFile.resolveFilePath(
+    (pathname :> string),
+    ~dir="markdown-pages/community",
+    ~alias="community",
+  )
+
+  let raw = await Node.Fs.readFile(filePath, "utf-8")
+  let {frontmatter}: MarkdownParser.result = MarkdownParser.parseSync(raw)
+
+  let description = switch frontmatter {
+  | Object(dict) =>
+    switch dict->Dict.get("description") {
+    | Some(String(s)) => s
+    | _ => ""
+    }
+  | _ => ""
+  }
+
+  let title = switch frontmatter {
+  | Object(dict) =>
+    switch dict->Dict.get("title") {
+    | Some(String(s)) => s
+    | _ => ""
+    }
+  | _ => ""
+  }
+
+  let compiledMdx = await MdxFile.compileMdx(raw, ~filePath, ~remarkPlugins=Mdx.plugins)
+
+  let markdownTree = Mdast.fromMarkdown(raw)
+  let tocResult = Mdast.toc(markdownTree, {maxDepth: 2})
+
+  let headers = Dict.make()
+  Mdast.reduceHeaders(tocResult.map, headers)
+
+  let entries =
+    headers
+    ->Dict.toArray
+    ->Array.map(((header, url)): TableOfContents.entry => {
+      header,
+      href: (url :> string),
+    })
+    ->Array.slice(~start=2)
+
+  let categories = await communityTableOfContents()
+
+  {
+    compiledMdx,
+    entries,
+    title: `${title} | ReScript Community`,
+    description,
+    filePath,
+    categories,
+  }
+}
+
+let default = () => {
+  let {compiledMdx, entries, filePath, categories} = ReactRouter.useLoaderData()
+
+  let editHref = `https://github.com/rescript-lang/rescript-lang.org/blob/master/${filePath}`
+
+  <>
+    <CommunityLayout categories entries>
+      <div className="markdown-body">
+        <MdxContent compiledMdx />
+      </div>
+      <a
+        href=editHref className="inline text-14 hover:underline text-fire" rel="noopener noreferrer"
+      >
+        {React.string("Edit")}
+      </a>
+    </CommunityLayout>
+  </>
+}

app/routes/CommunityRoute.resi

@@ -0,0 +1,12 @@
+type loaderData = {
+  compiledMdx: CompiledMdx.t,
+  entries: array<TableOfContents.entry>,
+  title: string,
+  description: string,
+  filePath: string,
+  categories: array<SidebarLayout.Sidebar.Category.t>,
+}
+
+let loader: ReactRouter.Loader.t<loaderData>
+
+let default: unit => React.element

app/routes/MdxRoute.res

@@ -79,22 +79,6 @@ let reactTableOfContents = async () => {
   categories
 }
 
-let communityTableOfContents = async () => {
-  let groups =
-    (await allMdx(~filterByPaths=["markdown-pages/community"]))
-    ->filterMdxPages("community")
-    ->groupBySection
-    ->Dict.mapValues(values => values->sortSection->convertToNavItems("/community"))
-
-  // these are the categories that appear in the sidebar
-  let categories: array<SidebarLayout.Sidebar.Category.t> = SidebarHelpers.getAllGroups(
-    groups,
-    ["Resources"],
-  )
-
-  categories
-}
-
 let loader: ReactRouter.Loader.t<loaderData> = async ({request}) => {
   let {pathname} = WebAPI.URL.make(~url=request.url)
 
@@ -130,8 +114,6 @@ let loader: ReactRouter.Loader.t<loaderData> = async ({request}) => {
         []
       } else if pathname->String.includes("docs/react") {
         await reactTableOfContents()
-      } else if pathname->String.includes("community") {
-        await communityTableOfContents()
       } else {
         []
       }
@@ -195,8 +177,8 @@ let loader: ReactRouter.Loader.t<loaderData> = async ({request}) => {
         "ReScript React"
       } else if path->String.includes("docs/manual/api") {
         "ReScript API"
-      } else if path->String.includes("community") {
-        "ReScript Community"
+      } else if path->String.includes("docs/manual") {
+        "ReScript Language Manual"
       } else {
         "ReScript"
       }
@@ -354,10 +336,6 @@ let default = () => {
           </>
         }
       </>
-    } else if (pathname :> string)->String.includes("community") {
-      <CommunityLayout categories entries>
-        <div className="markdown-body"> {component()} </div>
-      </CommunityLayout>
     } else {
       switch loaderData.mdxSources {
       | Some(mdxSources) =>

package.json

@@ -82,6 +82,9 @@
     "unified": "^11.0.5",
     "vfile-matter": "^5.0.1"
   },
+  "resolutions": {
+    "marked": "4.0.10"
+  },
   "devDependencies": {
     "@prettier/plugin-oxc": "^0.1.3",
     "@react-router/dev": "^7.14.0",

yarn.lock

@@ -6635,12 +6635,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"marked@npm:^0.3.14":
-  version: 0.3.19
-  resolution: "marked@npm:0.3.19"
+"marked@npm:4.0.10":
+  version: 4.0.10
+  resolution: "marked@npm:4.0.10"
   bin:
-    marked: ./bin/marked
-  checksum: 10c0/ee5e268716de56a7543c245268d72e5eb1a66f67022e0392cab9744b3b38768d1db289c173679ff696cdbf1bcd82ff10520cae2296f3293989e07a17f9218705
+    marked: bin/marked.js
+  checksum: 10c0/137660cd1eca54cfcdcec9d9c7dea786fc57ba3663da9043b721aff4c1419fc869d21bc38f6d5907062b82d4ef354f4fcac6605cac5f4f9dc1595a743b856d91
   languageName: node
   linkType: hard