Make @apollo/client/testing a fully-fledged, independent entry point.

#8687 (comment)

Until now, the `@apollo/client/testing` entry point has merely
re-exported the contents of `@apollo/client/utilities/testing`, even
though the latter is not an official entry point, leading to "Risky
cross-entry-point nested import..." warnings during build.

This commit moves the contents of `@apollo/client/utilities/testing` to
reside within `@apollo/client/testing`, which should be safe
because `@apollo/client/testing` was the only safe way to access these
modules previously.

config/entryPoints.js

@@ -22,9 +22,9 @@ const entryPoints = [
   { dirs: ['react', 'hooks'] },
   { dirs: ['react', 'parser'] },
   { dirs: ['react', 'ssr'] },
+  { dirs: ['testing'], extensions: [".js", ".jsx"] },
   { dirs: ['utilities'] },
   { dirs: ['utilities', 'globals'], sideEffects: true },
-  { dirs: ['testing'], extensions: [".js", ".jsx"] },
 ];
 
 const lookupTrie = Object.create(null);

src/__tests__/local-state/resolvers.ts

@@ -15,8 +15,8 @@ import { InMemoryCache } from '../../cache';
 import { Observable, Observer } from '../../utilities';
 import { ApolloLink } from '../../link/core';
 import { itAsync } from '../../testing';
-import mockQueryManager from '../../utilities/testing/mocking/mockQueryManager';
-import wrap from '../../utilities/testing/wrap';
+import mockQueryManager from '../../testing/mocking/mockQueryManager';
+import wrap from '../../testing/wrap';
 
 // Helper method that sets up a mockQueryManager and then passes on the
 // results to an observer.

src/__tests__/refetchQueries.ts

@@ -1,6 +1,6 @@
 import { Subscription } from "zen-observable-ts";
 
-import { itAsync } from '../utilities/testing/itAsync';
+import { itAsync } from '../testing/itAsync';
 import {
   ApolloClient,
   ApolloLink,

src/cache/inmemory/__tests__/policies.ts

@@ -5,9 +5,9 @@ import { ReactiveVar, makeVar } from "../reactiveVars";
 import { Reference, StoreObject, ApolloClient, NetworkStatus, TypedDocumentNode, DocumentNode } from "../../../core";
 import { MissingFieldError } from "../..";
 import { relayStylePagination } from "../../../utilities";
-import { MockLink } from '../../../utilities/testing/mocking/mockLink';
-import subscribeAndCount from '../../../utilities/testing/subscribeAndCount';
-import { itAsync } from '../../../utilities/testing/itAsync';
+import { MockLink } from '../../../testing/mocking/mockLink';
+import subscribeAndCount from '../../../testing/subscribeAndCount';
+import { itAsync } from '../../../testing/itAsync';
 import { FieldPolicy, StorageType } from "../policies";
 import { withErrorSpy, withWarningSpy } from "../../../testing";
 

src/cache/inmemory/__tests__/writeToStore.ts

@@ -18,7 +18,7 @@ import {
 } from '../../../utilities/graphql/storeUtils';
 import { addTypenameToDocument } from '../../../utilities/graphql/transform';
 import { cloneDeep } from '../../../utilities/common/cloneDeep';
-import { itAsync } from '../../../utilities/testing/itAsync';
+import { itAsync } from '../../../testing/itAsync';
 import { StoreWriter } from '../writeToStore';
 import { defaultNormalizedCacheFactory, writeQueryToStore } from './helpers';
 import { InMemoryCache } from '../inMemoryCache';

src/core/__tests__/ObservableQuery.ts

@@ -12,9 +12,9 @@ import { InMemoryCache, NormalizedCacheObject } from '../../cache';
 import { ApolloError } from '../../errors';
 
 import { itAsync, mockSingleLink, subscribeAndCount } from '../../testing';
-import mockQueryManager from '../../utilities/testing/mocking/mockQueryManager';
-import mockWatchQuery from '../../utilities/testing/mocking/mockWatchQuery';
-import wrap from '../../utilities/testing/wrap';
+import mockQueryManager from '../../testing/mocking/mockQueryManager';
+import mockWatchQuery from '../../testing/mocking/mockWatchQuery';
+import wrap from '../../testing/wrap';
 
 export const mockFetchQuery = (queryManager: QueryManager<any>) => {
   const fetchQueryObservable = queryManager.fetchQueryObservable;

src/core/__tests__/QueryManager/index.ts

@@ -15,9 +15,9 @@ import {
 } from '../../../cache/inmemory/types';
 
 // mocks
-import mockQueryManager from '../../../utilities/testing/mocking/mockQueryManager';
-import mockWatchQuery from '../../../utilities/testing/mocking/mockWatchQuery';
-import { MockApolloLink, mockSingleLink } from '../../../utilities/testing/mocking/mockLink';
+import mockQueryManager from '../../../testing/mocking/mockQueryManager';
+import mockWatchQuery from '../../../testing/mocking/mockWatchQuery';
+import { MockApolloLink, mockSingleLink } from '../../../testing/mocking/mockLink';
 
 // core
 import { ApolloQueryResult } from '../../types';
@@ -29,12 +29,12 @@ import { QueryManager } from '../../QueryManager';
 import { ApolloError } from '../../../errors';
 
 // testing utils
-import wrap from '../../../utilities/testing/wrap';
+import wrap from '../../../testing/wrap';
 import observableToPromise, {
   observableToPromiseAndSubscription,
-} from '../../../utilities/testing/observableToPromise';
-import subscribeAndCount from '../../../utilities/testing/subscribeAndCount';
-import { itAsync } from '../../../utilities/testing/itAsync';
+} from '../../../testing/observableToPromise';
+import subscribeAndCount from '../../../testing/subscribeAndCount';
+import { itAsync } from '../../../testing/itAsync';
 import { ApolloClient } from '../../../core'
 import { mockFetchQuery } from '../ObservableQuery';
 

src/core/__tests__/QueryManager/links.ts

@@ -6,7 +6,7 @@ import { ApolloLink } from '../../../link/core';
 import { InMemoryCache } from '../../../cache/inmemory/inMemoryCache';
 
 // mocks
-import { MockSubscriptionLink } from '../../../utilities/testing/mocking/mockSubscriptionLink';
+import { MockSubscriptionLink } from '../../../testing/mocking/mockSubscriptionLink';
 
 // core
 import { QueryManager } from '../../QueryManager';

src/core/__tests__/QueryManager/multiple-results.ts

@@ -5,7 +5,7 @@ import { InMemoryCache } from '../../../cache/inmemory/inMemoryCache';
 // mocks
 import {
   MockSubscriptionLink
-} from '../../../utilities/testing/mocking/mockSubscriptionLink';
+} from '../../../testing/mocking/mockSubscriptionLink';
 
 // core
 import { QueryManager } from '../../QueryManager';

src/core/__tests__/QueryManager/recycler.ts

@@ -9,7 +9,7 @@ import gql from 'graphql-tag';
 import { InMemoryCache } from '../../../cache/inmemory/inMemoryCache';
 import {
   MockSubscriptionLink
-} from '../../../utilities/testing/mocking/mockSubscriptionLink';
+} from '../../../testing/mocking/mockSubscriptionLink';
 
 // core
 import { QueryManager } from '../../QueryManager';

src/react/hoc/__tests__/mutations/lifecycle.test.tsx

@@ -3,7 +3,7 @@ import { render, cleanup } from '@testing-library/react';
 import gql from 'graphql-tag';
 
 import { ApolloProvider } from '../../../context/ApolloProvider';
-import { createMockClient } from '../../../../utilities/testing/mocking/mockClient';
+import { createMockClient } from '../../../../testing/mocking/mockClient';
 import { graphql } from '../../graphql';
 import { ChildProps } from '../../types';
 

src/testing/index.ts

@@ -1,2 +1,16 @@
 import '../utilities/globals';
-export * from '../utilities/testing';
+export { MockedProvider, MockedProviderProps } from './mocking/MockedProvider';
+export {
+  MockLink,
+  mockSingleLink,
+  MockedResponse,
+  ResultFunction
+} from './mocking/mockLink';
+export {
+  MockSubscriptionLink,
+  mockObservableLink
+} from './mocking/mockSubscriptionLink';
+export { createMockClient } from './mocking/mockClient';
+export { default as subscribeAndCount } from './subscribeAndCount';
+export { itAsync } from './itAsync';
+export * from './withConsoleSpy';

src/utilities/testing/mocking/MockedProvider.tsx → src/testing/mocking/MockedProvider.tsx

@@ -1,12 +1,12 @@
 import * as React from 'react';
 
-import { ApolloClient, DefaultOptions } from '../../../core';
-import { InMemoryCache as Cache } from '../../../cache';
-import { ApolloProvider } from '../../../react/context';
+import { ApolloClient, DefaultOptions } from '../../core';
+import { InMemoryCache as Cache } from '../../cache';
+import { ApolloProvider } from '../../react/context';
 import { MockLink, MockedResponse } from './mockLink';
-import { ApolloLink } from '../../../link/core';
-import { Resolvers } from '../../../core';
-import { ApolloCache } from '../../../cache';
+import { ApolloLink } from '../../link/core';
+import { Resolvers } from '../../core';
+import { ApolloCache } from '../../cache';
 
 export interface MockedProviderProps<TSerializedCache = {}> {
   mocks?: ReadonlyArray<MockedResponse>;

src/utilities/testing/mocking/__tests__/MockedProvider.test.tsx → src/testing/mocking/__tests__/MockedProvider.test.tsx

@@ -6,9 +6,9 @@ import { itAsync } from '../../itAsync';
 import { MockedProvider } from '../MockedProvider';
 import { MockedResponse, MockLink } from '../mockLink';
 import { DocumentNode } from 'graphql';
-import { useQuery } from '../../../../react/hooks/useQuery';
-import { InMemoryCache } from '../../../../cache/inmemory/inMemoryCache';
-import { ApolloLink } from '../../../../link/core';
+import { useQuery } from '../../../react/hooks';
+import { InMemoryCache } from '../../../cache';
+import { ApolloLink } from '../../../link/core';
 
 const variables = {
   username: 'mock_username'

src/utilities/testing/mocking/__tests__/mockSubscriptionLink.test.tsx → src/testing/mocking/__tests__/mockSubscriptionLink.test.tsx

@@ -3,10 +3,10 @@ import { render, wait } from '@testing-library/react';
 import gql from 'graphql-tag';
 
 import { MockSubscriptionLink } from '../mockSubscriptionLink';
-import { ApolloClient } from '../../../../core';
-import { InMemoryCache as Cache } from '../../../../cache';
-import { ApolloProvider } from '../../../../react/context';
-import { useSubscription } from '../../../../react/hooks';
+import { ApolloClient } from '../../../core';
+import { InMemoryCache as Cache } from '../../../cache';
+import { ApolloProvider } from '../../../react/context';
+import { useSubscription } from '../../../react/hooks';
 
 describe('mockSubscriptionLink', () => {
   it('should work with multiple subscribers to the same mock websocket', () => {

src/utilities/testing/mocking/mockClient.ts → src/testing/mocking/mockClient.ts

@@ -1,7 +1,7 @@
 import { DocumentNode } from 'graphql';
 
-import { ApolloClient } from '../../../core';
-import { InMemoryCache, NormalizedCacheObject } from '../../../cache';
+import { ApolloClient } from '../../core';
+import { InMemoryCache, NormalizedCacheObject } from '../../cache';
 import { mockSingleLink } from './mockLink';
 
 export function createMockClient<TData>(

src/utilities/testing/mocking/mockLink.ts → src/testing/mocking/mockLink.ts

@@ -1,4 +1,4 @@
-import { invariant } from '../../globals';
+import { invariant } from '../../utilities/globals';
 
 import { print } from 'graphql';
 import { equal } from '@wry/equality';
@@ -8,7 +8,7 @@ import {
   Operation,
   GraphQLRequest,
   FetchResult,
-} from '../../../link/core';
+} from '../../link/core';
 
 import {
   Observable,
@@ -17,7 +17,7 @@ import {
   removeConnectionDirectiveFromDocument,
   cloneDeep,
   stringifyForDisplay,
-} from '../../../utilities';
+} from '../../utilities';
 
 export type ResultFunction<T> = () => T;
 

src/utilities/testing/mocking/mockQueryManager.ts → src/testing/mocking/mockQueryManager.ts

@@ -1,6 +1,6 @@
-import { QueryManager } from '../../../core/QueryManager';
+import { QueryManager } from '../../core/QueryManager';
 import { mockSingleLink, MockedResponse } from './mockLink';
-import { InMemoryCache } from '../../../cache/inmemory/inMemoryCache';
+import { InMemoryCache } from '../../cache';
 
 // Helper method for the tests that construct a query manager out of a
 // a list of mocked responses for a mocked network interface.

src/utilities/testing/mocking/mockSubscriptionLink.ts → src/testing/mocking/mockSubscriptionLink.ts

@@ -1,5 +1,5 @@
-import { Observable } from '../../../utilities';
-import { ApolloLink, FetchResult, Operation } from '../../../link/core';
+import { Observable } from '../../utilities';
+import { ApolloLink, FetchResult, Operation } from '../../link/core';
 
 export interface MockedSubscription {
   request: Operation;

src/utilities/testing/mocking/mockWatchQuery.ts → src/testing/mocking/mockWatchQuery.ts

@@ -1,6 +1,6 @@
 import { MockedResponse } from './mockLink';
 import mockQueryManager from './mockQueryManager';
-import { ObservableQuery } from '../../../core/ObservableQuery';
+import { ObservableQuery } from '../../core';
 
 export default (
   reject: (reason: any) => any,

src/utilities/testing/observableToPromise.ts → src/testing/observableToPromise.ts

@@ -1,6 +1,5 @@
-import { ObservableQuery } from '../../core/ObservableQuery';
-import { ApolloQueryResult } from '../../core/types';
-import { ObservableSubscription } from '../../utilities/observables/Observable';
+import { ObservableQuery, ApolloQueryResult } from '../core';
+import { ObservableSubscription } from '../utilities';
 
 /**
  *

src/utilities/testing/subscribeAndCount.ts → src/testing/subscribeAndCount.ts

@@ -1,7 +1,5 @@
-import { ObservableQuery } from '../../core/ObservableQuery';
-import { ApolloQueryResult, OperationVariables } from '../../core/types';
-import { ObservableSubscription } from '../../utilities/observables/Observable';
-import { asyncMap } from '../../utilities/observables/asyncMap';
+import { ObservableQuery, ApolloQueryResult, OperationVariables } from '../core';
+import { ObservableSubscription, asyncMap } from '../utilities';
 
 export default function subscribeAndCount<
   TData,

src/utilities/observables/__tests__/asyncMap.ts

@@ -1,6 +1,6 @@
-import { itAsync } from "../../testing";
 import { Observable } from "../Observable";
 import { asyncMap } from "../asyncMap";
+import { itAsync } from "../../../testing";
 
 const wait = (delayMs: number) =>
   new Promise<void>(resolve => setTimeout(resolve, delayMs));