[Breaking] move to rescript v12

.changeset/famous-planes-fetch.md

@@ -0,0 +1,7 @@
+---
+"@rescript-relay-router-example/client-rendering": major
+"@rescript-relay-router-example/express": major
+"rescript-relay-router": major
+---
+
+Require Rescript v12 and remove usage of Core

examples/client-rendering/package.json

@@ -44,7 +44,7 @@
     "react-dom": "^18.2.0",
     "react-relay": "17.0.0",
     "relay-runtime": "17.0.0",
-    "rescript": "11.1.3",
+    "rescript": "12.0.0-alpha.13",
     "rescript-relay": "3.0.0",
     "rollup": "^2",
     "rollup-plugin-visualizer": "5.5.0",
@@ -54,7 +54,6 @@
   },
   "dependencies": {
     "@rescript-relay-router/test-utils": "workspace:^",
-    "@rescript/core": "1.5.2",
     "history": "^5.2.0",
     "jsonc-parser": "^3.0.0",
     "rescript-relay-router": "workspace:^",

examples/client-rendering/rescript.json

@@ -28,10 +28,9 @@
   "bs-dependencies": [
     "@rescript/react",
     "rescript-relay",
-    "rescript-relay-router",
-    "@rescript/core"
+    "rescript-relay-router"
   ],
   "bs-dev-dependencies": ["@rescript-relay-router/test-utils"],
-  "bsc-flags": ["-open RescriptCore"],
+  "bsc-flags": [],
   "pinned-dependencies": ["rescript-relay-router"]
 }

examples/client-rendering/src/utils/NetworkUtils.res

@@ -3,29 +3,20 @@
 // (comprehensive) example application we're going to build eventually.
 let preloadFromResponse = (part: JSON.t, ~preloadAsset: RelayRouter__Types.preloadAssetFn) => {
   switch part {
-  | Object(obj) =>
-    switch obj->Dict.get("extensions") {
-    // todo: use pattern matching on dict once we move to rescript v12
-    | Some(Object(extensions)) =>
-      let images = switch extensions->Dict.get("preloadableImages") {
-      | Some(Array(images)) =>
-        images->Array.filterMap(item =>
-          switch item {
-          | String(url) => Some(url)
-          | _ => None
-          }
-        )
-      | _ => []
-      }
-      images->Array.forEach(imgUrl => {
+  | Object(dict{"extensions": JSON.Object(dict{"preloadableImages": JSON.Array(images)})}) =>
+    images->Array.forEach(item =>
+      switch item {
+      | String(imgUrl) =>
         preloadAsset(~priority=RelayRouter.Types.Default, RelayRouter.Types.Image({url: imgUrl}))
-      })
-    | _ => ()
-    }
+      | _ => ()
+      }
+    )
   | _ => ()
   }
 }
 
+external toOldExnUnsafe: JsExn.t => Exn.t = "%identity"
+
 // The client and server fetch query are currently copied, but one could easily
 // set them up so that they use the same base, and just take whatever config
 // they need.
@@ -37,7 +28,7 @@ let makeFetchQuery = (~preloadAsset) =>
       "http://0.0.0.0:4000/graphql",
       {
         "method": "POST",
-        "headers": Dict.fromArray([("content-type", "application/json")]),
+        "headers": dict{"content-type": "application/json"},
         "body": {"query": operation.text, "variables": variables}
         ->JSON.stringifyAny
         ->Option.getOr(""),
@@ -50,14 +41,14 @@ let makeFetchQuery = (~preloadAsset) =>
           sink.next(part)
         },
         ~onError=err => {
-          sink.error(err)
+          err->toOldExnUnsafe->sink.error
         },
         ~onComplete=() => {
           sink.complete()
         },
       )
     })
-    ->ignore
+    ->Promise.ignore
 
     None
   })

examples/express/Server.res

@@ -67,7 +67,7 @@ switch NodeJs.isProduction {
           },
         )
       } catch {
-      | Exn.Error(err) => {
+      | JsExn(err) => {
           vite->ssrFixStacktrace(err)
           Console.log("[debug] got error")
           Console.log(err)

examples/express/package.json

@@ -10,7 +10,7 @@
   "scripts": {
     "build": "yarn router:generate && run-s 'build:*'",
     "build:relay": "rescript-relay-compiler",
-    "build:rescript": "rescript build -with-deps",
+    "build:rescript": "rescript",
     "build:vite": "run-s 'build:vite:*'",
     "build:vite:client": "vite build --outDir dist/client --ssrManifest --manifest",
     "build:vite:server": "vite build --outDir dist/server --ssr src/EntryServer.res.mjs",
@@ -46,15 +46,14 @@
     "react-dom": "^18.2.0",
     "react-relay": "17.0.0",
     "relay-runtime": "17.0.0",
-    "rescript": "11.1.3",
+    "rescript": "12.0.0-alpha.13",
     "rescript-relay": "3.0.0",
     "rollup": "^2",
     "rollup-plugin-visualizer": "5.5.0",
     "vite": "^4.4.9",
     "vite-plugin-html": "3.2.0"
   },
   "dependencies": {
-    "@rescript/core": "1.5.2",
     "history": "^5.2.0",
     "jsonc-parser": "^3.0.0",
     "node-fetch": "^3.2.0",

examples/express/rescript.json

@@ -24,9 +24,8 @@
   "bs-dependencies": [
     "@rescript/react",
     "rescript-relay",
-    "rescript-relay-router",
-    "@rescript/core"
+    "rescript-relay-router"
   ],
-  "bsc-flags": ["-open RescriptCore"],
+  "bsc-flags": [],
   "pinned-dependencies": ["rescript-relay-router"]
 }

examples/express/src/EntryServer.res

@@ -91,15 +91,15 @@ let handleRequest = (~request, ~response, ~manifest: RelayRouter.Manifest.t) =>
     stream :=
       ReactDOMServer.renderToPipeableStream(
         <App environment routerContext />,
-        ReactDOMServer.renderToPipeableStreamOptions(
-          // This renders as React is ready to start hydrating, and ensures that
-          // if the client side bundle has already been downloaded, it starts
-          // hydrating right away. If not, it lets the client bundle know that
-          // React is ready to hydrate, and the client bundle starts hydration
-          // as soon as it loads.
-          ~bootstrapScriptContent="window.__READY_TO_BOOT ? window.__BOOT() : (window.__READY_TO_BOOT = true)",
-          ~bootstrapModules,
-          ~onShellReady=() => {
+        ~options=// This renders as React is ready to start hydrating, and ensures that
+        // if the client side bundle has already been downloaded, it starts
+        // hydrating right away. If not, it lets the client bundle know that
+        // React is ready to hydrate, and the client bundle starts hydration
+        // as soon as it loads.
+        {
+          bootstrapScriptContent: "window.__READY_TO_BOOT ? window.__BOOT() : (window.__READY_TO_BOOT = true)",
+          bootstrapModules,
+          onShellReady: () => {
             response->Express.Response.setHeader("Content-Type", "text/html")
 
             response->Express.Response.setStatus(didError.contents ? 500 : 200)
@@ -116,17 +116,16 @@ let handleRequest = (~request, ~response, ~manifest: RelayRouter.Manifest.t) =>
 
             resolve(ignore())
           },
-          ~onShellError=err => {
+          onShellError: err => {
             cleanup()
             reject(err)
           },
-          ~onError=err => {
+          onError: err => {
             cleanup()
             didError := true
             Console.error(err)
           },
-          (),
-        ),
+        },
       )->Some
   })
 }

examples/express/src/bindings/ReactDOMServer.res

@@ -4,16 +4,13 @@ external renderToString: React.element => string = "renderToString"
 @module("react-dom/server")
 external renderToStaticMarkup: React.element => string = "renderToStaticMarkup"
 
-// Use deriving(abstrat) because we don't want functions to show up in the object
-// if they're not used.
-@deriving(abstract)
 type renderToPipeableStreamOptions = {
-  @optional bootstrapScriptContent: string,
-  @optional bootstrapModules: array<string>,
-  @optional onShellReady: unit => unit,
-  @optional onShellError: Exn.t => unit,
-  @optional onAllReady: unit => unit,
-  @optional onError: Exn.t => unit,
+  bootstrapScriptContent?: string,
+  bootstrapModules?: array<string>,
+  onShellReady?: unit => unit,
+  onShellError?: JsError.t => unit,
+  onAllReady?: unit => unit,
+  onError?: JsError.t => unit,
 }
 
 type renderToPipeableStreamControls = {
@@ -24,5 +21,5 @@ type renderToPipeableStreamControls = {
 @module("react-dom/server")
 external renderToPipeableStream: (
   React.element,
-  renderToPipeableStreamOptions,
+  ~options: renderToPipeableStreamOptions=?,
 ) => renderToPipeableStreamControls = "renderToPipeableStream"

examples/express/src/bindings/Vite.res

@@ -16,4 +16,4 @@ let make = (~middlewareMode) => make({server: {middlewareMode: middlewareMode}})
 
 @send external transformIndexHtml: (t, string, string) => promise<string> = "transformIndexHtml"
 
-@send external ssrFixStacktrace: (t, Exn.t) => unit = "ssrFixStackTrace"
+@send external ssrFixStacktrace: (t, JsExn.t) => unit = "ssrFixStackTrace"

examples/express/src/bindings/Vite.resi

@@ -9,4 +9,4 @@ let make: (~middlewareMode: middlewareMode) => Promise.t<t>
 
 @send external transformIndexHtml: (t, string, string) => Promise.t<string> = "transformIndexHtml"
 
-@send external ssrFixStacktrace: (t, Exn.t) => unit = "ssrFixStackTrace"
+@send external ssrFixStacktrace: (t, JsExn.t) => unit = "ssrFixStackTrace"