[2.0] Import graphql-extensions and apollo-engine-reporting and avoid global apollo-server-env

.circleci/config.yml

@@ -25,8 +25,15 @@ common_test_steps: &common_test_steps
   steps:
     - *run_install_desired_npm
     - checkout
+    - run: cat ./packages/*/package.json > package-checksum
+    - restore_cache:
+        key: dependency-cache-{{ checksum "package.json" }}-{{ checksum "package-checksum" }}
     - run: npm --version
     - run: npm install
+    - save_cache:
+        key: dependency-cache-{{ checksum "package.json" }}-{{ checksum "package-checksum" }}
+        paths:
+          - ./node_modules
     - run: npm run travis
 
 # Important! When adding a new job to `jobs`, make sure to define when it
@@ -62,8 +69,14 @@ jobs:
     steps:
       # (speed) Intentionally omitted, unnecessary, run_install_desired_npm.
       - checkout
+      - restore_cache:
+          key: dependency-cache-{{ checksum "./docs/package.json" }}
       # (speed) Ignore scripts to skip the Lerna build stuff for linting.
       - run: npm install-test --prefix ./docs
+      - save_cache:
+          key: dependency-cache-{{ checksum "./docs/package.json" }}
+          paths:
+            - ./docs/node_modules
 
 ignore_doc_branches: &ignore_doc_branches
   filters:

__mocks__/fetch.ts → __mocks__/apollo-server-env.ts

@@ -1,10 +1,12 @@
-declare global {
-  namespace NodeJS {
-    interface Global {
-      fetch: typeof fetch;
-    }
-  }
-}
+import {
+  fetch,
+  Request,
+  Response,
+  BodyInit,
+  Headers,
+  URL,
+  URLSearchParams,
+} from 'apollo-server-env';
 
 type Headers = { [name: string]: string };
 
@@ -13,39 +15,38 @@ interface FetchMock extends jest.Mock<typeof fetch> {
   mockJSONResponseOnce(data?: object, headers?: Headers);
 }
 
-const fetchMock = jest.fn<typeof fetch>() as FetchMock;
+const mockFetch = jest.fn<typeof fetch>() as FetchMock;
 
-fetchMock.mockResponseOnce = (
+mockFetch.mockResponseOnce = (
   data?: BodyInit,
   headers?: Headers,
   status: number = 200,
 ) => {
-  return fetchMock.mockImplementationOnce(async () => {
+  return mockFetch.mockImplementationOnce(async () => {
     return new Response(data, {
       status,
       headers,
     });
   });
 };
 
-fetchMock.mockJSONResponseOnce = (
+mockFetch.mockJSONResponseOnce = (
   data = {},
   headers?: Headers,
   status?: number,
 ) => {
-  return fetchMock.mockResponseOnce(
+  return mockFetch.mockResponseOnce(
     JSON.stringify(data),
     Object.assign({ 'Content-Type': 'application/json' }, headers),
     status,
   );
 };
 
-export default fetchMock;
-
-export function mockFetch() {
-  global.fetch = fetchMock;
-}
-
-export function unmockFetch() {
-  global.fetch = fetch;
-}
+export = {
+  fetch: mockFetch,
+  Request,
+  Response,
+  Headers,
+  URL,
+  URLSearchParams,
+};

lerna.json

@@ -1,6 +1,6 @@
 {
   "lerna": "2.0.0",
-  "version": "2.0.0-rc.5",
+  "version": "independent",
   "changelog": {
     "repo": "apollographql/apollo-server",
     "labels": {
@@ -13,7 +13,5 @@
     }
   },
   "hoist": true,
-  "packages": [
-    "packages/*"
-  ]
+  "packages": ["packages/*"]
 }

package.json

@@ -36,23 +36,23 @@
     "node": ">=6"
   },
   "devDependencies": {
-    "@types/chai": "4.1.3",
+    "@types/chai": "^4.1.4",
     "@types/graphql": "^0.13.1",
-    "@types/mocha": "5.2.1",
-    "@types/node": "^10.3.2",
+    "@types/mocha": "^5.2.3",
+    "@types/node": "^10.3.6",
     "@types/sinon": "5.0.1",
     "chai": "4.1.2",
-    "graphql": "0.13.2",
-    "husky": "0.14.3",
-    "istanbul": "1.1.0-alpha.1",
-    "lerna": "2.11.0",
-    "lint-staged": "7.2.0",
-    "mocha": "5.2.0",
-    "prettier": "1.13.5",
-    "prettier-check": "2.0.0",
-    "remap-istanbul": "0.11.1",
-    "sinon": "6.0.0",
-    "supertest": "3.1.0",
-    "typescript": "2.9.1"
+    "graphql": "^0.13.2",
+    "husky": "^0.14.3",
+    "istanbul": "^1.1.0-alpha.1",
+    "lerna": "^2.11.0",
+    "lint-staged": "^7.2.0",
+    "mocha": "^5.2.0",
+    "prettier": "^1.13.6",
+    "prettier-check": "^2.0.0",
+    "remap-istanbul": "^0.11.1",
+    "sinon": "^6.0.1",
+    "supertest": "^3.1.0",
+    "typescript": "^2.9.2"
   }
 }

packages/apollo-datasource-rest/package.json

@@ -12,7 +12,7 @@
     "url": "https://github.com/apollographql/apollo-server/issues"
   },
   "scripts": {
-    "clean": "rm -rf lib",
+    "clean": "rm -rf dist",
     "compile": "tsc",
     "prepublish": "npm run clean && npm run compile",
     "test": "jest --verbose"
@@ -30,13 +30,16 @@
     "lru-cache": "^4.1.3"
   },
   "devDependencies": {
-    "@types/jest": "^23.0.0",
+    "@types/jest": "^23.1.2",
     "@types/lru-cache": "^4.1.1",
-    "jest": "^23.1.0",
+    "jest": "^23.2.0",
     "ts-jest": "^22.4.6"
   },
   "jest": {
     "testEnvironment": "node",
+    "setupFiles": [
+      "<rootDir>/node_modules/apollo-server-env/dist/index.js"
+    ],
     "transform": {
       "^.+\\.(ts|js)$": "ts-jest"
     },
@@ -45,7 +48,10 @@
       "js",
       "json"
     ],
-    "testRegex": "/__tests__/.*$",
+    "testRegex": "apollo-datasource-rest/src/__tests__/.*$",
+    "roots": [
+      "../../"
+    ],
     "globals": {
       "ts-jest": {
         "skipBabel": true

packages/apollo-datasource-rest/src/HTTPCache.ts

@@ -1,3 +1,12 @@
+import {
+  fetch,
+  Request,
+  RequestInfo,
+  RequestInit,
+  Response,
+  Headers,
+} from 'apollo-server-env';
+
 import CachePolicy = require('http-cache-semantics');
 
 import { KeyValueCache, InMemoryLRUCache } from 'apollo-server-caching';

packages/apollo-datasource-rest/src/RESTDataSource.ts

@@ -1,3 +1,14 @@
+import {
+  BodyInit,
+  Headers,
+  Request,
+  RequestInit,
+  Response,
+  URL,
+  URLSearchParams,
+  URLSearchParamsInit,
+} from 'apollo-server-env';
+
 import { HTTPCache } from './HTTPCache';
 import {
   ApolloError,

packages/apollo-datasource-rest/src/__tests__/HTTPCache.test.ts

@@ -1,7 +1,6 @@
-import 'apollo-server-env';
+import { fetch } from 'apollo-server-env';
 import { HTTPCache } from '../HTTPCache';
 
-import fetch, { mockFetch, unmockFetch } from '../../../../__mocks__/fetch';
 import {
   mockDate,
   unmockDate,
@@ -13,7 +12,6 @@ describe('HTTPCache', () => {
   let httpCache: HTTPCache;
 
   beforeAll(() => {
-    mockFetch();
     mockDate();
   });
 
@@ -25,7 +23,6 @@ describe('HTTPCache', () => {
   });
 
   afterAll(() => {
-    unmockFetch();
     unmockDate();
   });
 

packages/apollo-datasource-rest/src/__tests__/RESTDataSource.test.ts

@@ -1,21 +1,19 @@
-import 'apollo-server-env';
+import { fetch } from 'apollo-server-env';
+
 import {
   ApolloError,
   AuthenticationError,
   ForbiddenError,
 } from 'apollo-server-errors';
 import { RESTDataSource } from '../RESTDataSource';
 
-import fetch, { mockFetch, unmockFetch } from '../../../../__mocks__/fetch';
 import { HTTPCache } from '../HTTPCache';
 
 describe('RESTDataSource', () => {
   const store = new Map<string, string>();
   let httpCache: HTTPCache;
 
   beforeAll(() => {
-    mockFetch();
-
     httpCache = new HTTPCache({
       async get(key: string) {
         return store.get(key);
@@ -31,10 +29,6 @@ describe('RESTDataSource', () => {
     store.clear();
   });
 
-  afterAll(() => {
-    unmockFetch();
-  });
-
   it('returns data as parsed JSON when Content-Type is application/json', async () => {
     const dataSource = new class extends RESTDataSource {
       baseURL = 'https://api.example.com';

packages/apollo-engine-reporting/.npmignore

@@ -0,0 +1,6 @@
+*
+!src/**/*
+!dist/**/*
+dist/**/*.test.*
+!package.json
+!README.md

packages/apollo-engine-reporting/CHANGELOG.md

@@ -0,0 +1,4 @@
+### vNext
+
+* Initial release.
+

packages/apollo-engine-reporting/README.md

@@ -0,0 +1,6 @@
+# apollo-engine-reporting
+
+[![npm version](https://badge.fury.io/js/apollo-engine-reporting.svg)](https://badge.fury.io/js/apollo-engine-reporting)
+[![Build Status](https://circleci.com/gh/apollographql/apollo-engine-reporting.svg?style=svg)](https://circleci.com/gh/apollographql/apollo-engine-reporting)
+
+This package is a pure JS implementation of the Apollo Engine reporting feature. It is a work in progress and is not recommended for production use.

packages/apollo-engine-reporting/package.json

@@ -0,0 +1,64 @@
+{
+  "name": "apollo-engine-reporting",
+  "version": "0.0.0-beta.16",
+  "description": "Send reports about your GraphQL services to Apollo Engine",
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "scripts": {
+    "clean": "rm -rf dist",
+    "compile": "tsc",
+    "watch": "tsc -w",
+    "prepublish": "npm run clean && npm run compile",
+    "test": "jest --verbose",
+    "circle": "jest --verbose --coverage",
+    "lint": "prettier -l 'src/**/*.{ts,js}' && tslint -p tsconfig.json 'src/**/*.ts'",
+    "lint-fix": "prettier --write 'src/**/*.{ts,js}' && tslint --fix -p tsconfig.json 'src/**/*.ts'"
+  },
+  "license": "MIT",
+  "repository": "https://github.com/apollographql/apollo-engine-reporting",
+  "author": "Apollo <community@apollographql.com>",
+  "engines": {
+    "node": ">=6.0"
+  },
+  "dependencies": {
+    "apollo-server-env": "^2.0.0-rc.3",
+    "apollo-engine-reporting-protobuf": "0.0.0-beta.7",
+    "graphql-extensions": "^0.1.0-beta.15",
+    "lodash": "^4.17.10",
+    "requestretry": "^1.13.0"
+  },
+  "devDependencies": {
+    "@types/graphql": "^0.13.1",
+    "@types/jest": "^23.1.2",
+    "@types/lodash": "^4.14.110",
+    "@types/node-fetch": "^2.1.1",
+    "@types/requestretry": "^1.12.3",
+    "graphql": "^0.13.2",
+    "graphql-tag": "^2.9.2",
+    "graphql-tools": "^3.0.4",
+    "jest": "^23.2.0",
+    "node-fetch": "^2.1.2",
+    "ts-jest": "^22.4.6",
+    "tslint": "^5.10.0"
+  },
+  "jest": {
+    "testEnvironment": "node",
+    "setupFiles": [
+      "<rootDir>/node_modules/apollo-server-env/dist/index.js"
+    ],
+    "transform": {
+      "^.+\\.(ts|js)$": "ts-jest"
+    },
+    "moduleFileExtensions": [
+      "ts",
+      "js",
+      "json"
+    ],
+    "testRegex": "/__tests__/.*$",
+    "globals": {
+      "ts-jest": {
+        "skipBabel": true
+      }
+    }
+  }
+}