Export wrap as es2015 instead of commonjs (#4158)

apollographql · Jan 2, 2019 · be30577 · be30577
1 parent 7589180
commit be30577
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 13 deletions.
diff --git a/packages/apollo-boost/rollup-bundle.config.js b/packages/apollo-boost/rollup-bundle.config.js
@@ -17,6 +17,7 @@ const globals = {
   'fast-json-stable-stringify': 'stringify',
   'graphql-tag': 'gql',
   'apollo-utilities': 'apolloUtilities',
+  optimism: 'optimism',
 };
 
 export default {

diff --git a/packages/apollo-cache-inmemory/package-lock.json b/packages/apollo-cache-inmemory/package-lock.json
diff --git a/packages/apollo-cache-inmemory/rollup.config.js b/packages/apollo-cache-inmemory/rollup.config.js
@@ -3,6 +3,8 @@ import build, { globals } from '../../config/rollup.config';
 const globalsOverride = {
   ...globals,
   'graphql/language/printer': 'print',
+  optimism: 'optimism',
+  'graphql/language/visitor': 'visitor',
 };
 
 export default build('apollo.cache.inmemory', {

diff --git a/packages/apollo-cache-inmemory/src/declarations.d.ts b/packages/apollo-cache-inmemory/src/declarations.d.ts
@@ -0,0 +1,6 @@
+declare module 'optimism' {
+  export function wrap<T>(
+    originalFunction: T,
+    options?: OptimisticWrapOptions,
+  ): OptimisticWrapperFunction<T>;
+}
diff --git a/packages/apollo-cache-inmemory/src/optimism.ts b/packages/apollo-cache-inmemory/src/optimism.ts
@@ -1,5 +1,3 @@
-declare function require(id: string): any;
-
 export type OptimisticWrapperFunction<
   T = (...args: any[]) => any
 > = T & {
@@ -14,16 +12,7 @@ export type OptimisticWrapOptions = {
   makeCacheKey?(...args: any[]): any;
 };
 
-const {
-  wrap,
-}: {
-  wrap<T>(
-    originalFunction: T,
-    options?: OptimisticWrapOptions,
-  ): OptimisticWrapperFunction<T>;
-} = require('optimism'); // tslint:disable-line
-
-export { wrap };
+export { wrap } from 'optimism';
 
 export class CacheKeyNode<KeyType = object> {
   private children: Map<any, CacheKeyNode<KeyType>> | null = null;