Use WebApi for Response construction

tom-sherman · Dec 24, 2021 · 9250839 · 9250839
1 parent 00ddedd
commit 9250839
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 26 deletions.
diff --git a/app/entry.server.res b/app/entry.server.res
@@ -1,14 +1,4 @@
-module ResponseInit = {
-  type t
-
-  external make: {..} => t = "%identity"
-}
-
-// TODO: Swap out for Webapi.Fetch.Response when it supports construction
-// See https://github.com/tinymce/rescript-webapi/issues/63
-@new
-external makeResponse: (Webapi.Fetch.BodyInit.t, ResponseInit.t) => Webapi.Fetch.Response.t =
-  "Response"
+external castHeadersToInit: Webapi.Fetch.Headers.t => Webapi.Fetch.HeadersInit.t = "%identity"
 
 let default = (request, responseStatusCode, responseHeaders, remixContext) => {
   open Webapi
@@ -19,11 +9,12 @@ let default = (request, responseStatusCode, responseHeaders, remixContext) => {
 
   responseHeaders->Fetch.Headers.set("Content-Type", "text/html")
 
-  makeResponse(
-    Fetch.BodyInit.make("<!DOCTYPE html>" ++ markup),
-    ResponseInit.make({
-      "status": responseStatusCode,
-      "headers": responseHeaders,
-    }),
+  Fetch.Response.makeWithInit(
+    "<!DOCTYPE html>" ++ markup,
+    Fetch.ResponseInit.make(
+      ~status=responseStatusCode,
+      ~headers=responseHeaders->castHeadersToInit,
+      (),
+    ),
   )
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -18,7 +18,7 @@
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "remix": "^1.1.1",
-    "rescript-webapi": "^0.2.0"
+    "rescript-webapi": "^0.3.0"
   },
   "devDependencies": {
     "@remix-run/dev": "^1.1.1",

diff --git a/remix.config.js b/remix.config.js
@@ -8,5 +8,5 @@ module.exports = {
   serverBuildDirectory: "build",
   devServerPort: 8002,
   ignoredRouteFiles: [".*", "*.res"],
-  transpileModules: ["rescript"]
+  transpileModules: ["rescript", "rescript-webapi"]
 };