@apollo/react-hooks - npm Package Compare versions

Comparing version 3.1.4 to 3.1.5

lib/data/QueryData.d.ts

@@ -11,3 +11,3 @@ import { ApolloQueryResult } from 'apollo-client';
     private lazyOptions?;
-    constructor({ options, context, onNewData }: {
+    constructor({ options, context, onNewData, }: {
         options: QueryOptions<TData, TVariables>;
@@ -14,0 +14,0 @@ context: ApolloContextValue;

lib/data/QueryData.js

 import { __assign, __extends } from "tslib";
-import { ApolloError, NetworkStatus } from 'apollo-client';
+import { ApolloError, NetworkStatus, } from 'apollo-client';
 import { equal as isEqual } from '@wry/equality';
-import { DocumentType } from '@apollo/react-common';
+import { DocumentType, } from '@apollo/react-common';
 import { OperationData } from './OperationData';
@@ -64,4 +64,4 @@ var QueryData = (function (_super) {
                     called: false,
-                    data: undefined
-                }
+                    data: undefined,
+                },
             ]
@@ -79,3 +79,2 @@ : [this.runLazyQuery, this.execute()];
     QueryData.prototype.afterExecute = function (_a) {
-        var _this = this;
         var _b = (_a === void 0 ? {} : _a).lazy, lazy = _b === void 0 ? false : _b;
@@ -85,6 +84,2 @@ this.isMounted = true;
             this.handleErrorOrCompleted();
-            setTimeout(function () {
-                _this.currentObservable.query &&
-                    _this.currentObservable.query.resetQueryStoreErrors();
-            });
         }
@@ -116,9 +111,5 @@ this.previousOptions = this.getOptions();
         var fetchDisabled = this.refreshClient().client.disableNetworkFetches;
-        var ssrLoading = {
-            loading: true,
-            networkStatus: NetworkStatus.loading,
-            called: true,
-            data: undefined
-        };
+        var ssrLoading = __assign({ loading: true, networkStatus: NetworkStatus.loading, called: true, data: undefined, stale: false, client: this.client }, this.observableQueryFields());
         if (ssrDisabled && (this.ssrInitiated() || fetchDisabled)) {
+            this.previousData.result = ssrLoading;
             return ssrLoading;
@@ -198,3 +189,3 @@ }
                 }
-            }
+            },
         });
@@ -210,3 +201,3 @@ };
             lastError: lastError,
-            lastResult: lastResult
+            lastResult: lastResult,
         });
@@ -239,3 +230,3 @@ };
                     data: (this.currentObservable.query.getLastResult() || {})
-                        .data
+                        .data,
                 });
@@ -252,3 +243,3 @@ }
                         loading: true,
-                        networkStatus: NetworkStatus.loading
+                        networkStatus: NetworkStatus.loading,
                     });
@@ -265,2 +256,4 @@ result.refetch();
         this.previousData.result = result;
+        this.currentObservable.query &&
+            this.currentObservable.query.resetQueryStoreErrors();
         return result;
@@ -270,5 +263,5 @@ };
         var obsQuery = this.currentObservable.query;
-        if (!obsQuery)
+        if (!obsQuery || !this.previousData.result)
             return;
-        var _a = obsQuery.getCurrentResult(), data = _a.data, loading = _a.loading, error = _a.error;
+        var _a = this.previousData.result, data = _a.data, loading = _a.loading, error = _a.error;
         if (!loading) {
@@ -305,3 +298,3 @@ var _b = this.getOptions(), query = _b.query, variables = _b.variables, onCompleted = _b.onCompleted, onError = _b.onError;
             stopPolling: this.obsStopPolling,
-            subscribeToMore: this.obsSubscribeToMore
+            subscribeToMore: this.obsSubscribeToMore,
         };
@@ -308,0 +301,0 @@ };

lib/react-hooks.cjs.js

@@ -181,4 +181,2 @@ exports.__esModule = true;
   QueryData.prototype.afterExecute = function (_a) {
-    var _this = this;
-
     var _b = (_a === void 0 ? {} : _a).lazy,
@@ -190,5 +188,2 @@ lazy = _b === void 0 ? false : _b;
       this.handleErrorOrCompleted();
-      setTimeout(function () {
-        _this.currentObservable.query && _this.currentObservable.query.resetQueryStoreErrors();
-      });
     }
@@ -228,10 +223,13 @@
     var fetchDisabled = this.refreshClient().client.disableNetworkFetches;
-    var ssrLoading = {
+    var ssrLoading = (0, _tslib.__assign)({
       loading: true,
       networkStatus: _apolloClient.NetworkStatus.loading,
       called: true,
-      data: undefined
-    };
+      data: undefined,
+      stale: false,
+      client: this.client
+    }, this.observableQueryFields());
 
     if (ssrDisabled && (this.ssrInitiated() || fetchDisabled)) {
+      this.previousData.result = ssrLoading;
       return ssrLoading;
@@ -410,2 +408,3 @@ }
     this.previousData.result = result;
+    this.currentObservable.query && this.currentObservable.query.resetQueryStoreErrors();
     return result;
@@ -416,5 +415,4 @@ };
     var obsQuery = this.currentObservable.query;
-    if (!obsQuery) return;
-
-    var _a = obsQuery.getCurrentResult(),
+    if (!obsQuery || !this.previousData.result) return;
+    var _a = this.previousData.result,
         data = _a.data,
@@ -497,4 +495,2 @@ loading = _a.loading,
   };
-  var isRendering = (0, _react.useRef)(true);
-  var isRenderScheduled = (0, _react.useRef)(false);
   var queryDataRef = (0, _react.useRef)();
@@ -505,4 +501,4 @@ var queryData = queryDataRef.current || new QueryData({
     onNewData: function () {
-      if (!queryData.ssrInitiated() && isRendering.current) {
-        isRenderScheduled.current = true;
+      if (!queryData.ssrInitiated()) {
+        Promise.resolve().then(forceUpdate);
       } else {
@@ -537,9 +533,6 @@ forceUpdate();
 
-    isRendering.current = false;
-
-    if (isRenderScheduled.current) {
-      isRenderScheduled.current = false;
-      forceUpdate();
-    }
-  });
+    return function () {
+      return queryData.cleanup();
+    };
+  }, []);
   (0, _react.useEffect)(function () {
@@ -550,7 +543,2 @@ return queryData.afterExecute({
   }, [queryResult.loading, queryResult.networkStatus, queryResult.error, queryResult.data]);
-  (0, _react.useEffect)(function () {
-    return function () {
-      return queryData.cleanup();
-    };
-  }, []);
   return result;
@@ -557,0 +545,0 @@ }

lib/react-hooks.cjs.min.js

@@ -1,1 +0,1 @@
-exports.__esModule=!0,exports.useApolloClient=function(){var e=r.default.useContext((0,t.getApolloContext)()).client;return(0,n.invariant)(e,1),e},exports.useLazyQuery=function(t,e){return c(t,e,!0)},exports.useMutation=function(s,i){var n=(0,r.useContext)((0,t.getApolloContext)()),o=(0,r.useState)({called:!1,loading:!1}),u=o[0],a=o[1],c=i?(0,e.__assign)((0,e.__assign)({},i),{mutation:s}):{mutation:s},l=(0,r.useRef)();var h=(l.current||(l.current=new p({options:c,context:n,result:u,setResult:a})),l.current);return h.setOptions(c),h.context=n,(0,r.useEffect)((function(){return h.afterExecute()})),h.execute(u)},exports.useQuery=function(t,e){return c(t,e,!1)},exports.useSubscription=function(s,i){var n=(0,r.useContext)((0,t.getApolloContext)()),o=i?(0,e.__assign)((0,e.__assign)({},i),{subscription:s}):{subscription:s},u=(0,r.useState)({loading:!o.skip,error:void 0,data:void 0}),a=u[0],c=u[1],p=(0,r.useRef)();var h=(p.current||(p.current=new l({options:o,context:n,setResult:c})),p.current);return h.setOptions(o,!0),h.context=n,(0,r.useEffect)((function(){return h.afterExecute()})),(0,r.useEffect)((function(){return h.cleanup.bind(h)}),[]),h.execute(a)},exports.RenderPromises=exports.resetApolloContext=exports.ApolloProvider=exports.ApolloConsumer=void 0;var t=require("@apollo/react-common");exports.getApolloContext=t.getApolloContext,exports.ApolloConsumer=t.ApolloConsumer,exports.ApolloProvider=t.ApolloProvider,exports.resetApolloContext=t.resetApolloContext;var e=require("tslib"),r=function(t){if(t&&t.__esModule)return t;if(null===t||"object"!=typeof t&&"function"!=typeof t)return{default:t};var e=o();if(e&&e.has(t))return e.get(t);var r={},s=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(var i in t)if(Object.prototype.hasOwnProperty.call(t,i)){var n=s?Object.getOwnPropertyDescriptor(t,i):null;n&&(n.get||n.set)?Object.defineProperty(r,i,n):r[i]=t[i]}r.default=t,e&&e.set(t,r);return r}(require("react")),s=require("apollo-client"),i=require("@wry/equality"),n=require("ts-invariant");function o(){if("function"!=typeof WeakMap)return null;var t=new WeakMap;return o=function(){return t},t}var u=function(){function e(t,e){this.isMounted=!1,this.previousOptions={},this.context={},this.options={},this.options=t||{},this.context=e||{}}return e.prototype.getOptions=function(){return this.options},e.prototype.setOptions=function(t,e){void 0===e&&(e=!1),e&&!(0,i.equal)(this.options,t)&&(this.previousOptions=this.options),this.options=t},e.prototype.unmount=function(){this.isMounted=!1},e.prototype.refreshClient=function(){var t=this.options&&this.options.client||this.context&&this.context.client;(0,n.invariant)(!!t,2);var e=!1;return t!==this.client&&(e=!0,this.client=t,this.cleanup()),{client:this.client,isNew:e}},e.prototype.verifyDocumentType=function(e,r){var s=(0,t.parser)(e);(0,t.operationName)(r),(0,t.operationName)(s.type);(0,n.invariant)(s.type===r,3)},e}(),a=function(r){function n(t){var e=t.options,s=t.context,i=t.onNewData,n=r.call(this,e,s)||this;return n.previousData={},n.currentObservable={},n.runLazy=!1,n.runLazyQuery=function(t){n.cleanup(),n.runLazy=!0,n.lazyOptions=t,n.onNewData()},n.getExecuteResult=function(){var t=n.getQueryResult();return n.startQuerySubscription(),t},n.obsRefetch=function(t){return n.currentObservable.query.refetch(t)},n.obsFetchMore=function(t){return n.currentObservable.query.fetchMore(t)},n.obsUpdateQuery=function(t){return n.currentObservable.query.updateQuery(t)},n.obsStartPolling=function(t){n.currentObservable&&n.currentObservable.query&&n.currentObservable.query.startPolling(t)},n.obsStopPolling=function(){n.currentObservable&&n.currentObservable.query&&n.currentObservable.query.stopPolling()},n.obsSubscribeToMore=function(t){return n.currentObservable.query.subscribeToMore(t)},n.onNewData=i,n}return(0,e.__extends)(n,r),n.prototype.execute=function(){this.refreshClient();var t=this.getOptions(),e=t.skip,r=t.query;return(e||r!==this.previousData.query)&&(this.removeQuerySubscription(),this.previousData.query=r),this.updateObservableQuery(),this.isMounted&&this.startQuerySubscription(),this.getExecuteSsrResult()||this.getExecuteResult()},n.prototype.executeLazy=function(){return this.runLazy?[this.runLazyQuery,this.execute()]:[this.runLazyQuery,{loading:!1,networkStatus:s.NetworkStatus.ready,called:!1,data:void 0}]},n.prototype.fetchData=function(){var t=this.getOptions();if(t.skip||!1===t.ssr)return!1;var e=this.currentObservable.query;return!!e.getCurrentResult().loading&&e.result()},n.prototype.afterExecute=function(t){var e=this,r=(void 0===t?{}:t).lazy,s=void 0!==r&&r;return this.isMounted=!0,s&&!this.runLazy||(this.handleErrorOrCompleted(),setTimeout((function(){e.currentObservable.query&&e.currentObservable.query.resetQueryStoreErrors()}))),this.previousOptions=this.getOptions(),this.unmount.bind(this)},n.prototype.cleanup=function(){this.removeQuerySubscription(),delete this.currentObservable.query,delete this.previousData.result},n.prototype.getOptions=function(){var t=r.prototype.getOptions.call(this);return this.lazyOptions&&(t.variables=(0,e.__assign)((0,e.__assign)({},t.variables),this.lazyOptions.variables),t.context=(0,e.__assign)((0,e.__assign)({},t.context),this.lazyOptions.context)),this.runLazy&&delete t.skip,t},n.prototype.ssrInitiated=function(){return this.context&&this.context.renderPromises},n.prototype.getExecuteSsrResult=function(){var t,e=!1===this.getOptions().ssr,r=this.refreshClient().client.disableNetworkFetches,i={loading:!0,networkStatus:s.NetworkStatus.loading,called:!0,data:void 0};return e&&(this.ssrInitiated()||r)?i:(this.ssrInitiated()&&(t=this.context.renderPromises.addQueryPromise(this,this.getExecuteResult)||i),t)},n.prototype.prepareObservableQueryOptions=function(){var r=this.getOptions();this.verifyDocumentType(r.query,t.DocumentType.Query);var s=r.displayName||"Query";return!this.ssrInitiated()||"network-only"!==r.fetchPolicy&&"cache-and-network"!==r.fetchPolicy||(r.fetchPolicy="cache-first"),(0,e.__assign)((0,e.__assign)({},r),{displayName:s,context:r.context,metadata:{reactComponent:{displayName:s}}})},n.prototype.initializeObservableQuery=function(){var t,r;if(this.ssrInitiated()&&(this.currentObservable.query=this.context.renderPromises.getSSRObservable(this.getOptions())),!this.currentObservable.query){var s=this.prepareObservableQueryOptions();this.previousData.observableQueryOptions=(0,e.__assign)((0,e.__assign)({},s),{children:null}),this.currentObservable.query=this.refreshClient().client.watchQuery((0,e.__assign)({},s)),this.ssrInitiated()&&(null===(r=null===(t=this.context)||void 0===t?void 0:t.renderPromises)||void 0===r||r.registerSSRObservable(this.currentObservable.query,s))}},n.prototype.updateObservableQuery=function(){if(this.currentObservable.query){var t=(0,e.__assign)((0,e.__assign)({},this.prepareObservableQueryOptions()),{children:null});(0,i.equal)(t,this.previousData.observableQueryOptions)||(this.previousData.observableQueryOptions=t,this.currentObservable.query.setOptions(t).catch((function(){})))}else this.initializeObservableQuery()},n.prototype.startQuerySubscription=function(){var t=this;if(!this.currentObservable.subscription&&!this.getOptions().skip){var e=this.currentObservable.query;this.currentObservable.subscription=e.subscribe({next:function(e){var r=e.loading,s=e.networkStatus,n=e.data,o=t.previousData.result;o&&o.loading===r&&o.networkStatus===s&&(0,i.equal)(o.data,n)||t.onNewData()},error:function(e){if(t.resubscribeToQuery(),!e.hasOwnProperty("graphQLErrors"))throw e;var r=t.previousData.result;(r&&r.loading||!(0,i.equal)(e,t.previousData.error))&&(t.previousData.error=e,t.onNewData())}})}},n.prototype.resubscribeToQuery=function(){this.removeQuerySubscription();var t=this.currentObservable.query.getLastError(),e=this.currentObservable.query.getLastResult();this.currentObservable.query.resetLastResults(),this.startQuerySubscription(),Object.assign(this.currentObservable.query,{lastError:t,lastResult:e})},n.prototype.getQueryResult=function(){var t=this.observableQueryFields(),r=this.getOptions();if(r.skip)t=(0,e.__assign)((0,e.__assign)({},t),{data:void 0,error:void 0,loading:!1,called:!0});else{var i=this.currentObservable.query.getCurrentResult(),n=i.loading,o=i.partial,u=i.networkStatus,a=i.errors,c=i.error,p=i.data;if(a&&a.length>0&&(c=new s.ApolloError({graphQLErrors:a})),t=(0,e.__assign)((0,e.__assign)({},t),{loading:n,networkStatus:u,error:c,called:!0}),n){var l=this.previousData.result&&this.previousData.result.data;t.data=l&&p?(0,e.__assign)((0,e.__assign)({},l),p):l||p}else if(c)Object.assign(t,{data:(this.currentObservable.query.getLastResult()||{}).data});else{var h=this.currentObservable.query.options.fetchPolicy;if(r.partialRefetch&&!p&&o&&"cache-only"!==h)return Object.assign(t,{loading:!0,networkStatus:s.NetworkStatus.loading}),t.refetch(),t;t.data=p}}return t.client=this.client,this.previousData.loading=this.previousData.result&&this.previousData.result.loading||!1,this.previousData.result=t,t},n.prototype.handleErrorOrCompleted=function(){var t=this.currentObservable.query;if(t){var e=t.getCurrentResult(),r=e.data,s=e.loading,n=e.error;if(!s){var o=this.getOptions(),u=o.query,a=o.variables,c=o.onCompleted,p=o.onError;if(this.previousOptions&&!this.previousData.loading&&(0,i.equal)(this.previousOptions.query,u)&&(0,i.equal)(this.previousOptions.variables,a))return;c&&!n?c(r):p&&n&&p(n)}}},n.prototype.removeQuerySubscription=function(){this.currentObservable.subscription&&(this.currentObservable.subscription.unsubscribe(),delete this.currentObservable.subscription)},n.prototype.observableQueryFields=function(){return{variables:this.currentObservable.query.variables,refetch:this.obsRefetch,fetchMore:this.obsFetchMore,updateQuery:this.obsUpdateQuery,startPolling:this.obsStartPolling,stopPolling:this.obsStopPolling,subscribeToMore:this.obsSubscribeToMore}},n}(u);function c(s,n,o){void 0===o&&(o=!1);var u=(0,r.useContext)((0,t.getApolloContext)()),c=(0,r.useReducer)((function(t){return t+1}),0),p=c[0],l=c[1],h=n?(0,e.__assign)((0,e.__assign)({},n),{query:s}):{query:s},b=(0,r.useRef)(!0),v=(0,r.useRef)(!1),y=(0,r.useRef)(),f=y.current||new a({options:h,context:u,onNewData:function(){!f.ssrInitiated()&&b.current?v.current=!0:l()}});f.setOptions(h),f.context=u,f.ssrInitiated()&&!y.current&&(y.current=f);var d,g,O,x={options:(0,e.__assign)((0,e.__assign)({},h),{onError:void 0,onCompleted:void 0}),context:u,tick:p},m=(d=function(){return o?f.executeLazy():f.execute()},g=x,(O=(0,r.useRef)()).current&&(0,i.equal)(g,O.current.key)||(O.current={key:g,value:d()}),O.current.value),_=o?m[1]:m;return(0,r.useEffect)((function(){y.current||(y.current=f),b.current=!1,v.current&&(v.current=!1,l())})),(0,r.useEffect)((function(){return f.afterExecute({lazy:o})}),[_.loading,_.networkStatus,_.error,_.data]),(0,r.useEffect)((function(){return function(){return f.cleanup()}}),[]),m}var p=function(r){function n(e){var s=e.options,i=e.context,n=e.result,o=e.setResult,u=r.call(this,s,i)||this;return u.runMutation=function(t){void 0===t&&(t={}),u.onMutationStart();var e=u.generateNewMutationId();return u.mutate(t).then((function(t){return u.onMutationCompleted(t,e),t})).catch((function(t){if(u.onMutationError(t,e),!u.getOptions().onError)throw t}))},u.verifyDocumentType(s.mutation,t.DocumentType.Mutation),u.result=n,u.setResult=o,u.mostRecentMutationId=0,u}return(0,e.__extends)(n,r),n.prototype.execute=function(e){return this.isMounted=!0,this.verifyDocumentType(this.getOptions().mutation,t.DocumentType.Mutation),e.client=this.refreshClient().client,[this.runMutation,e]},n.prototype.afterExecute=function(){return this.isMounted=!0,this.unmount.bind(this)},n.prototype.cleanup=function(){},n.prototype.mutate=function(t){var r=this.getOptions(),s=r.mutation,i=r.variables,n=r.optimisticResponse,o=r.update,u=r.context,a=void 0===u?{}:u,c=r.awaitRefetchQueries,p=void 0!==c&&c,l=r.fetchPolicy,h=(0,e.__assign)({},t),b=Object.assign({},i,h.variables);return delete h.variables,this.refreshClient().client.mutate((0,e.__assign)({mutation:s,optimisticResponse:n,refetchQueries:h.refetchQueries||this.getOptions().refetchQueries,awaitRefetchQueries:p,update:o,context:a,fetchPolicy:l,variables:b},h))},n.prototype.onMutationStart=function(){this.result.loading||this.getOptions().ignoreResults||this.updateResult({loading:!0,error:void 0,data:void 0,called:!0})},n.prototype.onMutationCompleted=function(t,e){var r=this.getOptions(),i=r.onCompleted,n=r.ignoreResults,o=t.data,u=t.errors,a=u&&u.length>0?new s.ApolloError({graphQLErrors:u}):void 0;this.isMostRecentMutation(e)&&!n&&this.updateResult({called:!0,loading:!1,data:o,error:a}),i&&i(o)},n.prototype.onMutationError=function(t,e){var r=this.getOptions().onError;this.isMostRecentMutation(e)&&this.updateResult({loading:!1,error:t,data:void 0,called:!0}),r&&r(t)},n.prototype.generateNewMutationId=function(){return++this.mostRecentMutationId},n.prototype.isMostRecentMutation=function(t){return this.mostRecentMutationId===t},n.prototype.updateResult=function(t){!this.isMounted||this.previousResult&&(0,i.equal)(this.previousResult,t)||(this.setResult(t),this.previousResult=t)},n}(u);var l=function(t){function r(e){var r=e.options,s=e.context,i=e.setResult,n=t.call(this,r,s)||this;return n.currentObservable={},n.setResult=i,n.initialize(r),n}return(0,e.__extends)(r,t),r.prototype.execute=function(t){if(!0===this.getOptions().skip)return this.cleanup(),{loading:!1,error:void 0,data:void 0,variables:this.getOptions().variables};var r=t;this.refreshClient().isNew&&(r=this.getLoadingResult());var s=this.getOptions().shouldResubscribe;return"function"==typeof s&&(s=!!s(this.getOptions())),!1!==s&&this.previousOptions&&Object.keys(this.previousOptions).length>0&&(this.previousOptions.subscription!==this.getOptions().subscription||!(0,i.equal)(this.previousOptions.variables,this.getOptions().variables)||this.previousOptions.skip!==this.getOptions().skip)&&(this.cleanup(),r=this.getLoadingResult()),this.initialize(this.getOptions()),this.startSubscription(),this.previousOptions=this.getOptions(),(0,e.__assign)((0,e.__assign)({},r),{variables:this.getOptions().variables})},r.prototype.afterExecute=function(){this.isMounted=!0},r.prototype.cleanup=function(){this.endSubscription(),delete this.currentObservable.query},r.prototype.initialize=function(t){this.currentObservable.query||!0===this.getOptions().skip||(this.currentObservable.query=this.refreshClient().client.subscribe({query:t.subscription,variables:t.variables,fetchPolicy:t.fetchPolicy}))},r.prototype.startSubscription=function(){this.currentObservable.subscription||(this.currentObservable.subscription=this.currentObservable.query.subscribe({next:this.updateCurrentData.bind(this),error:this.updateError.bind(this),complete:this.completeSubscription.bind(this)}))},r.prototype.getLoadingResult=function(){return{loading:!0,error:void 0,data:void 0}},r.prototype.updateResult=function(t){this.isMounted&&this.setResult(t)},r.prototype.updateCurrentData=function(t){var e=this.getOptions().onSubscriptionData;this.updateResult({data:t.data,loading:!1,error:void 0}),e&&e({client:this.refreshClient().client,subscriptionData:t})},r.prototype.updateError=function(t){this.updateResult({error:t,loading:!1})},r.prototype.completeSubscription=function(){var t=this.getOptions().onSubscriptionComplete;t&&t(),this.endSubscription()},r.prototype.endSubscription=function(){this.currentObservable.subscription&&(this.currentObservable.subscription.unsubscribe(),delete this.currentObservable.subscription)},r}(u);var h=function(){function t(){this.queryPromises=new Map,this.queryInfoTrie=new Map}return t.prototype.registerSSRObservable=function(t,e){this.lookupQueryInfo(e).observable=t},t.prototype.getSSRObservable=function(t){return this.lookupQueryInfo(t).observable},t.prototype.addQueryPromise=function(t,e){return this.lookupQueryInfo(t.getOptions()).seen?e():(this.queryPromises.set(t.getOptions(),new Promise((function(e){e(t.fetchData())}))),null)},t.prototype.hasPromises=function(){return this.queryPromises.size>0},t.prototype.consumeAndAwaitPromises=function(){var t=this,e=[];return this.queryPromises.forEach((function(r,s){t.lookupQueryInfo(s).seen=!0,e.push(r)})),this.queryPromises.clear(),Promise.all(e)},t.prototype.lookupQueryInfo=function(t){var e=this.queryInfoTrie,r=t.query,s=t.variables,i=e.get(r)||new Map;e.has(r)||e.set(r,i);var n=JSON.stringify(s),o=i.get(n)||{seen:!1,observable:null};return i.has(n)||i.set(n,o),o},t}();exports.RenderPromises=h;
+exports.__esModule=!0,exports.useApolloClient=function(){var e=r.default.useContext((0,t.getApolloContext)()).client;return(0,o.invariant)(e,1),e},exports.useLazyQuery=function(t,e){return l(t,e,!0)},exports.useMutation=function(s,i){var o=(0,r.useContext)((0,t.getApolloContext)()),n=(0,r.useState)({called:!1,loading:!1}),u=n[0],a=n[1],l=i?(0,e.__assign)((0,e.__assign)({},i),{mutation:s}):{mutation:s},c=(0,r.useRef)();var h=(c.current||(c.current=new p({options:l,context:o,result:u,setResult:a})),c.current);return h.setOptions(l),h.context=o,(0,r.useEffect)((function(){return h.afterExecute()})),h.execute(u)},exports.useQuery=function(t,e){return l(t,e,!1)},exports.useSubscription=function(s,i){var o=(0,r.useContext)((0,t.getApolloContext)()),n=i?(0,e.__assign)((0,e.__assign)({},i),{subscription:s}):{subscription:s},u=(0,r.useState)({loading:!n.skip,error:void 0,data:void 0}),a=u[0],l=u[1],p=(0,r.useRef)();var h=(p.current||(p.current=new c({options:n,context:o,setResult:l})),p.current);return h.setOptions(n,!0),h.context=o,(0,r.useEffect)((function(){return h.afterExecute()})),(0,r.useEffect)((function(){return h.cleanup.bind(h)}),[]),h.execute(a)},exports.RenderPromises=exports.resetApolloContext=exports.ApolloProvider=exports.ApolloConsumer=void 0;var t=require("@apollo/react-common");exports.getApolloContext=t.getApolloContext,exports.ApolloConsumer=t.ApolloConsumer,exports.ApolloProvider=t.ApolloProvider,exports.resetApolloContext=t.resetApolloContext;var e=require("tslib"),r=function(t){if(t&&t.__esModule)return t;if(null===t||"object"!=typeof t&&"function"!=typeof t)return{default:t};var e=n();if(e&&e.has(t))return e.get(t);var r={},s=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(var i in t)if(Object.prototype.hasOwnProperty.call(t,i)){var o=s?Object.getOwnPropertyDescriptor(t,i):null;o&&(o.get||o.set)?Object.defineProperty(r,i,o):r[i]=t[i]}r.default=t,e&&e.set(t,r);return r}(require("react")),s=require("apollo-client"),i=require("@wry/equality"),o=require("ts-invariant");function n(){if("function"!=typeof WeakMap)return null;var t=new WeakMap;return n=function(){return t},t}var u=function(){function e(t,e){this.isMounted=!1,this.previousOptions={},this.context={},this.options={},this.options=t||{},this.context=e||{}}return e.prototype.getOptions=function(){return this.options},e.prototype.setOptions=function(t,e){void 0===e&&(e=!1),e&&!(0,i.equal)(this.options,t)&&(this.previousOptions=this.options),this.options=t},e.prototype.unmount=function(){this.isMounted=!1},e.prototype.refreshClient=function(){var t=this.options&&this.options.client||this.context&&this.context.client;(0,o.invariant)(!!t,2);var e=!1;return t!==this.client&&(e=!0,this.client=t,this.cleanup()),{client:this.client,isNew:e}},e.prototype.verifyDocumentType=function(e,r){var s=(0,t.parser)(e);(0,t.operationName)(r),(0,t.operationName)(s.type);(0,o.invariant)(s.type===r,3)},e}(),a=function(r){function o(t){var e=t.options,s=t.context,i=t.onNewData,o=r.call(this,e,s)||this;return o.previousData={},o.currentObservable={},o.runLazy=!1,o.runLazyQuery=function(t){o.cleanup(),o.runLazy=!0,o.lazyOptions=t,o.onNewData()},o.getExecuteResult=function(){var t=o.getQueryResult();return o.startQuerySubscription(),t},o.obsRefetch=function(t){return o.currentObservable.query.refetch(t)},o.obsFetchMore=function(t){return o.currentObservable.query.fetchMore(t)},o.obsUpdateQuery=function(t){return o.currentObservable.query.updateQuery(t)},o.obsStartPolling=function(t){o.currentObservable&&o.currentObservable.query&&o.currentObservable.query.startPolling(t)},o.obsStopPolling=function(){o.currentObservable&&o.currentObservable.query&&o.currentObservable.query.stopPolling()},o.obsSubscribeToMore=function(t){return o.currentObservable.query.subscribeToMore(t)},o.onNewData=i,o}return(0,e.__extends)(o,r),o.prototype.execute=function(){this.refreshClient();var t=this.getOptions(),e=t.skip,r=t.query;return(e||r!==this.previousData.query)&&(this.removeQuerySubscription(),this.previousData.query=r),this.updateObservableQuery(),this.isMounted&&this.startQuerySubscription(),this.getExecuteSsrResult()||this.getExecuteResult()},o.prototype.executeLazy=function(){return this.runLazy?[this.runLazyQuery,this.execute()]:[this.runLazyQuery,{loading:!1,networkStatus:s.NetworkStatus.ready,called:!1,data:void 0}]},o.prototype.fetchData=function(){var t=this.getOptions();if(t.skip||!1===t.ssr)return!1;var e=this.currentObservable.query;return!!e.getCurrentResult().loading&&e.result()},o.prototype.afterExecute=function(t){var e=(void 0===t?{}:t).lazy,r=void 0!==e&&e;return this.isMounted=!0,r&&!this.runLazy||this.handleErrorOrCompleted(),this.previousOptions=this.getOptions(),this.unmount.bind(this)},o.prototype.cleanup=function(){this.removeQuerySubscription(),delete this.currentObservable.query,delete this.previousData.result},o.prototype.getOptions=function(){var t=r.prototype.getOptions.call(this);return this.lazyOptions&&(t.variables=(0,e.__assign)((0,e.__assign)({},t.variables),this.lazyOptions.variables),t.context=(0,e.__assign)((0,e.__assign)({},t.context),this.lazyOptions.context)),this.runLazy&&delete t.skip,t},o.prototype.ssrInitiated=function(){return this.context&&this.context.renderPromises},o.prototype.getExecuteSsrResult=function(){var t,r=!1===this.getOptions().ssr,i=this.refreshClient().client.disableNetworkFetches,o=(0,e.__assign)({loading:!0,networkStatus:s.NetworkStatus.loading,called:!0,data:void 0,stale:!1,client:this.client},this.observableQueryFields());return r&&(this.ssrInitiated()||i)?(this.previousData.result=o,o):(this.ssrInitiated()&&(t=this.context.renderPromises.addQueryPromise(this,this.getExecuteResult)||o),t)},o.prototype.prepareObservableQueryOptions=function(){var r=this.getOptions();this.verifyDocumentType(r.query,t.DocumentType.Query);var s=r.displayName||"Query";return!this.ssrInitiated()||"network-only"!==r.fetchPolicy&&"cache-and-network"!==r.fetchPolicy||(r.fetchPolicy="cache-first"),(0,e.__assign)((0,e.__assign)({},r),{displayName:s,context:r.context,metadata:{reactComponent:{displayName:s}}})},o.prototype.initializeObservableQuery=function(){var t,r;if(this.ssrInitiated()&&(this.currentObservable.query=this.context.renderPromises.getSSRObservable(this.getOptions())),!this.currentObservable.query){var s=this.prepareObservableQueryOptions();this.previousData.observableQueryOptions=(0,e.__assign)((0,e.__assign)({},s),{children:null}),this.currentObservable.query=this.refreshClient().client.watchQuery((0,e.__assign)({},s)),this.ssrInitiated()&&(null===(r=null===(t=this.context)||void 0===t?void 0:t.renderPromises)||void 0===r||r.registerSSRObservable(this.currentObservable.query,s))}},o.prototype.updateObservableQuery=function(){if(this.currentObservable.query){var t=(0,e.__assign)((0,e.__assign)({},this.prepareObservableQueryOptions()),{children:null});(0,i.equal)(t,this.previousData.observableQueryOptions)||(this.previousData.observableQueryOptions=t,this.currentObservable.query.setOptions(t).catch((function(){})))}else this.initializeObservableQuery()},o.prototype.startQuerySubscription=function(){var t=this;if(!this.currentObservable.subscription&&!this.getOptions().skip){var e=this.currentObservable.query;this.currentObservable.subscription=e.subscribe({next:function(e){var r=e.loading,s=e.networkStatus,o=e.data,n=t.previousData.result;n&&n.loading===r&&n.networkStatus===s&&(0,i.equal)(n.data,o)||t.onNewData()},error:function(e){if(t.resubscribeToQuery(),!e.hasOwnProperty("graphQLErrors"))throw e;var r=t.previousData.result;(r&&r.loading||!(0,i.equal)(e,t.previousData.error))&&(t.previousData.error=e,t.onNewData())}})}},o.prototype.resubscribeToQuery=function(){this.removeQuerySubscription();var t=this.currentObservable.query.getLastError(),e=this.currentObservable.query.getLastResult();this.currentObservable.query.resetLastResults(),this.startQuerySubscription(),Object.assign(this.currentObservable.query,{lastError:t,lastResult:e})},o.prototype.getQueryResult=function(){var t=this.observableQueryFields(),r=this.getOptions();if(r.skip)t=(0,e.__assign)((0,e.__assign)({},t),{data:void 0,error:void 0,loading:!1,called:!0});else{var i=this.currentObservable.query.getCurrentResult(),o=i.loading,n=i.partial,u=i.networkStatus,a=i.errors,l=i.error,p=i.data;if(a&&a.length>0&&(l=new s.ApolloError({graphQLErrors:a})),t=(0,e.__assign)((0,e.__assign)({},t),{loading:o,networkStatus:u,error:l,called:!0}),o){var c=this.previousData.result&&this.previousData.result.data;t.data=c&&p?(0,e.__assign)((0,e.__assign)({},c),p):c||p}else if(l)Object.assign(t,{data:(this.currentObservable.query.getLastResult()||{}).data});else{var h=this.currentObservable.query.options.fetchPolicy;if(r.partialRefetch&&!p&&n&&"cache-only"!==h)return Object.assign(t,{loading:!0,networkStatus:s.NetworkStatus.loading}),t.refetch(),t;t.data=p}}return t.client=this.client,this.previousData.loading=this.previousData.result&&this.previousData.result.loading||!1,this.previousData.result=t,this.currentObservable.query&&this.currentObservable.query.resetQueryStoreErrors(),t},o.prototype.handleErrorOrCompleted=function(){if(this.currentObservable.query&&this.previousData.result){var t=this.previousData.result,e=t.data,r=t.loading,s=t.error;if(!r){var o=this.getOptions(),n=o.query,u=o.variables,a=o.onCompleted,l=o.onError;if(this.previousOptions&&!this.previousData.loading&&(0,i.equal)(this.previousOptions.query,n)&&(0,i.equal)(this.previousOptions.variables,u))return;a&&!s?a(e):l&&s&&l(s)}}},o.prototype.removeQuerySubscription=function(){this.currentObservable.subscription&&(this.currentObservable.subscription.unsubscribe(),delete this.currentObservable.subscription)},o.prototype.observableQueryFields=function(){return{variables:this.currentObservable.query.variables,refetch:this.obsRefetch,fetchMore:this.obsFetchMore,updateQuery:this.obsUpdateQuery,startPolling:this.obsStartPolling,stopPolling:this.obsStopPolling,subscribeToMore:this.obsSubscribeToMore}},o}(u);function l(s,o,n){void 0===n&&(n=!1);var u=(0,r.useContext)((0,t.getApolloContext)()),l=(0,r.useReducer)((function(t){return t+1}),0),p=l[0],c=l[1],h=o?(0,e.__assign)((0,e.__assign)({},o),{query:s}):{query:s},b=(0,r.useRef)(),v=b.current||new a({options:h,context:u,onNewData:function(){v.ssrInitiated()?c():Promise.resolve().then(c)}});v.setOptions(h),v.context=u,v.ssrInitiated()&&!b.current&&(b.current=v);var y,d,f,g={options:(0,e.__assign)((0,e.__assign)({},h),{onError:void 0,onCompleted:void 0}),context:u,tick:p},O=(y=function(){return n?v.executeLazy():v.execute()},d=g,(f=(0,r.useRef)()).current&&(0,i.equal)(d,f.current.key)||(f.current={key:d,value:y()}),f.current.value),x=n?O[1]:O;return(0,r.useEffect)((function(){return b.current||(b.current=v),function(){return v.cleanup()}}),[]),(0,r.useEffect)((function(){return v.afterExecute({lazy:n})}),[x.loading,x.networkStatus,x.error,x.data]),O}var p=function(r){function o(e){var s=e.options,i=e.context,o=e.result,n=e.setResult,u=r.call(this,s,i)||this;return u.runMutation=function(t){void 0===t&&(t={}),u.onMutationStart();var e=u.generateNewMutationId();return u.mutate(t).then((function(t){return u.onMutationCompleted(t,e),t})).catch((function(t){if(u.onMutationError(t,e),!u.getOptions().onError)throw t}))},u.verifyDocumentType(s.mutation,t.DocumentType.Mutation),u.result=o,u.setResult=n,u.mostRecentMutationId=0,u}return(0,e.__extends)(o,r),o.prototype.execute=function(e){return this.isMounted=!0,this.verifyDocumentType(this.getOptions().mutation,t.DocumentType.Mutation),e.client=this.refreshClient().client,[this.runMutation,e]},o.prototype.afterExecute=function(){return this.isMounted=!0,this.unmount.bind(this)},o.prototype.cleanup=function(){},o.prototype.mutate=function(t){var r=this.getOptions(),s=r.mutation,i=r.variables,o=r.optimisticResponse,n=r.update,u=r.context,a=void 0===u?{}:u,l=r.awaitRefetchQueries,p=void 0!==l&&l,c=r.fetchPolicy,h=(0,e.__assign)({},t),b=Object.assign({},i,h.variables);return delete h.variables,this.refreshClient().client.mutate((0,e.__assign)({mutation:s,optimisticResponse:o,refetchQueries:h.refetchQueries||this.getOptions().refetchQueries,awaitRefetchQueries:p,update:n,context:a,fetchPolicy:c,variables:b},h))},o.prototype.onMutationStart=function(){this.result.loading||this.getOptions().ignoreResults||this.updateResult({loading:!0,error:void 0,data:void 0,called:!0})},o.prototype.onMutationCompleted=function(t,e){var r=this.getOptions(),i=r.onCompleted,o=r.ignoreResults,n=t.data,u=t.errors,a=u&&u.length>0?new s.ApolloError({graphQLErrors:u}):void 0;this.isMostRecentMutation(e)&&!o&&this.updateResult({called:!0,loading:!1,data:n,error:a}),i&&i(n)},o.prototype.onMutationError=function(t,e){var r=this.getOptions().onError;this.isMostRecentMutation(e)&&this.updateResult({loading:!1,error:t,data:void 0,called:!0}),r&&r(t)},o.prototype.generateNewMutationId=function(){return++this.mostRecentMutationId},o.prototype.isMostRecentMutation=function(t){return this.mostRecentMutationId===t},o.prototype.updateResult=function(t){!this.isMounted||this.previousResult&&(0,i.equal)(this.previousResult,t)||(this.setResult(t),this.previousResult=t)},o}(u);var c=function(t){function r(e){var r=e.options,s=e.context,i=e.setResult,o=t.call(this,r,s)||this;return o.currentObservable={},o.setResult=i,o.initialize(r),o}return(0,e.__extends)(r,t),r.prototype.execute=function(t){if(!0===this.getOptions().skip)return this.cleanup(),{loading:!1,error:void 0,data:void 0,variables:this.getOptions().variables};var r=t;this.refreshClient().isNew&&(r=this.getLoadingResult());var s=this.getOptions().shouldResubscribe;return"function"==typeof s&&(s=!!s(this.getOptions())),!1!==s&&this.previousOptions&&Object.keys(this.previousOptions).length>0&&(this.previousOptions.subscription!==this.getOptions().subscription||!(0,i.equal)(this.previousOptions.variables,this.getOptions().variables)||this.previousOptions.skip!==this.getOptions().skip)&&(this.cleanup(),r=this.getLoadingResult()),this.initialize(this.getOptions()),this.startSubscription(),this.previousOptions=this.getOptions(),(0,e.__assign)((0,e.__assign)({},r),{variables:this.getOptions().variables})},r.prototype.afterExecute=function(){this.isMounted=!0},r.prototype.cleanup=function(){this.endSubscription(),delete this.currentObservable.query},r.prototype.initialize=function(t){this.currentObservable.query||!0===this.getOptions().skip||(this.currentObservable.query=this.refreshClient().client.subscribe({query:t.subscription,variables:t.variables,fetchPolicy:t.fetchPolicy}))},r.prototype.startSubscription=function(){this.currentObservable.subscription||(this.currentObservable.subscription=this.currentObservable.query.subscribe({next:this.updateCurrentData.bind(this),error:this.updateError.bind(this),complete:this.completeSubscription.bind(this)}))},r.prototype.getLoadingResult=function(){return{loading:!0,error:void 0,data:void 0}},r.prototype.updateResult=function(t){this.isMounted&&this.setResult(t)},r.prototype.updateCurrentData=function(t){var e=this.getOptions().onSubscriptionData;this.updateResult({data:t.data,loading:!1,error:void 0}),e&&e({client:this.refreshClient().client,subscriptionData:t})},r.prototype.updateError=function(t){this.updateResult({error:t,loading:!1})},r.prototype.completeSubscription=function(){var t=this.getOptions().onSubscriptionComplete;t&&t(),this.endSubscription()},r.prototype.endSubscription=function(){this.currentObservable.subscription&&(this.currentObservable.subscription.unsubscribe(),delete this.currentObservable.subscription)},r}(u);var h=function(){function t(){this.queryPromises=new Map,this.queryInfoTrie=new Map}return t.prototype.registerSSRObservable=function(t,e){this.lookupQueryInfo(e).observable=t},t.prototype.getSSRObservable=function(t){return this.lookupQueryInfo(t).observable},t.prototype.addQueryPromise=function(t,e){return this.lookupQueryInfo(t.getOptions()).seen?e():(this.queryPromises.set(t.getOptions(),new Promise((function(e){e(t.fetchData())}))),null)},t.prototype.hasPromises=function(){return this.queryPromises.size>0},t.prototype.consumeAndAwaitPromises=function(){var t=this,e=[];return this.queryPromises.forEach((function(r,s){t.lookupQueryInfo(s).seen=!0,e.push(r)})),this.queryPromises.clear(),Promise.all(e)},t.prototype.lookupQueryInfo=function(t){var e=this.queryInfoTrie,r=t.query,s=t.variables,i=e.get(r)||new Map;e.has(r)||e.set(r,i);var o=JSON.stringify(s),n=i.get(o)||{seen:!1,observable:null};return i.has(o)||i.set(o,n),n},t}();exports.RenderPromises=h;

lib/react-hooks.esm.js

@@ -116,4 +116,4 @@ import { parser, operationName, DocumentType, getApolloContext } from '@apollo/react-common';
                     called: false,
-                    data: undefined
-                }
+                    data: undefined,
+                },
             ]
@@ -131,3 +131,2 @@ : [this.runLazyQuery, this.execute()];
     QueryData.prototype.afterExecute = function (_a) {
-        var _this = this;
         var _b = (_a === void 0 ? {} : _a).lazy, lazy = _b === void 0 ? false : _b;
@@ -137,6 +136,2 @@ this.isMounted = true;
             this.handleErrorOrCompleted();
-            setTimeout(function () {
-                _this.currentObservable.query &&
-                    _this.currentObservable.query.resetQueryStoreErrors();
-            });
         }
@@ -168,9 +163,5 @@ this.previousOptions = this.getOptions();
         var fetchDisabled = this.refreshClient().client.disableNetworkFetches;
-        var ssrLoading = {
-            loading: true,
-            networkStatus: NetworkStatus.loading,
-            called: true,
-            data: undefined
-        };
+        var ssrLoading = __assign({ loading: true, networkStatus: NetworkStatus.loading, called: true, data: undefined, stale: false, client: this.client }, this.observableQueryFields());
         if (ssrDisabled && (this.ssrInitiated() || fetchDisabled)) {
+            this.previousData.result = ssrLoading;
             return ssrLoading;
@@ -250,3 +241,3 @@ }
                 }
-            }
+            },
         });
@@ -262,3 +253,3 @@ };
             lastError: lastError,
-            lastResult: lastResult
+            lastResult: lastResult,
         });
@@ -291,3 +282,3 @@ };
                     data: (this.currentObservable.query.getLastResult() || {})
-                        .data
+                        .data,
                 });
@@ -304,3 +295,3 @@ }
                         loading: true,
-                        networkStatus: NetworkStatus.loading
+                        networkStatus: NetworkStatus.loading,
                     });
@@ -317,2 +308,4 @@ result.refetch();
         this.previousData.result = result;
+        this.currentObservable.query &&
+            this.currentObservable.query.resetQueryStoreErrors();
         return result;
@@ -322,5 +315,5 @@ };
         var obsQuery = this.currentObservable.query;
-        if (!obsQuery)
+        if (!obsQuery || !this.previousData.result)
             return;
-        var _a = obsQuery.getCurrentResult(), data = _a.data, loading = _a.loading, error = _a.error;
+        var _a = this.previousData.result, data = _a.data, loading = _a.loading, error = _a.error;
         if (!loading) {
@@ -357,3 +350,3 @@ var _b = this.getOptions(), query = _b.query, variables = _b.variables, onCompleted = _b.onCompleted, onError = _b.onError;
             stopPolling: this.obsStopPolling,
-            subscribeToMore: this.obsSubscribeToMore
+            subscribeToMore: this.obsSubscribeToMore,
         };
@@ -377,4 +370,2 @@ };
     var updatedOptions = options ? __assign(__assign({}, options), { query: query }) : { query: query };
-    var isRendering = useRef(true);
-    var isRenderScheduled = useRef(false);
     var queryDataRef = useRef();
@@ -386,4 +377,4 @@ var queryData = queryDataRef.current ||
             onNewData: function () {
-                if (!queryData.ssrInitiated() && isRendering.current) {
-                    isRenderScheduled.current = true;
+                if (!queryData.ssrInitiated()) {
+                    Promise.resolve().then(forceUpdate);
                 }
@@ -393,3 +384,3 @@ else {
                 }
-            }
+            },
         });
@@ -404,3 +395,3 @@ queryData.setOptions(updatedOptions);
         context: context,
-        tick: tick
+        tick: tick,
     };
@@ -415,8 +406,4 @@ var result = useDeepMemo(function () { return (lazy ? queryData.executeLazy() : queryData.execute()); }, memo);
         }
-        isRendering.current = false;
-        if (isRenderScheduled.current) {
-            isRenderScheduled.current = false;
-            forceUpdate();
-        }
-    });
+        return function () { return queryData.cleanup(); };
+    }, []);
     useEffect(function () { return queryData.afterExecute({ lazy: lazy }); }, [
@@ -426,7 +413,4 @@ queryResult.loading,
         queryResult.error,
-        queryResult.data
+        queryResult.data,
     ]);
-    useEffect(function () {
-        return function () { return queryData.cleanup(); };
-    }, []);
     return result;
@@ -433,0 +417,0 @@ }

lib/react-hooks.umd.js

@@ -183,4 +183,2 @@ (function (global, factory) {
     QueryData.prototype.afterExecute = function (_a) {
-      var _this = this;
-
       var _b = (_a === void 0 ? {} : _a).lazy,
@@ -192,5 +190,2 @@ lazy = _b === void 0 ? false : _b;
         this.handleErrorOrCompleted();
-        setTimeout(function () {
-          _this.currentObservable.query && _this.currentObservable.query.resetQueryStoreErrors();
-        });
       }
@@ -230,10 +225,13 @@
       var fetchDisabled = this.refreshClient().client.disableNetworkFetches;
-      var ssrLoading = {
+      var ssrLoading = (0, _tslib.__assign)({
         loading: true,
         networkStatus: _apolloClient.NetworkStatus.loading,
         called: true,
-        data: undefined
-      };
+        data: undefined,
+        stale: false,
+        client: this.client
+      }, this.observableQueryFields());
 
       if (ssrDisabled && (this.ssrInitiated() || fetchDisabled)) {
+        this.previousData.result = ssrLoading;
         return ssrLoading;
@@ -412,2 +410,3 @@ }
       this.previousData.result = result;
+      this.currentObservable.query && this.currentObservable.query.resetQueryStoreErrors();
       return result;
@@ -418,5 +417,4 @@ };
       var obsQuery = this.currentObservable.query;
-      if (!obsQuery) return;
-
-      var _a = obsQuery.getCurrentResult(),
+      if (!obsQuery || !this.previousData.result) return;
+      var _a = this.previousData.result,
           data = _a.data,
@@ -499,4 +497,2 @@ loading = _a.loading,
     };
-    var isRendering = (0, _react.useRef)(true);
-    var isRenderScheduled = (0, _react.useRef)(false);
     var queryDataRef = (0, _react.useRef)();
@@ -507,4 +503,4 @@ var queryData = queryDataRef.current || new QueryData({
       onNewData: function () {
-        if (!queryData.ssrInitiated() && isRendering.current) {
-          isRenderScheduled.current = true;
+        if (!queryData.ssrInitiated()) {
+          Promise.resolve().then(forceUpdate);
         } else {
@@ -539,9 +535,6 @@ forceUpdate();
 
-      isRendering.current = false;
-
-      if (isRenderScheduled.current) {
-        isRenderScheduled.current = false;
-        forceUpdate();
-      }
-    });
+      return function () {
+        return queryData.cleanup();
+      };
+    }, []);
     (0, _react.useEffect)(function () {
@@ -552,7 +545,2 @@ return queryData.afterExecute({
     }, [queryResult.loading, queryResult.networkStatus, queryResult.error, queryResult.data]);
-    (0, _react.useEffect)(function () {
-      return function () {
-        return queryData.cleanup();
-      };
-    }, []);
     return result;
@@ -559,0 +547,0 @@ }

lib/types.d.ts

 /// <reference types="zen-observable" />
 import { ReactNode } from 'react';
-import { ApolloClient, ApolloQueryResult, ObservableQuery, ApolloError } from 'apollo-client';
+import { ApolloClient, ObservableQuery, ApolloError } from 'apollo-client';
 import { Observable } from 'apollo-link';
@@ -24,3 +24,3 @@ import { OperationVariables, QueryFunctionOptions, QueryResult, BaseMutationOptions, MutationResult, MutationFunctionOptions, ExecutionResult, BaseSubscriptionOptions, SubscriptionResult, Context } from '@apollo/react-common';
     observableQueryOptions?: {};
-    result?: ApolloQueryResult<TData> | null;
+    result?: QueryResult<TData, TVariables> | null;
     loading?: boolean;
@@ -27,0 +27,0 @@ options?: QueryOptions<TData, TVariables>;

lib/utils/useBaseQuery.js

 import { __assign } from "tslib";
 import { useContext, useEffect, useReducer, useRef } from 'react';
-import { getApolloContext } from '@apollo/react-common';
+import { getApolloContext, } from '@apollo/react-common';
 import { QueryData } from '../data/QueryData';
@@ -11,4 +11,2 @@ import { useDeepMemo } from './useDeepMemo';
     var updatedOptions = options ? __assign(__assign({}, options), { query: query }) : { query: query };
-    var isRendering = useRef(true);
-    var isRenderScheduled = useRef(false);
     var queryDataRef = useRef();
@@ -20,4 +18,4 @@ var queryData = queryDataRef.current ||
             onNewData: function () {
-                if (!queryData.ssrInitiated() && isRendering.current) {
-                    isRenderScheduled.current = true;
+                if (!queryData.ssrInitiated()) {
+                    Promise.resolve().then(forceUpdate);
                 }
@@ -27,3 +25,3 @@ else {
                 }
-            }
+            },
         });
@@ -38,3 +36,3 @@ queryData.setOptions(updatedOptions);
         context: context,
-        tick: tick
+        tick: tick,
     };
@@ -49,8 +47,4 @@ var result = useDeepMemo(function () { return (lazy ? queryData.executeLazy() : queryData.execute()); }, memo);
         }
-        isRendering.current = false;
-        if (isRenderScheduled.current) {
-            isRenderScheduled.current = false;
-            forceUpdate();
-        }
-    });
+        return function () { return queryData.cleanup(); };
+    }, []);
     useEffect(function () { return queryData.afterExecute({ lazy: lazy }); }, [
@@ -60,9 +54,6 @@ queryResult.loading,
         queryResult.error,
-        queryResult.data
+        queryResult.data,
     ]);
-    useEffect(function () {
-        return function () { return queryData.cleanup(); };
-    }, []);
     return result;
 }
 //# sourceMappingURL=useBaseQuery.js.map

package.json

 {
   "name": "@apollo/react-hooks",
   "description": "React Apollo Hooks.",
-  "version": "3.1.4",
+  "version": "3.1.5",
   "author": "[e-mail]",
@@ -63,3 +63,3 @@ "keywords": [
   },
-  "gitHead": "142fe1c816b1776d7ea8aed8dae23fb391834746"
+  "gitHead": "4bd40a94b18102b1eb42864d2e59d52ced0303f5"
 }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Worsened metrics

Total package byte prevSize

377288

decreased by-0.61%

Lines of code

3415

decreased by-1.44%

No dependency changes