@khanacademy/wonder-blocks-data 8.0.1 → 8.0.4

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @khanacademy/wonder-blocks-data
 
+## 8.0.4
+
+### Patch Changes
+
+-   dc2e00f4: Do not fetch if FetchPolicy is CacheBeforeNetwork and there is already a cached value, even if the requestId changes
+
+## 8.0.3
+
+### Patch Changes
+
+-   5f4a4297: Make dependency on `flow-enums-runtime` explicit
+-   2b96fd59: Change flow-enums-runtime to be peer dependencies
+-   Updated dependencies [5f4a4297]
+-   Updated dependencies [2b96fd59]
+    -   @khanacademy/wonder-blocks-core@4.3.2
+
+## 8.0.2
+
+### Patch Changes
+
+-   580141ed: Always initialize SSR-only cache
+
 ## 8.0.1
 
 ### Patch Changes

package/dist/es/index.js

@@ -172,11 +172,10 @@ class SsrCache {
     };
 
     this.getEntry = id => {
-      var _this$_ssrOnlyCache$g, _this$_ssrOnlyCache;
+      const ssrEntry = Server.isServerSide() ? this._ssrOnlyCache.get(DefaultScope$2, id) : null;
+      const internalEntry = ssrEntry != null ? ssrEntry : this._hydrationCache.get(DefaultScope$2, id);
 
-      const internalEntry = (_this$_ssrOnlyCache$g = (_this$_ssrOnlyCache = this._ssrOnlyCache) == null ? void 0 : _this$_ssrOnlyCache.get(DefaultScope$2, id)) != null ? _this$_ssrOnlyCache$g : this._hydrationCache.get(DefaultScope$2, id);
-
-      if (this._ssrOnlyCache == null && internalEntry != null) {
+      if (!Server.isServerSide() && internalEntry != null) {
         this._hydrationCache.purge(DefaultScope$2, id);
       }
 
@@ -184,13 +183,11 @@ class SsrCache {
     };
 
     this.purgeData = predicate => {
-      var _this$_ssrOnlyCache2;
-
       const realPredicate = predicate ? (_, key, cachedEntry) => predicate(key, cachedEntry) : undefined;
 
       this._hydrationCache.purgeAll(realPredicate);
 
-      (_this$_ssrOnlyCache2 = this._ssrOnlyCache) == null ? void 0 : _this$_ssrOnlyCache2.purgeAll(realPredicate);
+      this._ssrOnlyCache.purgeAll(realPredicate);
     };
 
     this.cloneHydratableData = () => {
@@ -201,7 +198,7 @@ class SsrCache {
       return (_cache$DefaultScope = cache[DefaultScope$2]) != null ? _cache$DefaultScope : {};
     };
 
-    this._ssrOnlyCache = process.env.NODE_ENV === "test" || Server.isServerSide() ? ssrOnlyCache || new SerializableInMemoryCache() : undefined;
+    this._ssrOnlyCache = ssrOnlyCache || new SerializableInMemoryCache();
     this._hydrationCache = hydrationCache || new SerializableInMemoryCache();
   }
 
@@ -212,9 +209,7 @@ class SsrCache {
       if (hydrate) {
         this._hydrationCache.set(DefaultScope$2, id, frozenEntry);
       } else {
-        var _this$_ssrOnlyCache3;
-
-        (_this$_ssrOnlyCache3 = this._ssrOnlyCache) == null ? void 0 : _this$_ssrOnlyCache3.set(DefaultScope$2, id, frozenEntry);
+        this._ssrOnlyCache.set(DefaultScope$2, id, frozenEntry);
       }
     }
 
@@ -590,7 +585,6 @@ const useCachedEffect = (requestId, handler, options = {}) => {
 
     return fetchFn;
   }, [requestId, onResultChanged, forceUpdate, setMostRecentResult, fetchPolicy]);
-  const requestIdRef = React.useRef(requestId);
   const shouldFetch = React.useMemo(() => {
     if (hardSkip) {
       return false;
@@ -601,14 +595,13 @@ const useCachedEffect = (requestId, handler, options = {}) => {
         return false;
 
       case FetchPolicy.CacheBeforeNetwork:
-        return mostRecentResult == null || requestId !== requestIdRef.current;
+        return mostRecentResult == null;
 
       case FetchPolicy.CacheAndNetwork:
       case FetchPolicy.NetworkOnly:
         return networkResultRef.current == null;
     }
-  }, [requestId, mostRecentResult, fetchPolicy, hardSkip]);
-  requestIdRef.current = requestId;
+  }, [mostRecentResult, fetchPolicy, hardSkip]);
   React.useEffect(() => {
     if (!shouldFetch) {
       return;

package/dist/index.js

@@ -165,21 +165,20 @@ module.exports = require("react");
 
 /***/ }),
 /* 2 */
+/***/ (function(module, exports) {
+
+module.exports = require("@khanacademy/wonder-blocks-core");
+
+/***/ }),
+/* 3 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return FetchPolicy; });
-// TODO(somewhatabstract, FEI-4172): Update eslint-plugin-flowtype when
-// they've fixed https://github.com/gajus/eslint-plugin-flowtype/issues/502
-
-/* eslint-disable no-undef */
-
 /**
  * Defines the various fetch policies that can be applied to requests.
  */
 const FetchPolicy = __webpack_require__(22).Mirrored(["CacheBeforeNetwork", "CacheAndNetwork", "CacheOnly", "NetworkOnly"]);
-/* eslint-enable no-undef */
-
 /**
  * Define what can be cached.
  *
@@ -187,12 +186,6 @@ const FetchPolicy = __webpack_require__(22).Mirrored(["CacheBeforeNetwork", "Cac
  * and functions are not allowed.
  */
 
-/***/ }),
-/* 3 */
-/***/ (function(module, exports) {
-
-module.exports = require("@khanacademy/wonder-blocks-core");
-
 /***/ }),
 /* 4 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
@@ -556,7 +549,7 @@ class RequestTracker {
 
 "use strict";
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return SsrCache; });
-/* harmony import */ var _khanacademy_wonder_blocks_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(3);
+/* harmony import */ var _khanacademy_wonder_blocks_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2);
 /* harmony import */ var _khanacademy_wonder_blocks_core__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_khanacademy_wonder_blocks_core__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var _serializable_in_memory_cache_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(13);
 
@@ -608,14 +601,14 @@ class SsrCache {
     };
 
     this.getEntry = id => {
-      var _this$_ssrOnlyCache$g, _this$_ssrOnlyCache;
-
       // Get the cached entry for this value.
-      // We first look in the ssr cache and then the hydration cache.
-      const internalEntry = (_this$_ssrOnlyCache$g = (_this$_ssrOnlyCache = this._ssrOnlyCache) == null ? void 0 : _this$_ssrOnlyCache.get(DefaultScope, id)) != null ? _this$_ssrOnlyCache$g : this._hydrationCache.get(DefaultScope, id); // If we are not server-side and we hydrated something, let's clear
+      // We first look in the ssr cache, if we need to.
+      const ssrEntry = _khanacademy_wonder_blocks_core__WEBPACK_IMPORTED_MODULE_0__["Server"].isServerSide() ? this._ssrOnlyCache.get(DefaultScope, id) : null; // Now we defer to the SSR value, and fallback to the hydration cache.
+
+      const internalEntry = ssrEntry != null ? ssrEntry : this._hydrationCache.get(DefaultScope, id); // If we are not server-side and we hydrated something, let's clear
       // that from the hydration cache to save memory.
 
-      if (this._ssrOnlyCache == null && internalEntry != null) {
+      if (!_khanacademy_wonder_blocks_core__WEBPACK_IMPORTED_MODULE_0__["Server"].isServerSide() && internalEntry != null) {
         // We now delete this from our hydration cache as we don't need it.
         // This does mean that if another handler of the same type but
         // without some sort of linked cache won't get the value, but
@@ -632,8 +625,6 @@ class SsrCache {
     };
 
     this.purgeData = predicate => {
-      var _this$_ssrOnlyCache2;
-
       const realPredicate = predicate ? // We know what we're putting into the cache so let's assume it
       // conforms.
       // $FlowIgnore[incompatible-call]
@@ -641,7 +632,7 @@ class SsrCache {
 
       this._hydrationCache.purgeAll(realPredicate);
 
-      (_this$_ssrOnlyCache2 = this._ssrOnlyCache) == null ? void 0 : _this$_ssrOnlyCache2.purgeAll(realPredicate);
+      this._ssrOnlyCache.purgeAll(realPredicate);
     };
 
     this.cloneHydratableData = () => {
@@ -658,13 +649,7 @@ class SsrCache {
       return (_cache$DefaultScope = cache[DefaultScope]) != null ? _cache$DefaultScope : {};
     };
 
-    // The default instance gets made on first reference and if that happens
-    // before server-side mode is turned on, the Default instance would
-    // never have an SSR-only cache instance, which would then mean that if
-    // server-side mode got turned on, it wouldn't work right.
-    // This should only be an issue of surprise during testing, so, let's
-    // always have an instance in that circumstance.
-    this._ssrOnlyCache =  false || _khanacademy_wonder_blocks_core__WEBPACK_IMPORTED_MODULE_0__["Server"].isServerSide() ? ssrOnlyCache || new _serializable_in_memory_cache_js__WEBPACK_IMPORTED_MODULE_1__[/* SerializableInMemoryCache */ "a"]() : undefined;
+    this._ssrOnlyCache = ssrOnlyCache || new _serializable_in_memory_cache_js__WEBPACK_IMPORTED_MODULE_1__[/* SerializableInMemoryCache */ "a"]();
     this._hydrationCache = hydrationCache || new _serializable_in_memory_cache_js__WEBPACK_IMPORTED_MODULE_1__[/* SerializableInMemoryCache */ "a"]();
   }
 
@@ -677,12 +662,10 @@ class SsrCache {
       if (hydrate) {
         this._hydrationCache.set(DefaultScope, id, frozenEntry);
       } else {
-        var _this$_ssrOnlyCache3;
-
         // Usually, when server-side, this cache will always be present.
         // We do fake server-side in our doc example though, when it
         // won't be.
-        (_this$_ssrOnlyCache3 = this._ssrOnlyCache) == null ? void 0 : _this$_ssrOnlyCache3.set(DefaultScope, id, frozenEntry);
+        this._ssrOnlyCache.set(DefaultScope, id, frozenEntry);
       }
     }
 
@@ -927,7 +910,7 @@ class ScopedInMemoryCache {
 /* harmony import */ var _use_server_effect_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(16);
 /* harmony import */ var _use_shared_cache_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(5);
 /* harmony import */ var _use_cached_effect_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(17);
-/* harmony import */ var _util_types_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(2);
+/* harmony import */ var _util_types_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(3);
 
 
 
@@ -1129,7 +1112,7 @@ const purgeHydrationCache = predicate => _ssr_cache_js__WEBPACK_IMPORTED_MODULE_
 
 "use strict";
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return useServerEffect; });
-/* harmony import */ var _khanacademy_wonder_blocks_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(3);
+/* harmony import */ var _khanacademy_wonder_blocks_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2);
 /* harmony import */ var _khanacademy_wonder_blocks_core__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_khanacademy_wonder_blocks_core__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(1);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_1__);
@@ -1194,14 +1177,14 @@ const useServerEffect = (requestId, handler, options = {}) => {
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return useCachedEffect; });
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var _khanacademy_wonder_blocks_core__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(3);
+/* harmony import */ var _khanacademy_wonder_blocks_core__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(2);
 /* harmony import */ var _khanacademy_wonder_blocks_core__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_khanacademy_wonder_blocks_core__WEBPACK_IMPORTED_MODULE_1__);
 /* harmony import */ var _util_data_error_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(0);
 /* harmony import */ var _util_request_fulfillment_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(10);
 /* harmony import */ var _util_status_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(6);
 /* harmony import */ var _use_shared_cache_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(5);
 /* harmony import */ var _use_request_interception_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(19);
-/* harmony import */ var _util_types_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(2);
+/* harmony import */ var _util_types_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(3);
 
 
 
@@ -1353,10 +1336,7 @@ const useCachedEffect = (requestId, handler, options = {}) => {
     // really make sense - the same requestId should be handled the same as
     // each other.
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [requestId, onResultChanged, forceUpdate, setMostRecentResult, fetchPolicy]); // We need to trigger a re-render when the request ID changes as that
-  // indicates its a different request.
-
-  const requestIdRef = react__WEBPACK_IMPORTED_MODULE_0__["useRef"](requestId); // Calculate if we want to fetch the result or not.
+  }, [requestId, onResultChanged, forceUpdate, setMostRecentResult, fetchPolicy]); // Calculate if we want to fetch the result or not.
   // If this is true, we will do a new fetch, cancelling the previous fetch
   // if there is one inflight.
 
@@ -1373,9 +1353,8 @@ const useCachedEffect = (requestId, handler, options = {}) => {
         return false;
 
       case _util_types_js__WEBPACK_IMPORTED_MODULE_7__[/* FetchPolicy */ "a"].CacheBeforeNetwork:
-        // If we don't have a cached value or this is a new requestId,
-        // then we need to fetch.
-        return mostRecentResult == null || requestId !== requestIdRef.current;
+        // If we don't have a cached value then we need to fetch.
+        return mostRecentResult == null;
 
       case _util_types_js__WEBPACK_IMPORTED_MODULE_7__[/* FetchPolicy */ "a"].CacheAndNetwork:
       case _util_types_js__WEBPACK_IMPORTED_MODULE_7__[/* FetchPolicy */ "a"].NetworkOnly:
@@ -1383,9 +1362,7 @@ const useCachedEffect = (requestId, handler, options = {}) => {
         // result, then we need to fetch one.
         return networkResultRef.current == null;
     }
-  }, [requestId, mostRecentResult, fetchPolicy, hardSkip]); // Let's make sure our ref is set to the most recent requestId.
-
-  requestIdRef.current = requestId;
+  }, [mostRecentResult, fetchPolicy, hardSkip]);
   react__WEBPACK_IMPORTED_MODULE_0__["useEffect"](() => {
     if (!shouldFetch) {
       return;
@@ -1590,125 +1567,9 @@ const mergeGqlContext = (defaultContext, overrides) => {
 
 /***/ }),
 /* 22 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-
-
-// Below we want to use `hasOwnProperty` on an object that doesn't have
-// `Object.prototype` in its proto chain, so we must extract it here.
-var hasOwnProperty = Object.prototype.hasOwnProperty;
-
-// Map from an enum object to a reverse map of its values to names
-var reverseMapCache = typeof WeakMap === 'function' ? new WeakMap() : new Map();
-
-// Computes the reverse mapping of the enum object: from value to name.
-// Flow Enum values are unique (enforced by the parser), so this is a
-// one to one mapping.
-function getReverseMap(enumObject) {
-  var reverseMap = reverseMapCache.get(enumObject);
-  if (reverseMap !== undefined) {
-    return reverseMap;
-  }
-  // We aren't using `Object.values` because that gets enumerable
-  // properties, and our properties aren't enumerable.
-  var newReverseMap = new Map();
-  Object.getOwnPropertyNames(enumObject).forEach(function (name) {
-    newReverseMap.set(enumObject[name], name);
-  });
-  reverseMapCache.set(enumObject, newReverseMap);
-  return newReverseMap;
-}
-
-var EnumPrototype = Object.freeze(
-  Object.defineProperties(Object.create(null), {
-    isValid: {
-      value: function (x) {
-        return getReverseMap(this).has(x);
-      },
-    },
-    cast: {
-      value: function (x) {
-        return this.isValid(x) ? x : undefined;
-      },
-    },
-    members: {
-      value: function () {
-        return getReverseMap(this).keys();
-      },
-    },
-    getName: {
-      value: function (value) {
-        return getReverseMap(this).get(value);
-      }
-    }
-  })
-);
-
-// `members` is an object mapping name to value.
-function Enum(members) {
-  var o = Object.create(EnumPrototype);
-  for (var k in members) {
-    if (hasOwnProperty.call(members, k)) {
-      // Create non-enumerable properties.
-      Object.defineProperty(o, k, {value: members[k]});
-    }
-  }
-  return Object.freeze(o);
-}
-
-// Mirrored enum (string enum with no member initializers).
-// Optimized implementation, taking advantage of the fact that
-// keys and values are identical.
-var EnumMirroredPrototype = Object.freeze(
-  Object.defineProperties(Object.create(null), {
-    isValid: {
-      value: function (x) {
-        if (typeof x === 'string') {
-          return hasOwnProperty.call(this, x);
-        }
-        return false;
-      },
-    },
-    cast: {
-      value: EnumPrototype.cast,
-    },
-    members: {
-      value: function () {
-        // We aren't using `Object.values` because that gets enumerable
-        // properties, and our properties aren't enumerable.
-        return Object.getOwnPropertyNames(this).values();
-      },
-    },
-    getName: {
-      value: function (value) {
-        return value;
-      }
-    }
-  })
-);
-
-// `members` is an array of names (which, are also the values).
-Enum.Mirrored = function EnumMirrored(members) {
-  var o = Object.create(EnumMirroredPrototype);
-  for (var i = 0, len = members.length; i < len; ++i) {
-    // Value is same as key. Also, non-enumerable.
-    Object.defineProperty(o, members[i], {value: members[i]});
-  }
-  return Object.freeze(o);
-};
-
-Object.freeze(Enum.Mirrored);
-
-module.exports = Object.freeze(Enum);
+/***/ (function(module, exports) {
 
+module.exports = require("flow-enums-runtime");
 
 /***/ }),
 /* 23 */
@@ -1718,7 +1579,7 @@ module.exports = Object.freeze(Enum);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return fetchTrackedRequests; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "c", function() { return hasTrackedRequestsToBeFetched; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return abortInflightRequests; });
-/* harmony import */ var _khanacademy_wonder_blocks_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(3);
+/* harmony import */ var _khanacademy_wonder_blocks_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2);
 /* harmony import */ var _khanacademy_wonder_blocks_core__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_khanacademy_wonder_blocks_core__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var _request_tracking_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(8);
 /* harmony import */ var _request_fulfillment_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(10);
@@ -1818,7 +1679,7 @@ const purgeCaches = () => {
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return TrackData; });
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var _khanacademy_wonder_blocks_core__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(3);
+/* harmony import */ var _khanacademy_wonder_blocks_core__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(2);
 /* harmony import */ var _khanacademy_wonder_blocks_core__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_khanacademy_wonder_blocks_core__WEBPACK_IMPORTED_MODULE_1__);
 /* harmony import */ var _util_request_tracking_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(8);
 
@@ -2272,7 +2133,7 @@ const getGqlDataFromResponse = async response => {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _util_types_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2);
+/* harmony import */ var _util_types_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(3);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "FetchPolicy", function() { return _util_types_js__WEBPACK_IMPORTED_MODULE_0__["a"]; });
 
 /* harmony import */ var _util_hydration_cache_api_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(15);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@khanacademy/wonder-blocks-data",
-  "version": "8.0.1",
+  "version": "8.0.4",
   "design": "v1",
   "publishConfig": {
     "access": "public"
@@ -13,11 +13,12 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
-    "@babel/runtime": "^7.16.3",
-    "@khanacademy/wonder-blocks-core": "^4.3.1"
+    "@babel/runtime": "^7.18.6",
+    "@khanacademy/wonder-blocks-core": "^4.3.2"
   },
   "peerDependencies": {
     "@khanacademy/wonder-stuff-core": "^0.1.2",
+    "flow-enums-runtime": "^0.0.6",
     "react": "16.14.0"
   },
   "devDependencies": {

package/src/hooks/use-cached-effect.js

@@ -232,10 +232,6 @@ export const useCachedEffect = <TData: ValidCacheData>(
         fetchPolicy,
     ]);
 
-    // We need to trigger a re-render when the request ID changes as that
-    // indicates its a different request.
-    const requestIdRef = React.useRef(requestId);
-
     // Calculate if we want to fetch the result or not.
     // If this is true, we will do a new fetch, cancelling the previous fetch
     // if there is one inflight.
@@ -252,12 +248,8 @@ export const useCachedEffect = <TData: ValidCacheData>(
                 return false;
 
             case FetchPolicy.CacheBeforeNetwork:
-                // If we don't have a cached value or this is a new requestId,
-                // then we need to fetch.
-                return (
-                    mostRecentResult == null ||
-                    requestId !== requestIdRef.current
-                );
+                // If we don't have a cached value then we need to fetch.
+                return mostRecentResult == null;
 
             case FetchPolicy.CacheAndNetwork:
             case FetchPolicy.NetworkOnly:
@@ -265,10 +257,7 @@ export const useCachedEffect = <TData: ValidCacheData>(
                 // result, then we need to fetch one.
                 return networkResultRef.current == null;
         }
-    }, [requestId, mostRecentResult, fetchPolicy, hardSkip]);
-
-    // Let's make sure our ref is set to the most recent requestId.
-    requestIdRef.current = requestId;
+    }, [mostRecentResult, fetchPolicy, hardSkip]);
 
     React.useEffect(() => {
         if (!shouldFetch) {

package/src/hooks/use-hydratable-effect.js

@@ -16,9 +16,6 @@ import type {Result, ValidCacheData} from "../util/types.js";
  * Policies to define how a hydratable effect should behave client-side.
  */
 export enum WhenClientSide {
-    // TODO(somewhatabstract, FEI-4172): Update eslint-plugin-flowtype when
-    // they've fixed https://github.com/gajus/eslint-plugin-flowtype/issues/502
-    /* eslint-disable no-undef */
     /**
      * The result from executing the effect server-side will not be hydrated.
      * The effect will always be executed client-side.
@@ -52,7 +49,6 @@ export enum WhenClientSide {
      * hydrated result status.
      */
     AlwaysExecute,
-    /* eslint-enable no-undef */
 }
 
 type HydratableEffectOptions<TData: ValidCacheData> = {|

package/src/util/__tests__/ssr-cache.test.js

@@ -17,61 +17,51 @@ describe("../ssr-cache.js", () => {
     });
 
     describe("#constructor", () => {
-        const NODE_ENV = process.env.NODE_ENV;
-
-        afterEach(() => {
-            if (NODE_ENV == null) {
-                delete process.env.NODE_ENV;
-            } else {
-                process.env.NODE_ENV = NODE_ENV;
-            }
+        it("should default the ssr-only cache to a cache instance", () => {
+            // Arrange
+
+            // Act
+            const cache = new SsrCache();
+
+            // Assert
+            expect(cache._ssrOnlyCache).toBeInstanceOf(
+                SerializableInMemoryCache,
+            );
         });
 
-        it.each(["development", "production"])(
-            "should default the ssr-only cache to a undefined when client-side in %s",
-            (nodeEnv) => {
-                // Arrange
-                jest.spyOn(Server, "isServerSide").mockReturnValue(false);
-                process.env.NODE_ENV = nodeEnv;
+        it("should set the hydration cache to the passed instance if there is one", () => {
+            // Arrange
+            const passedInstance = new SerializableInMemoryCache();
 
-                // Act
-                const cache = new SsrCache();
+            // Act
+            const cache = new SsrCache(null, passedInstance);
 
-                // Assert
-                expect(cache._ssrOnlyCache).toBeUndefined();
-            },
-        );
+            // Assert
+            expect(cache._ssrOnlyCache).toBe(passedInstance);
+        });
 
-        it("should default the ssr-only cache to a cache instance when client-side in test", () => {
+        it("should default the hydration cache to a cache instance", () => {
             // Arrange
-            jest.spyOn(Server, "isServerSide").mockReturnValue(false);
-            process.env.NODE_ENV = "test";
 
             // Act
             const cache = new SsrCache();
 
             // Assert
-            expect(cache._ssrOnlyCache).toBeInstanceOf(
+            expect(cache._hydrationCache).toBeInstanceOf(
                 SerializableInMemoryCache,
             );
         });
 
-        it.each(["development", "production"])(
-            "should default the ssr-only cache to a cache instance when server-side in %s",
-            (nodeEnv) => {
-                // Arrange
-                jest.spyOn(Server, "isServerSide").mockReturnValue(true);
-                process.env.NODE_ENV = nodeEnv;
+        it("should set the hydration cache to the passed instance if there is one", () => {
+            // Arrange
+            const passedInstance = new SerializableInMemoryCache();
 
-                // Act
-                const cache = new SsrCache();
+            // Act
+            const cache = new SsrCache(passedInstance);
 
-                // Assert
-                expect(cache._ssrOnlyCache).toBeInstanceOf(
-                    SerializableInMemoryCache,
-                );
-            },
-        );
+            // Assert
+            expect(cache._hydrationCache).toBe(passedInstance);
+        });
     });
 
     describe("@Default", () => {