rescript-relay 1.0.0-beta.16 → 1.0.0-beta.19

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # master
 
-# 1.0.0-beta.16
+# 1.0.0-beta.19
 
 _[Here's a commit showing a project being upgraded to this version](https://github.com/zth/rescript-relay/commit/5831c2f1f0f13eedc1cb60468c32fd32b2dc01d3)_
 
@@ -9,6 +9,7 @@ The time has finally come - RescriptRelay `1.0.0` is in beta! The one, big major
 ## Upgrade versions
 
 - `react-relay` and `relay-runtime` to `13.2.0`
+- `react` and `react-dom` to `18.0.0`
 
 ## Remove Packages
 
@@ -48,6 +49,18 @@ You can go ahead and remove these packages, that are no longer needed, as the co
 
 ### unreleased
 
+### beta.19
+
+- Fix top level node interface issue.
+
+### beta.18
+
+- Fix `useTransition` bindings, where `startTransition` broke after going to React 18. Kudos to [Emilios1995](https://github.com/Emilios1995) for researching and finding the issue!
+
+### beta.17
+
+- Upgrade to stable React 18
+
 ### beta.16
 
 - Fix bug that caused issues when using unions in optimistic responses and `commitLocalPayload`.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rescript-relay",
-  "version": "1.0.0-beta.16",
+  "version": "1.0.0-beta.19",
   "main": "src/RescriptRelay.res",
   "license": "MIT",
   "author": "Gabriel Nordeborn",
@@ -40,15 +40,15 @@
   },
   "devDependencies": {
     "@rescript/react": "0.10.3",
-    "@testing-library/jest-dom": "^5.16.1",
-    "@testing-library/react": "^13.0.0-alpha.5",
+    "@testing-library/jest-dom": "^5.16.3",
+    "@testing-library/react": "^13.0.0-alpha.6",
     "bs-fetch": "^0.5.0",
     "graphql-query-test-mock": "^0.12.1",
     "jest": "^27.2.4",
     "nock": "^11.7.0",
     "node-fetch": "^2.6.0",
-    "react": "^18.0.0-rc.0",
-    "react-dom": "^18.0.0-rc.0",
+    "react": "18.0.0",
+    "react-dom": "18.0.0",
     "react-relay": "13.2.0",
     "relay-runtime": "13.2.0"
   },
@@ -63,7 +63,7 @@
     "rescript": "^9.1.2"
   },
   "resolutions": {
-    "react": "18.0.0-rc.0",
-    "react-dom": "18.0.0-rc.0"
+    "react": "18.0.0",
+    "react-dom": "18.0.0"
   }
 }

package/src/ReactDOMExperimental.bs.js

@@ -1,7 +1,7 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 'use strict';
 
-var ReactDom = require("react-dom");
+var Client = require("react-dom/client");
 
 function renderConcurrentRootAtElementWithId(content, id) {
   var element = document.getElementById(id);
@@ -12,9 +12,9 @@ function renderConcurrentRootAtElementWithId(content, id) {
           Error: new Error()
         };
   }
-  ReactDom.createRoot(element).render(content);
+  Client.createRoot(element).render(content);
   
 }
 
 exports.renderConcurrentRootAtElementWithId = renderConcurrentRootAtElementWithId;
-/* react-dom Not a pure module */
+/* react-dom/client Not a pure module */

package/src/ReactDOMExperimental.res

@@ -1,6 +1,6 @@
 include ReactDOM.Experimental
 
-@module("react-dom")
+@module("react-dom/client")
 external createRoot: Dom.element => root = "createRoot"
 
 @val @return(nullable)
@@ -15,6 +15,5 @@ let renderConcurrentRootAtElementWithId: (React.element, string) => unit = (cont
         id ++ " found in the HTML.",
       ),
     )
-  | Some(element) =>
-    createRoot(element)->render(content)
+  | Some(element) => createRoot(element)->render(content)
   }

package/src/ReactExperimental.bs.js

@@ -1,8 +1,21 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 'use strict';
 
+var React = require("react");
+
+function useTransition(param) {
+  var match = React.useTransition();
+  var startTransition = match[1];
+  return [
+          match[0],
+          React.useCallback((function (cb) {
+                  return startTransition(cb, undefined);
+                }), [startTransition])
+        ];
+}
 
 var SuspenseList = {};
 
+exports.useTransition = useTransition;
 exports.SuspenseList = SuspenseList;
-/* No side effect */
+/* react Not a pure module */

package/src/ReactExperimental.res

@@ -1,11 +1,16 @@
-type callback<'input, 'output> = 'input => 'output
-
 @module("react")
 external useDeferredValue: 'value => 'value = "useDeferredValue"
 
 @module("react")
-external useTransition: unit => (bool, callback<callback<unit, unit>, unit>) =
-  "useTransition"
+external useTransitionWithOptions: unit => (
+  bool,
+  (. unit => unit, option<{"name": option<string>}>) => unit,
+) = "useTransition"
+
+let useTransition = () => {
+  let (isPending, startTransition) = useTransitionWithOptions()
+  (isPending, React.useCallback1(cb => startTransition(. cb, None), [startTransition]))
+}
 
 module SuspenseList = {
   @module("react") @react.component

package/src/ReactExperimental.resi

@@ -0,0 +1,18 @@
+@module("react")
+external useDeferredValue: 'value => 'value = "useDeferredValue"
+
+@module("react")
+external useTransitionWithOptions: unit => (
+  bool,
+  (. unit => unit, option<{"name": option<string>}>) => unit,
+) = "useTransition"
+
+let useTransition: unit => (bool, React.callback<unit => unit, unit>)
+
+module SuspenseList: {
+  @module("react") @react.component
+  external make: (
+    ~children: React.element,
+    ~revealOrder: [#forwards | #backwards | #together]=?,
+  ) => React.element = "SuspenseList"
+}

package/src/experimental-router/RescriptRelayRouter.bs.js

@@ -9,6 +9,7 @@ var Belt_Array = require("rescript/lib/js/belt_Array.js");
 var Belt_Option = require("rescript/lib/js/belt_Option.js");
 var Caml_option = require("rescript/lib/js/caml_option.js");
 var Caml_exceptions = require("rescript/lib/js/caml_exceptions.js");
+var ReactExperimental = require("../ReactExperimental.bs.js");
 var RescriptReactRouter = require("@rescript/react/src/RescriptReactRouter.bs.js");
 
 function matchesUrl(t, url) {
@@ -242,7 +243,7 @@ function RescriptRelayRouter$RouteRenderer(Props) {
       });
   var initialized = match[0];
   var router = React.useContext(context);
-  var match$1 = React.useTransition();
+  var match$1 = ReactExperimental.useTransition(undefined);
   var startTransition = match$1[1];
   var match$2 = React.useState(function () {
         return Curry._1(router.get, undefined);

package/src/utils.js

@@ -174,6 +174,9 @@ function traverse(
       }
 
       if (isTopLevelNodeField) {
+        // If this is a top level node field we should try and convert, ensure
+        // it conforms to the desired shape (has the correct typename). If not,
+        // null it and return right away.
         if (
           v == null ||
           !v.hasOwnProperty("__typename") ||
@@ -181,6 +184,7 @@ function traverse(
         ) {
           newObj = getNewObj(newObj, currentObj);
           newObj[key] = nullableValue;
+          return newObj;
         }
       }
 

package/src/utils.mjs

@@ -174,6 +174,9 @@ function traverse(
       }
 
       if (isTopLevelNodeField) {
+        // If this is a top level node field we should try and convert, ensure
+        // it conforms to the desired shape (has the correct typename). If not,
+        // null it and return right away.
         if (
           v == null ||
           !v.hasOwnProperty("__typename") ||
@@ -181,6 +184,7 @@ function traverse(
         ) {
           newObj = getNewObj(newObj, currentObj);
           newObj[key] = nullableValue;
+          return newObj;
         }
       }