Fix for ReScript 10 (#6)

Author: cknitt

package.json

@@ -27,24 +27,24 @@
   ],
   "scripts": {
     "format:most": "prettier --write \"**/*.{md,json,js,css}\"",
-    "format:re": "find . -name \"*.re\" -or -name \"*.rei\" | grep -v \"node_modules\" | xargs bsrefmt --in-place",
-    "format": "yarn format:most && yarn format:re",
-    "re:start": "bsb -make-world -w",
-    "re:build": "bsb -make-world",
-    "re:clean-build": "bsb -clean-world -make-world",
-    "start": "yarn re:start",
-    "build": "yarn re:build",
-    "test": "yarn re:clean-build",
+    "format:res": "rescript format -all",
+    "format": "npm run format:most && npm run format:res",
+    "re:start": "rescript build -w",
+    "re:build": "rescript",
+    "re:clean-build": "rescript clean && rescript",
+    "start": "npm run re:start",
+    "build": "npm run re:build",
+    "test": "npm run re:clean-build",
     "release": "npmpub"
   },
   "devDependencies": {
-    "bs-platform": "^9.0.0",
+    "@rescript/react": "^0.10.3",
     "husky": "^4.0.0",
     "lint-staged": "^10.0.0",
     "npmpub": "^5.0.0",
     "prettier": "^2.0.0",
-    "@rescript/react": "^0.10.0",
-    "rescript-react-native": "^0.64.3"
+    "rescript": "^10.0.1",
+    "rescript-react-native": "^0.69.1"
   },
   "prettier": {
     "trailingComma": "all"

src/ReactNativeWebView.res

@@ -18,7 +18,7 @@ module Source = {
       | #PUT
       | #TRACE
     ]=?,
-    ~headers: Js.t<'a>=?,
+    ~headers: {..}=?,
     ~body: string=?,
     unit,
   ) => t = ""
@@ -78,31 +78,31 @@ module WebViewDownloadEvent = {
 }
 
 module WebViewErrorEvent = {
-  type payload = Js.t<webViewError>
+  type payload = webViewError
   include Event.SyntheticEvent({
     type _payload = payload
   })
 }
 module WebViewHttpErrorEvent = {
-  type payload = Js.t<webViewHttpError>
+  type payload = webViewHttpError
   include Event.SyntheticEvent({
     type _payload = payload
   })
 }
 module WebViewMessageEvent = {
-  type payload = Js.t<webViewMessage>
+  type payload = webViewMessage
   include Event.SyntheticEvent({
     type _payload = payload
   })
 }
 module WebViewNavigationEvent = {
-  type payload = Js.t<webViewNavigation>
+  type payload = webViewNavigation
   include Event.SyntheticEvent({
     type _payload = payload
   })
 }
 module WebViewProgressEvent = {
-  type payload = Js.t<webViewNativeProgressEvent>
+  type payload = webViewNativeProgressEvent
   include Event.SyntheticEvent({
     type _payload = payload
   })
@@ -114,14 +114,14 @@ module WebViewRenderProcessGone = {
   })
 }
 module WebViewTerminatedEvent = {
-  type payload = Js.t<webViewNativeEvent>
+  type payload = webViewNativeEvent
   include Event.SyntheticEvent({
     type _payload = payload
   })
 }
 
 module UnionCallback = ReactNativeWebView_UnionCallback.Make({
-  type union = Js.t<webViewNavigationOrError>
+  type union = webViewNavigationOrError
   type navigationEvent = WebViewNavigationEvent.t
   type errorEvent = WebViewErrorEvent.t
 })
@@ -131,8 +131,8 @@ type nativeConfig
 @obj
 external nativeConfig: (
   ~component: React.component<'a>=?,
-  ~props: Js.t<'b>=?,
-  ~viewManager: Js.t<'c>=?,
+  ~props: {..}=?,
+  ~viewManager: 'viewManager=?,
 ) => nativeConfig = ""
 
 @react.component @module("react-native-webview")
@@ -194,9 +194,9 @@ external make: (
   ~onLoadProgress: WebViewProgressEvent.t => unit=?,
   ~onLoadStart: WebViewNavigationEvent.t => unit=?,
   ~onMessage: WebViewMessageEvent.t => unit=?,
-  ~onNavigationStateChange: Js.t<webViewNavigation> => unit=?,
+  ~onNavigationStateChange: webViewNavigation => unit=?,
   ~onRenderProcessGone: WebViewRenderProcessGone.t => unit=?,
-  ~onShouldStartLoadWithRequest: Js.t<webViewShouldStartLoadWithRequest> => bool=?,
+  ~onShouldStartLoadWithRequest: webViewShouldStartLoadWithRequest => bool=?,
   ~originWhitelist: array<string>=?,
   ~overScrollMode: [#never | #always | #content]=?,
   ~pagingEnabled: bool=?,

src/ReactNativeWebView_UnionCallback.bs.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var Curry = require("bs-platform/lib/js/curry.js");
+var Curry = require("rescript/lib/js/curry.js");
 var Event$ReactNative = require("rescript-react-native/src/apis/Event.bs.js");
 var NativeElement$ReactNative = require("rescript-react-native/src/elements/NativeElement.bs.js");
 

yarn.lock

@@ -134,10 +134,10 @@
   dependencies:
     "@types/node" ">= 8"
 
-"@rescript/react@^0.10.0":
-  version "0.10.2"
-  resolved "https://registry.yarnpkg.com/@rescript/react/-/react-0.10.2.tgz#170d2a5ff34ad09cd614d92467d5efad95202794"
-  integrity sha512-Qe21P4WnrmrbhbEMQ4dpaXC1/iMMc7JmqjuSpZouSP+s41K5dCXUGY9sds30gajU74lSfJdG2PzSDYcNAcDyVA==
+"@rescript/react@^0.10.3":
+  version "0.10.3"
+  resolved "https://registry.yarnpkg.com/@rescript/react/-/react-0.10.3.tgz#a2a8bed6b017940ec26c2154764b350f50348889"
+  integrity sha512-Lf9rzrR3bQPKJjOK3PBRa/B3xrJ7CqQ1HYr9VHPVxJidarIJJFZBhj0Dg1uZURX+Wg/xiP0PHFxXmdj2bK8Vxw==
 
 "@sindresorhus/df@^1.0.1":
   version "1.0.1"
@@ -263,11 +263,6 @@ braces@^3.0.1:
   dependencies:
     fill-range "^7.0.1"
 
-bs-platform@^9.0.0:
-  version "9.0.2"
-  resolved "https://registry.yarnpkg.com/bs-platform/-/bs-platform-9.0.2.tgz#a6eac70eb8924a322556dacaccbfbc9b2a0d3a37"
-  integrity sha512-Ye9JqJ4Oa7mcjjoOVRYI8Uc2Cf8N7jQLWDcdUplY7996d/YErSR7WitmV7XnSwr4EvdrbwjEsg1NxNjUQv3ChA==
-
 callsites@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
@@ -1121,10 +1116,15 @@ regenerator-runtime@^0.13.4:
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz#d878a1d094b4306d10b9096484b33ebd55e26697"
   integrity sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==
 
-rescript-react-native@^0.64.3:
-  version "0.64.3"
-  resolved "https://registry.yarnpkg.com/rescript-react-native/-/rescript-react-native-0.64.3.tgz#8fd11a2681cfdd65c02f0ff620186e5adf0c6854"
-  integrity sha512-PjGDkV3RYiCTk4hCZyaKtZJV69By0AmJuzWyuHZONdeCB0q3DwjVJtA73gu6+jBrdl0OWon6UdXaVRXhhR47cQ==
+rescript-react-native@^0.69.1:
+  version "0.69.1"
+  resolved "https://registry.yarnpkg.com/rescript-react-native/-/rescript-react-native-0.69.1.tgz#76646e24e29c1ec70426d7066859a0c5842dce39"
+  integrity sha512-zNRmrwiRgqgoOAoxp5FV7mWrxWHvYJ+lqOC/rWedNcTmpccKYmr02Bs71YHf/Cuk/I8Wfkj09xL0cdlPF2E21A==
+
+rescript@^10.0.1:
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/rescript/-/rescript-10.0.1.tgz#5b2da8a8bcfb994bed1eb24820bf10cfb9d8c440"
+  integrity sha512-XwO1GPDtoEU4H03xQE5bp0/qtSVR6YLaJRPxWKrfFgKc+LI36ODOCie7o9UJfgzQdoMYkkZyiTGZ4N9OQEaiUw==
 
 resolve-from@^4.0.0:
   version "4.0.0"