Merge branch 'master' of github.com:rescript-lang/rescript-lang.org into vlk/fix-sidebarlayout-overflow

Author: jderochervlk

.gitignore

@@ -24,8 +24,11 @@ lib/
 .vercel
 
 src/**/*.mjs
+src/**/*.jsx
 scripts/gendocs.mjs
 scripts/generate_*.mjs
+scripts/gendocs.jsx
+scripts/generate_*.jsx
 
 # Generated via generate-llms script
 public/llms/manual/**/llm*.txt
@@ -42,7 +45,9 @@ build
 mdx-manifest.json
 
 app/**/*.mjs
+app/**/*.jsx
 !_shims.mjs
+!_shims.jsx
 
 # Yarn
 .yarn/*
@@ -51,3 +56,6 @@ app/**/*.mjs
 !.yarn/releases
 !.yarn/sdks
 !.yarn/versions
+
+# Scripts generated from rolldown to convert them from .jsx files to .mjs files
+_scripts

app/routes.res

@@ -23,25 +23,25 @@ let beltPaths = {
 }
 
 let stdlibRoutes =
-  stdlibPaths->Array.map(path => route(path, "./routes/ApiRoute.mjs", ~options={id: path}))
+  stdlibPaths->Array.map(path => route(path, "./routes/ApiRoute.jsx", ~options={id: path}))
 
 let beltRoutes =
-  beltPaths->Array.map(path => route(path, "./routes/ApiRoute.mjs", ~options={id: path}))
+  beltPaths->Array.map(path => route(path, "./routes/ApiRoute.jsx", ~options={id: path}))
 
 let default = [
-  index("./routes/LandingPageRoute.mjs"),
-  route("packages", "./routes/PackagesRoute.mjs"),
-  route("try", "./routes/TryRoute.mjs"),
-  route("syntax-lookup", "./routes/SyntaxLookupRoute.mjs", ~options={id: "syntax-lookup"}),
-  route("blog", "./routes/BlogRoute.mjs", ~options={id: "blog-index"}),
-  route("blog/archived", "./routes/BlogRoute.mjs", ~options={id: "blog-archived"}),
-  route("docs", "./routes/DocsOverview.mjs", ~options={id: "docs-overview"}),
-  route("docs/manual/api/stdlib", "./routes/ApiRoute.mjs", ~options={id: "api-stdlib"}),
-  route("docs/manual/api/introduction", "./routes/ApiRoute.mjs", ~options={id: "api-intro"}),
-  route("docs/manual/api/belt", "./routes/ApiRoute.mjs", ~options={id: "api-belt"}),
-  route("docs/manual/api/dom", "./routes/ApiRoute.mjs", ~options={id: "api-dom"}),
+  index("./routes/LandingPageRoute.jsx"),
+  route("packages", "./routes/PackagesRoute.jsx"),
+  route("try", "./routes/TryRoute.jsx"),
+  route("syntax-lookup", "./routes/SyntaxLookupRoute.jsx", ~options={id: "syntax-lookup"}),
+  route("blog", "./routes/BlogRoute.jsx", ~options={id: "blog-index"}),
+  route("blog/archived", "./routes/BlogRoute.jsx", ~options={id: "blog-archived"}),
+  route("docs", "./routes/DocsOverview.jsx", ~options={id: "docs-overview"}),
+  route("docs/manual/api/stdlib", "./routes/ApiRoute.jsx", ~options={id: "api-stdlib"}),
+  route("docs/manual/api/introduction", "./routes/ApiRoute.jsx", ~options={id: "api-intro"}),
+  route("docs/manual/api/belt", "./routes/ApiRoute.jsx", ~options={id: "api-belt"}),
+  route("docs/manual/api/dom", "./routes/ApiRoute.jsx", ~options={id: "api-dom"}),
   ...stdlibRoutes,
   ...beltRoutes,
-  ...mdxRoutes("./routes/MdxRoute.mjs"),
-  route("*", "./routes/NotFoundRoute.mjs"),
+  ...mdxRoutes("./routes/MdxRoute.jsx"),
+  route("*", "./routes/NotFoundRoute.jsx"),
 ]

package.json

@@ -14,16 +14,17 @@
     "res:watch": "rescript watch",
     "res:clean": "rescript clean",
     "res:build": "rescript build",
-    "build": "rescript build && yarn update-index && react-router build",
+    "build": "rescript build && yarn build-scripts && yarn update-index && react-router build",
     "test": "node scripts/test-examples.mjs && node scripts/test-hrefs.mjs",
-    "reanalyze": "reanalyze -all-cmt .",
-    "update-index": "yarn generate-llms && node scripts/generate_feed.mjs > public/blog/feed.xml",
+    "update-index": "yarn generate-llms && node _scripts/generate_feed.mjs > public/blog/feed.xml",
+    "reanalyze": "rescript-tools reanalyze -all-cmt .",
     "sync-bundles": "node scripts/sync-playground-bundles.mjs",
-    "generate-llms": "node scripts/generate_llms.mjs",
+    "generate-llms": "node _scripts/generate_llms.mjs",
     "format": "prettier . --write --experimental-cli && rescript format",
     "ci:format": "prettier . --check --experimental-cli",
     "preview": "yarn build && static-server build/client",
-    "convert-images": "auto-convert-images"
+    "convert-images": "auto-convert-images",
+    "build-scripts": "yarn dlx tsdown scripts/*.jsx -d _scripts --no-clean --ext .mjs"
   },
   "dependencies": {
     "@babel/generator": "^7.24.7",
@@ -84,7 +85,6 @@
     "jsdom": "^26.1.0",
     "lightningcss": "^1.30.1",
     "prettier": "^3.6.2",
-    "reanalyze": "^2.16.0",
     "remark-cli": "^12.0.1",
     "search-insights": "^2.17.3",
     "tailwindcss": "^4",
@@ -95,4 +95,4 @@
     "vite-plugin-env-compatible": "^2.0.1",
     "vite-plugin-page-reload": "^0.2.2"
   }
-}
+}

react-router.config.mjs

@@ -11,7 +11,7 @@ const mdx = init({
   aliases: ["blog", "docs", "community", "syntax-lookup"],
 });
 
-const { stdlibPaths } = await import("./app/routes.mjs");
+const { stdlibPaths } = await import("./app/routes.jsx");
 
 export default {
   ssr: false,

rescript.json

@@ -2,6 +2,7 @@
   "name": "rescript-lang.org",
   "namespace": false,
   "jsx": {
+    "preserve": true,
     "version": 4
   },
   "dependencies": ["@rescript/react", "@rescript/webapi"],
@@ -27,7 +28,7 @@
   "warnings": {
     "error": "+8"
   },
-  "suffix": ".mjs",
+  "suffix": ".jsx",
   "gentypeconfig": {
     "language": "untyped",
     "shims": [],

src/components/CodeMirror.res

@@ -46,14 +46,35 @@ module Error = {
 }
 
 module HoverHint = {
-  type position = {
-    line: int,
-    col: int,
+  module Position = {
+    type t = {
+      line: int,
+      col: int,
+    }
+    let compareLineCol = (pos1, pos2) => {
+      if pos1.line < pos2.line {
+        Ordering.less
+      } else if pos1.line > pos2.line {
+        Ordering.greater
+      } // same line, compare column
+      else if pos1.col < pos2.col {
+        Ordering.less
+      } else if pos1.col > pos2.col {
+        Ordering.greater
+      } else {
+        Ordering.equal
+      }
+    }
+    // let \"<" = (pos1, pos2) => compareLineCol(pos1, pos2) === Ordering.less
+    let \"<=" = (pos1, pos2) => compareLineCol(pos1, pos2) !== Ordering.greater
+    // let \">" = (pos1, pos2) => compareLineCol(pos1, pos2) === Ordering.greater
+    let \">=" = (pos1, pos2) => compareLineCol(pos1, pos2) !== Ordering.less
+    // let \"==" = (pos1, pos2) => compareLineCol(pos1, pos2) === Ordering.equal
   }
 
   type t = {
-    start: position,
-    end: position,
+    start: Position.t,
+    end: Position.t,
     hint: string,
   }
 }
@@ -178,9 +199,14 @@ module CM6 = {
     @module("@codemirror/view")
     external dropCursor: unit => extension = "dropCursor"
 
+    module HoverTooltipOptions = {
+      type t = {hoverTime?: int, hideOnChange?: bool}
+    }
     @module("@codemirror/view")
-    external hoverTooltip: ((editorView, int, Side.t) => null<Tooltip.t>) => extension =
-      "hoverTooltip"
+    external hoverTooltip: (
+      (editorView, int, Side.t) => null<Tooltip.t>,
+      ~options: HoverTooltipOptions.t=?,
+    ) => extension = "hoverTooltip"
 
     module UpdateListener = {
       type update
@@ -604,12 +630,25 @@ let createLinterExtension = (errors: array<Error.t>): CM6.extension => {
 }
 
 let createHoverHintExtension = (hoverHints: array<HoverHint.t>) => {
-  CM6.EditorView.hoverTooltip((view, pos, _side) => {
+  CM6.EditorView.hoverTooltip(~options={hoverTime: 100}, (view, pos, _side) => {
     let doc = view->CM6.EditorView.state->CM6.EditorState.doc
     let {number: line, from} = doc->CM6.Text.lineAt(pos)
     let col = pos - from
-    let found = hoverHints->Array.find(({start, end}) => {
-      line >= start.line && line <= end.line && col >= start.col && col <= end.col
+    let mousePos = {HoverHint.Position.line, col}
+
+    let found = Array.reduce(hoverHints, None, (prev, currentHint) => {
+      open! HoverHint.Position
+      let currentHintIncludesMousePos = currentHint.start <= mousePos && currentHint.end >= mousePos
+      switch prev {
+      | None if currentHintIncludesMousePos => Some(currentHint)
+      | Some(prevHint)
+        if currentHintIncludesMousePos &&
+        (currentHint.start >= prevHint.start &&
+        currentHint.end <= prevHint.end) =>
+        Some(currentHint)
+      | None
+      | Some(_) => prev
+      }
     })
     switch found {
     | Some({hint, start, end}) =>

src/components/CodeMirror.resi

@@ -18,14 +18,16 @@ module Error: {
 }
 
 module HoverHint: {
-  type position = {
-    line: int,
-    col: int,
+  module Position: {
+    type t = {
+      line: int,
+      col: int,
+    }
   }
 
   type t = {
-    start: position,
-    end: position,
+    start: Position.t,
+    end: Position.t,
     hint: string,
   }
 }

yarn.lock

@@ -8151,15 +8151,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"reanalyze@npm:^2.16.0":
-  version: 2.23.0
-  resolution: "reanalyze@npm:2.23.0"
-  bin:
-    reanalyze: reanalyze.exe
-  checksum: 10c0/b8b05f47d17b21175f9bf1b650c1c3d2888ebcf82601f0260d499a40f8ea52b7db0ab9fa5e93fb12b440e0a25025b203bb4fe600bba69d4ae671b61775b1620f
-  languageName: node
-  linkType: hard
-
 "recma-build-jsx@npm:^1.0.0":
   version: 1.0.0
   resolution: "recma-build-jsx@npm:1.0.0"
@@ -8460,7 +8451,6 @@ __metadata:
     react-router: "npm:^7.9.4"
     react-router-dom: "npm:^7.9.4"
     react-router-mdx: "patch:react-router-mdx@npm%3A1.0.8#~/.yarn/patches/react-router-mdx-npm-1.0.8-d4402c3003.patch"
-    reanalyze: "npm:^2.16.0"
     rehype-slug: "npm:^6.0.0"
     rehype-stringify: "npm:^10.0.1"
     remark: "npm:^15.0.1"