@apollo/client 3.6.0-beta.12 → 3.6.0-beta.13

package/apollo-client.cjs

@@ -13,6 +13,7 @@ var context = require('@wry/context');
 var trie = require('@wry/trie');
 var graphqlTag = require('graphql-tag');
 var React = require('react');
+var index_js = require('use-sync-external-store/shim/index.js');
 
 function _interopNamespace(e) {
     if (e && e.__esModule) return e;
@@ -1291,7 +1292,7 @@ var concat = ApolloLink.concat;
 
 var execute = ApolloLink.execute;
 
-var version = '3.6.0-beta.12';
+var version = '3.6.0-beta.13';
 
 var hasOwnProperty$3 = Object.prototype.hasOwnProperty;
 function parseAndCheckHttpResponse(operations) {
@@ -6129,17 +6130,75 @@ var InternalState = (function () {
     function InternalState(client, query) {
         this.client = client;
         this.query = query;
+        this.ssrDisabledResult = maybeDeepFreeze({
+            loading: true,
+            data: void 0,
+            error: void 0,
+            networkStatus: exports.NetworkStatus.loading,
+        });
+        this.skipStandbyResult = maybeDeepFreeze({
+            loading: false,
+            data: void 0,
+            error: void 0,
+            networkStatus: exports.NetworkStatus.ready,
+        });
         this.toQueryResultCache = new (canUseWeakMap ? WeakMap : Map)();
         verifyDocumentType(query, exports.DocumentType.Query);
     }
     InternalState.prototype.forceUpdate = function () {
     };
     InternalState.prototype.useQuery = function (options) {
+        var _this = this;
         this.renderPromises = React.useContext(getApolloContext()).renderPromises;
         this.useOptions(options);
         var obsQuery = this.useObservableQuery();
-        this.useSubscriptionEffect(obsQuery);
-        var result = this.getCurrentResult();
+        var result = index_js.useSyncExternalStore(React.useCallback(function () {
+            if (_this.renderPromises) {
+                return function () { };
+            }
+            var onNext = function () {
+                var previousResult = _this.result;
+                var result = obsQuery.getCurrentResult();
+                if (previousResult &&
+                    previousResult.loading === result.loading &&
+                    previousResult.networkStatus === result.networkStatus &&
+                    equality.equal(previousResult.data, result.data)) {
+                    return;
+                }
+                _this.setResult(result);
+            };
+            var onError = function (error) {
+                var last = obsQuery["last"];
+                subscription.unsubscribe();
+                try {
+                    obsQuery.resetLastResults();
+                    subscription = obsQuery.subscribe(onNext, onError);
+                }
+                finally {
+                    obsQuery["last"] = last;
+                }
+                if (!hasOwnProperty.call(error, 'graphQLErrors')) {
+                    throw error;
+                }
+                var previousResult = _this.result;
+                if (!previousResult ||
+                    (previousResult && previousResult.loading) ||
+                    !equality.equal(error, previousResult.error)) {
+                    _this.setResult({
+                        data: (previousResult && previousResult.data),
+                        error: error,
+                        loading: false,
+                        networkStatus: exports.NetworkStatus.error,
+                    });
+                }
+            };
+            var subscription = obsQuery.subscribe(onNext, onError);
+            return function () { return subscription.unsubscribe(); };
+        }, [
+            obsQuery,
+            this.renderPromises,
+            this.client.disableNetworkFetches,
+        ]), function () { return _this.getCurrentResult(); });
         this.unsafeHandlePartialRefetch(result);
         return this.toQueryResult(result);
     };
@@ -6152,6 +6211,18 @@ var InternalState = (function () {
             options.skip);
         this.onCompleted = options.onCompleted || InternalState.prototype.onCompleted;
         this.onError = options.onError || InternalState.prototype.onError;
+        if ((this.renderPromises || this.client.disableNetworkFetches) &&
+            this.queryHookOptions.ssr === false) {
+            this.result = this.ssrDisabledResult;
+        }
+        else if (this.queryHookOptions.skip ||
+            this.watchQueryOptions.fetchPolicy === 'standby') {
+            this.result = this.skipStandbyResult;
+        }
+        else if (this.result === this.ssrDisabledResult ||
+            this.result === this.skipStandbyResult) {
+            this.result = void 0;
+        }
     };
     InternalState.prototype.createWatchQueryOptions = function (_a) {
         if (_a === void 0) { _a = {}; }
@@ -6256,56 +6327,6 @@ var InternalState = (function () {
         }, [obsQuery, this.watchQueryOptions]);
         return obsQuery;
     };
-    InternalState.prototype.useSubscriptionEffect = function (obsQuery) {
-        var _this = this;
-        React.useEffect(function () {
-            if (_this.renderPromises) {
-                return;
-            }
-            var onNext = function () {
-                var previousResult = _this.result;
-                var result = obsQuery.getCurrentResult();
-                if (previousResult &&
-                    previousResult.loading === result.loading &&
-                    previousResult.networkStatus === result.networkStatus &&
-                    equality.equal(previousResult.data, result.data)) {
-                    return;
-                }
-                _this.setResult(result);
-            };
-            var onError = function (error) {
-                var last = obsQuery["last"];
-                subscription.unsubscribe();
-                try {
-                    obsQuery.resetLastResults();
-                    subscription = obsQuery.subscribe(onNext, onError);
-                }
-                finally {
-                    obsQuery["last"] = last;
-                }
-                if (!hasOwnProperty.call(error, 'graphQLErrors')) {
-                    throw error;
-                }
-                var previousResult = _this.result;
-                if (!previousResult ||
-                    (previousResult && previousResult.loading) ||
-                    !equality.equal(error, previousResult.error)) {
-                    _this.setResult({
-                        data: (previousResult && previousResult.data),
-                        error: error,
-                        loading: false,
-                        networkStatus: exports.NetworkStatus.error,
-                    });
-                }
-            };
-            var subscription = obsQuery.subscribe(onNext, onError);
-            return function () { return subscription.unsubscribe(); };
-        }, [
-            obsQuery,
-            this.renderPromises,
-            this.client.disableNetworkFetches,
-        ]);
-    };
     InternalState.prototype.setResult = function (nextResult) {
         var previousResult = this.result;
         if (previousResult && previousResult.data) {
@@ -6326,30 +6347,10 @@ var InternalState = (function () {
         }
     };
     InternalState.prototype.getCurrentResult = function () {
-        var result = this.result;
-        if (!result) {
-            result = this.result = this.observable.getCurrentResult();
-            this.handleErrorOrCompleted(result);
+        if (!this.result) {
+            this.handleErrorOrCompleted(this.result = this.observable.getCurrentResult());
         }
-        if ((this.renderPromises || this.client.disableNetworkFetches) &&
-            this.queryHookOptions.ssr === false) {
-            result = {
-                loading: true,
-                data: void 0,
-                error: void 0,
-                networkStatus: exports.NetworkStatus.loading,
-            };
-        }
-        else if (this.queryHookOptions.skip ||
-            this.watchQueryOptions.fetchPolicy === 'standby') {
-            result = {
-                loading: false,
-                data: void 0,
-                error: void 0,
-                networkStatus: exports.NetworkStatus.ready,
-            };
-        }
-        return result;
+        return this.result;
     };
     InternalState.prototype.toQueryResult = function (result) {
         var queryResult = this.toQueryResultCache.get(result);