Remove ENABLE_RELAY_RESOLVERS runtime feature flag

Reviewed By: monicatang Differential Revision: D63650435 fbshipit-source-id: 86db67848b54053f679d366e8246f8701d96624d
facebook · Oct 1, 2024 · 7b8f1f6 · 7b8f1f6
1 parent f0761b2
commit 7b8f1f6
Show file tree

Hide file tree

Showing 27 changed files with 5 additions and 373 deletions.
diff --git a/packages/react-relay/__tests__/Catch-test.js b/packages/react-relay/__tests__/Catch-test.js
@@ -14,7 +14,6 @@
 const React = require('react');
 const {RelayEnvironmentProvider, useLazyLoadQuery} = require('react-relay');
 const TestRenderer = require('react-test-renderer');
-const {RelayFeatureFlags} = require('relay-runtime');
 const {graphql} = require('relay-runtime');
 const RelayModernStore = require('relay-runtime/store/RelayModernStore');
 const RelayRecordSource = require('relay-runtime/store/RelayRecordSource');
@@ -27,14 +26,6 @@ const {
 disallowWarnings();
 disallowConsoleErrors();
 
-beforeEach(() => {
-  RelayFeatureFlags.ENABLE_RELAY_RESOLVERS = true;
-});
-
-afterEach(() => {
-  RelayFeatureFlags.ENABLE_RELAY_RESOLVERS = false;
-});
-
 it('should catch a server field error', () => {
   const environment = createMockEnvironment();
   function TestComponent() {

diff --git a/packages/react-relay/__tests__/ClientEdges-test.js b/packages/react-relay/__tests__/ClientEdges-test.js
@@ -14,13 +14,7 @@
 const React = require('react');
 const {RelayEnvironmentProvider, useLazyLoadQuery} = require('react-relay');
 const TestRenderer = require('react-test-renderer');
-const {
-  Environment,
-  Network,
-  RecordSource,
-  RelayFeatureFlags,
-  graphql,
-} = require('relay-runtime');
+const {Environment, Network, RecordSource, graphql} = require('relay-runtime');
 const RelayObservable = require('relay-runtime/network/RelayObservable');
 const RelayModernStore = require('relay-runtime/store/RelayModernStore');
 const {
@@ -31,14 +25,6 @@ const {
 disallowWarnings();
 disallowConsoleErrors();
 
-beforeEach(() => {
-  RelayFeatureFlags.ENABLE_RELAY_RESOLVERS = true;
-});
-
-afterEach(() => {
-  RelayFeatureFlags.ENABLE_RELAY_RESOLVERS = false;
-});
-
 let networkSink;
 let environment;
 let fetchFn;

diff --git a/packages/react-relay/__tests__/ClientOnlyQueries-test.js b/packages/react-relay/__tests__/ClientOnlyQueries-test.js
@@ -25,7 +25,6 @@ const {
   Environment,
   Network,
   RecordSource,
-  RelayFeatureFlags,
   Store,
   commitLocalUpdate,
   createOperationDescriptor,
@@ -49,14 +48,6 @@ function createEnvironment(
   });
 }
 
-beforeEach(() => {
-  RelayFeatureFlags.ENABLE_RELAY_RESOLVERS = true;
-});
-
-afterEach(() => {
-  RelayFeatureFlags.ENABLE_RELAY_RESOLVERS = false;
-});
-
 describe('Client-only queries', () => {
   let renderer;
   let environment: IEnvironment;

diff --git a/packages/react-relay/__tests__/LiveResolvers-test.js b/packages/react-relay/__tests__/LiveResolvers-test.js
@@ -49,14 +49,9 @@ disallowWarnings();
 disallowConsoleErrors();
 
 beforeEach(() => {
-  RelayFeatureFlags.ENABLE_RELAY_RESOLVERS = true;
   resetStore();
 });
 
-afterEach(() => {
-  RelayFeatureFlags.ENABLE_RELAY_RESOLVERS = false;
-});
-
 test('Can read an external state resolver directly', () => {
   const source = RelayRecordSource.create({
     'client:root': {

diff --git a/packages/react-relay/__tests__/QueryResource-ClientEdges-test.js b/packages/react-relay/__tests__/QueryResource-ClientEdges-test.js
@@ -18,7 +18,6 @@ const {
 } = require('react-relay/relay-hooks/QueryResource');
 const {
   __internal: {fetchQuery},
-  RelayFeatureFlags,
   getFragment,
 } = require('relay-runtime');
 const {graphql} = require('relay-runtime/query/GraphQLTag');
@@ -33,14 +32,6 @@ const {
 disallowWarnings();
 disallowConsoleErrors();
 
-beforeEach(() => {
-  RelayFeatureFlags.ENABLE_RELAY_RESOLVERS = true;
-});
-
-afterEach(() => {
-  RelayFeatureFlags.ENABLE_RELAY_RESOLVERS = false;
-});
-
 const FRAGMENT_1 = graphql`
   fragment QueryResourceClientEdgesTestUser1Fragment on User {
     actorCount

diff --git a/packages/react-relay/__tests__/RelayClient3DModule-test.js b/packages/react-relay/__tests__/RelayClient3DModule-test.js
@@ -22,7 +22,6 @@ import {
 } from 'react-relay';
 import TestRenderer from 'react-test-renderer';
 import {
-  RelayFeatureFlags,
   ROOT_ID,
   createOperationDescriptor,
   createReaderSelector,
@@ -110,15 +109,10 @@ function logFn(event: LogEvent): void {
 }
 
 beforeEach(() => {
-  RelayFeatureFlags.ENABLE_RELAY_RESOLVERS = true;
   logEvents = [];
   resetStore(logFn);
 });
 
-afterEach(() => {
-  RelayFeatureFlags.ENABLE_RELAY_RESOLVERS = false;
-});
-
 describe('ClientUser', () => {
   let store;
   let environment;

diff --git a/packages/react-relay/__tests__/RelayResolverInterface-test.js b/packages/react-relay/__tests__/RelayResolverInterface-test.js
@@ -32,14 +32,6 @@ const {
 disallowWarnings();
 disallowConsoleErrors();
 
-beforeEach(() => {
-  RelayFeatureFlags.ENABLE_RELAY_RESOLVERS = true;
-});
-
-afterEach(() => {
-  RelayFeatureFlags.ENABLE_RELAY_RESOLVERS = false;
-});
-
 function EnvironmentWrapper({
   children,
   environment,

diff --git a/packages/react-relay/__tests__/RelayResolverModel-test.js b/packages/react-relay/__tests__/RelayResolverModel-test.js
@@ -59,15 +59,10 @@ function logFn(event: LogEvent): void {
 }
 
 beforeEach(() => {
-  RelayFeatureFlags.ENABLE_RELAY_RESOLVERS = true;
   logEvents = [];
   resetStore(logFn);
 });
 
-afterEach(() => {
-  RelayFeatureFlags.ENABLE_RELAY_RESOLVERS = false;
-});
-
 function EnvironmentWrapper({
   children,
   environment,

diff --git a/packages/react-relay/__tests__/RelayResolverNullableModelClientEdge-test.js b/packages/react-relay/__tests__/RelayResolverNullableModelClientEdge-test.js
@@ -178,14 +178,6 @@ export function edge_to_plural_models_some_throw(): $ReadOnlyArray<{
   return [{id: ERROR_ID}, {id: 'a valid id!'}];
 }
 
-beforeEach(() => {
-  RelayFeatureFlags.ENABLE_RELAY_RESOLVERS = true;
-});
-
-afterEach(() => {
-  RelayFeatureFlags.ENABLE_RELAY_RESOLVERS = false;
-});
-
 const logEvents: Array<LogEvent> = [];
 function logFn(event: LogEvent): void {
   logEvents.push(event);

diff --git a/packages/react-relay/__tests__/RelayResolvers-withOutputType-test.js b/packages/react-relay/__tests__/RelayResolvers-withOutputType-test.js
@@ -48,15 +48,10 @@ function logFn(event: LogEvent): void {
 }
 
 beforeEach(() => {
-  RelayFeatureFlags.ENABLE_RELAY_RESOLVERS = true;
   logEvents = [];
   resetStore(logFn);
 });
 
-afterEach(() => {
-  RelayFeatureFlags.ENABLE_RELAY_RESOLVERS = false;
-});
-
 function createEnvironment() {
   return new RelayModernEnvironment({
     network: RelayNetwork.create(jest.fn()),

diff --git a/packages/react-relay/relay-hooks/__tests__/FragmentResource-ClientEdges-test.js b/packages/react-relay/relay-hooks/__tests__/FragmentResource-ClientEdges-test.js
@@ -14,7 +14,7 @@
 const {
   getFragmentResourceForEnvironment,
 } = require('react-relay/relay-hooks/legacy/FragmentResource');
-const {RelayFeatureFlags, getFragment} = require('relay-runtime');
+const {getFragment} = require('relay-runtime');
 const {graphql} = require('relay-runtime/query/GraphQLTag');
 const {
   createOperationDescriptor,
@@ -28,14 +28,6 @@ const {
 disallowWarnings();
 disallowConsoleErrors();
 
-beforeEach(() => {
-  RelayFeatureFlags.ENABLE_RELAY_RESOLVERS = true;
-});
-
-afterEach(() => {
-  RelayFeatureFlags.ENABLE_RELAY_RESOLVERS = false;
-});
-
 const BASIC_QUERY = graphql`
   query FragmentResourceClientEdgesTest1Query($id: ID!) {
     node(id: $id) {

diff --git a/packages/react-relay/relay-hooks/__tests__/FragmentResource-Resolver-test.js b/packages/react-relay/relay-hooks/__tests__/FragmentResource-Resolver-test.js
@@ -16,7 +16,7 @@ import type {RelayFieldLoggerEvent} from 'relay-runtime/store/RelayStoreTypes';
 const {
   getFragmentResourceForEnvironment,
 } = require('react-relay/relay-hooks/legacy/FragmentResource');
-const {RelayFeatureFlags, getFragment} = require('relay-runtime');
+const {getFragment} = require('relay-runtime');
 const {graphql} = require('relay-runtime/query/GraphQLTag');
 const {
   createOperationDescriptor,
@@ -30,14 +30,6 @@ const {
 disallowConsoleErrors();
 disallowWarnings();
 
-beforeEach(() => {
-  RelayFeatureFlags.ENABLE_RELAY_RESOLVERS = true;
-});
-
-afterEach(() => {
-  RelayFeatureFlags.ENABLE_RELAY_RESOLVERS = false;
-});
-
 const BASIC_QUERY = graphql`
   query FragmentResourceResolverTest1Query($id: ID!) {
     node(id: $id) {

diff --git a/packages/react-relay/relay-hooks/__tests__/useFragment_nullability-test.js b/packages/react-relay/relay-hooks/__tests__/useFragment_nullability-test.js
@@ -18,7 +18,6 @@ const useClientQuery = require('../useClientQuery');
 const React = require('react');
 const TestRenderer = require('react-test-renderer');
 const {graphql} = require('relay-runtime');
-const {RelayFeatureFlags} = require('relay-runtime');
 const {readFragment} = require('relay-runtime/store/ResolverFragments');
 const {createMockEnvironment} = require('relay-test-utils');
 
@@ -50,14 +49,9 @@ export function field_with_fragment_that_throws(
 
 describe('useFragment_nullability-test.js', () => {
   beforeEach(() => {
-    RelayFeatureFlags.ENABLE_RELAY_RESOLVERS = true;
     jest.spyOn(console, 'error').mockImplementation(() => {});
   });
 
-  afterEach(() => {
-    RelayFeatureFlags.ENABLE_RELAY_RESOLVERS = false;
-  });
-
   it('should throw when a resolver in throwOnFieldError-fragment throws', async () => {
     const environment = createMockEnvironment();
 

diff --git a/packages/relay-runtime/store/RelayReader.js b/packages/relay-runtime/store/RelayReader.js
@@ -480,9 +480,6 @@ class RelayReader {
         }
         case 'RelayLiveResolver':
         case 'RelayResolver': {
-          if (!RelayFeatureFlags.ENABLE_RELAY_RESOLVERS) {
-            throw new Error('Relay Resolver fields are not yet supported.');
-          }
           this._readResolverField(selection, record, data);
           break;
         }
@@ -580,20 +577,11 @@ class RelayReader {
           return this._readLink(selection.field, record, data);
         }
       case 'RelayResolver':
-        if (!RelayFeatureFlags.ENABLE_RELAY_RESOLVERS) {
-          throw new Error('Relay Resolver fields are not yet supported.');
-        }
         return this._readResolverField(selection.field, record, data);
       case 'RelayLiveResolver':
-        if (!RelayFeatureFlags.ENABLE_RELAY_RESOLVERS) {
-          throw new Error('Relay Resolver fields are not yet supported.');
-        }
         return this._readResolverField(selection.field, record, data);
       case 'ClientEdgeToClientObject':
       case 'ClientEdgeToServerObject':
-        if (!RelayFeatureFlags.ENABLE_RELAY_RESOLVERS) {
-          throw new Error('Relay Resolver fields are not yet supported.');
-        }
         return this._readClientEdge(selection.field, record, data);
       default:
         (selection.field.kind: empty);

diff --git a/packages/relay-runtime/store/__tests__/ClientEdgeToClientObject-test.js b/packages/relay-runtime/store/__tests__/ClientEdgeToClientObject-test.js
@@ -30,14 +30,6 @@ const {
 disallowConsoleErrors();
 disallowWarnings();
 
-beforeEach(() => {
-  RelayFeatureFlags.ENABLE_RELAY_RESOLVERS = true;
-});
-
-afterEach(() => {
-  RelayFeatureFlags.ENABLE_RELAY_RESOLVERS = false;
-});
-
 describe.each([true, false])(
   'AVOID_CYCLES_IN_RESOLVER_NOTIFICATION is %p',
   avoidCycles => {

diff --git a/packages/relay-runtime/store/__tests__/RelayReader-ClientEdges-test.js b/packages/relay-runtime/store/__tests__/RelayReader-ClientEdges-test.js
@@ -31,14 +31,6 @@ const {
 disallowConsoleErrors();
 disallowWarnings();
 
-beforeEach(() => {
-  RelayFeatureFlags.ENABLE_RELAY_RESOLVERS = true;
-});
-
-afterEach(() => {
-  RelayFeatureFlags.ENABLE_RELAY_RESOLVERS = false;
-});
-
 const BASIC_QUERY = graphql`
   query RelayReaderClientEdgesTest1Query {
     me {

diff --git a/packages/relay-runtime/store/__tests__/RelayReader-RelayErrorHandling-test.js b/packages/relay-runtime/store/__tests__/RelayReader-RelayErrorHandling-test.js
@@ -11,20 +11,12 @@
 'use strict';
 
 const {graphql} = require('../../query/GraphQLTag');
-const RelayFeatureFlags = require('../../util/RelayFeatureFlags');
 const {
   createOperationDescriptor,
 } = require('../RelayModernOperationDescriptor');
 const {read} = require('../RelayReader');
 const RelayRecordSource = require('../RelayRecordSource');
 
-beforeEach(() => {
-  RelayFeatureFlags.ENABLE_RELAY_RESOLVERS = true;
-});
-afterEach(() => {
-  RelayFeatureFlags.ENABLE_RELAY_RESOLVERS = false;
-});
-
 describe('RelayReader error fields', () => {
   it('adds the errors to errorResponseFields', () => {
     const source = RelayRecordSource.create({

diff --git a/packages/relay-runtime/store/__tests__/RelayReader-RequiredFields-test.js b/packages/relay-runtime/store/__tests__/RelayReader-RequiredFields-test.js
@@ -871,13 +871,6 @@ describe('RelayReader @required', () => {
   });
 
   describe('client edge with @required', () => {
-    beforeEach(() => {
-      RelayFeatureFlags.ENABLE_RELAY_RESOLVERS = true;
-    });
-    afterEach(() => {
-      RelayFeatureFlags.ENABLE_RELAY_RESOLVERS = false;
-    });
-
     describe('when CATCH is enabled', () => {
       test('caught missing required field error when action:THROW under a @catch', () => {
         const source = RelayRecordSource.create({