From 42070787ba58ad5b7088a5ce68d9e90b64e6694c Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@apollographql.com>
Date: Fri, 3 Feb 2023 17:09:46 -0500
Subject: [PATCH] Fix risky internal imports of modules with different
 package.json.

---
 src/__tests__/__snapshots__/exports.ts.snap          | 12 +++++++++++-
 src/cache/inmemory/__tests__/roundtrip.ts            |  1 +
 src/core/QueryInfo.ts                                |  2 +-
 src/core/QueryManager.ts                             |  2 +-
 src/link/http/responseIterator.ts                    |  2 +-
 .../hoc/__tests__/queries/recomposeWithState.ts      |  2 +-
 .../hooks/internal/useIsomorphicLayoutEffect.ts      |  2 +-
 src/utilities/index.ts                               |  2 ++
 8 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/__tests__/__snapshots__/exports.ts.snap b/src/__tests__/__snapshots__/exports.ts.snap
index b7f925d5b9d..275ce428b99 100644
--- a/src/__tests__/__snapshots__/exports.ts.snap
+++ b/src/__tests__/__snapshots__/exports.ts.snap
@@ -391,12 +391,21 @@ Array [
   "hasAnyDirectives",
   "hasClientExports",
   "hasDirectives",
+  "isAsyncIterableIterator",
+  "isBlob",
   "isDocumentNode",
+  "isExecutionPatchIncrementalResult",
+  "isExecutionPatchInitialResult",
+  "isExecutionPatchResult",
   "isField",
   "isInlineFragment",
+  "isNodeReadableStream",
+  "isNodeResponse",
   "isNonEmptyArray",
   "isNonNullObject",
+  "isReadableStream",
   "isReference",
+  "isStreamableBlob",
   "iterateObserversSafely",
   "makeReference",
   "makeUniqueId",
@@ -404,6 +413,7 @@ Array [
   "maybeDeepFreeze",
   "mergeDeep",
   "mergeDeepArray",
+  "mergeIncrementalData",
   "mergeOptions",
   "offsetLimitPagination",
   "relayStylePagination",
@@ -424,7 +434,7 @@ exports[`exports of public entry points @apollo/client/utilities/globals 1`] = `
 Array [
   "DEV",
   "InvariantError",
-  "checkDEV",
+  "__DEV__",
   "global",
   "invariant",
   "maybe",
diff --git a/src/cache/inmemory/__tests__/roundtrip.ts b/src/cache/inmemory/__tests__/roundtrip.ts
index 7e1bd70a762..4ff053812ee 100644
--- a/src/cache/inmemory/__tests__/roundtrip.ts
+++ b/src/cache/inmemory/__tests__/roundtrip.ts
@@ -1,3 +1,4 @@
+import { __DEV__ } from "../../../utilities/globals";
 import { DocumentNode } from 'graphql';
 import gql from 'graphql-tag';
 
diff --git a/src/core/QueryInfo.ts b/src/core/QueryInfo.ts
index 30edbc55cf1..0288f2d598c 100644
--- a/src/core/QueryInfo.ts
+++ b/src/core/QueryInfo.ts
@@ -3,7 +3,7 @@ import { equal } from "@wry/equality";
 
 import { Cache, ApolloCache } from '../cache';
 import { DeepMerger } from "../utilities"
-import { mergeIncrementalData } from '../utilities/common/incrementalResult';
+import { mergeIncrementalData } from '../utilities';
 import { WatchQueryOptions, ErrorPolicy } from './watchQueryOptions';
 import { ObservableQuery, reobserveCacheFirst } from './ObservableQuery';
 import { QueryListener } from './types';
diff --git a/src/core/QueryManager.ts b/src/core/QueryManager.ts
index 66b31daf630..451636379f6 100644
--- a/src/core/QueryManager.ts
+++ b/src/core/QueryManager.ts
@@ -9,7 +9,7 @@ import { ApolloLink, execute, FetchResult } from '../link/core';
 import {
   isExecutionPatchIncrementalResult,
   isExecutionPatchResult,
-} from '../utilities/common/incrementalResult';
+} from '../utilities';
 import { Cache, ApolloCache, canonicalStringify } from '../cache';
 
 import {
diff --git a/src/link/http/responseIterator.ts b/src/link/http/responseIterator.ts
index a0e565e464c..4698890a452 100644
--- a/src/link/http/responseIterator.ts
+++ b/src/link/http/responseIterator.ts
@@ -11,7 +11,7 @@ import {
   isNodeReadableStream,
   isReadableStream,
   isStreamableBlob,
-} from "../../utilities/common/responseIterator";
+} from "../../utilities";
 
 import asyncIterator from "./iterators/async";
 import nodeStreamIterator from "./iterators/nodeStream";
diff --git a/src/react/hoc/__tests__/queries/recomposeWithState.ts b/src/react/hoc/__tests__/queries/recomposeWithState.ts
index 1608f2fa7bf..92f97a0f8e7 100644
--- a/src/react/hoc/__tests__/queries/recomposeWithState.ts
+++ b/src/react/hoc/__tests__/queries/recomposeWithState.ts
@@ -2,7 +2,7 @@
 // to avoid incurring an indirect dependency on ua-parser-js via fbjs.
 
 import React, { createFactory, Component } from "react";
-import '../../../../utilities/globals'; // For __DEV__
+import { __DEV__ } from "../../../../utilities/globals";
 
 const setStatic =
   (key: string, value: string) => (BaseComponent: React.ComponentClass) => {
diff --git a/src/react/hooks/internal/useIsomorphicLayoutEffect.ts b/src/react/hooks/internal/useIsomorphicLayoutEffect.ts
index 7135b952e5c..203cfdcc42b 100644
--- a/src/react/hooks/internal/useIsomorphicLayoutEffect.ts
+++ b/src/react/hooks/internal/useIsomorphicLayoutEffect.ts
@@ -1,5 +1,5 @@
 import { useLayoutEffect, useEffect } from 'react';
-import { canUseLayoutEffect } from '../../../utilities/common/canUse';
+import { canUseLayoutEffect } from '../../../utilities';
 
 export const useIsomorphicLayoutEffect = canUseLayoutEffect
   ? useLayoutEffect
diff --git a/src/utilities/index.ts b/src/utilities/index.ts
index 4f6f4697897..a5ff2844501 100644
--- a/src/utilities/index.ts
+++ b/src/utilities/index.ts
@@ -96,5 +96,7 @@ export * from './common/compact';
 export * from './common/makeUniqueId';
 export * from './common/stringifyForDisplay';
 export * from './common/mergeOptions';
+export * from './common/responseIterator';
+export * from './common/incrementalResult';
 
 export * from './types/IsStrictlyAny';