turn queryRef symbols into Symbol.for calls (#12409)

* turn queryRef symbols into `Symbol.for` calls * Clean up Prettier, Size-limit, and Api-Extractor --------- Co-authored-by: phryneas <[email protected]>
apollographql · Mar 6, 2025 · 6aa2f3e · 6aa2f3e
1 parent 4332b88
commit 6aa2f3e
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 7 deletions.
diff --git a/.changeset/grumpy-dogs-add.md b/.changeset/grumpy-dogs-add.md
@@ -0,0 +1,5 @@
+---
+"@apollo/client": patch
+---
+
+To mitigate problems when Apollo Client ends up more than once in the bundle, some unique symbols were converted into `Symbol.for` calls.
diff --git a/.size-limits.json b/.size-limits.json
@@ -1,4 +1,4 @@
 {
-  "dist/apollo-client.min.cjs": 42231,
+  "dist/apollo-client.min.cjs": 42243,
   "import { ApolloClient, InMemoryCache, HttpLink } from \"dist/index.js\" (production)": 34437
 }
diff --git a/src/react/hooks/useLazyQuery.ts b/src/react/hooks/useLazyQuery.ts
@@ -5,6 +5,7 @@ import * as React from "rehackt";
 import type {
   ApolloClient,
   ApolloQueryResult,
+  ObservableQuery,
   OperationVariables,
   WatchQueryOptions,
 } from "../../core/index.js";
@@ -17,7 +18,7 @@ import type {
   QueryHookOptions,
   QueryResult,
 } from "../types/types.js";
-import type { InternalResult, ObsQueryWithMeta } from "./useQuery.js";
+import type { InternalResult } from "./useQuery.js";
 import {
   createMakeWatchQueryOptions,
   getDefaultFetchPolicy,
@@ -203,7 +204,7 @@ export function useLazyQuery<
 
 function executeQuery<TData, TVariables extends OperationVariables>(
   resultData: InternalResult<TData, TVariables>,
-  observable: ObsQueryWithMeta<TData, TVariables>,
+  observable: ObservableQuery<TData, TVariables>,
   client: ApolloClient<object>,
   currentQuery: DocumentNode,
   options: QueryHookOptions<TData, TVariables> & {

diff --git a/src/react/hooks/useQuery.ts b/src/react/hooks/useQuery.ts
@@ -68,9 +68,9 @@ type InternalQueryResult<TData, TVariables extends OperationVariables> = Omit<
 >;
 
 function noop() {}
-export const lastWatchOptions = Symbol();
+const lastWatchOptions = Symbol();
 
-export interface ObsQueryWithMeta<TData, TVariables extends OperationVariables>
+interface ObsQueryWithMeta<TData, TVariables extends OperationVariables>
   extends ObservableQuery<TData, TVariables> {
   [lastWatchOptions]?: WatchQueryOptions<TVariables, TData>;
 }

diff --git a/src/react/internal/cache/QueryReference.ts b/src/react/internal/cache/QueryReference.ts
@@ -29,8 +29,10 @@ type FetchMoreOptions<TData> = Parameters<
   ObservableQuery<TData>["fetchMore"]
 >[0];
 
-const QUERY_REFERENCE_SYMBOL: unique symbol = Symbol();
-const PROMISE_SYMBOL: unique symbol = Symbol();
+const QUERY_REFERENCE_SYMBOL: unique symbol = Symbol.for(
+  "apollo.internal.queryRef"
+);
+const PROMISE_SYMBOL: unique symbol = Symbol.for("apollo.internal.refPromise");
 declare const QUERY_REF_BRAND: unique symbol;
 /**
  * A `QueryReference` is an opaque object returned by `useBackgroundQuery`.