From be305770b4f7ccc09825585756896ab1197b3fb5 Mon Sep 17 00:00:00 2001
From: Arda TANRIKULU <20847995+ardatan@users.noreply.github.com>
Date: Wed, 2 Jan 2019 20:59:00 +0300
Subject: [PATCH] Export wrap as es2015 instead of commonjs (#4158)

---
 packages/apollo-boost/rollup-bundle.config.js       |  1 +
 packages/apollo-cache-inmemory/package-lock.json    |  2 +-
 packages/apollo-cache-inmemory/rollup.config.js     |  2 ++
 .../apollo-cache-inmemory/src/declarations.d.ts     |  6 ++++++
 packages/apollo-cache-inmemory/src/optimism.ts      | 13 +------------
 5 files changed, 11 insertions(+), 13 deletions(-)
 create mode 100644 packages/apollo-cache-inmemory/src/declarations.d.ts

diff --git a/packages/apollo-boost/rollup-bundle.config.js b/packages/apollo-boost/rollup-bundle.config.js
index c29ad12c89b..f9e33f016e1 100644
--- 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
index 268b4dd112e..660630b353e 100644
--- a/packages/apollo-cache-inmemory/package-lock.json
+++ b/packages/apollo-cache-inmemory/package-lock.json
@@ -9,7 +9,7 @@
       "resolved": "https://registry.npmjs.org/apollo-cache/-/apollo-cache-1.1.21.tgz",
       "integrity": "sha512-5ErNb78KHtrJNimkDBTEigcvHkIqUmS7QJIk4lpZZ+XLVVgvk2fD+GhD1PLP+s8vHfAKVbO6vdbRxCCjGGrh5w==",
       "requires": {
-        "apollo-utilities": "^1.0.26"
+        "apollo-utilities": "file:../apollo-utilities"
       }
     },
     "apollo-utilities": {
diff --git a/packages/apollo-cache-inmemory/rollup.config.js b/packages/apollo-cache-inmemory/rollup.config.js
index 33c3b3f8073..551b6fa7d18 100644
--- 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
new file mode 100644
index 00000000000..8ce2256e602
--- /dev/null
+++ 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
index 15ee2b53a7a..9f167d99fc1 100644
--- 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;