@joshroy/relay-nextjs 3.1.1 → 3.1.2

package/app.js

@@ -22,7 +22,7 @@ function useRelayNextjs(props, opts) {
         }
         return env;
     });
-    const [preloadedQuery, setPreloadedQuery] = (0, react_1.useState)(() => {
+    const preloadedQuery = (0, react_1.useMemo)(() => {
         if (props.preloadedQuery) {
             return props.preloadedQuery;
         }
@@ -30,29 +30,14 @@ function useRelayNextjs(props, opts) {
             return (0, react_relay_1.loadQuery)(relayEnvironment, props.operationDescriptor.request.node, props.operationDescriptor.request.variables, { fetchPolicy: 'store-or-network' });
         }
         return undefined;
-    });
-    const prevPreloadedQueryProp = (0, react_1.useRef)(props.preloadedQuery);
+    }, [props.preloadedQuery, props.operationDescriptor, relayEnvironment]);
+    const prevQueryRef = (0, react_1.useRef)(undefined);
     (0, react_1.useEffect)(() => {
-        if (props.preloadedQuery &&
-            props.preloadedQuery !== prevPreloadedQueryProp.current) {
-            prevPreloadedQueryProp.current = props.preloadedQuery;
-            setPreloadedQuery((prev) => {
-                if (prev && prev !== props.preloadedQuery) {
-                    prev.dispose();
-                }
-                return props.preloadedQuery;
-            });
+        const prev = prevQueryRef.current;
+        prevQueryRef.current = preloadedQuery;
+        if (prev && prev !== preloadedQuery) {
+            prev.dispose();
         }
-    }, [props.preloadedQuery]);
-    (0, react_1.useEffect)(() => {
-        return () => {
-            setPreloadedQuery((prev) => {
-                if (prev) {
-                    prev.dispose();
-                }
-                return undefined;
-            });
-        };
-    }, []);
+    }, [preloadedQuery]);
     return { env: relayEnvironment, preloadedQuery, CSN: props.CSN };
 }

package/component.js

@@ -107,16 +107,6 @@ function withRelay(Component, query, opts) {
             });
             return () => nextPreloadedQuery.dispose();
         }, [env, queryVariables, queryOptions]);
-        (0, react_1.useEffect)(() => {
-            return () => {
-                setPreloadedQuery((prev) => {
-                    if (prev) {
-                        prev.dispose();
-                    }
-                    return prev;
-                });
-            };
-        }, []);
         return preloadedQuery;
     }
     function RelayComponent(props) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@joshroy/relay-nextjs",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "description": "Use Relay in your Next.js apps!",
   "main": "index.js",
   "scripts": {