Merge branch 'master' of github.com:rescript-lang/rescript-lang.org into v11

Author: jderochervlk

data/api/v12.0.0/belt.json

@@ -170,6 +170,7 @@ module SidebarTree = {
             open Url
             ReactEvent.Form.preventDefault(evt)
             let version = (evt->ReactEvent.Form.target)["value"]
+            WebAPI.Storage.setItem(localStorage, ~key=(Manual :> string), ~value=version)
             let url = Url.parse(router.asPath)
             switch url.pagepath[1] {
             | Some("core") | Some("stdlib") =>
@@ -369,14 +370,15 @@ let default = (props: props) => {
   | Error(_) => React.null
   }
 
-  let prefix = {
-    {Url.name: "API", href: "/docs/manual/" ++ (version ++ "/api")}
-  }
+  let prefix = {Url.name: "API", href: "/docs/manual/" ++ (version ++ "/api")}
 
   let breadcrumbs = ApiLayout.makeBreadcrumbs(~prefix, router.asPath)
 
   <SidebarLayout
-    breadcrumbs
+    breadcrumbs={list{
+      {Url.name: "Docs", href: "/docs/manual/" ++ version ++ "/introduction"},
+      ...breadcrumbs,
+    }}
     metaTitle={title ++ " | ReScript API"}
     theme=#Reason
     components=ApiMarkdown.default

data/api/v12.0.0/js.json

@@ -30,35 +30,8 @@ let default = (~showVersionSelect=true) => {
     ("Reanalyze", "https://github.com/rescript-lang/reanalyze"),
   ]
 
-  let versionSelect = if showVersionSelect {
-    let onChange = evt => {
-      open Url
-      ReactEvent.Form.preventDefault(evt)
-      let version = (evt->ReactEvent.Form.target)["value"]
-      let url = Url.parse(router.route)
-
-      let targetUrl =
-        "/" ++
-        (Array.join(url.base, "/") ++
-        ("/" ++ (version ++ ("/" ++ Array.join(url.pagepath, "/")))))
-      router->Next.Router.push(targetUrl)
-    }
-
-    <div className="text-fire">
-      <VersionSelect
-        availableVersions=Constants.allManualVersions
-        nextVersion=?Constants.nextVersion
-        onChange
-        version
-      />
-    </div>
-  } else {
-    React.null
-  }
-
   <>
     <div>
-      versionSelect
       <div className="mb-6" />
       <Markdown.H1> {React.string("Docs")} </Markdown.H1>
     </div>

data/api/v12.0.0/stdlib.json

@@ -886,7 +886,9 @@ module Settings = {
             ReactEvent.Form.preventDefault(evt)
             let id: string = (evt->ReactEvent.Form.target)["value"]
             switch id->Semver.parse {
-            | Some(v) => onCompilerSelect(v)
+            | Some(v) =>
+              onCompilerSelect(v)
+              WebAPI.Storage.setItem(localStorage, ~key=(Url.Playground :> string), ~value=id)
             | None => ()
             }
           }}>
@@ -908,28 +910,30 @@ module Settings = {
               {switch experimentalVersions {
               | [] => React.null
               | experimentalVersions =>
-                let versionByOrder = experimentalVersions->Belt.SortArray.stableSortBy((a, b) => {
-                  let cmp = ({Semver.major: major, minor, patch, preRelease}) => {
-                    let preRelease = switch preRelease {
-                    | Some(preRelease) =>
-                      switch preRelease {
-                      | Dev(id) => 0 + id
-                      | Alpha(id) => 10 + id
-                      | Beta(id) => 20 + id
-                      | Rc(id) => 30 + id
+                let versionByOrder = experimentalVersions->Array.toSorted((b, a) => {
+                  if a.major != b.major {
+                    a.major - b.major
+                  } else if a.minor != b.minor {
+                    a.minor - b.minor
+                  } else if a.patch != b.patch {
+                    a.patch - b.patch
+                  } else {
+                    switch (a.preRelease, b.preRelease)->Option.all2 {
+                    | Some((prereleaseA, prereleaseB)) =>
+                      switch (prereleaseA, prereleaseB) {
+                      | (Rc(rcA), Rc(rcB)) => rcA - rcB
+                      | (Rc(rcA), _) => rcA
+                      | (Beta(betaA), Beta(betaB)) => betaA - betaB
+                      | (Beta(betaA), _) => betaA
+                      | (Alpha(alphaA), Alpha(alphaB)) => alphaA - alphaB
+                      | (Alpha(alphaA), _) => alphaA
+                      | (Dev(devA), Dev(devB)) => devA - devB
+                      | (Dev(devA), _) => devA
                       }
+
                     | None => 0
                     }
-                    let number =
-                      [major, minor, patch]
-                      ->Array.map(v => v->Int.toString)
-                      ->Array.join("")
-                      ->Int.fromString
-                      ->Option.getOr(0)
-
-                    number + preRelease
-                  }
-                  cmp(b) - cmp(a)
+                  }->Float.fromInt
                 })
                 <>
                   <VersionSelect.SectionHeader value=Constants.dropdownLabelNext />
@@ -1417,7 +1421,11 @@ let make = (~versions: array<string>) => {
 
   let initialVersion = switch Dict.get(router.query, "version") {
   | Some(version) => version->Semver.parse
-  | None => lastStableVersion
+  | None =>
+    switch Url.getVersionFromStorage(Playground) {
+    | Some(v) => v->Semver.parse
+    | None => lastStableVersion
+    }
   }
 
   let initialLang = switch Dict.get(router.query, "ext") {

src/ApiDocs.res

@@ -147,24 +147,32 @@ type props = {mdxSources: array<MdxRemote.output>}
 type params = {slug: string}
 
 let decode = (json: JSON.t) => {
-  open Json.Decode
-  let id = json->field("id", string, _)
-  let keywords = json->field("keywords", array(string, ...), _)
-  let name = json->field("name", string, _)
-  let summary = json->field("summary", string, _)
-  let category = json->field("category", string, _)->Category.fromString
-  let status =
-    json
-    ->optional(field("status", string, _), _)
-    ->Option.mapOr(Status.Active, Status.fromString)
-
-  {
-    id,
-    keywords,
-    name,
-    summary,
-    category,
-    status,
+  open JSON
+  switch json {
+  | Object(dict{
+      "id": String(id),
+      "keywords": Array(keywords),
+      "name": String(name),
+      "summary": String(summary),
+      "category": String(category),
+      "status": ?status,
+    }) => {
+      id,
+      name,
+      summary,
+      category: Category.fromString(category),
+      keywords: keywords->Array.filterMap(k =>
+        switch k {
+        | String(k) => Some(k)
+        | _ => None
+        }
+      ),
+      status: switch status {
+      | Some(String(status)) => status->Status.fromString
+      | _ => Status.Active
+      },
+    }
+  | _ => throw(Failure(`Failed to decode SyntaxLookup. ${__LOC__}`))
   }
 }
 

src/DocsOverview.res

@@ -4,7 +4,15 @@ let default = props => {
   let (isOverlayOpen, setOverlayOpen) = React.useState(() => false)
 
   let lazyPlayground = Next.Dynamic.dynamic(
-    async () => await import(Playground.make),
+    async () => {
+      try {
+        await import(Playground.make)
+      } catch {
+      | JsExn(e) =>
+        Console.error2("Error loading Playground:", e)
+        JsExn.throw(e)
+      }
+    },
     {
       ssr: false,
       loading: () => <span> {React.string("Loading...")} </span>,

src/Playground.res

@@ -16,6 +16,9 @@ module Process = {
   @scope("process") external env: Dict.t<string> = "env"
   @scope("process") @val external argv: array<string> = "argv"
   @scope("process") external exit: int => unit = "exit"
+  module Env = {
+    @scope(("process", "env")) external nodeEnv: string = "NODE_ENV"
+  }
 }
 
 module Fs = {