Deep import to leverage ESM

packages/apollo-angular/headers/src/index.ts

@@ -1,5 +1,5 @@
 import { HttpHeaders } from '@angular/common/http';
-import { ApolloLink, NextLink, Operation } from '@apollo/client/core';
+import { ApolloLink, NextLink, Operation } from '@apollo/client/core/index.js';
 
 export const httpHeaders = () => {
   return new ApolloLink((operation: Operation, forward: NextLink) => {

packages/apollo-angular/headers/tests/index.spec.ts

@@ -1,5 +1,10 @@
 import { HttpHeaders } from '@angular/common/http';
-import { ApolloLink, execute, gql, Observable as LinkObservable } from '@apollo/client/core';
+import {
+  ApolloLink,
+  execute,
+  gql,
+  Observable as LinkObservable,
+} from '@apollo/client/core/index.js';
 import { httpHeaders } from '../src';
 
 const query = gql`

packages/apollo-angular/http/src/http-batch-link.ts

@@ -6,7 +6,7 @@ import {
   FetchResult,
   Observable as LinkObservable,
   Operation,
-} from '@apollo/client/core';
+} from '@apollo/client/core/index.js';
 import { BatchHandler, BatchLink } from '@apollo/client/link/batch';
 import { BatchOptions, Body, Context, OperationPrinter, Options, Request } from './types';
 import { createHeadersWithClientAwareness, fetch, mergeHeaders, prioritize } from './utils';

packages/apollo-angular/http/src/http-link.ts

@@ -6,7 +6,7 @@ import {
   FetchResult,
   Observable as LinkObservable,
   Operation,
-} from '@apollo/client/core';
+} from '@apollo/client/core/index.js';
 import { pick } from './http-batch-link';
 import { Body, Context, OperationPrinter, Options, Request } from './types';
 import { createHeadersWithClientAwareness, fetch, mergeHeaders } from './utils';

packages/apollo-angular/http/src/types.ts

@@ -1,6 +1,6 @@
 import { DocumentNode } from 'graphql';
 import { HttpHeaders } from '@angular/common/http';
-import { Operation } from '@apollo/client/core';
+import { Operation } from '@apollo/client/core/index.js';
 
 export type HttpRequestOptions = {
   headers?: HttpHeaders;

packages/apollo-angular/http/tests/http-batch-link.spec.ts

@@ -1,7 +1,7 @@
 import { HttpClientModule, HttpHeaders } from '@angular/common/http';
 import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
 import { TestBed } from '@angular/core/testing';
-import { ApolloLink, execute, gql, Operation } from '@apollo/client/core';
+import { ApolloLink, execute, gql, Operation } from '@apollo/client/core/index.js';
 import { HttpBatchLink } from '../src/http-batch-link';
 
 const noop = () => {

packages/apollo-angular/http/tests/http-link.spec.ts

@@ -3,7 +3,7 @@ import { mergeMap } from 'rxjs/operators';
 import { HttpClientModule, HttpHeaders } from '@angular/common/http';
 import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
 import { TestBed } from '@angular/core/testing';
-import { ApolloLink, execute, gql, InMemoryCache } from '@apollo/client/core';
+import { ApolloLink, execute, gql, InMemoryCache } from '@apollo/client/core/index.js';
 import { Apollo } from '../../src';
 import { HttpLink } from '../src/http-link';
 

packages/apollo-angular/http/tests/ssr.spec.ts

@@ -9,7 +9,7 @@ import {
   renderModule,
   ServerModule,
 } from '@angular/platform-server';
-import { execute, gql } from '@apollo/client/core';
+import { execute, gql } from '@apollo/client/core/index.js';
 import { HttpLink } from '../src/http-link';
 
 describe.skip('integration', () => {

packages/apollo-angular/persisted-queries/tests/persisted-queries.spec.ts

@@ -1,4 +1,11 @@
-import { ApolloLink, execute, FetchResult, gql, Observable, Operation } from '@apollo/client/core';
+import {
+  ApolloLink,
+  execute,
+  FetchResult,
+  gql,
+  Observable,
+  Operation,
+} from '@apollo/client/core/index.js';
 import { createPersistedQueryLink } from '../src';
 
 const query = gql`

packages/apollo-angular/schematics/install/files/module/graphql.module.ts

@@ -1,7 +1,7 @@
 import { APOLLO_OPTIONS, ApolloModule } from 'apollo-angular';
 import { HttpLink } from 'apollo-angular/http';
 import { NgModule } from '@angular/core';
-import { ApolloClientOptions, InMemoryCache } from '@apollo/client/core';
+import { ApolloClientOptions, InMemoryCache } from '@apollo/client/core/index.js';
 
 const uri = '<%= endpoint %>'; // <-- add the URL of the GraphQL server here
 export function createApollo(httpLink: HttpLink): ApolloClientOptions<any> {

packages/apollo-angular/schematics/install/index.ts

@@ -98,7 +98,7 @@ function includeAsyncIterableLib(): Rule {
         '\n' +
           tags.stripIndent`
               We couldn't find '${requiredLib}' in the list of library files to be included in the compilation.
-              It's required by '@apollo/client/core' package so please add it to your tsconfig.
+              It's required by '@apollo/client/core/index.js' package so please add it to your tsconfig.
             ` +
           '\n',
       );
@@ -151,7 +151,7 @@ function allowSyntheticDefaultImports(): Rule {
         '\n' +
           tags.stripIndent`
               We couldn't enable 'allowSyntheticDefaultImports' flag.
-              It's required by '@apollo/client/core' package so please add it to your tsconfig.
+              It's required by '@apollo/client/core/index.js' package so please add it to your tsconfig.
             ` +
           '\n',
       );
@@ -201,7 +201,7 @@ function importSetup(options: Schema): Rule {
         link: httpLink.create({
           uri: '<%= endpoint %>',
         }),
-        cache: new ${external('InMemoryCache', '@apollo/client/core')}(),
+        cache: new ${external('InMemoryCache', '@apollo/client/core/index.js')}(),
       };
     })`;
       });

packages/apollo-angular/src/apollo-module.ts

@@ -1,5 +1,5 @@
 import { NgModule, Provider } from '@angular/core';
-import { ApolloClientOptions } from '@apollo/client/core';
+import { ApolloClientOptions } from '@apollo/client/core/index.js';
 import { Apollo } from './apollo';
 import { APOLLO_FLAGS, APOLLO_NAMED_OPTIONS, APOLLO_OPTIONS } from './tokens';
 import { Flags, NamedOptions } from './types';

packages/apollo-angular/src/apollo.ts

@@ -9,8 +9,8 @@ import type {
   QueryOptions,
   SubscriptionOptions,
   WatchFragmentResult,
-} from '@apollo/client/core';
-import { ApolloClient } from '@apollo/client/core';
+} from '@apollo/client/core/index.js';
+import { ApolloClient } from '@apollo/client/core/index.js';
 import { QueryRef } from './query-ref';
 import { APOLLO_FLAGS, APOLLO_NAMED_OPTIONS, APOLLO_OPTIONS } from './tokens';
 import type {

packages/apollo-angular/src/gql.ts

@@ -1,4 +1,4 @@
-import { gql as gqlTag, TypedDocumentNode } from '@apollo/client/core';
+import { gql as gqlTag, TypedDocumentNode } from '@apollo/client/core/index.js';
 
 function typedGQLTag<Result, Variables>(
   literals: ReadonlyArray<string> | Readonly<string>,

packages/apollo-angular/src/index.ts

@@ -1,4 +1,4 @@
-export type { TypedDocumentNode } from '@apollo/client/core';
+export type { TypedDocumentNode } from '@apollo/client/core/index.js';
 export { ApolloModule, provideApollo, provideNamedApollo } from './apollo-module';
 export { Apollo, ApolloBase } from './apollo';
 export { QueryRef, QueryRefFromDocument } from './query-ref';

packages/apollo-angular/src/mutation.ts

@@ -1,7 +1,7 @@
 import type { DocumentNode } from 'graphql';
 import type { Observable } from 'rxjs';
 import { Injectable } from '@angular/core';
-import type { OperationVariables, TypedDocumentNode } from '@apollo/client/core';
+import type { OperationVariables, TypedDocumentNode } from '@apollo/client/core/index.js';
 import { Apollo } from './apollo';
 import type { EmptyObject, MutationOptionsAlone, MutationResult } from './types';
 

packages/apollo-angular/src/query-ref.ts

@@ -9,8 +9,8 @@ import type {
   SubscribeToMoreOptions,
   TypedDocumentNode,
   UpdateQueryOptions,
-} from '@apollo/client/core';
-import { NetworkStatus } from '@apollo/client/core';
+} from '@apollo/client/core/index.js';
+import { NetworkStatus } from '@apollo/client/core/index.js';
 import { EmptyObject, WatchQueryOptions } from './types';
 import { fixObservable, wrapWithZone } from './utils';
 

packages/apollo-angular/src/query.ts

@@ -1,7 +1,11 @@
 import type { DocumentNode } from 'graphql';
 import type { Observable } from 'rxjs';
 import { Injectable } from '@angular/core';
-import type { ApolloQueryResult, OperationVariables, TypedDocumentNode } from '@apollo/client/core';
+import type {
+  ApolloQueryResult,
+  OperationVariables,
+  TypedDocumentNode,
+} from '@apollo/client/core/index.js';
 import { Apollo } from './apollo';
 import { QueryRef } from './query-ref';
 import { EmptyObject, QueryOptionsAlone, WatchQueryOptionsAlone } from './types';

packages/apollo-angular/src/subscription.ts

@@ -1,7 +1,7 @@
 import type { DocumentNode } from 'graphql';
 import type { Observable } from 'rxjs';
 import { Injectable } from '@angular/core';
-import type { OperationVariables, TypedDocumentNode } from '@apollo/client/core';
+import type { OperationVariables, TypedDocumentNode } from '@apollo/client/core/index.js';
 import { Apollo } from './apollo';
 import {
   EmptyObject,

packages/apollo-angular/src/tokens.ts

@@ -1,5 +1,5 @@
 import { InjectionToken } from '@angular/core';
-import type { ApolloClientOptions } from '@apollo/client/core';
+import type { ApolloClientOptions } from '@apollo/client/core/index.js';
 import type { Flags, NamedOptions } from './types';
 
 export const APOLLO_FLAGS = new InjectionToken<Flags>('APOLLO_FLAGS');

packages/apollo-angular/src/types.ts

@@ -9,7 +9,7 @@ import type {
   FetchResult,
   OperationVariables,
   TypedDocumentNode,
-} from '@apollo/client/core';
+} from '@apollo/client/core/index.js';
 
 export type EmptyObject = {
   [key: string]: any;

packages/apollo-angular/src/utils.ts

@@ -7,7 +7,7 @@ import type {
   ApolloQueryResult,
   FetchResult,
   ObservableQuery,
-} from '@apollo/client/core';
+} from '@apollo/client/core/index.js';
 import { MutationResult } from './types';
 
 export function fromPromise<T>(promiseFn: () => Promise<T>): Observable<T> {

packages/apollo-angular/testing/src/backend.ts

@@ -1,7 +1,7 @@
 import { DocumentNode, print } from 'graphql';
 import { Observer } from 'rxjs';
 import { Injectable } from '@angular/core';
-import { FetchResult, Observable as LinkObservable } from '@apollo/client/core';
+import { FetchResult, Observable as LinkObservable } from '@apollo/client/core/index.js';
 import { ApolloTestingController, MatchOperation } from './controller';
 import { Operation, TestOperation } from './operation';
 

packages/apollo-angular/testing/src/module.ts

@@ -5,7 +5,7 @@ import {
   ApolloLink,
   InMemoryCache,
   Operation as LinkOperation,
-} from '@apollo/client/core';
+} from '@apollo/client/core/index.js';
 import { ApolloTestingBackend } from './backend';
 import { ApolloTestingController } from './controller';
 import { Operation } from './operation';

packages/apollo-angular/testing/src/operation.ts

@@ -1,6 +1,6 @@
 import { ExecutionResult, GraphQLError } from 'graphql';
 import { Observer } from 'rxjs';
-import { ApolloError, FetchResult, Operation as LinkOperation } from '@apollo/client/core';
+import { ApolloError, FetchResult, Operation as LinkOperation } from '@apollo/client/core/index.js';
 
 const isApolloError = (err: any): err is ApolloError => err && err.hasOwnProperty('graphQLErrors');
 

packages/apollo-angular/testing/tests/integration.spec.ts

@@ -1,7 +1,7 @@
 import { Apollo } from 'apollo-angular';
 import { print } from 'graphql';
 import { TestBed } from '@angular/core/testing';
-import { gql, InMemoryCache } from '@apollo/client/core';
+import { gql, InMemoryCache } from '@apollo/client/core/index.js';
 import { addTypenameToDocument } from '@apollo/client/utilities';
 import { APOLLO_TESTING_CACHE, ApolloTestingController, ApolloTestingModule } from '../src';
 

packages/apollo-angular/testing/tests/module.spec.ts

@@ -1,6 +1,6 @@
 import { Apollo } from 'apollo-angular';
 import { TestBed } from '@angular/core/testing';
-import { ApolloReducerConfig, gql, InMemoryCache } from '@apollo/client/core';
+import { ApolloReducerConfig, gql, InMemoryCache } from '@apollo/client/core/index.js';
 import { APOLLO_TESTING_CACHE, ApolloTestingController, ApolloTestingModule } from '../src';
 
 describe('ApolloTestingModule', () => {

packages/apollo-angular/testing/tests/operation.spec.ts

@@ -1,4 +1,4 @@
-import { ApolloLink, execute, gql } from '@apollo/client/core';
+import { ApolloLink, execute, gql } from '@apollo/client/core/index.js';
 import { ApolloTestingBackend } from '../src/backend';
 import { buildOperationForLink } from './utils';
 

packages/apollo-angular/tests/Apollo.spec.ts

@@ -2,7 +2,7 @@ import { Observable, of } from 'rxjs';
 import { mergeMap } from 'rxjs/operators';
 import { NgZone } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
-import { ApolloLink, InMemoryCache, NetworkStatus } from '@apollo/client/core';
+import { ApolloLink, InMemoryCache, NetworkStatus } from '@apollo/client/core/index.js';
 import { mockSingleLink } from '@apollo/client/testing';
 import { Apollo, ApolloBase } from '../src/apollo';
 import { gql } from '../src/gql';

packages/apollo-angular/tests/QueryRef.spec.ts

@@ -1,7 +1,12 @@
 import { Subject } from 'rxjs';
 import { map, takeUntil } from 'rxjs/operators';
 import { NgZone } from '@angular/core';
-import { ApolloClient, ApolloLink, InMemoryCache, ObservableQuery } from '@apollo/client/core';
+import {
+  ApolloClient,
+  ApolloLink,
+  InMemoryCache,
+  ObservableQuery,
+} from '@apollo/client/core/index.js';
 import { mockSingleLink } from '@apollo/client/testing';
 import { gql } from '../src/gql';
 import { QueryRef } from '../src/query-ref';

packages/apollo-angular/tests/integration.spec.ts

@@ -1,6 +1,6 @@
 import { HttpClientModule } from '@angular/common/http';
 import { TestBed } from '@angular/core/testing';
-import { InMemoryCache } from '@apollo/client/core';
+import { InMemoryCache } from '@apollo/client/core/index.js';
 import { mockSingleLink } from '@apollo/client/testing';
 import { Apollo, provideApollo } from '../src';
 

packages/demo/src/app/app.config.ts

@@ -3,7 +3,7 @@ import { HttpLink } from 'apollo-angular/http';
 import { provideHttpClient } from '@angular/common/http';
 import { ApplicationConfig, inject, provideZoneChangeDetection } from '@angular/core';
 import { provideRouter } from '@angular/router';
-import { InMemoryCache } from '@apollo/client/core';
+import { InMemoryCache } from '@apollo/client/core/index.js';
 import { routes } from './app.routes';
 
 export const appConfig: ApplicationConfig = {

website/src/pages/docs/caching/advanced-topics.mdx

@@ -314,7 +314,7 @@ a different query, Apollo Client doesn't know that. To tell Apollo Client where
 existing `book` data, we can define a field policy `read` function for the `book` field:
 
 ```ts
-import { InMemoryCache } from '@apollo/client/core';
+import { InMemoryCache } from '@apollo/client/core/index.js';
 
 const cache = new InMemoryCache({
   typePolicies: {
@@ -383,7 +383,7 @@ write to the cache with a short configurable debounce interval.
 
 ```ts
 import { LocalStorageWrapper, persistCacheSync } from 'apollo3-cache-persist';
-import { InMemoryCache } from '@apollo/client/core';
+import { InMemoryCache } from '@apollo/client/core/index.js';
 
 const cache = new InMemoryCache();
 

website/src/pages/docs/caching/configuration.mdx

@@ -28,7 +28,7 @@ Create an `InMemoryCache` object and provide to Apollo options, like so:
 import { provideApollo } from 'apollo-angular';
 import { HttpLink } from 'apollo-angular/http';
 import { inject } from '@angular/core';
-import { InMemoryCache } from '@apollo/client/core';
+import { InMemoryCache } from '@apollo/client/core/index.js';
 
 provideApollo(() => {
   const httpLink = inject(HttpLink);
@@ -168,7 +168,7 @@ If you need to define a single fallback `keyFields` function that isn't specific
 `__typename`, you can use the `dataIdFromObject` function that was introduced in Apollo Client 2.x:
 
 ```ts
-import { defaultDataIdFromObject } from '@apollo/client/core';
+import { defaultDataIdFromObject } from '@apollo/client/core/index.js';
 
 const cache = new InMemoryCache({
   dataIdFromObject(responseObject) {

website/src/pages/docs/data/mutations.mdx

@@ -258,7 +258,7 @@ can enable `useMutationLoading` flag in configuration.
 import { provideApollo } from 'apollo-angular';
 import { HttpLink } from 'apollo-angular/http';
 import { inject } from '@angular/core';
-import { InMemoryCache } from '@apollo/client/core';
+import { InMemoryCache } from '@apollo/client/core/index.js';
 
 provideApollo(
   () => {