@colisweb/rescript-toolkit 2.39.0 → 2.41.1

package/bsconfig.json

@@ -27,19 +27,13 @@
     "bs-css-emotion",
     "@rescript/react",
     "reason-promise",
-    "reason-react",
     "decco",
     "rescript-classnames",
     "reschema",
     "rescript-react-update",
-    "restorative"
+    "@colisweb/restorative"
   ],
-  "ppx-flags": [
-    "decco/ppx",
-    "lenses-ppx/ppx",
-    "res-react-intl/ppx"
-  ],
-  "refmt": 3,
+  "ppx-flags": ["decco/ppx", "lenses-ppx/ppx", "res-react-intl/ppx"],
   "warnings": {
     "number": "-44-30-32",
     "error": "+5"
@@ -50,4 +44,4 @@
     "-open Belt",
     "-open Cx"
   ]
-}
+}

package/package.json

@@ -1,12 +1,11 @@
 {
   "name": "@colisweb/rescript-toolkit",
-  "version": "2.39.0",
+  "version": "2.41.1",
   "scripts": {
     "clean": "rescript clean",
-    "build": "rescript build",
-    "watch": "rescript build -w",
-    "dev": "rescript build -w",
-    "test": "rescript build -with-deps",
+    "build": "rescript build -with-deps",
+    "dev": "rescript build -with-deps -w",
+    "test": "yarn build",
     "build:reacticons": "node tools/extract-react-icons.js",
     "build:scss": "node tools/build-scss.js",
     "storybook": "STORYBOOK=true start-storybook -p 6006 --no-manager-cache",
@@ -23,6 +22,7 @@
   "license": "MIT",
   "dependencies": {
     "@colisweb/react-day-picker": "7.4.16",
+    "@colisweb/restorative": "0.5.1",
     "@reach/accordion": "0.16.1",
     "@reach/alert-dialog": "0.16.2",
     "@reach/auto-id": "0.16.0",
@@ -45,7 +45,7 @@
     "case": "1.6.3",
     "click-outside-hook": "1.1.0",
     "copy-to-clipboard": "3.3.1",
-    "date-fns": "2.27.0",
+    "date-fns": "2.28.0",
     "decco": "1.5.0",
     "dedent": "0.7.0",
     "downshift": "5.2.5",
@@ -61,15 +61,16 @@
     "react-table": "7.7.0",
     "react-use": "17.3.1",
     "reason-promise": "1.1.5",
-    "reason-react": "0.9.1",
+    "res-react-intl": "3.1.2",
     "reschema": "1.3.1",
     "rescript": "9.1.4",
     "rescript-classnames": "6.0.0",
     "rescript-react-update": "5.0.0",
-    "restorative": "0.4.0-beta.1",
     "sanitize-html": "2.6.1",
     "swr": "1.1.1",
-    "tailwindcss": "3.0.2"
+    "tailwindcss": "3.1.4",
+    "react-error-boundary": "3.1.4",
+    "@datadog/browser-rum": "4.7.1"
   },
   "devDependencies": {
     "@babel/core": "7.16.5",
@@ -87,7 +88,6 @@
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "react-intl": "5.24.7",
-    "res-react-intl": "3.1.2",
     "react-is": "17.0.2",
     "sass": "1.45.0"
   }

package/src/vendors/Axios.res

@@ -111,15 +111,15 @@ module Interceptors = {
 module WithResult = {
   type customError<'apiError, 'response> = [
     | #default(error<'response>)
-    | #decodeError(Decco.decodeError)
+    | #decodeError(config, Decco.decodeError)
     | #custom('apiError)
   ]
 
-  type decodeData<'newData, 'err> = Js.Json.t => result<'newData, 'err>
+  type decodeData<'newData> = Js.Json.t => result<'newData, Decco.decodeError>
 
   type mapError<'a, 'response, 'headers, 'request> = error<'response> => customError<'a, 'response>
 
-  let toResult = (promise, ~mapError, ~decodeData) =>
+  let toResult = (promise, ~mapError, ~decodeData: decodeData<'a>) =>
     promise
     ->Promise.Js.toResult
     ->Promise.mapError(err => mapError->Option.mapWithDefault(#default(err), fn => fn(err)))
@@ -127,14 +127,14 @@ module WithResult = {
       Promise.resolved(
         switch decodeData(response.data) {
         | Ok(_) as ok => ok
-        | Error(decodeError) => Error(#decodeError(decodeError))
+        | Error(decodeError) => Error(#decodeError(response.config, decodeError))
         },
       )
     })
 
   let get = (
     ~config=?,
-    ~decodeData: decodeData<'newData, 'err>,
+    ~decodeData: decodeData<'newData>,
     ~mapError: option<mapError<'a, 'response, 'headers, 'request>>=?,
     string,
   ) => get(string, ~config?, ())->toResult(~decodeData, ~mapError)
@@ -142,7 +142,7 @@ module WithResult = {
   let post = (
     ~data,
     ~config=?,
-    ~decodeData: decodeData<'newData, 'err>,
+    ~decodeData: decodeData<'newData>,
     ~mapError: option<mapError<'a, 'response, 'headers, 'request>>=?,
     string,
   ) => post(string, ~data, ~config?, ())->toResult(~decodeData, ~mapError)
@@ -150,7 +150,7 @@ module WithResult = {
   let put = (
     ~data,
     ~config=?,
-    ~decodeData: decodeData<'newData, 'err>,
+    ~decodeData: decodeData<'newData>,
     ~mapError: option<mapError<'a, 'response, 'headers, 'request>>=?,
     string,
   ) => put(string, ~data, ~config?, ())->toResult(~decodeData, ~mapError)
@@ -158,21 +158,21 @@ module WithResult = {
   let patch = (
     ~data,
     ~config=?,
-    ~decodeData: decodeData<'newData, 'err>,
+    ~decodeData: decodeData<'newData>,
     ~mapError: option<mapError<'a, 'response, 'headers, 'request>>=?,
     string,
   ) => patch(string, ~data, ~config?, ())->toResult(~decodeData, ~mapError)
 
   let delete = (
     ~config=?,
-    ~decodeData: decodeData<'newData, 'err>,
+    ~decodeData: decodeData<'newData>,
     ~mapError: option<mapError<'a, 'response, 'headers, 'request>>=?,
     string,
   ) => delete(string, ~config?, ())->toResult(~decodeData, ~mapError)
 
   let options = (
     ~config=?,
-    ~decodeData: decodeData<'newData, 'err>,
+    ~decodeData: decodeData<'newData>,
     ~mapError: option<mapError<'a, 'response, 'headers, 'request>>=?,
     string,
   ) => options(string, ~config?, ())->toResult(~decodeData, ~mapError)

package/src/vendors/ReactErrorBoundary.res

@@ -10,4 +10,5 @@ external make: (
   ~fallbackRender: fallbackProps => React.element=?,
   ~children: React.element,
   ~resetKeys: array<'a>=?,
+  ~onError: 'error => unit=?,
 ) => React.element = "ErrorBoundary"