breaking: upgrade rescript v11 and react v18

rescriptbr · Jan 17, 2024 · 90cd75c · 90cd75c
1 parent fa82583
commit 90cd75c
Show file tree

Hide file tree

Showing 8 changed files with 70 additions and 353 deletions.
diff --git a/package.json b/package.json
@@ -37,8 +37,7 @@
   "workspaces": [
     "packages/reform",
     "packages/website",
-    "packages/reschema",
-    "packages/demo"
+    "packages/reschema"
   ],
   "husky": {
     "hooks": {
@@ -60,6 +59,6 @@
   },
   "dependencies": {
     "@rolandpeelen/rewatch": "0.0.12-0c3740d.0",
-    "rescript": "^10.1.4"
+    "rescript": "^11.0.0"
   }
 }
diff --git a/packages/demo/package.json b/packages/demo/package.json
@@ -4,15 +4,15 @@
   "private": true,
   "dependencies": {
     "@emotion/css": "11.7.1",
-    "@rescript/react": "0.10.3",
+    "@rescript/react": "^0.12.0",
     "@rescriptbr/ancestor": "0.5.0",
     "@rescriptbr/reform": "12.0.1",
     "@vitejs/plugin-react": "1.0.0",
     "lenses-ppx": "6.1.10",
-    "react": "17.0.2",
-    "react-dom": "17.0.2",
+    "react": "^18.0.0",
+    "react-dom": "^18.0.0",
     "@rescriptbr/reschema": "3.0.1",
-    "rescript": "9.1.1",
+    "rescript": "^11.0.0",
     "vite": "2.6.4"
   },
   "scripts": {

diff --git a/packages/reform/package.json b/packages/reform/package.json
@@ -20,12 +20,12 @@
   "author": "Gabriel Rubens <fakenickels.dev>",
   "license": "MIT",
   "peerDependencies": {
-    "@rescript/react": "^0.10.3",
-    "rescript": "^10.1.4"
+    "@rescript/react": "^0.12.0",
+    "rescript": "^11.0.0"
   },
   "devDependencies": {
-    "@rescript/react": "^0.10.1",
-    "rescript": "^10.1.4"
+    "@rescript/react": "^0.12.0",
+    "rescript": "^11.0.0"
   },
   "scripts": {
     "start": "yarn res:watch",
@@ -36,6 +36,7 @@
   },
   "dependencies": {
     "@rescriptbr/reschema": "^3.0.3",
-    "rescript": "^10.1.4"
+    "rescript": "^11.0.0",
+    "rescript-react-update": "5.0.2"
   }
 }
diff --git a/packages/reform/src/ReForm.res b/packages/reform/src/ReForm.res
@@ -132,7 +132,7 @@ module Make = (Config: Config) => {
       validateField,
       state,
     }) => {
-      handleChange: handleChange(field),
+      handleChange: value => handleChange(field, value),
       error: getFieldError(Field(field)),
       state: getFieldState(Field(field)),
       validate: () => validateField(Field(field)),
@@ -159,17 +159,15 @@ module Make = (Config: Config) => {
     ) => {
       let fieldInterface = useField(field)
 
-      React.useMemo3(
-        () =>
-          fieldInterface
-          ->Belt.Option.map(render)
-          ->Belt.Option.getWithDefault(renderOnMissingContext),
-        (
-          fieldInterface->Belt.Option.map(({error}) => error),
-          fieldInterface->Belt.Option.map(({value}) => value),
-          fieldInterface->Belt.Option.map(({state}) => state),
-        ),
-      )
+      React.useMemo(() =>
+        fieldInterface
+        ->Belt.Option.map(render)
+        ->Belt.Option.getWithDefault(renderOnMissingContext)
+      , (
+        fieldInterface->Belt.Option.map(({error}) => error),
+        fieldInterface->Belt.Option.map(({value}) => value),
+        fieldInterface->Belt.Option.map(({state}) => state),
+      ))
     }
   }
 
@@ -183,12 +181,7 @@ module Make = (Config: Config) => {
     (),
   ) => {
     let (state, send) = ReactUpdate.useReducer(
-      {
-        fieldsState: getInitialFieldsState(schema),
-        values: initialState,
-        formState: Pristine,
-      },
-      (action, state) =>
+      (state: state, action) =>
         switch action {
         | Submit =>
           UpdateWithSideEffects(
@@ -353,6 +346,11 @@ module Make = (Config: Config) => {
           Update({...state, values: Config.set(state.values, field, value)})
         | RaiseSubmitFailed(err) => Update({...state, formState: SubmitFailed(err)})
         },
+      {
+        fieldsState: getInitialFieldsState(schema),
+        values: initialState,
+        formState: Pristine,
+      },
     )
 
     let getFieldState = field =>
@@ -365,12 +363,7 @@ module Make = (Config: Config) => {
     let getFieldError = field =>
       switch getFieldState(field) {
       | Error(error) => Some(error)
-      | NestedErrors(_errors) =>
-        Js.log2(
-          "The following field has nested errors, access these with `getNestedFieldError` instead of `getFieldError`",
-          field,
-        )
-        None
+      | NestedErrors(_errors) => None
       | Pristine
       | Valid =>
         None

diff --git a/packages/reschema/demo/package.json b/packages/reschema/demo/package.json
@@ -3,10 +3,10 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@rescript/react": "0.10.3",
+    "@rescript/react": "^0.12.0",
     "@rescriptbr/reform": "12.0.0-0",
     "lenses-ppx": "6.1.10",
-    "rescript": "9.1.4"
+    "rescript": "^11.0.0"
   },
   "scripts": {
     "rescript:start": "npx rescript build -w",

diff --git a/packages/reschema/package.json b/packages/reschema/package.json
@@ -19,6 +19,6 @@
     "jest": "28.1.3"
   },
   "dependencies": {
-    "rescript": "^9.0.2"
+    "rescript": "^11.0.0"
   }
 }
diff --git a/packages/website/package.json b/packages/website/package.json
@@ -20,16 +20,16 @@
     "@docusaurus/core": "2.0.0-beta.18",
     "@docusaurus/preset-classic": "2.0.0-beta.18",
     "@mdx-js/react": "^1.6.21",
-    "@rescript/react": "0.10.3",
+    "@rescript/react": "^0.12.0",
     "@rescriptbr/ancestor": "0.5.0",
     "@rescriptbr/reform": "12.0.1",
     "clsx": "^1.1.1",
     "lenses-ppx": "6.1.10",
     "prism-react-renderer": "^1.2.1",
     "prismjs": "1.28.0",
     "raw-loader": "4.0.2",
-    "react": "^17.0.1",
-    "react-dom": "^17.0.1",
+    "react": "^18.0.0",
+    "react-dom": "^18.0.0",
     "@rescriptbr/reschema": "3.0.1"
   },
   "browserslist": {