Install core and start migrating files

package.json

@@ -20,6 +20,7 @@
     "@docsearch/react": "^3.5.2",
     "@headlessui/react": "^1.2.0",
     "@mdx-js/loader": "^2.3.0",
+    "@rescript/core": "^1.3.0",
     "@rescript/react": "^0.12.0-alpha.3",
     "@rescript/tools": "^0.5.0",
     "codemirror": "^5.54.0",
@@ -47,7 +48,7 @@
     "remark-slug": "^5.1.2",
     "remark-stringify": "^7.0.3",
     "request": "^2.88.0",
-    "rescript": "^11.0.0",
+    "rescript": "^11.1.0",
     "stringify-object": "^3.3.0",
     "unified": "^8.4.0"
   },
@@ -70,4 +71,4 @@
     "simple-functional-loader": "^1.2.1",
     "tailwindcss": "^3.3.3"
   }
-}
+}

rescript.json

@@ -6,10 +6,12 @@
   },
   "bs-dependencies": [
     "@rescript/react",
-    "@rescript/tools"
+    "@rescript/tools",
+    "@rescript/core"
   ],
   "uncurried": true,
   "ppx-flags": [],
+  "bsc-flags": [],
   "sources": [
     {
       "dir": "src",
@@ -22,7 +24,7 @@
     }
   ],
   "package-specs": {
-    "module": "es6",
+    "module": "esmodule",
     "in-source": true
   },
   "warnings": {
@@ -34,4 +36,4 @@
     "shims": [],
     "module": "es6"
   }
-}
+}

src/ApiDocs.resi

@@ -9,7 +9,7 @@ let getStaticPathsByVersion: (
   ~version: string,
 ) => promise<{
   "fallback": bool,
-  "paths": Js.Array2.t<{
-    "params": {"slug": array<Js.String2.t>},
+  "paths": array<{
+    "params": {"slug": array<string>},
   }>,
 }>

src/Blog.res

@@ -14,11 +14,12 @@
  */
 
 module Link = Next.Link
+open RescriptCore
 
 let defaultPreviewImg = "/static/Art-3-rescript-launch.jpg"
 
 // For encoding reasons, see https://shripadk.github.io/react/docs/jsx-gotchas.html
-let middleDotSpacer = " " ++ (Js.String.fromCharCode(183) ++ " ")
+let middleDotSpacer = " " ++ (String.fromCharCode(183) ++ " ")
 
 module Badge = {
   @react.component
@@ -79,7 +80,7 @@ module BlogCard = {
     ~author as _: BlogFrontmatter.author,
     ~category: option<string>=?,
     ~badge: option<BlogFrontmatter.Badge.t>=?,
-    ~date: Js.Date.t,
+    ~date: Date.t,
     ~slug: string,
   ) =>
     <section className="h-full">
@@ -127,7 +128,7 @@ module FeatureCard = {
     ~title: string="Unknown Title",
     ~author: BlogFrontmatter.author,
     ~badge: option<BlogFrontmatter.Badge.t>=?,
-    ~date: Js.Date.t,
+    ~date: Date.t,
     ~category: option<string>=?,
     ~firstParagraph: string="",
     ~slug: string,
@@ -204,7 +205,7 @@ type props = {posts: array<BlogApi.post>, category: category}
 let default = (props: props): React.element => {
   let {posts, category} = props
 
-  let content = if Belt.Array.length(posts) === 0 {
+  let content = if Array.length(posts) === 0 {
     /* <div> {React.string("Currently no posts available")} </div>; */
     <div className="mt-8">
       <Markdown.H1> {React.string("Blog not yet available")} </Markdown.H1>
@@ -220,11 +221,11 @@ let default = (props: props): React.element => {
       let featureBox =
         <div className="w-full mb-24 lg:px-8 xl:px-0">
           <FeatureCard
-            previewImg=?{first.frontmatter.previewImg->Js.Null.toOption}
+            previewImg=?{first.frontmatter.previewImg->Null.toOption}
             title=first.frontmatter.title
-            badge=?{first.frontmatter.badge->Js.Null.toOption}
+            badge=?{first.frontmatter.badge->Null.toOption}
             author=first.frontmatter.author
-            firstParagraph=?{first.frontmatter.description->Js.Null.toOption}
+            firstParagraph=?{first.frontmatter.description->Null.toOption}
             date={first.frontmatter.date->DateStr.toDate}
             slug={BlogApi.blogPathToSlug(first.path)}
           />
@@ -236,11 +237,11 @@ let default = (props: props): React.element => {
         <div
           className="px-4 md:px-8 xl:px-0 grid grid-cols-1 xs:grid-cols-2 md:grid-cols-3 gap-20 gap-y-12 md:gap-y-24 w-full">
           {Js.Array2.map(rest, post => {
-            let badge = post.frontmatter.badge->Js.Null.toOption
+            let badge = post.frontmatter.badge->Null.toOption
 
             <BlogCard
               key={post.path}
-              previewImg=?{post.frontmatter.previewImg->Js.Null.toOption}
+              previewImg=?{post.frontmatter.previewImg->Null.toOption}
               title=post.frontmatter.title
               author=post.frontmatter.author
               ?badge

src/BlogArticle.res

@@ -16,7 +16,9 @@
       builds are taking too long.  I think we will be fine for now.
   Link to NextJS discussion: https://github.com/zeit/next.js/discussions/11728#discussioncomment-3501
  */
-let middleDotSpacer = " " ++ (Js.String.fromCharCode(183) ++ " ")
+open RescriptCore
+
+let middleDotSpacer = " " ++ (String.fromCharCode(183) ++ " ")
 
 module Params = {
   type t = {slug: string}
@@ -151,17 +153,17 @@ let default = (props: props) => {
       <Meta
         siteName="ReScript Blog"
         title={title ++ " | ReScript Blog"}
-        description=?{description->Js.Null.toOption}
-        ogImage={previewImg->Js.Null.toOption->Belt.Option.getWithDefault(Blog.defaultPreviewImg)}
+        description=?{description->Null.toOption}
+        ogImage={previewImg->Null.toOption->Option.getOr(Blog.defaultPreviewImg)}
       />
       <div className="mb-10 md:mb-20">
         <BlogHeader
           date
           author
           co_authors
           title
-          description={description->Js.Null.toOption}
-          articleImg={articleImg->Js.Null.toOption}
+          description={description->Null.toOption}
+          articleImg={articleImg->Null.toOption}
         />
       </div>
       <div className="flex justify-center">
@@ -206,7 +208,7 @@ let getStaticProps: Next.GetStaticProps.t<props, Params.t> = async ctx => {
   open Next.GetStaticProps
   let {params} = ctx
 
-  let path = switch BlogApi.getAllPosts()->Js.Array2.find(({path}) =>
+  let path = switch BlogApi.getAllPosts()->Array.find(({path}) =>
     BlogApi.blogPathToSlug(path) == params.slug
   ) {
   | None => params.slug
@@ -215,7 +217,7 @@ let getStaticProps: Next.GetStaticProps.t<props, Params.t> = async ctx => {
 
   let filePath = Node.Path.resolve("_blogposts", path)
 
-  let isArchived = Js.String2.startsWith(path, "archive/")
+  let isArchived = String.startsWith(path, "archive/")
 
   let source = filePath->Node.Fs.readFileSync
 

src/Design.res

@@ -1,6 +1,6 @@
 // NOTE: This file will later be important to document our
 //       design tokens etc.
-
+open RescriptCore
 module ColorSquare = {
   @react.component
   let make = (~className="") => {
@@ -16,7 +16,7 @@ let default = () => {
     "bg-fire-50",
     "bg-fire-30",
     "bg-fire-10",
-  ]->Js.Array2.map(bgColorClass => {
+  ]->Array.map(bgColorClass => {
     <ColorSquare className=bgColorClass />
   })
 

src/DocsOverview.res

@@ -1,11 +1,12 @@
+open RescriptCore
 module Card = {
   @react.component
   let make = (~title: string, ~hrefs: array<(string, string)>) => {
     let style = ReactDOM.Style.make(~maxWidth="21rem", ())
     <div style className="border border-gray-10 bg-gray-5 px-5 py-8 rounded-lg">
       <h2 className="font-bold text-24 mb-4"> {React.string(title)} </h2>
       <ul>
-        {Belt.Array.map(hrefs, ((text, href)) =>
+        {Array.map(hrefs, ((text, href)) =>
           <li key=text className="text-16 mb-1 last:mb-0">
             <Markdown.A href> {React.string(text)} </Markdown.A>
           </li>
@@ -51,8 +52,8 @@ let default = (~showVersionSelect=true) => {
 
       let targetUrl =
         "/" ++
-        (Js.Array2.joinWith(url.base, "/") ++
-        ("/" ++ (version ++ ("/" ++ Js.Array2.joinWith(url.pagepath, "/")))))
+        (Array.join(url.base, "/") ++
+        ("/" ++ (version ++ ("/" ++ Array.join(url.pagepath, "/")))))
       router->Next.Router.push(targetUrl)
     }
     <div className="text-fire">

src/components/AnsiPre.res

@@ -1,6 +1,7 @@
 // This file was automatically converted to ReScript from 'AnsiPre.re'
 // Check the output and make sure to delete the original file
 open Ansi
+open RescriptCore
 
 type colorTarget =
   | Fg
@@ -31,15 +32,15 @@ let renderSgrString = (~key: string, sgrStr: SgrString.t): React.element => {
 
   let className =
     params
-    ->Js.Array2.map(p =>
+    ->Array.map(p =>
       switch p {
       | Sgr.Bold => "bold"
       | Fg(c) => mapColor(~target=Fg, c)
       | Bg(c) => mapColor(~target=Bg, c)
       | _ => ""
       }
     )
-    ->Js.Array2.joinWith(" ")
+    ->Array.join(" ")
 
   <span key className> {React.string(content)} </span>
 }