Remove ENABLE_CLIENT_EDGES runtime feature flag

captbaritone · facebook-github-bot · commit cdab89f4e04d · 2024-04-30T19:19:25.000-07:00
Reviewed By: evanyeung

Differential Revision: D56792319

fbshipit-source-id: 1842720a3acade9e67d103c3d3710d21e4a37ba7
diff --git a/packages/react-relay/__tests__/ClientEdges-test.js b/packages/react-relay/__tests__/ClientEdges-test.js
@@ -33,12 +33,10 @@ disallowConsoleErrors();
 
 beforeEach(() => {
   RelayFeatureFlags.ENABLE_RELAY_RESOLVERS = true;
-  RelayFeatureFlags.ENABLE_CLIENT_EDGES = true;
 });
 
 afterEach(() => {
   RelayFeatureFlags.ENABLE_RELAY_RESOLVERS = false;
-  RelayFeatureFlags.ENABLE_CLIENT_EDGES = false;
 });
 
 let networkSink;
diff --git a/packages/react-relay/__tests__/ClientOnlyQueries-test.js b/packages/react-relay/__tests__/ClientOnlyQueries-test.js
@@ -51,12 +51,10 @@ function createEnvironment(
 
 beforeEach(() => {
   RelayFeatureFlags.ENABLE_RELAY_RESOLVERS = true;
-  RelayFeatureFlags.ENABLE_CLIENT_EDGES = true;
 });
 
 afterEach(() => {
   RelayFeatureFlags.ENABLE_RELAY_RESOLVERS = false;
-  RelayFeatureFlags.ENABLE_CLIENT_EDGES = false;
 });
 
 describe('Client-only queries', () => {
diff --git a/packages/react-relay/__tests__/LiveResolvers-test.js b/packages/react-relay/__tests__/LiveResolvers-test.js
@@ -49,13 +49,11 @@ disallowConsoleErrors();
 
 beforeEach(() => {
   RelayFeatureFlags.ENABLE_RELAY_RESOLVERS = true;
-  RelayFeatureFlags.ENABLE_CLIENT_EDGES = true;
   resetStore();
 });
 
 afterEach(() => {
   RelayFeatureFlags.ENABLE_RELAY_RESOLVERS = false;
-  RelayFeatureFlags.ENABLE_CLIENT_EDGES = false;
 });
 
 test('Can read an external state resolver directly', () => {
diff --git a/packages/react-relay/__tests__/QueryResource-ClientEdges-test.js b/packages/react-relay/__tests__/QueryResource-ClientEdges-test.js
@@ -35,12 +35,10 @@ disallowConsoleErrors();
 
 beforeEach(() => {
   RelayFeatureFlags.ENABLE_RELAY_RESOLVERS = true;
-  RelayFeatureFlags.ENABLE_CLIENT_EDGES = true;
 });
 
 afterEach(() => {
   RelayFeatureFlags.ENABLE_RELAY_RESOLVERS = false;
-  RelayFeatureFlags.ENABLE_CLIENT_EDGES = false;
 });
 
 const FRAGMENT_1 = graphql`
diff --git a/packages/react-relay/__tests__/RelayResolverInterface-test.js b/packages/react-relay/__tests__/RelayResolverInterface-test.js
@@ -34,12 +34,10 @@ disallowConsoleErrors();
 
 beforeEach(() => {
   RelayFeatureFlags.ENABLE_RELAY_RESOLVERS = true;
-  RelayFeatureFlags.ENABLE_CLIENT_EDGES = true;
 });
 
 afterEach(() => {
   RelayFeatureFlags.ENABLE_RELAY_RESOLVERS = false;
-  RelayFeatureFlags.ENABLE_CLIENT_EDGES = false;
 });
 
 function EnvironmentWrapper({
diff --git a/packages/react-relay/__tests__/RelayResolverModel-test.js b/packages/react-relay/__tests__/RelayResolverModel-test.js
@@ -60,14 +60,12 @@ function logFn(event: LogEvent): void {
 
 beforeEach(() => {
   RelayFeatureFlags.ENABLE_RELAY_RESOLVERS = true;
-  RelayFeatureFlags.ENABLE_CLIENT_EDGES = true;
   logEvents = [];
   resetStore(logFn);
 });
 
 afterEach(() => {
   RelayFeatureFlags.ENABLE_RELAY_RESOLVERS = false;
-  RelayFeatureFlags.ENABLE_CLIENT_EDGES = false;
 });
 
 function EnvironmentWrapper({
diff --git a/packages/react-relay/__tests__/RelayResolverNullableModelClientEdge-test.js b/packages/react-relay/__tests__/RelayResolverNullableModelClientEdge-test.js
@@ -180,12 +180,10 @@ export function edge_to_plural_models_some_throw(): $ReadOnlyArray<{
 
 beforeEach(() => {
   RelayFeatureFlags.ENABLE_RELAY_RESOLVERS = true;
-  RelayFeatureFlags.ENABLE_CLIENT_EDGES = true;
 });
 
 afterEach(() => {
   RelayFeatureFlags.ENABLE_RELAY_RESOLVERS = false;
-  RelayFeatureFlags.ENABLE_CLIENT_EDGES = false;
 });
 
 const logEvents: Array<LogEvent> = [];
diff --git a/packages/react-relay/__tests__/RelayResolvers-withOutputType-test.js b/packages/react-relay/__tests__/RelayResolvers-withOutputType-test.js
@@ -49,14 +49,12 @@ function logFn(event: LogEvent): void {
 
 beforeEach(() => {
   RelayFeatureFlags.ENABLE_RELAY_RESOLVERS = true;
-  RelayFeatureFlags.ENABLE_CLIENT_EDGES = true;
   logEvents = [];
   resetStore(logFn);
 });
 
 afterEach(() => {
   RelayFeatureFlags.ENABLE_RELAY_RESOLVERS = false;
-  RelayFeatureFlags.ENABLE_CLIENT_EDGES = false;
 });
 
 function createEnvironment() {
diff --git a/packages/react-relay/relay-hooks/__tests__/FragmentResource-ClientEdges-test.js b/packages/react-relay/relay-hooks/__tests__/FragmentResource-ClientEdges-test.js
@@ -30,12 +30,10 @@ disallowConsoleErrors();
 
 beforeEach(() => {
   RelayFeatureFlags.ENABLE_RELAY_RESOLVERS = true;
-  RelayFeatureFlags.ENABLE_CLIENT_EDGES = true;
 });
 
 afterEach(() => {
   RelayFeatureFlags.ENABLE_RELAY_RESOLVERS = false;
-  RelayFeatureFlags.ENABLE_CLIENT_EDGES = false;
 });
 
 const BASIC_QUERY = graphql`
diff --git a/packages/react-relay/relay-hooks/legacy/FragmentResource.js b/packages/react-relay/relay-hooks/legacy/FragmentResource.js
@@ -206,11 +206,9 @@ class FragmentResourceImpl {
   constructor(environment: IEnvironment) {
     this._environment = environment;
     this._cache = LRUCache.create(CACHE_CAPACITY);
-    if (RelayFeatureFlags.ENABLE_CLIENT_EDGES) {
-      this._clientEdgeQueryResultsCache = new ClientEdgeQueryResultsCache(
-        environment,
-      );
-    }
+    this._clientEdgeQueryResultsCache = new ClientEdgeQueryResultsCache(
+      environment,
+    );
   }
 
   /**
@@ -397,7 +395,6 @@ class FragmentResourceImpl {
     // First, initiate a query for any client edges that were missing data:
     let clientEdgeRequests: ?Array<RequestDescriptor> = null;
     if (
-      RelayFeatureFlags.ENABLE_CLIENT_EDGES &&
       fragmentNode.metadata?.hasClientEdges === true &&
       hasMissingClientEdges(snapshot)
     ) {
@@ -432,7 +429,7 @@ class FragmentResourceImpl {
       );
     }
     let clientEdgePromises: Array<Promise<void>> = [];
-    if (RelayFeatureFlags.ENABLE_CLIENT_EDGES && clientEdgeRequests) {
+    if (clientEdgeRequests) {
       clientEdgePromises = clientEdgeRequests
         .map(request => getPromiseForActiveRequest(this._environment, request))
         .filter(Boolean);
@@ -672,15 +669,13 @@ class FragmentResourceImpl {
       );
     }
 
-    if (RelayFeatureFlags.ENABLE_CLIENT_EDGES) {
-      const clientEdgeQueryResults =
-        this._clientEdgeQueryResultsCache?.get(cacheKey) ?? undefined;
-      if (clientEdgeQueryResults?.length) {
-        const queryResource = getQueryResourceForEnvironment(this._environment);
-        clientEdgeQueryResults.forEach(queryResult => {
-          disposables.push(queryResource.retain(queryResult));
-        });
-      }
+    const clientEdgeQueryResults =
+      this._clientEdgeQueryResultsCache?.get(cacheKey) ?? undefined;
+    if (clientEdgeQueryResults?.length) {
+      const queryResource = getQueryResourceForEnvironment(this._environment);
+      clientEdgeQueryResults.forEach(queryResult => {
+        disposables.push(queryResource.retain(queryResult));
+      });
     }
 
     return {
diff --git a/packages/relay-runtime/store/RelayReader.js b/packages/relay-runtime/store/RelayReader.js
@@ -136,11 +136,9 @@ class RelayReader {
     selector: SingularReaderSelector,
     resolverCache: ResolverCache,
   ) {
-    this._clientEdgeTraversalPath =
-      RelayFeatureFlags.ENABLE_CLIENT_EDGES &&
-      selector.clientEdgeTraversalPath?.length
-        ? [...selector.clientEdgeTraversalPath]
-        : [];
+    this._clientEdgeTraversalPath = selector.clientEdgeTraversalPath?.length
+      ? [...selector.clientEdgeTraversalPath]
+      : [];
     this._missingClientEdges = [];
     this._missingLiveResolverFields = [];
     this._isMissingData = false;
@@ -223,10 +221,9 @@ class RelayReader {
     return {
       data,
       isMissingData: this._isMissingData && isDataExpectedToBePresent,
-      missingClientEdges:
-        RelayFeatureFlags.ENABLE_CLIENT_EDGES && this._missingClientEdges.length
-          ? this._missingClientEdges
-          : null,
+      missingClientEdges: this._missingClientEdges.length
+        ? this._missingClientEdges
+        : null,
       missingLiveResolverFields: this._missingLiveResolverFields,
       seenRecords: this._seenRecords,
       selector: this._selector,
@@ -262,10 +259,7 @@ class RelayReader {
 
   _markDataAsMissing(): void {
     this._isMissingData = true;
-    if (
-      RelayFeatureFlags.ENABLE_CLIENT_EDGES &&
-      this._clientEdgeTraversalPath.length
-    ) {
+    if (this._clientEdgeTraversalPath.length) {
       const top =
         this._clientEdgeTraversalPath[this._clientEdgeTraversalPath.length - 1];
       // Top can be null if we've traversed past a client edge into an ordinary
@@ -557,9 +551,7 @@ class RelayReader {
         case CLIENT_EXTENSION: {
           const isMissingData = this._isMissingData;
           const alreadyMissingClientEdges = this._missingClientEdges.length;
-          if (RelayFeatureFlags.ENABLE_CLIENT_EDGES) {
-            this._clientEdgeTraversalPath.push(null);
-          }
+          this._clientEdgeTraversalPath.push(null);
           const hasExpectedData = this._traverseSelections(
             selection.selections,
             record,
@@ -572,9 +564,7 @@ class RelayReader {
             isMissingData ||
             this._missingClientEdges.length > alreadyMissingClientEdges ||
             this._missingLiveResolverFields.length > 0;
-          if (RelayFeatureFlags.ENABLE_CLIENT_EDGES) {
-            this._clientEdgeTraversalPath.pop();
-          }
+          this._clientEdgeTraversalPath.pop();
           if (!hasExpectedData) {
             return false;
           }
@@ -596,11 +586,7 @@ class RelayReader {
           break;
         case CLIENT_EDGE_TO_CLIENT_OBJECT:
         case CLIENT_EDGE_TO_SERVER_OBJECT:
-          if (RelayFeatureFlags.ENABLE_CLIENT_EDGES) {
-            this._readClientEdge(selection, record, data);
-          } else {
-            throw new Error('Client edges are not yet supported.');
-          }
+          this._readClientEdge(selection, record, data);
           break;
         default:
           (selection: empty);
@@ -1317,15 +1303,13 @@ class RelayReader {
     );
     data[FRAGMENT_OWNER_KEY] = this._owner;
 
-    if (RelayFeatureFlags.ENABLE_CLIENT_EDGES) {
-      if (
-        this._clientEdgeTraversalPath.length > 0 &&
-        this._clientEdgeTraversalPath[
-          this._clientEdgeTraversalPath.length - 1
-        ] !== null
-      ) {
-        data[CLIENT_EDGE_TRAVERSAL_PATH] = [...this._clientEdgeTraversalPath];
-      }
+    if (
+      this._clientEdgeTraversalPath.length > 0 &&
+      this._clientEdgeTraversalPath[
+        this._clientEdgeTraversalPath.length - 1
+      ] !== null
+    ) {
+      data[CLIENT_EDGE_TRAVERSAL_PATH] = [...this._clientEdgeTraversalPath];
     }
   }
 
diff --git a/packages/relay-runtime/store/__tests__/ClientEdgeToClientObject-test.js b/packages/relay-runtime/store/__tests__/ClientEdgeToClientObject-test.js
@@ -32,12 +32,10 @@ disallowWarnings();
 
 beforeEach(() => {
   RelayFeatureFlags.ENABLE_RELAY_RESOLVERS = true;
-  RelayFeatureFlags.ENABLE_CLIENT_EDGES = true;
 });
 
 afterEach(() => {
   RelayFeatureFlags.ENABLE_RELAY_RESOLVERS = false;
-  RelayFeatureFlags.ENABLE_CLIENT_EDGES = false;
 });
 
 test('Can read a deep portion of the schema that is backed by client edges to client objects.', () => {
diff --git a/packages/relay-runtime/store/__tests__/RelayReader-ClientEdges-test.js b/packages/relay-runtime/store/__tests__/RelayReader-ClientEdges-test.js
@@ -33,12 +33,10 @@ disallowWarnings();
 
 beforeEach(() => {
   RelayFeatureFlags.ENABLE_RELAY_RESOLVERS = true;
-  RelayFeatureFlags.ENABLE_CLIENT_EDGES = true;
 });
 
 afterEach(() => {
   RelayFeatureFlags.ENABLE_RELAY_RESOLVERS = false;
-  RelayFeatureFlags.ENABLE_CLIENT_EDGES = false;
 });
 
 const BASIC_QUERY = graphql`
diff --git a/packages/relay-runtime/store/__tests__/RelayReferenceMarker-test.js b/packages/relay-runtime/store/__tests__/RelayReferenceMarker-test.js
@@ -26,12 +26,10 @@ import {ROOT_ID} from '../RelayStoreUtils';
 
 beforeEach(() => {
   RelayFeatureFlags.ENABLE_RELAY_RESOLVERS = true;
-  RelayFeatureFlags.ENABLE_CLIENT_EDGES = true;
 });
 
 afterEach(() => {
   RelayFeatureFlags.ENABLE_RELAY_RESOLVERS = false;
-  RelayFeatureFlags.ENABLE_CLIENT_EDGES = false;
 });
 
 describe('RelayReferenceMarker', () => {
diff --git a/packages/relay-runtime/store/__tests__/resolvers/LiveResolvers-test.js b/packages/relay-runtime/store/__tests__/resolvers/LiveResolvers-test.js
@@ -38,13 +38,11 @@ disallowConsoleErrors();
 
 beforeEach(() => {
   RelayFeatureFlags.ENABLE_RELAY_RESOLVERS = true;
-  RelayFeatureFlags.ENABLE_CLIENT_EDGES = true;
   resetStore();
 });
 
 afterEach(() => {
   RelayFeatureFlags.ENABLE_RELAY_RESOLVERS = false;
-  RelayFeatureFlags.ENABLE_CLIENT_EDGES = false;
 });
 
 test('unsubscribe happens when record is updated due to missing data', () => {
diff --git a/packages/relay-runtime/store/__tests__/resolvers/ResolverGC-test.js b/packages/relay-runtime/store/__tests__/resolvers/ResolverGC-test.js
@@ -51,13 +51,11 @@ disallowConsoleErrors();
 
 beforeEach(() => {
   RelayFeatureFlags.ENABLE_RELAY_RESOLVERS = true;
-  RelayFeatureFlags.ENABLE_CLIENT_EDGES = true;
   resetStore();
 });
 
 afterEach(() => {
   RelayFeatureFlags.ENABLE_RELAY_RESOLVERS = false;
-  RelayFeatureFlags.ENABLE_CLIENT_EDGES = false;
 });
 
 test('Live Resolver without fragment', async () => {
diff --git a/packages/relay-runtime/util/RelayFeatureFlags.js b/packages/relay-runtime/util/RelayFeatureFlags.js
@@ -14,7 +14,6 @@
 import type {Disposable} from '../util/RelayRuntimeTypes';
 
 export type FeatureFlags = {
-  ENABLE_CLIENT_EDGES: boolean,
   ENABLE_VARIABLE_CONNECTION_KEY: boolean,
   ENABLE_RELAY_RESOLVERS: boolean,
   ENABLE_GETFRAGMENTIDENTIFIER_OPTIMIZATION: boolean,
@@ -54,7 +53,6 @@ export type FeatureFlags = {
 };
 
 const RelayFeatureFlags: FeatureFlags = {
-  ENABLE_CLIENT_EDGES: false,
   ENABLE_VARIABLE_CONNECTION_KEY: false,
   ENABLE_RELAY_RESOLVERS: false,
   ENABLE_GETFRAGMENTIDENTIFIER_OPTIMIZATION: false,
