clean up warnings and remove rebase dep

Author: rickyvetter

bsconfig.json

@@ -3,7 +3,7 @@
   "name" : "reason-tools",
   "version": "0.0.0",
   "reason" : {"react-jsx" : 2},
-  "bs-dependencies": ["reason-react", "rebase"],
+  "bs-dependencies": ["reason-react"],
   "sources": {
     "dir": "src",
     "subdirs": [

docs/Popup.bundle.js

@@ -34,11 +34,10 @@
     "react-codemirror2": "^4.0.0",
     "react-copy-to-clipboard": "^5.0.1",
     "react-dom": "^16.0.0",
-    "reason-react": "^0.3.0",
-    "rebase": "glennsl/rebase#v0.0.2"
+    "reason-react": "^0.3.0"
   },
   "devDependencies": {
-    "bs-platform": "^2.1.0",
+    "bs-platform": "^2.2.1",
     "chrome-store-api": "^1.0.5",
     "file-loader": "^1.1.5",
     "generate-json-webpack-plugin": "^0.2.1",

package.json

@@ -1,23 +1,21 @@
-open Rebase;
-
 open Core;
 
 module Refmt = {
   let refmt = Refmt2.refmtJS;
   let parse =
     fun
-    | ("Failure", error) => Error(error)
+    | ("Failure", error) => Protocol.Error(error)
     | (conversion, outText) =>
       switch (conversion |> Js.String.split("to")) {
       | [|inLang, outLang|] when Protocol.languageOfString(outLang) != RefmtShared.UnknownLang =>
-        Ok(
+        Protocol.Ok(
           Protocol.Refmt.{
             outText,
             inLang: Protocol.languageOfString(inLang),
             outLang: Protocol.languageOfString(outLang)
           }
         )
-      | _ => Error(outText)
+      | _ => Protocol.Error(outText)
       };
 };
 

src/extension/background.re

@@ -1,7 +1,9 @@
-open Rebase;
-
 open Common;
 
+type result('a, 'e) =
+  | Ok('a)
+  | Error('e);
+
 type language = RefmtShared.language;
 
 type codeType = RefmtShared.codeType;
@@ -122,7 +124,7 @@ module Storage = {
   let queryDisabled = (callback: bool => unit) =>
     Chrome.Storage.Local.get(
       "disabled",
-      (response) => response##disabled |> Js.Undefined.to_opt |> Option.getOr(false) |> callback
+      (response) => response##disabled |> Js.Undefined.toOption |> Js.Option.getWithDefault(false) |> callback
     );
   let setDisabled = (value: bool) => Chrome.Storage.Local.set({"disabled": value});
   let onDisabledChanged = (callback: bool => unit) =>

src/extension/common/protocol.re

@@ -20,14 +20,14 @@ let make =
       | Some(true) => Js.true_
       | Some(false) | None => Js.false_
       },
-      "style": Js.Undefined.from_opt(style),
-      "value": Js.Undefined.from_opt(value),
+      "style": Js.Undefined.fromOption(style),
+      "value": Js.Undefined.fromOption(value),
       "onBeforeChange": (_editor, _data, value) => switch (onChange) {
       | Some(onChange) => onChange(value)
       | None => ()
       },
-      "editorDidMount": Js.Undefined.from_opt(editorDidMount),
-      "options": Js.Undefined.from_opt(options)
+      "editorDidMount": Js.Undefined.fromOption(editorDidMount),
+      "options": Js.Undefined.fromOption(options)
     },
     children
   );

src/extension/common/vendor/codeMirror.re

@@ -63,7 +63,7 @@ let isWhitelisted = () => getWhitelist() |> List.mem(getSignificantUrl());
 let isBlacklisted = () => getBlacklist() |> List.mem(getSignificantUrl());
 
 let shouldConvert = () => {
-  let cached: option(bool) = [%raw "window._rtShouldConvert"] |> Js.Undefined.to_opt;
+  let cached: option(bool) = [%raw "window._rtShouldConvert"] |> Js.Undefined.toOption;
   switch cached {
   | Some(shouldConvert) => shouldConvert
   | None =>

src/extension/content/convert/detect.re

@@ -15,12 +15,12 @@ type listing = {
 };
 
 let getTypeTable = (pre) =>
-  switch (Js.Null.to_opt(Element.nextElementSibling(pre))) {
+  switch (Js.Null.toOption(Element.nextElementSibling(pre))) {
   | None => None
   | Some(el) =>
     if (Js.to_bool(DOMTokenList.contains(Element.classList(el), "typetable"))) {
       let text = Element.innerText(el);
-      switch (Js.Null.to_opt(Element.nextSibling(el))) {
+      switch (Js.Null.toOption(Element.nextSibling(el))) {
       | None => Some({el, text, remove: () => Element.remove(el)})
       | Some(next) =>
         if (Node.nodeType(next) == Node._TEXT_NODE) {

src/extension/content/convert/retrieve.re

@@ -1,5 +1,3 @@
-open Rebase;
-
 open LocalDom;
 
 open Common;
@@ -18,7 +16,7 @@ let swapStyleSheets = (_) => {
 };
 
 let readjustViewport = () =>
-  if (! Str.isEmpty(Location.hash)) {
+  if (! (Location.hash == "")) {
     [%bs.raw {| window.location.href = window.location.href |}]
   };
 
@@ -31,8 +29,8 @@ let doListing = (mode, state, listing) => {
     text,
     (response) => {
       switch response {
-      | Error(_) => () /* TODO */
-      | Ok({outText}) => Replace.replaceListing(els, outText, replace)
+      | Protocol.Error(_) => () /* TODO */
+      | Protocol.Ok({outText}) => Replace.replaceListing(els, outText, replace)
       };
       /* we're in an async callback, so keep track of when we're finished by keeping count */
       state.remaining = state.remaining - 1;

src/extension/content/convertPage.re

@@ -1,7 +1,5 @@
 open LocalDom;
 
-open Rebase;
-
 let onOpen: string => unit = [%bs.raw
   {|
   function (hash) {
@@ -28,8 +26,8 @@ let refmt =
     ~outLang,
     (error) =>
       switch error {
-      | Error(error) => cb(error, RefmtShared.UnknownLang, RefmtShared.UnknownLang)
-      | Ok({outText, inLang, outLang}) => cb(outText, inLang, outLang)
+      | Protocol.Error(error) => cb(error, RefmtShared.UnknownLang, RefmtShared.UnknownLang)
+      | Protocol.Ok({outText, inLang, outLang}) => cb(outText, inLang, outLang)
       }
   );
   Protocol.Storage.setLatestInput(input)