Apollo Server 2.0 without Docs

.circleci/config.yml

@@ -36,10 +36,6 @@ jobs:
   # Platform tests, each with the same tests but different platform or version.
   # The docker tag represents the Node.js version and the full list is available
   # at https://hub.docker.com/r/circleci/node/.
-  Node.js 4:
-    docker: [ { image: 'circleci/node:4' } ]
-    <<: *common_test_steps
-
   Node.js 6:
     docker: [ { image: 'circleci/node:6' } ]
     <<: *common_test_steps
@@ -79,8 +75,6 @@ workflows:
   version: 2
   Build and Test:
     jobs:
-      - Node.js 4:
-          <<: *ignore_doc_branches
       - Node.js 6:
           <<: *ignore_doc_branches
       - Node.js 8:

CHANGELOG.md

@@ -4,6 +4,9 @@ All of the packages in the `apollo-server` repo are released with the same versi
 
 ### vNEXT
 
+* Upgrade `subscription-transport-ws` to 0.9.9 for Graphiql
+* Remove tests and guaranteed support for Node 4 [PR #1024](https://github.com/apollographql/apollo-server/pull/1024)
+
 ### v1.3.6
 
 * Recognize requests with Apollo Persisted Queries and return `PersistedQueryNotSupported` to the client instead of a confusing error. [PR #982](https://github.com/apollographql/apollo-server/pull/982)

docs/_config.yml

@@ -4,7 +4,6 @@ subtitle: Apollo Server
 description: A guide to using Apollo Server.
 versions:
   - '1'
-  - '2'
 sidebar_categories:
   null:
     - index

docs/package.json

@@ -13,7 +13,7 @@
     "hexo-renderer-ejs": "0.3.1",
     "hexo-renderer-less": "0.2.0",
     "hexo-renderer-marked": "0.3.2",
-    "hexo-server": "0.3.1",
+    "hexo-server": "0.3.2",
     "meteor-theme-hexo": "1.0.9"
   },
   "scripts": {

package.json

@@ -34,9 +34,10 @@
   },
   "devDependencies": {
     "@types/chai": "4.1.3",
+    "@types/graphql": "^0.13.0",
     "@types/mocha": "5.2.0",
-    "@types/node": "9.6.6",
-    "@types/sinon": "4.3.0",
+    "@types/node": "9.6.15",
+    "@types/sinon": "4.3.3",
     "chai": "4.1.2",
     "graphql": "0.13.2",
     "husky": "0.14.3",
@@ -47,7 +48,7 @@
     "prettier": "1.12.1",
     "prettier-check": "2.0.0",
     "remap-istanbul": "0.11.1",
-    "sinon": "4.5.0",
+    "sinon": "5.0.7",
     "supertest": "3.0.0",
     "supertest-as-promised": "4.0.2",
     "typescript": "2.8.3"

packages/apollo-server-adonis/package.json

@@ -29,7 +29,7 @@
     "apollo-server-module-graphiql": "^1.3.4"
   },
   "devDependencies": {
-    "@adonisjs/bodyparser": "2.0.2",
+    "@adonisjs/bodyparser": "2.0.3",
     "@adonisjs/fold": "4.0.8",
     "@adonisjs/framework": "4.0.31",
     "@adonisjs/sink": "1.0.16",

packages/graphql-server-module-graphiql/package.json → packages/apollo-server-cloudflare/package.json

@@ -1,31 +1,35 @@
 {
-  "name": "graphql-server-module-graphiql",
-  "version": "1.3.4",
-  "description": "GraphiQL renderer for Apollo GraphQL Server",
+  "name": "apollo-server-cloudflare",
+  "version": "1.0.0-beta.0",
+  "description": "Production-ready Node.js GraphQL server for Cloudflare workers",
   "main": "dist/index.js",
   "scripts": {
     "compile": "tsc",
     "prepublish": "npm run compile"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/apollographql/apollo-server/tree/master/packages/graphql-server-module-graphiql"
+    "url": "https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-cloudflare-workers"
   },
   "keywords": [
     "GraphQL",
-    "GraphiQL",
     "Apollo",
+    "Server",
+    "Cloudflare",
     "Javascript"
   ],
-  "author": "Jonas Helfer <jonas@helfer.email>",
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/apollographql/apollo-server/issues"
   },
   "homepage": "https://github.com/apollographql/apollo-server#readme",
   "dependencies": {
+    "apollo-server-core": "2.0.0-beta.0",
     "apollo-server-module-graphiql": "^1.3.4"
   },
+  "devDependencies": {
+    "@types/graphql": "0.12.7"
+  },
   "typings": "dist/index.d.ts",
   "typescript": {
     "definition": "dist/index.d.ts"

packages/apollo-server-cloudflare/src/ApolloServer.ts

@@ -0,0 +1,18 @@
+import { graphqlCloudflare } from './cloudflareApollo';
+
+import { ApolloServerBase } from 'apollo-server-core';
+
+interface FetchEvent extends Event {
+  respondWith: (result: Promise<ResponseInit>) => void;
+  request: RequestInit;
+}
+
+export class ApolloServer extends ApolloServerBase {
+  public async listen() {
+    const graphql = this.request.bind(this);
+    addEventListener('fetch', (event: FetchEvent) => {
+      event.respondWith(graphqlCloudflare(graphql)(event.request));
+    });
+    return await { url: '', port: null };
+  }
+}

packages/apollo-server-cloudflare/src/cloudflareApollo.ts

@@ -0,0 +1,67 @@
+import * as url from 'url';
+import {
+  GraphQLOptions,
+  HttpQueryError,
+  runHttpQuery,
+} from 'apollo-server-core';
+// import * as GraphiQL from 'apollo-server-module-graphiql';
+
+// Design principles:
+// - You can issue a GET or POST with your query.
+// - simple, fast and secure
+//
+
+export function graphqlCloudflare(options: GraphQLOptions) {
+  if (!options) {
+    throw new Error('Apollo Server requires options.');
+  }
+
+  if (arguments.length > 1) {
+    throw new Error(
+      `Apollo Server expects exactly one argument, got ${arguments.length}`,
+    );
+  }
+
+  const graphqlHandler = async (req: RequestInit): Promise<Response> => {
+    const url = new URL((req as Request).url);
+    const query =
+      req.method === 'POST'
+        ? await (req as Request).json()
+        : {
+            query: url.searchParams.get('query'),
+            variables: url.searchParams.get('variables'),
+            operationName: url.searchParams.get('operationName'),
+            extensions: url.searchParams.get('extensions'),
+          };
+
+    return runHttpQuery([req], {
+      method: req.method,
+      options: options,
+      query,
+    }).then(
+      gqlResponse =>
+        new Response(gqlResponse, {
+          status: 200,
+          headers: { 'content-type': 'application/json' },
+        }),
+      (error: HttpQueryError) => {
+        if ('HttpQueryError' !== error.name) throw error;
+
+        const res = new Response(error.message, {
+          status: error.statusCode,
+          headers: { 'content-type': 'application/json' },
+        });
+
+        if (error.headers) {
+          Object.keys(error.headers).forEach(header => {
+            res.headers[header] = error.headers[header];
+          });
+        }
+
+        return res;
+      },
+    );
+  };
+
+  return graphqlHandler;
+}

packages/apollo-server-cloudflare/src/index.ts

@@ -0,0 +1,2 @@
+export { graphqlCloudflare } from './cloudflareApollo';
+export { ApolloServer } from './ApolloServer';

packages/graphql-server-express/tsconfig.json → packages/apollo-server-cloudflare/tsconfig.json

@@ -2,7 +2,9 @@
   "extends": "../../tsconfig",
   "compilerOptions": {
     "rootDir": "./src",
-    "outDir": "./dist"
+    "outDir": "./dist",
+    "lib": ["es6", "esnext.asynciterable", "dom"],
+    "types": ["@types/node"]
   },
   "exclude": ["node_modules", "dist"]
 }

packages/apollo-server-core/CHANGELOG.md

@@ -0,0 +1,9 @@
+# Changelog
+
+### vNEXT
+
+* `apollo-server-core`: move subscriptions options into listen [PR#1059](https://github.com/apollographql/apollo-server/pull/1059)
+* `apollo-server-core`: Replace console.error with logFunction for opt-in logging [PR #1024](https://github.com/apollographql/apollo-server/pull/1024)
+* `apollo-server-core`: context creation can be async and errors are formatted to include error code [PR #1024](https://github.com/apollographql/apollo-server/pull/1024)
+* `apollo-server-core`: add `mocks` parameter to the base constructor(applies to all variants) [PR#1017](https://github.com/apollographql/apollo-server/pull/1017)
+* `apollo-server-core`: Remove printing of stack traces with `debug` option and include response in logging function[PR#1018](https://github.com/apollographql/apollo-server/pull/1018)

packages/apollo-server-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apollo-server-core",
-  "version": "1.3.6",
+  "version": "2.0.0-beta.0",
   "description": "Core engine for Apollo GraphQL server",
   "main": "dist/index.js",
   "scripts": {
@@ -27,20 +27,27 @@
   "devDependencies": {
     "@types/fibers": "0.0.30",
     "@types/graphql": "0.12.7",
+    "@types/node": "^9.6.1",
+    "@types/ws": "^4.0.2",
+    "apollo-engine": "^1.0.6",
     "fibers": "1.0.15",
     "meteor-promise": "0.8.6",
     "typescript": "2.8.3"
   },
   "peerDependencies": {
-    "graphql": "^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0"
+    "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0"
   },
   "typings": "dist/index.d.ts",
   "typescript": {
     "definition": "dist/index.d.ts"
   },
   "dependencies": {
-    "apollo-cache-control": "^0.1.0",
+    "apollo-cache-control": "^0.1.1",
     "apollo-tracing": "^0.1.0",
-    "graphql-extensions": "^0.0.x"
+    "graphql-extensions": "^0.0.x",
+    "graphql-subscriptions": "^0.5.8",
+    "graphql-tools": "^2.23.1",
+    "subscriptions-transport-ws": "^0.9.7",
+    "ws": "^5.1.1"
   }
 }