chore: workaround broken apollo-client import mess

ardatan · Jun 24, 2022 · ff3c071 · ff3c071
1 parent 0d5a52c
commit ff3c071
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 14 deletions.
diff --git a/packages/links/src/AwaitVariablesLink.ts b/packages/links/src/AwaitVariablesLink.ts
@@ -1,5 +1,6 @@
-import { ApolloLink, FetchResult, NextLink, Operation } from '@apollo/client/link/core';
-import { Observable } from '@apollo/client/utilities';
+import * as apolloImport from '@apollo/client';
+
+const apollo: typeof apolloImport = (apolloImport as any)?.default ?? apolloImport;
 
 function getFinalPromise(object: any): Promise<any> {
   return Promise.resolve(object).then(resolvedObject => {
@@ -23,9 +24,12 @@ function getFinalPromise(object: any): Promise<any> {
   });
 }
 
-export class AwaitVariablesLink extends ApolloLink {
-  request(operation: Operation, forward: NextLink): Observable<FetchResult> {
-    return new Observable(observer => {
+export class AwaitVariablesLink extends apollo.ApolloLink {
+  request(
+    operation: apolloImport.Operation,
+    forward: apolloImport.NextLink
+  ): apolloImport.Observable<apolloImport.FetchResult> {
+    return new apollo.Observable(observer => {
       let subscription: any;
       getFinalPromise(operation.variables)
         .then(resolvedVariables => {

diff --git a/packages/links/src/createServerHttpLink.ts b/packages/links/src/createServerHttpLink.ts
@@ -1,12 +1,14 @@
-import { concat } from '@apollo/client/link/core';
+import * as apolloImport from '@apollo/client';
 import { createUploadLink, formDataAppendFile, isExtractableFile } from 'apollo-upload-client';
 import FormData from 'form-data';
 import fetch from 'node-fetch';
 
 import { AwaitVariablesLink } from './AwaitVariablesLink.js';
 
+const apollo: typeof apolloImport = (apolloImport as any)?.default ?? apolloImport;
+
 export const createServerHttpLink = (options: any) =>
-  concat(
+  apollo.concat(
     new AwaitVariablesLink(),
     createUploadLink({
       ...options,

diff --git a/packages/links/src/linkToExecutor.ts b/packages/links/src/linkToExecutor.ts
@@ -1,6 +1,4 @@
-import { toPromise } from '@apollo/client/core';
-import { ApolloLink, execute } from '@apollo/client/link/core';
-import { Observable } from '@apollo/client/utilities';
+import * as apolloImport from '@apollo/client';
 
 import {
   Executor,
@@ -10,11 +8,13 @@ import {
   getOperationASTFromRequest,
 } from '@graphql-tools/utils';
 
-export function linkToExecutor(link: ApolloLink): Executor {
+const apollo: typeof apolloImport = (apolloImport as any)?.default ?? apolloImport;
+
+export function linkToExecutor(link: apolloImport.ApolloLink): Executor {
   return function executorFromLink<TReturn, TArgs extends Record<string, any>, TContext>(
     request: ExecutionRequest<TArgs, TContext>
   ) {
-    const observable = execute(link, {
+    const observable = apollo.execute(link, {
       query: request.document,
       operationName: request.operationName,
       variables: request.variables,
@@ -24,11 +24,11 @@ export function linkToExecutor(link: ApolloLink): Executor {
         clientAwareness: {},
       },
       extensions: request.extensions,
-    }) as Observable<ExecutionResult<TReturn>>;
+    }) as apolloImport.Observable<ExecutionResult<TReturn>>;
     const operationAst = getOperationASTFromRequest(request);
     if (operationAst.operation === 'subscription') {
       return observableToAsyncIterable<ExecutionResult<TReturn>>(observable);
     }
-    return toPromise(observable);
+    return apollo.toPromise(observable);
   };
 }