fix rollup imports and sourcemap support(jest + rollup) (#489)

* fix rollup imports * add mapCoverage to jest for ts sourcemaps * add sourcemap support for tsc to rollup * apollo-link: allowSyntheticDefaultImports is true and zen-observable a default import not * as * add esModuleInterop config to tsc to ensure * as imports are illegal
apollographql · Feb 20, 2018 · 98f9d15 · 98f9d15
1 parent 7fcfa9c
commit 98f9d15
Show file tree

Hide file tree

Showing 29 changed files with 45 additions and 26 deletions.
diff --git a/package.json b/package.json
@@ -95,6 +95,7 @@
     "lint-staged": "6.1.1",
     "pre-commit": "1.2.2",
     "prettier": "1.10.2",
+    "rollup-plugin-sourcemaps": "^0.4.2",
     "ts-jest": "21.2.4",
     "typescript": "2.7.2"
   }

diff --git a/packages/apollo-link-batch-http/package.json b/packages/apollo-link-batch-http/package.json
@@ -71,6 +71,7 @@
     },
     "testRegex": "(/__tests__/.*|\\.(test|spec))\\.(ts|tsx|js)$",
     "moduleFileExtensions": ["ts", "tsx", "js", "json"],
-    "testPathIgnorePatterns": ["/node_modules/", "sharedHttpTests.ts"]
+    "testPathIgnorePatterns": ["/node_modules/", "sharedHttpTests.ts"],
+    "mapCoverage": true
   }
 }
diff --git a/packages/apollo-link-batch-http/src/__tests__/batchHttpLink.ts b/packages/apollo-link-batch-http/src/__tests__/batchHttpLink.ts
@@ -1,6 +1,6 @@
 import { ApolloLink, execute, Observable, makePromise } from 'apollo-link';
 import { print } from 'graphql';
-import * as fetchMock from 'fetch-mock';
+import fetchMock from 'fetch-mock';
 import gql from 'graphql-tag';
 
 import { sharedHttpTest } from './sharedHttpTests';

diff --git a/packages/apollo-link-batch/package.json b/packages/apollo-link-batch/package.json
@@ -65,6 +65,7 @@
       ".(ts|tsx)": "<rootDir>/node_modules/ts-jest/preprocessor.js"
     },
     "testRegex": "(/__tests__/.*|\\.(test|spec))\\.(ts|tsx|js)$",
-    "moduleFileExtensions": ["ts", "tsx", "js", "json"]
+    "moduleFileExtensions": ["ts", "tsx", "js", "json"],
+    "mapCoverage": true
   }
 }
diff --git a/packages/apollo-link-context/package.json b/packages/apollo-link-context/package.json
@@ -56,6 +56,7 @@
       ".(ts|tsx)": "<rootDir>/node_modules/ts-jest/preprocessor.js"
     },
     "testRegex": "(/__tests__/.*|\\.(test|spec))\\.(ts|tsx|js)$",
-    "moduleFileExtensions": ["ts", "tsx", "js", "json"]
+    "moduleFileExtensions": ["ts", "tsx", "js", "json"],
+    "mapCoverage": true
   }
 }
diff --git a/packages/apollo-link-dedup/package.json b/packages/apollo-link-dedup/package.json
@@ -62,6 +62,7 @@
       ".(ts|tsx)": "<rootDir>/node_modules/ts-jest/preprocessor.js"
     },
     "testRegex": "(/__tests__/.*|\\.(test|spec))\\.(ts|tsx|js)$",
-    "moduleFileExtensions": ["ts", "tsx", "js", "json"]
+    "moduleFileExtensions": ["ts", "tsx", "js", "json"],
+    "mapCoverage": true
   }
 }
diff --git a/packages/apollo-link-error/package.json b/packages/apollo-link-error/package.json
@@ -56,6 +56,7 @@
       ".(ts|tsx)": "<rootDir>/node_modules/ts-jest/preprocessor.js"
     },
     "testRegex": "(/__tests__/.*|\\.(test|spec))\\.(ts|tsx|js)$",
-    "moduleFileExtensions": ["ts", "tsx", "js", "json"]
+    "moduleFileExtensions": ["ts", "tsx", "js", "json"],
+    "mapCoverage": true
   }
 }
diff --git a/packages/apollo-link-http-common/package.json b/packages/apollo-link-http-common/package.json
@@ -63,6 +63,7 @@
       ".(ts|tsx)": "<rootDir>/node_modules/ts-jest/preprocessor.js"
     },
     "testRegex": "(/__tests__/.*|\\.(test|spec))\\.(ts|tsx|js)$",
-    "moduleFileExtensions": ["ts", "tsx", "js", "json"]
+    "moduleFileExtensions": ["ts", "tsx", "js", "json"],
+    "mapCoverage": true
   }
 }
diff --git a/packages/apollo-link-http-common/src/__tests__/index.ts b/packages/apollo-link-http-common/src/__tests__/index.ts
@@ -1,6 +1,6 @@
 import { createOperation, Observable, ApolloLink, execute } from 'apollo-link';
 import gql from 'graphql-tag';
-import * as fetchMock from 'fetch-mock';
+import fetchMock from 'fetch-mock';
 
 import {
   parseAndCheckHttpResponse,

diff --git a/packages/apollo-link-http/package.json b/packages/apollo-link-http/package.json
@@ -71,6 +71,7 @@
     },
     "testRegex": "(/__tests__/.*|\\.(test|spec))\\.(ts|tsx|js)$",
     "moduleFileExtensions": ["ts", "tsx", "js", "json"],
+    "mapCoverage": true,
     "testPathIgnorePatterns": ["/node_modules/", "sharedHttpTests.ts"]
   }
 }
diff --git a/packages/apollo-link-http/src/__tests__/httpLink.ts b/packages/apollo-link-http/src/__tests__/httpLink.ts
@@ -1,6 +1,6 @@
 import { Observable, ApolloLink, execute } from 'apollo-link';
 import gql from 'graphql-tag';
-import * as fetchMock from 'fetch-mock';
+import fetchMock from 'fetch-mock';
 import objectToQuery from 'object-to-querystring';
 
 import { sharedHttpTest } from './sharedHttpTests';

diff --git a/packages/apollo-link-http/src/__tests__/sharedHttpTests.ts b/packages/apollo-link-http/src/__tests__/sharedHttpTests.ts
@@ -1,7 +1,7 @@
 import { Observable, ApolloLink, execute } from 'apollo-link';
 import { print } from 'graphql';
 import gql from 'graphql-tag';
-import * as fetchMock from 'fetch-mock';
+import fetchMock from 'fetch-mock';
 
 const sampleQuery = gql`
   query SampleQuery {

diff --git a/packages/apollo-link-polling/package.json b/packages/apollo-link-polling/package.json
@@ -64,6 +64,7 @@
       ".(ts|tsx)": "<rootDir>/node_modules/ts-jest/preprocessor.js"
     },
     "testRegex": "(/__tests__/.*|\\.(test|spec))\\.(ts|tsx|js)$",
-    "moduleFileExtensions": ["ts", "tsx", "js", "json"]
+    "moduleFileExtensions": ["ts", "tsx", "js", "json"],
+    "mapCoverage": true
   }
 }
diff --git a/packages/apollo-link-retry/package.json b/packages/apollo-link-retry/package.json
@@ -64,6 +64,7 @@
       ".(ts|tsx)": "<rootDir>/node_modules/ts-jest/preprocessor.js"
     },
     "testRegex": "(/__tests__/.*|\\.(test|spec))\\.(ts|tsx|js)$",
-    "moduleFileExtensions": ["ts", "tsx", "js", "json"]
+    "moduleFileExtensions": ["ts", "tsx", "js", "json"],
+    "mapCoverage": true
   }
 }
diff --git a/packages/apollo-link-schema/package.json b/packages/apollo-link-schema/package.json
@@ -66,6 +66,7 @@
       ".(ts|tsx)": "<rootDir>/node_modules/ts-jest/preprocessor.js"
     },
     "testRegex": "(/__tests__/.*|\\.(test|spec))\\.(ts|tsx|js)$",
-    "moduleFileExtensions": ["ts", "tsx", "js", "json"]
+    "moduleFileExtensions": ["ts", "tsx", "js", "json"],
+    "mapCoverage": true
   }
 }
diff --git a/packages/apollo-link-ws/package.json b/packages/apollo-link-ws/package.json
@@ -66,6 +66,7 @@
       ".(ts|tsx)": "<rootDir>/node_modules/ts-jest/preprocessor.js"
     },
     "testRegex": "(/__tests__/.*|\\.(test|spec))\\.(ts|tsx|js)$",
-    "moduleFileExtensions": ["ts", "tsx", "js", "json"]
+    "moduleFileExtensions": ["ts", "tsx", "js", "json"],
+    "mapCoverage": true
   }
 }
diff --git a/packages/apollo-link/CHANGELOG.md b/packages/apollo-link/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ### vNEXT
 - Add `fromError` Observable helper
+- change import method of zen-observable for rollup compat
 
 ### 1.1.0
 - Expose `#execute` on ApolloLink as static

diff --git a/packages/apollo-link/package.json b/packages/apollo-link/package.json
@@ -41,6 +41,7 @@
     "watch": "tsc -w -p . & rollup -c -w"
   },
   "dependencies": {
+    "@types/node": "^9.4.6",
     "@types/zen-observable": "0.5.3",
     "apollo-utilities": "^1.0.0",
     "zen-observable": "^0.8.0"
@@ -67,6 +68,7 @@
       ".(ts|tsx)": "<rootDir>/node_modules/ts-jest/preprocessor.js"
     },
     "testRegex": "(/__tests__/.*|\\.(test|spec))\\.(ts|tsx|js)$",
-    "moduleFileExtensions": ["ts", "tsx", "js", "json"]
+    "moduleFileExtensions": ["ts", "tsx", "js", "json"],
+    "mapCoverage": true
   }
 }
diff --git a/packages/apollo-link/src/__tests__/link.ts b/packages/apollo-link/src/__tests__/link.ts
@@ -1,4 +1,4 @@
-import * as Observable from 'zen-observable';
+import Observable from 'zen-observable';
 import gql from 'graphql-tag';
 import { print } from 'graphql/language/printer';
 

diff --git a/packages/apollo-link/src/__tests__/linkUtils.ts b/packages/apollo-link/src/__tests__/linkUtils.ts
@@ -4,7 +4,7 @@ import {
   makePromise,
   fromError,
 } from '../linkUtils';
-import * as Observable from 'zen-observable';
+import Observable from 'zen-observable';
 
 describe('Link utilities:', () => {
   describe('validateOperation', () => {

diff --git a/packages/apollo-link/src/index.ts b/packages/apollo-link/src/index.ts
@@ -8,6 +8,5 @@ export {
 } from './linkUtils';
 export * from './types';
 
-import * as Observable from 'zen-observable';
-
+import Observable from 'zen-observable';
 export { Observable };
diff --git a/packages/apollo-link/src/link.ts b/packages/apollo-link/src/link.ts
@@ -1,4 +1,4 @@
-import * as Observable from 'zen-observable';
+import Observable from 'zen-observable';
 
 import {
   GraphQLRequest,

diff --git a/packages/apollo-link/src/linkUtils.ts b/packages/apollo-link/src/linkUtils.ts
@@ -1,5 +1,5 @@
 import { getOperationName } from 'apollo-utilities';
-import * as Observable from 'zen-observable';
+import Observable from 'zen-observable';
 import { print } from 'graphql/language/printer';
 
 import { GraphQLRequest, Operation } from './types';

diff --git a/packages/apollo-link/src/test-utils/mockLink.ts b/packages/apollo-link/src/test-utils/mockLink.ts
@@ -1,6 +1,6 @@
 import { Operation, RequestHandler, NextLink, FetchResult } from '../types';
 
-import * as Observable from 'zen-observable';
+import Observable from 'zen-observable';
 
 import { ApolloLink } from '../link';
 

diff --git a/packages/apollo-link/src/test-utils/setContext.ts b/packages/apollo-link/src/test-utils/setContext.ts
@@ -1,6 +1,6 @@
 import { Operation, NextLink, FetchResult } from '../types';
 
-import * as Observable from 'zen-observable';
+import Observable from 'zen-observable';
 
 import { ApolloLink } from '../link';
 

diff --git a/packages/apollo-link/src/types.ts b/packages/apollo-link/src/types.ts
@@ -1,4 +1,4 @@
-import * as Observable from 'zen-observable';
+import Observable from 'zen-observable';
 import { ExecutionResult, DocumentNode } from 'graphql';
 
 export interface GraphQLRequest {

diff --git a/packages/apollo-link/tsconfig.json b/packages/apollo-link/tsconfig.json
@@ -2,7 +2,8 @@
   "extends": "../../tsconfig",
   "compilerOptions": {
     "rootDir": "./src",
-    "outDir": "lib"
+    "outDir": "lib",
+    "allowSyntheticDefaultImports": true
   },
   "include": ["src/**/*.ts"],
   "exclude": ["src/**/__tests__/*.ts"]

diff --git a/rollup.config.js b/rollup.config.js
@@ -1,3 +1,5 @@
+import sourcemaps from 'rollup-plugin-sourcemaps';
+
 export const globals = {
   // Apollo
   'apollo-client': 'apollo.core',
@@ -24,6 +26,7 @@ export default name => ({
   },
   external: Object.keys(globals),
   onwarn,
+  plugins: [sourcemaps()],
 });
 
 export function onwarn(message) {

diff --git a/tsconfig.json b/tsconfig.json
@@ -10,6 +10,7 @@
     "noImplicitAny": false,
     "noUnusedParameters": false,
     "noUnusedLocals": true,
-    "skipLibCheck": true
+    "skipLibCheck": true,
+    "esModuleInterop": true
   }
 }