@khanacademy/wonder-blocks-data 10.0.5 → 10.1.0

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @khanacademy/wonder-blocks-data
 
+## 10.1.0
+
+### Minor Changes
+
+-   91cb727c: Convert enums to POJOs
+
+### Patch Changes
+
+-   91cb727c: Update wonder-stuff dependencies
+-   91cb727c: Remove file extensions from imports
+-   Updated dependencies [91cb727c]
+-   Updated dependencies [91cb727c]
+    -   @khanacademy/wonder-blocks-core@4.7.0
+
 ## 10.0.5
 
 ### Patch Changes

package/dist/es/index.js

@@ -4,7 +4,12 @@ import _extends from '@babel/runtime/helpers/extends';
 import * as React from 'react';
 import { useContext, useRef, useMemo, useCallback } from 'react';
 
-const FetchPolicy = require("flow-enums-runtime").Mirrored(["CacheBeforeNetwork", "CacheAndNetwork", "CacheOnly", "NetworkOnly"]);
+const FetchPolicy = {
+  CacheBeforeNetwork: "CacheBeforeNetwork",
+  CacheAndNetwork: "CacheAndNetwork",
+  CacheOnly: "CacheOnly",
+  NetworkOnly: "NetworkOnly"
+};
 
 const DataErrors = Object.freeze({
   Unknown: "Unknown",
@@ -616,7 +621,12 @@ const useCachedEffect = (requestId, handler, options = {}) => {
   return [result, fetchRequest];
 };
 
-const WhenClientSide = require("flow-enums-runtime").Mirrored(["DoNotHydrate", "ExecuteWhenNoResult", "ExecuteWhenNoSuccessResult", "AlwaysExecute"]);
+const WhenClientSide = {
+  DoNotHydrate: "DoNotHydrate",
+  ExecuteWhenNoResult: "ExecuteWhenNoResult",
+  ExecuteWhenNoSuccessResult: "ExecuteWhenNoSuccessResult",
+  AlwaysExecute: "AlwaysExecute"
+};
 const DefaultScope = "useHydratableEffect";
 const useHydratableEffect = (requestId, handler, options = {}) => {
   const {

package/dist/index.js

@@ -30,7 +30,12 @@ function _interopNamespace(e) {
 var _extends__default = /*#__PURE__*/_interopDefaultLegacy(_extends);
 var React__namespace = /*#__PURE__*/_interopNamespace(React);
 
-const FetchPolicy = require("flow-enums-runtime").Mirrored(["CacheBeforeNetwork", "CacheAndNetwork", "CacheOnly", "NetworkOnly"]);
+const FetchPolicy = {
+  CacheBeforeNetwork: "CacheBeforeNetwork",
+  CacheAndNetwork: "CacheAndNetwork",
+  CacheOnly: "CacheOnly",
+  NetworkOnly: "NetworkOnly"
+};
 
 const DataErrors = Object.freeze({
   Unknown: "Unknown",
@@ -642,7 +647,12 @@ const useCachedEffect = (requestId, handler, options = {}) => {
   return [result, fetchRequest];
 };
 
-const WhenClientSide = require("flow-enums-runtime").Mirrored(["DoNotHydrate", "ExecuteWhenNoResult", "ExecuteWhenNoSuccessResult", "AlwaysExecute"]);
+const WhenClientSide = {
+  DoNotHydrate: "DoNotHydrate",
+  ExecuteWhenNoResult: "ExecuteWhenNoResult",
+  ExecuteWhenNoSuccessResult: "ExecuteWhenNoSuccessResult",
+  AlwaysExecute: "AlwaysExecute"
+};
 const DefaultScope = "useHydratableEffect";
 const useHydratableEffect = (requestId, handler, options = {}) => {
   const {

package/dist/index.js.flow

@@ -1,2 +1,2 @@
 // @flow
-export * from "../src/index.js";
+export * from "../src/index";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@khanacademy/wonder-blocks-data",
-  "version": "10.0.5",
+  "version": "10.1.0",
   "design": "v1",
   "publishConfig": {
     "access": "public"
@@ -14,15 +14,15 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.18.6",
-    "@khanacademy/wonder-blocks-core": "^4.6.2"
+    "@khanacademy/wonder-blocks-core": "^4.7.0"
   },
   "peerDependencies": {
-    "@khanacademy/wonder-stuff-core": "^1.2.0",
+    "@khanacademy/wonder-stuff-core": "^1.2.1",
     "flow-enums-runtime": "^0.0.6",
     "react": "16.14.0"
   },
   "devDependencies": {
-    "wb-dev-build-settings": "^0.7.0"
+    "wb-dev-build-settings": "^0.7.1"
   },
   "author": "",
   "license": "MIT"

package/src/components/__tests__/data.test.js

@@ -7,20 +7,14 @@ import {render, act} from "@testing-library/react";
 import * as ReactDOMServer from "react-dom/server";
 import {Server, View} from "@khanacademy/wonder-blocks-core";
 
-import {SharedCache} from "../../hooks/use-shared-cache.js";
-import TrackData from "../track-data.js";
-import {RequestFulfillment} from "../../util/request-fulfillment.js";
-import {SsrCache} from "../../util/ssr-cache.js";
-import {RequestTracker} from "../../util/request-tracking.js";
-import InterceptRequests from "../intercept-requests.js";
-import Data from "../data.js";
-import {
-    // TODO(somewhatabstract, FEI-4174): Update eslint-plugin-import when they
-    // have fixed:
-    // https://github.com/import-js/eslint-plugin-import/issues/2073
-    // eslint-disable-next-line import/named
-    WhenClientSide,
-} from "../../hooks/use-hydratable-effect.js";
+import {SharedCache} from "../../hooks/use-shared-cache";
+import TrackData from "../track-data";
+import {RequestFulfillment} from "../../util/request-fulfillment";
+import {SsrCache} from "../../util/ssr-cache";
+import {RequestTracker} from "../../util/request-tracking";
+import InterceptRequests from "../intercept-requests";
+import Data from "../data";
+import {WhenClientSide} from "../../hooks/use-hydratable-effect";
 
 describe("Data", () => {
     beforeEach(() => {

package/src/components/__tests__/gql-router.test.js

@@ -2,8 +2,8 @@
 import * as React from "react";
 import {render} from "@testing-library/react";
 
-import {GqlRouterContext} from "../../util/gql-router-context.js";
-import {GqlRouter} from "../gql-router.js";
+import {GqlRouterContext} from "../../util/gql-router-context";
+import {GqlRouter} from "../gql-router";
 
 describe("GqlRouter", () => {
     it("should provide the GqlRouterContext as configured", async () => {

package/src/components/__tests__/intercept-requests.test.js

@@ -2,8 +2,8 @@
 import * as React from "react";
 import {render} from "@testing-library/react";
 
-import InterceptContext from "../intercept-context.js";
-import InterceptRequests from "../intercept-requests.js";
+import InterceptContext from "../intercept-context";
+import InterceptRequests from "../intercept-requests";
 
 describe("InterceptRequests", () => {
     afterEach(() => {

package/src/components/__tests__/track-data.test.js

@@ -3,8 +3,8 @@ import * as React from "react";
 import {Server} from "@khanacademy/wonder-blocks-core";
 import {render, screen} from "@testing-library/react";
 
-import TrackData from "../track-data.js";
-import {RequestTracker, TrackerContext} from "../../util/request-tracking.js";
+import TrackData from "../track-data";
+import {RequestTracker, TrackerContext} from "../../util/request-tracking";
 
 describe("TrackData", () => {
     afterEach(() => {

package/src/components/data.js

@@ -3,14 +3,10 @@ import * as React from "react";
 
 import {
     useHydratableEffect,
-    // TODO(somewhatabstract, FEI-4174): Update eslint-plugin-import when they
-    // have fixed:
-    // https://github.com/import-js/eslint-plugin-import/issues/2073
-    // eslint-disable-next-line import/named
     WhenClientSide,
-} from "../hooks/use-hydratable-effect.js";
+} from "../hooks/use-hydratable-effect";
 
-import type {Result, ValidCacheData} from "../util/types.js";
+import type {Result, ValidCacheData} from "../util/types";
 
 type Props<
     /**
@@ -41,7 +37,7 @@ type Props<
      *
      * Default is `OnClientRender.ExecuteWhenNoSuccessResult`.
      */
-    clientBehavior?: WhenClientSide,
+    clientBehavior?: $Values<typeof WhenClientSide>,
 
     /**
      * When true, the children will be rendered with the existing result

package/src/components/gql-router.js

@@ -1,13 +1,13 @@
 // @flow
 import * as React from "react";
 
-import {GqlRouterContext} from "../util/gql-router-context.js";
+import {GqlRouterContext} from "../util/gql-router-context";
 
 import type {
     GqlContext,
     GqlFetchFn,
     GqlRouterConfiguration,
-} from "../util/gql-types.js";
+} from "../util/gql-types";
 
 type Props<TContext: GqlContext> = {|
     /**

package/src/components/intercept-context.js

@@ -1,6 +1,6 @@
 // @flow
 import * as React from "react";
-import type {ValidCacheData} from "../util/types.js";
+import type {ValidCacheData} from "../util/types";
 
 type InterceptContextData = $ReadOnlyArray<
     (requestId: string) => ?Promise<?ValidCacheData>,

package/src/components/intercept-requests.js

@@ -1,9 +1,9 @@
 // @flow
 import * as React from "react";
 
-import InterceptContext from "./intercept-context.js";
+import InterceptContext from "./intercept-context";
 
-import type {ValidCacheData} from "../util/types.js";
+import type {ValidCacheData} from "../util/types";
 
 type Props<TData: ValidCacheData> = {|
     /**

package/src/components/track-data.js

@@ -2,7 +2,7 @@
 import * as React from "react";
 import {Server} from "@khanacademy/wonder-blocks-core";
 
-import {RequestTracker, TrackerContext} from "../util/request-tracking.js";
+import {RequestTracker, TrackerContext} from "../util/request-tracking";
 
 type TrackDataProps = {|
     children: React.Node,

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

@@ -6,27 +6,24 @@ import {
 } from "@testing-library/react-hooks";
 import {renderHook as serverRenderHook} from "@testing-library/react-hooks/server";
 import {render, act as reactAct} from "@testing-library/react";
+import {values} from "@khanacademy/wonder-stuff-core";
 
 import {Server} from "@khanacademy/wonder-blocks-core";
-import {Status} from "../../util/status.js";
+import {Status} from "../../util/status";
 
-import {RequestFulfillment} from "../../util/request-fulfillment.js";
-import * as UseRequestInterception from "../use-request-interception.js";
-import * as UseSharedCache from "../use-shared-cache.js";
+import {RequestFulfillment} from "../../util/request-fulfillment";
+import * as UseRequestInterception from "../use-request-interception";
+import * as UseSharedCache from "../use-shared-cache";
 
-import {useCachedEffect} from "../use-cached-effect.js";
+import {useCachedEffect} from "../use-cached-effect";
 
-// TODO(somewhatabstract, FEI-4174): Update eslint-plugin-import when they
-// have fixed:
-// https://github.com/import-js/eslint-plugin-import/issues/2073
-// eslint-disable-next-line import/named
-import {FetchPolicy} from "../../util/types.js";
+import {FetchPolicy} from "../../util/types";
 
-jest.mock("../use-request-interception.js");
-jest.mock("../use-shared-cache.js");
+jest.mock("../use-request-interception");
+jest.mock("../use-shared-cache");
 
-const allPolicies = Array.from(FetchPolicy.members());
-const allPoliciesBut = (policy: FetchPolicy) =>
+const allPolicies = Array.from(values(FetchPolicy));
+const allPoliciesBut = (policy: $Values<typeof FetchPolicy>) =>
     allPolicies.filter((p) => p !== policy);
 
 describe("#useCachedEffect", () => {

package/src/hooks/__tests__/use-gql-router-context.test.js

@@ -2,8 +2,8 @@
 import * as React from "react";
 import {renderHook} from "@testing-library/react-hooks";
 
-import {GqlRouterContext} from "../../util/gql-router-context.js";
-import {useGqlRouterContext} from "../use-gql-router-context.js";
+import {GqlRouterContext} from "../../util/gql-router-context";
+import {useGqlRouterContext} from "../use-gql-router-context";
 
 describe("#useGqlRouterContext", () => {
     it("should throw if there is no GqlRouterContext", () => {

package/src/hooks/__tests__/use-gql.test.js

@@ -2,9 +2,9 @@
 import * as React from "react";
 import {renderHook} from "@testing-library/react-hooks";
 
-import * as GetGqlDataFromResponse from "../../util/get-gql-data-from-response.js";
-import {GqlRouterContext} from "../../util/gql-router-context.js";
-import {useGql} from "../use-gql.js";
+import * as GetGqlDataFromResponse from "../../util/get-gql-data-from-response";
+import {GqlRouterContext} from "../../util/gql-router-context";
+import {useGql} from "../use-gql";
 
 describe("#useGql", () => {
     beforeEach(() => {

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

@@ -7,25 +7,18 @@ import {
 import {renderHook as serverRenderHook} from "@testing-library/react-hooks/server";
 
 import {Server} from "@khanacademy/wonder-blocks-core";
-import {Status} from "../../util/status.js";
+import {Status} from "../../util/status";
 
-import {RequestFulfillment} from "../../util/request-fulfillment.js";
-import * as UseRequestInterception from "../use-request-interception.js";
-import * as UseServerEffect from "../use-server-effect.js";
-import * as UseSharedCache from "../use-shared-cache.js";
+import {RequestFulfillment} from "../../util/request-fulfillment";
+import * as UseRequestInterception from "../use-request-interception";
+import * as UseServerEffect from "../use-server-effect";
+import * as UseSharedCache from "../use-shared-cache";
 
-import {
-    useHydratableEffect,
-    // TODO(somewhatabstract, FEI-4174): Update eslint-plugin-import when they
-    // have fixed:
-    // https://github.com/import-js/eslint-plugin-import/issues/2073
-    // eslint-disable-next-line import/named
-    WhenClientSide,
-} from "../use-hydratable-effect.js";
-
-jest.mock("../use-request-interception.js");
-jest.mock("../use-server-effect.js");
-jest.mock("../use-shared-cache.js");
+import {useHydratableEffect, WhenClientSide} from "../use-hydratable-effect";
+
+jest.mock("../use-request-interception");
+jest.mock("../use-server-effect");
+jest.mock("../use-shared-cache");
 
 describe("#useHydratableEffect", () => {
     beforeEach(() => {

package/src/hooks/__tests__/use-request-interception.test.js

@@ -1,8 +1,8 @@
 // @flow
 import * as React from "react";
 import {renderHook} from "@testing-library/react-hooks";
-import InterceptRequests from "../../components/intercept-requests.js";
-import {useRequestInterception} from "../use-request-interception.js";
+import InterceptRequests from "../../components/intercept-requests";
+import {useRequestInterception} from "../use-request-interception";
 
 describe("#useRequestInterception", () => {
     it("should return a function", () => {

package/src/hooks/__tests__/use-server-effect.test.js

@@ -4,16 +4,16 @@ import {renderHook as serverRenderHook} from "@testing-library/react-hooks/serve
 
 import {Server} from "@khanacademy/wonder-blocks-core";
 
-import TrackData from "../../components/track-data.js";
-import {RequestFulfillment} from "../../util/request-fulfillment.js";
-import {SsrCache} from "../../util/ssr-cache.js";
-import {RequestTracker} from "../../util/request-tracking.js";
-import {DataError} from "../../util/data-error.js";
-import * as UseRequestInterception from "../use-request-interception.js";
+import TrackData from "../../components/track-data";
+import {RequestFulfillment} from "../../util/request-fulfillment";
+import {SsrCache} from "../../util/ssr-cache";
+import {RequestTracker} from "../../util/request-tracking";
+import {DataError} from "../../util/data-error";
+import * as UseRequestInterception from "../use-request-interception";
 
-import {useServerEffect} from "../use-server-effect.js";
+import {useServerEffect} from "../use-server-effect";
 
-jest.mock("../use-request-interception.js");
+jest.mock("../use-request-interception");
 
 describe("#useServerEffect", () => {
     beforeEach(() => {

package/src/hooks/__tests__/use-shared-cache.test.js

@@ -1,7 +1,7 @@
 // @flow
 import {renderHook as clientRenderHook} from "@testing-library/react-hooks";
 
-import {useSharedCache, SharedCache} from "../use-shared-cache.js";
+import {useSharedCache, SharedCache} from "../use-shared-cache";
 
 describe("#useSharedCache", () => {
     beforeEach(() => {

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

@@ -1,21 +1,17 @@
 // @flow
 import * as React from "react";
 import {useForceUpdate} from "@khanacademy/wonder-blocks-core";
-import {DataError, DataErrors} from "../util/data-error.js";
+import {DataError, DataErrors} from "../util/data-error";
 
-import {RequestFulfillment} from "../util/request-fulfillment.js";
-import {Status} from "../util/status.js";
+import {RequestFulfillment} from "../util/request-fulfillment";
+import {Status} from "../util/status";
 
-import {useSharedCache} from "./use-shared-cache.js";
-import {useRequestInterception} from "./use-request-interception.js";
+import {useSharedCache} from "./use-shared-cache";
+import {useRequestInterception} from "./use-request-interception";
 
-import type {Result, ValidCacheData} from "../util/types.js";
+import type {Result, ValidCacheData} from "../util/types";
 
-// TODO(somewhatabstract, FEI-4174): Update eslint-plugin-import when they
-// have fixed:
-// https://github.com/import-js/eslint-plugin-import/issues/2073
-// eslint-disable-next-line import/named
-import {FetchPolicy} from "../util/types.js";
+import {FetchPolicy} from "../util/types";
 
 type CachedEffectOptions<TData: ValidCacheData> = {|
     /**
@@ -24,7 +20,7 @@ type CachedEffectOptions<TData: ValidCacheData> = {|
      *
      * Defaults to `FetchPolicy.CacheBeforeNetwork`.
      */
-    fetchPolicy?: FetchPolicy,
+    fetchPolicy?: $Values<typeof FetchPolicy>,
 
     /**
      * When `true`, the effect will not be executed; otherwise, the effect will

package/src/hooks/use-gql-router-context.js

@@ -1,11 +1,11 @@
 // @flow
 import {useContext, useRef, useMemo} from "react";
 
-import {mergeGqlContext} from "../util/merge-gql-context.js";
-import {GqlRouterContext} from "../util/gql-router-context.js";
-import {GqlError, GqlErrors} from "../util/gql-error.js";
+import {mergeGqlContext} from "../util/merge-gql-context";
+import {GqlRouterContext} from "../util/gql-router-context";
+import {GqlError, GqlErrors} from "../util/gql-error";
 
-import type {GqlRouterConfiguration, GqlContext} from "../util/gql-types.js";
+import type {GqlRouterConfiguration, GqlContext} from "../util/gql-types";
 
 /**
  * Construct a GqlRouterContext from the current one and partial context.

package/src/hooks/use-gql.js

@@ -1,15 +1,15 @@
 // @flow
 import {useCallback} from "react";
 
-import {mergeGqlContext} from "../util/merge-gql-context.js";
-import {useGqlRouterContext} from "./use-gql-router-context.js";
-import {getGqlDataFromResponse} from "../util/get-gql-data-from-response.js";
+import {mergeGqlContext} from "../util/merge-gql-context";
+import {useGqlRouterContext} from "./use-gql-router-context";
+import {getGqlDataFromResponse} from "../util/get-gql-data-from-response";
 
 import type {
     GqlContext,
     GqlOperation,
     GqlFetchOptions,
-} from "../util/gql-types.js";
+} from "../util/gql-types";
 
 /**
  * Hook to obtain a gqlFetch function for performing GraphQL requests.

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

@@ -1,21 +1,18 @@
 // @flow
 import * as React from "react";
 
-import {useServerEffect} from "./use-server-effect.js";
-import {useSharedCache} from "./use-shared-cache.js";
-import {useCachedEffect} from "./use-cached-effect.js";
+import {useServerEffect} from "./use-server-effect";
+import {useSharedCache} from "./use-shared-cache";
+import {useCachedEffect} from "./use-cached-effect";
 
-// TODO(somewhatabstract, FEI-4174): Update eslint-plugin-import when they
-// have fixed:
-// https://github.com/import-js/eslint-plugin-import/issues/2073
-// eslint-disable-next-line import/named
-import {FetchPolicy} from "../util/types.js";
-import type {Result, ValidCacheData} from "../util/types.js";
+import {FetchPolicy} from "../util/types";
+import type {Result, ValidCacheData} from "../util/types";
 
 /**
  * Policies to define how a hydratable effect should behave client-side.
  */
-export enum WhenClientSide {
+// TODO(FEI-5000): Convert to TS enum after all codebases have been migrated
+export const WhenClientSide = {
     /**
      * The result from executing the effect server-side will not be hydrated.
      * The effect will always be executed client-side.
@@ -24,7 +21,7 @@ export enum WhenClientSide {
      * for properly hydrating this component (for example, the action invokes
      * Apollo which manages its own cache to ensure things render properly).
      */
-    DoNotHydrate,
+    DoNotHydrate: ("DoNotHydrate": "DoNotHydrate"),
 
     /**
      * The result from executing the effect server-side will be hydrated.
@@ -32,7 +29,7 @@ export enum WhenClientSide {
      * be hydrated (i.e. both error and success hydration results prevent the
      * effect running client-side).
      */
-    ExecuteWhenNoResult,
+    ExecuteWhenNoResult: ("ExecuteWhenNoResult": "ExecuteWhenNoResult"),
 
     /**
      * The result from executing the effect server-side will be hydrated.
@@ -41,15 +38,16 @@ export enum WhenClientSide {
      * If the hydrated result was not a success result, or there was no
      * hydrated result, the effect will not be executed.
      */
-    ExecuteWhenNoSuccessResult,
+    ExecuteWhenNoSuccessResult:
+        ("ExecuteWhenNoSuccessResult": "ExecuteWhenNoSuccessResult"),
 
     /**
      * The result from executing the effect server-side will be hydrated.
      * The effect will always be executed client-side, regardless of the
      * hydrated result status.
      */
-    AlwaysExecute,
-}
+    AlwaysExecute: ("AlwaysExecute": "AlwaysExecute"),
+};
 
 type HydratableEffectOptions<TData: ValidCacheData> = {|
     /**
@@ -62,7 +60,7 @@ type HydratableEffectOptions<TData: ValidCacheData> = {|
      * Changing this value after the first call is irrelevant as it only
      * affects the initial render behavior.
      */
-    clientBehavior?: WhenClientSide,
+    clientBehavior?: $Values<typeof WhenClientSide>,
 
     /**
      * When `true`, the effect will not be executed; otherwise, the effect will

package/src/hooks/use-request-interception.js

@@ -1,8 +1,8 @@
 // @flow
 import * as React from "react";
 
-import InterceptContext from "../components/intercept-context.js";
-import type {ValidCacheData} from "../util/types.js";
+import InterceptContext from "../components/intercept-context";
+import type {ValidCacheData} from "../util/types";
 
 /**
  * Allow request handling to be intercepted.

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

@@ -1,12 +1,12 @@
 // @flow
 import {Server} from "@khanacademy/wonder-blocks-core";
 import {useContext} from "react";
-import {TrackerContext} from "../util/request-tracking.js";
-import {SsrCache} from "../util/ssr-cache.js";
-import {resultFromCachedResponse} from "../util/result-from-cache-response.js";
-import {useRequestInterception} from "./use-request-interception.js";
+import {TrackerContext} from "../util/request-tracking";
+import {SsrCache} from "../util/ssr-cache";
+import {resultFromCachedResponse} from "../util/result-from-cache-response";
+import {useRequestInterception} from "./use-request-interception";
 
-import type {Result, ValidCacheData} from "../util/types.js";
+import type {Result, ValidCacheData} from "../util/types";
 
 type ServerEffectOptions = {|
     /**

package/src/hooks/use-shared-cache.js

@@ -1,8 +1,8 @@
 // @flow
 import * as React from "react";
-import {DataError, DataErrors} from "../util/data-error.js";
-import {ScopedInMemoryCache} from "../util/scoped-in-memory-cache.js";
-import type {ValidCacheData, ScopedCache} from "../util/types.js";
+import {DataError, DataErrors} from "../util/data-error";
+import {ScopedInMemoryCache} from "../util/scoped-in-memory-cache";
+import type {ValidCacheData, ScopedCache} from "../util/types";
 
 /**
  * A function for inserting a value into the cache or clearing it.

package/src/index.js

@@ -1,9 +1,5 @@
 // @flow
-// TODO(somewhatabstract, FEI-4174): Update eslint-plugin-import when they
-// have fixed:
-// https://github.com/import-js/eslint-plugin-import/issues/2073
-// eslint-disable-next-line import/named
-export {FetchPolicy} from "./util/types.js";
+export {FetchPolicy} from "./util/types";
 export type {
     ErrorOptions,
     ResponseCache,
@@ -12,44 +8,40 @@ export type {
     RawScopedCache,
     ValidCacheData,
     ScopedCache,
-} from "./util/types.js";
+} from "./util/types";
 
-export * from "./util/hydration-cache-api.js";
-export * from "./util/request-api.js";
-export {purgeCaches} from "./util/purge-caches.js";
-export {default as TrackData} from "./components/track-data.js";
-export {default as Data} from "./components/data.js";
-export {default as InterceptRequests} from "./components/intercept-requests.js";
-export {DataError, DataErrors} from "./util/data-error.js";
-export {useServerEffect} from "./hooks/use-server-effect.js";
-export {useCachedEffect} from "./hooks/use-cached-effect.js";
-export {useSharedCache, SharedCache} from "./hooks/use-shared-cache.js";
+export * from "./util/hydration-cache-api";
+export * from "./util/request-api";
+export {purgeCaches} from "./util/purge-caches";
+export {default as TrackData} from "./components/track-data";
+export {default as Data} from "./components/data";
+export {default as InterceptRequests} from "./components/intercept-requests";
+export {DataError, DataErrors} from "./util/data-error";
+export {useServerEffect} from "./hooks/use-server-effect";
+export {useCachedEffect} from "./hooks/use-cached-effect";
+export {useSharedCache, SharedCache} from "./hooks/use-shared-cache";
 export {
     useHydratableEffect,
-    // TODO(somewhatabstract, FEI-4174): Update eslint-plugin-import when they
-    // have fixed:
-    // https://github.com/import-js/eslint-plugin-import/issues/2073
-    // eslint-disable-next-line import/named
     WhenClientSide,
-} from "./hooks/use-hydratable-effect.js";
-export {ScopedInMemoryCache} from "./util/scoped-in-memory-cache.js";
-export {SerializableInMemoryCache} from "./util/serializable-in-memory-cache.js";
-export {Status} from "./util/status.js";
+} from "./hooks/use-hydratable-effect";
+export {ScopedInMemoryCache} from "./util/scoped-in-memory-cache";
+export {SerializableInMemoryCache} from "./util/serializable-in-memory-cache";
+export {Status} from "./util/status";
 
 ////////////////////////////////////////////////////////////////////////////////
 // GraphQL
 ////////////////////////////////////////////////////////////////////////////////
-export {getGqlRequestId} from "./util/get-gql-request-id.js";
-export {getGqlDataFromResponse} from "./util/get-gql-data-from-response.js";
-export {graphQLDocumentNodeParser} from "./util/graphql-document-node-parser.js";
-export {toGqlOperation} from "./util/to-gql-operation.js";
-export {GqlRouter} from "./components/gql-router.js";
-export {useGql} from "./hooks/use-gql.js";
-export {GqlError, GqlErrors} from "./util/gql-error.js";
+export {getGqlRequestId} from "./util/get-gql-request-id";
+export {getGqlDataFromResponse} from "./util/get-gql-data-from-response";
+export {graphQLDocumentNodeParser} from "./util/graphql-document-node-parser";
+export {toGqlOperation} from "./util/to-gql-operation";
+export {GqlRouter} from "./components/gql-router";
+export {useGql} from "./hooks/use-gql";
+export {GqlError, GqlErrors} from "./util/gql-error";
 export type {
     GqlContext,
     GqlOperation,
     GqlOperationType,
     GqlFetchOptions,
     GqlFetchFn,
-} from "./util/gql-types.js";
+} from "./util/gql-types";

package/src/util/__tests__/get-gql-data-from-response.test.js

@@ -1,5 +1,5 @@
 // @flow
-import {getGqlDataFromResponse} from "../get-gql-data-from-response.js";
+import {getGqlDataFromResponse} from "../get-gql-data-from-response";
 
 describe("#getGqlDataFromReponse", () => {
     it("should throw if the response cannot be parsed", async () => {

package/src/util/__tests__/get-gql-request-id.test.js

@@ -1,6 +1,6 @@
 // @flow
 
-import {getGqlRequestId} from "../get-gql-request-id.js";
+import {getGqlRequestId} from "../get-gql-request-id";
 
 describe("#getGqlRequestId", () => {
     it("should include the id of the query", () => {

package/src/util/__tests__/graphql-document-node-parser.test.js

@@ -1,5 +1,5 @@
 // @flow
-import {graphQLDocumentNodeParser} from "../graphql-document-node-parser.js";
+import {graphQLDocumentNodeParser} from "../graphql-document-node-parser";
 
 describe("#graphQLDocumentNodeParser", () => {
     describe("in production - shorter error messages", () => {

package/src/util/__tests__/hydration-cache-api.test.js

@@ -1,10 +1,10 @@
 // @flow
-import {SsrCache} from "../ssr-cache.js";
+import {SsrCache} from "../ssr-cache";
 
 import {
     initializeHydrationCache,
     purgeHydrationCache,
-} from "../hydration-cache-api.js";
+} from "../hydration-cache-api";
 
 describe("#initializeHydrationCache", () => {
     it("should call SsrCache.Default.initialize", () => {

package/src/util/__tests__/merge-gql-context.test.js

@@ -1,5 +1,5 @@
 // @flow
-import {mergeGqlContext} from "../merge-gql-context.js";
+import {mergeGqlContext} from "../merge-gql-context";
 
 describe("#mergeGqlContext", () => {
     it("should combine the default context with the given overrides", () => {

package/src/util/__tests__/purge-caches.test.js

@@ -1,8 +1,8 @@
 // @flow
-import {SharedCache} from "../../hooks/use-shared-cache.js";
-import * as HydrationCacheApi from "../hydration-cache-api.js";
+import {SharedCache} from "../../hooks/use-shared-cache";
+import * as HydrationCacheApi from "../hydration-cache-api";
 
-import {purgeCaches} from "../purge-caches.js";
+import {purgeCaches} from "../purge-caches";
 
 describe("#purgeCaches", () => {
     it("should purge the shared cache", () => {

package/src/util/__tests__/request-api.test.js

@@ -1,13 +1,13 @@
 // @flow
 import {Server} from "@khanacademy/wonder-blocks-core";
-import {RequestFulfillment} from "../request-fulfillment.js";
-import {RequestTracker} from "../request-tracking.js";
+import {RequestFulfillment} from "../request-fulfillment";
+import {RequestTracker} from "../request-tracking";
 
 import {
     abortInflightRequests,
     fetchTrackedRequests,
     hasTrackedRequestsToBeFetched,
-} from "../request-api.js";
+} from "../request-api";
 
 describe("#fetchTrackedRequests", () => {
     describe("when server-side", () => {

package/src/util/__tests__/request-fulfillment.test.js

@@ -1,6 +1,6 @@
 // @flow
-import {RequestFulfillment} from "../request-fulfillment.js";
-import {DataError} from "../data-error.js";
+import {RequestFulfillment} from "../request-fulfillment";
+import {DataError} from "../data-error";
 
 describe("RequestFulfillment", () => {
     it("should provide static default instance", () => {

package/src/util/__tests__/request-tracking.test.js

@@ -3,8 +3,8 @@ import * as React from "react";
 import {render} from "@testing-library/react";
 
 import {Server} from "@khanacademy/wonder-blocks-core";
-import {RequestTracker, TrackerContext} from "../request-tracking.js";
-import {SsrCache} from "../ssr-cache.js";
+import {RequestTracker, TrackerContext} from "../request-tracking";
+import {SsrCache} from "../ssr-cache";
 
 describe("../request-tracking.js", () => {
     describe("TrackerContext", () => {

package/src/util/__tests__/result-from-cache-response.test.js

@@ -1,5 +1,5 @@
 // @flow
-import {resultFromCachedResponse} from "../result-from-cache-response.js";
+import {resultFromCachedResponse} from "../result-from-cache-response";
 
 describe("#resultFromCachedResponse", () => {
     it("should return null cache entry is null", () => {

package/src/util/__tests__/scoped-in-memory-cache.test.js

@@ -1,5 +1,5 @@
 // @flow
-import {ScopedInMemoryCache} from "../scoped-in-memory-cache.js";
+import {ScopedInMemoryCache} from "../scoped-in-memory-cache";
 
 describe("ScopedInMemoryCache", () => {
     describe("#set", () => {

package/src/util/__tests__/serializable-in-memory-cache.test.js

@@ -1,6 +1,6 @@
 // @flow
 import * as WSCore from "@khanacademy/wonder-stuff-core";
-import {SerializableInMemoryCache} from "../serializable-in-memory-cache.js";
+import {SerializableInMemoryCache} from "../serializable-in-memory-cache";
 
 describe("SerializableInMemoryCache", () => {
     describe("#constructor", () => {

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

@@ -1,7 +1,7 @@
 // @flow
 import {Server} from "@khanacademy/wonder-blocks-core";
-import {SsrCache} from "../ssr-cache.js";
-import {SerializableInMemoryCache} from "../serializable-in-memory-cache.js";
+import {SsrCache} from "../ssr-cache";
+import {SerializableInMemoryCache} from "../serializable-in-memory-cache";
 
 describe("../ssr-cache.js", () => {
     afterEach(() => {

package/src/util/__tests__/to-gql-operation.test.js

@@ -1,8 +1,8 @@
 // @flow
-import {toGqlOperation} from "../to-gql-operation.js";
-import * as GDNP from "../graphql-document-node-parser.js";
+import {toGqlOperation} from "../to-gql-operation";
+import * as GDNP from "../graphql-document-node-parser";
 
-jest.mock("../graphql-document-node-parser.js");
+jest.mock("../graphql-document-node-parser");
 
 describe("#toGqlOperation", () => {
     it("should parse the document node", () => {

package/src/util/data-error.js

@@ -1,6 +1,6 @@
 // @flow
 import {KindError} from "@khanacademy/wonder-stuff-core";
-import type {ErrorOptions} from "./types.js";
+import type {ErrorOptions} from "./types";
 
 /**
  * Error kinds for DataError.

package/src/util/get-gql-data-from-response.js

@@ -1,6 +1,6 @@
 // @flow
-import {DataError, DataErrors} from "./data-error.js";
-import {GqlError, GqlErrors} from "./gql-error.js";
+import {DataError, DataErrors} from "./data-error";
+import {GqlError, GqlErrors} from "./gql-error";
 
 /**
  * Validate a GQL operation response and extract the data.

package/src/util/get-gql-request-id.js

@@ -1,6 +1,6 @@
 // @flow
 import {entries} from "@khanacademy/wonder-stuff-core";
-import type {GqlOperation, GqlContext} from "./gql-types.js";
+import type {GqlOperation, GqlContext} from "./gql-types";
 
 const toString = (value: mixed): string => {
     if (typeof value === "string") {

package/src/util/gql-error.js

@@ -1,7 +1,7 @@
 // @flow
 import {KindError} from "@khanacademy/wonder-stuff-core";
 
-import type {ErrorOptions} from "./types.js";
+import type {ErrorOptions} from "./types";
 
 /**
  * Error kinds for GqlError.

package/src/util/gql-router-context.js

@@ -1,6 +1,6 @@
 // @flow
 import * as React from "react";
-import type {GqlRouterConfiguration} from "./gql-types.js";
+import type {GqlRouterConfiguration} from "./gql-types";
 
 export const GqlRouterContext: React.Context<?GqlRouterConfiguration<any>> =
     React.createContext<?GqlRouterConfiguration<any>>(null);

package/src/util/graphql-document-node-parser.js

@@ -4,8 +4,8 @@ import type {
     DefinitionNode,
     VariableDefinitionNode,
     OperationDefinitionNode,
-} from "./graphql-types.js";
-import {DataError, DataErrors} from "./data-error.js";
+} from "./graphql-types";
+import {DataError, DataErrors} from "./data-error";
 
 export const DocumentTypes = Object.freeze({
     query: "query",

package/src/util/hydration-cache-api.js

@@ -1,7 +1,7 @@
 // @flow
-import {SsrCache} from "./ssr-cache.js";
+import {SsrCache} from "./ssr-cache";
 
-import type {ValidCacheData, CachedResponse, ResponseCache} from "./types.js";
+import type {ValidCacheData, CachedResponse, ResponseCache} from "./types";
 
 /**
  * Initialize the hydration cache.

package/src/util/merge-gql-context.js

@@ -1,5 +1,5 @@
 // @flow
-import type {GqlContext} from "./gql-types.js";
+import type {GqlContext} from "./gql-types";
 
 /**
  * Construct a complete GqlContext from current defaults and a partial context.

package/src/util/purge-caches.js

@@ -1,6 +1,6 @@
 // @flow
-import {SharedCache} from "../hooks/use-shared-cache.js";
-import {purgeHydrationCache} from "./hydration-cache-api.js";
+import {SharedCache} from "../hooks/use-shared-cache";
+import {purgeHydrationCache} from "./hydration-cache-api";
 
 /**
  * Purge all caches managed by Wonder Blocks Data.

package/src/util/request-api.js

@@ -1,10 +1,10 @@
 // @flow
 import {Server} from "@khanacademy/wonder-blocks-core";
-import {RequestTracker} from "./request-tracking.js";
-import {RequestFulfillment} from "./request-fulfillment.js";
-import {DataError, DataErrors} from "./data-error.js";
+import {RequestTracker} from "./request-tracking";
+import {RequestFulfillment} from "./request-fulfillment";
+import {DataError, DataErrors} from "./data-error";
 
-import type {ResponseCache} from "./types.js";
+import type {ResponseCache} from "./types";
 
 const SSRCheck = () => {
     if (Server.isServerSide()) {

package/src/util/request-fulfillment.js

@@ -1,7 +1,7 @@
 // @flow
-import type {Result, ValidCacheData} from "./types.js";
+import type {Result, ValidCacheData} from "./types";
 
-import {DataError, DataErrors} from "./data-error.js";
+import {DataError, DataErrors} from "./data-error";
 
 type RequestCache = {
     [id: string]: Promise<Result<any>>,

package/src/util/request-tracking.js

@@ -1,9 +1,9 @@
 // @flow
 import * as React from "react";
-import {SsrCache} from "./ssr-cache.js";
-import {RequestFulfillment} from "./request-fulfillment.js";
+import {SsrCache} from "./ssr-cache";
+import {RequestFulfillment} from "./request-fulfillment";
 
-import type {ResponseCache, ValidCacheData} from "./types.js";
+import type {ResponseCache, ValidCacheData} from "./types";
 
 type TrackerFn = <TData: ValidCacheData>(
     id: string,

package/src/util/result-from-cache-response.js

@@ -1,7 +1,7 @@
 // @flow
-import {Status} from "./status.js";
-import {DataError, DataErrors} from "./data-error.js";
-import type {ValidCacheData, CachedResponse, Result} from "./types.js";
+import {Status} from "./status";
+import {DataError, DataErrors} from "./data-error";
+import type {ValidCacheData, CachedResponse, Result} from "./types";
 
 /**
  * Turns a cache entry into a stateful result.

package/src/util/scoped-in-memory-cache.js

@@ -1,6 +1,6 @@
 // @flow
-import {DataError, DataErrors} from "./data-error.js";
-import type {ScopedCache, RawScopedCache, ValidCacheData} from "./types.js";
+import {DataError, DataErrors} from "./data-error";
+import type {ScopedCache, RawScopedCache, ValidCacheData} from "./types";
 
 /**
  * Describe an in-memory cache.

package/src/util/serializable-in-memory-cache.js

@@ -1,8 +1,8 @@
 // @flow
 import {clone} from "@khanacademy/wonder-stuff-core";
-import {DataError, DataErrors} from "./data-error.js";
-import {ScopedInMemoryCache} from "./scoped-in-memory-cache.js";
-import type {ValidCacheData, RawScopedCache} from "./types.js";
+import {DataError, DataErrors} from "./data-error";
+import {ScopedInMemoryCache} from "./scoped-in-memory-cache";
+import type {ValidCacheData, RawScopedCache} from "./types";
 
 /**
  * Describe a serializable in-memory cache.

package/src/util/ssr-cache.js

@@ -1,8 +1,8 @@
 // @flow
 import {Server} from "@khanacademy/wonder-blocks-core";
-import {SerializableInMemoryCache} from "./serializable-in-memory-cache.js";
+import {SerializableInMemoryCache} from "./serializable-in-memory-cache";
 
-import type {ValidCacheData, CachedResponse, ResponseCache} from "./types.js";
+import type {ValidCacheData, CachedResponse, ResponseCache} from "./types";
 
 const DefaultScope = "default";
 

package/src/util/status.js

@@ -1,5 +1,5 @@
 // @flow
-import type {Result, ValidCacheData} from "./types.js";
+import type {Result, ValidCacheData} from "./types";
 
 const loadingStatus = Object.freeze({
     status: "loading",

package/src/util/to-gql-operation.js

@@ -1,7 +1,7 @@
 // @flow
-import {graphQLDocumentNodeParser} from "./graphql-document-node-parser.js";
-import type {GqlOperation} from "./gql-types.js";
-import type {DocumentNode} from "./graphql-types.js";
+import {graphQLDocumentNodeParser} from "./graphql-document-node-parser";
+import type {GqlOperation} from "./gql-types";
+import type {DocumentNode} from "./graphql-types";
 
 /**
  * Convert a GraphQL DocumentNode to a base Wonder Blocks Data GqlOperation.

package/src/util/types.js

@@ -4,29 +4,30 @@ import type {Metadata} from "@khanacademy/wonder-stuff-core";
 /**
  * Defines the various fetch policies that can be applied to requests.
  */
-export enum FetchPolicy {
+// TODO(FEI-5000): Convert to TS enum after all codebases have been migrated
+export const FetchPolicy = {
     /**
      * If the data is in the cache, return that; otherwise, fetch from the
      * server.
      */
-    CacheBeforeNetwork,
+    CacheBeforeNetwork: ("CacheBeforeNetwork": "CacheBeforeNetwork"),
 
     /**
      * If the data is in the cache, return that; always fetch from the server
      * regardless of cache.
      */
-    CacheAndNetwork,
+    CacheAndNetwork: ("CacheAndNetwork": "CacheAndNetwork"),
 
     /**
      * If the data is in the cache, return that; otherwise, do nothing.
      */
-    CacheOnly,
+    CacheOnly: ("CacheOnly": "CacheOnly"),
 
     /**
      * Ignore any existing cached result; always fetch from the server.
      */
-    NetworkOnly,
-}
+    NetworkOnly: ("NetworkOnly": "NetworkOnly"),
+};
 
 /**
  * Define what can be cached.