Merge pull request #8 from evgenykochetkov/bump-bs-platform

Bump bs-platform, fix deprecations
jonlaing · Aug 1, 2018 · aed0073 · aed0073
2 parents e627b91 + 7d41e0a
commit aed0073
Show file tree

Hide file tree

Showing 8 changed files with 1,163 additions and 423 deletions.
diff --git a/README.md b/README.md
@@ -24,9 +24,9 @@ In the OCaml/ReasonML standard library, many of the common List operations throw
 - nth
 - etc
 
-### Monadic Options and Js.Results
+### Monadic Options and Belt.Results
 
-Rationale includes monadic and functor operations ala Haskell for the `option` and `Js.Result` types.
+Rationale includes monadic and functor operations ala Haskell for the `option` and `Belt.Result` types.
 
 ```Reason
 open Rationale.Option.Infix;

diff --git a/__tests__/Option_test.re b/__tests__/Option_test.re
@@ -34,7 +34,7 @@ test(
 test(
   "ofResult",
   () =>
-    expect((ofResult(Js.Result.Ok(true)), ofResult(Js.Result.Error(false))))
+    expect((ofResult(Belt.Result.Ok(true)), ofResult(Belt.Result.Error(false))))
     |> toEqual((Some(true), None))
 );
 

diff --git a/bsconfig.json b/bsconfig.json
@@ -13,7 +13,7 @@
     }
   ],
   "bs-dev-dependencies": [
-    "bs-jest"
+    "@glennsl/bs-jest"
   ],
   "namespace": true,
   "refmt": 3

diff --git a/package.json b/package.json
@@ -23,8 +23,11 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "bs-platform": "2.0.0",
-    "bs-jest": "^0.2.0"
+    "bs-platform": "^4.0.2",
+    "@glennsl/bs-jest": "^0.4.2"
   },
-  "dependencies": {}
+  "dependencies": {},
+  "jest": {
+    "testEnvironment": "node"
+  }
 }
diff --git a/src/Option.re b/src/Option.re
@@ -21,7 +21,7 @@ let default = (d, o) =>
   };
 
 let ofResult = (r) =>
-  Js.Result.(
+  Belt.Result.(
     switch r {
     | Ok(a) => Some(a)
     | Error(_) => None

diff --git a/src/Option.rei b/src/Option.rei
@@ -8,7 +8,7 @@ let isSome: option('a) => bool;
 
 let default: ('a, option('a)) => 'a;
 
-let ofResult: Js.Result.t('a, 'b) => option('a);
+let ofResult: Belt.Result.t('a, 'b) => option('a);
 
 let toExn: (string, option('a)) => 'a;
 

diff --git a/src/Result.re b/src/Result.re
@@ -1,4 +1,4 @@
-open Js.Result;
+open Belt.Result;
 
 let fail = (err) => Error(err);
 
@@ -53,7 +53,7 @@ let bimap = (okF, errF, r) =>
 include
   Monad.MakeBasic2(
     {
-      type t('a, 'd) = Js.Result.t('a, 'd);
+      type t('a, 'd) = Belt.Result.t('a, 'd);
       let bind = (r, f) =>
         switch r {
         | Ok(a) => f(a)