From 9ea38ba16ce74f125367446a1697c67b90e8ca42 Mon Sep 17 00:00:00 2001
From: Stephen Pittman <stephen@gomerits.com>
Date: Fri, 27 Mar 2020 08:53:41 -0700
Subject: [PATCH] Fix broken export of MockEnvironment type (#43300)

* Fix broken export of MockEnvironment type

* Update index.d.ts

Co-authored-by: Daniel Rosenwasser <DanielRosenwasser@users.noreply.github.com>
---
 types/relay-test-utils/index.d.ts                      |  6 ++----
 .../lib/RelayModernMockEnvironment.d.ts                | 10 ++++------
 types/relay-test-utils/relay-test-utils-tests.tsx      |  6 ++++--
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/types/relay-test-utils/index.d.ts b/types/relay-test-utils/index.d.ts
index a37897db40..a8810319eb 100644
--- a/types/relay-test-utils/index.d.ts
+++ b/types/relay-test-utils/index.d.ts
@@ -1,13 +1,11 @@
 // Type definitions for relay-test-utils 6.0
 // Project: https://relay.dev
 // Definitions by: Renan Machado <https://github.com/renanmav>
+//                 Stephen Pittman <https://github.com/Stephen2>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 3.3
 
-import * as MockEnvironment from './lib/RelayModernMockEnvironment';
-export { MockEnvironment };
-
-export { createMockEnvironment } from './lib/RelayModernMockEnvironment';
+export * from './lib/RelayModernMockEnvironment';
 
 import * as MockPayloadGenerator from './lib/RelayMockPayloadGenerator';
 export { MockPayloadGenerator };
diff --git a/types/relay-test-utils/lib/RelayModernMockEnvironment.d.ts b/types/relay-test-utils/lib/RelayModernMockEnvironment.d.ts
index aaee9b40e6..72e3290776 100644
--- a/types/relay-test-utils/lib/RelayModernMockEnvironment.d.ts
+++ b/types/relay-test-utils/lib/RelayModernMockEnvironment.d.ts
@@ -14,9 +14,9 @@ import {
     MissingFieldHandler,
 } from 'relay-runtime';
 
-type OperationMockResolver = (operation: OperationDescriptor) => GraphQLResponse | Error | null;
+export type OperationMockResolver = (operation: OperationDescriptor) => GraphQLResponse | Error | null;
 
-interface MockFunctions {
+export interface MockFunctions {
     clearCache: () => void;
     cachePayload: (
         request: ConcreteRequest | OperationDescriptor,
@@ -42,12 +42,12 @@ interface MockFunctions {
     queueOperationResolver: (resolver: OperationMockResolver) => void;
 }
 
-interface MockEnvironment {
+export interface MockEnvironment {
     mock: MockFunctions;
     mockClear: () => void;
 }
 
-interface RelayMockEnvironment extends MockEnvironment, IEnvironment {
+export interface RelayMockEnvironment extends MockEnvironment, IEnvironment {
     configName: string | null | undefined;
     revertUpdate(update: OptimisticUpdate): void;
     replaceUpdate(update: OptimisticUpdate, newUpdate: OptimisticUpdate): void;
@@ -95,5 +95,3 @@ export function createMockEnvironment(config?: {
     operationTracker?: OperationTracker;
     operationLoader?: OperationLoader;
 }): RelayMockEnvironment;
-
-export {};
diff --git a/types/relay-test-utils/relay-test-utils-tests.tsx b/types/relay-test-utils/relay-test-utils-tests.tsx
index 2d448e2540..3a61a71b57 100644
--- a/types/relay-test-utils/relay-test-utils-tests.tsx
+++ b/types/relay-test-utils/relay-test-utils-tests.tsx
@@ -1,8 +1,8 @@
 import React from 'react';
-import { MockEnvironment, MockPayloadGenerator, unwrapContainer } from 'relay-test-utils';
+import { MockEnvironment, MockPayloadGenerator, createMockEnvironment, unwrapContainer } from 'relay-test-utils';
 import { createFragmentContainer, graphql, QueryRenderer } from 'react-relay';
 
-const environment = MockEnvironment.createMockEnvironment();
+const environment = createMockEnvironment();
 
 environment.mock.resolveMostRecentOperation(operation => {
     MockPayloadGenerator.generate(operation);
@@ -34,3 +34,5 @@ function TestQueryRenderer() {
         />
     );
 }
+
+const mockEnvironment: MockEnvironment = createMockEnvironment();