Merge branch 'master' into testing-improvements

apollographql · Oct 12, 2018 · 9a69ad3 · 9a69ad3
2 parents 59940a9 + 94fc935
commit 9a69ad3
Show file tree

Hide file tree

Showing 27 changed files with 52 additions and 39 deletions.
diff --git a/codecov.yml b/codecov.yml
@@ -0,0 +1,13 @@
+coverage:
+  status:
+    patch:
+      default:
+        # We should raise this, but we want to evaluate how
+        # this looks in practice, first.  We can do that for now
+        # by observing the status checks on the PRs themselves.
+        target: 0%
+
+# The charts can still be viewed by clicking on the status
+# checks, but they create a fair amount of noise by default.
+comment: off
+
diff --git a/docs/source/features/scalars-enums.md b/docs/source/features/scalars-enums.md
@@ -280,7 +280,7 @@ const resolvers = {
   Query: {
     favoriteColor: () => 'RED',
     avatar: (root, args) => {
-      // args.favoriteColor is 'RED', 'GREEN', or 'BLUE'
+      // args.borderColor is 'RED', 'GREEN', or 'BLUE'
     },
   }
 };
@@ -318,7 +318,7 @@ const resolvers = {
   Query: {
     favoriteColor: () => '#f00',
     avatar: (root, args) => {
-      // args.favoriteColor is '#f00', '#0f0', or '#00f'
+      // args.borderColor is '#f00', '#0f0', or '#00f'
     },
   }
 };

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -73,7 +73,7 @@
     "@types/memcached": "2.2.5",
     "@types/micro": "7.3.2",
     "@types/multer": "1.3.7",
-    "@types/node": "10.11.6",
+    "@types/node": "10.11.7",
     "@types/node-fetch": "^2.1.2",
     "@types/redis": "2.8.7",
     "@types/request": "2.47.1",
@@ -96,7 +96,7 @@
     "graphql-tag": "2.10.0",
     "graphql-tools": "4.0.0",
     "hapi": "17.6.0",
-    "husky": "1.1.1",
+    "husky": "1.1.2",
     "jest": "23.6.0",
     "jest-junit": "5.2.0",
     "jest-matcher-utils": "23.6.0",

diff --git a/packages/apollo-cache-control/package.json b/packages/apollo-cache-control/package.json
@@ -1,6 +1,6 @@
 {
   "name": "apollo-cache-control",
-  "version": "0.2.5",
+  "version": "0.3.0-alpha.0",
   "description": "A GraphQL extension for cache control",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

diff --git a/packages/apollo-datasource-rest/package.json b/packages/apollo-datasource-rest/package.json
@@ -1,6 +1,6 @@
 {
   "name": "apollo-datasource-rest",
-  "version": "0.1.5",
+  "version": "0.2.0-alpha.0",
   "author": "opensource@apollographql.com",
   "license": "MIT",
   "repository": {

diff --git a/packages/apollo-datasource/package.json b/packages/apollo-datasource/package.json
@@ -1,6 +1,6 @@
 {
   "name": "apollo-datasource",
-  "version": "0.1.3",
+  "version": "0.2.0-alpha.0",
   "author": "opensource@apollographql.com",
   "license": "MIT",
   "repository": {

diff --git a/packages/apollo-engine-reporting-protobuf/package.json b/packages/apollo-engine-reporting-protobuf/package.json
@@ -1,6 +1,6 @@
 {
   "name": "apollo-engine-reporting-protobuf",
-  "version": "0.0.1",
+  "version": "0.1.0-alpha.0",
   "description": "Protobuf format for Apollo Engine",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/packages/apollo-engine-reporting/package.json b/packages/apollo-engine-reporting/package.json
@@ -1,6 +1,6 @@
 {
   "name": "apollo-engine-reporting",
-  "version": "0.0.6",
+  "version": "0.1.0-alpha.0",
   "description": "Send reports about your GraphQL services to Apollo Engine",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

diff --git a/packages/apollo-server-cache-memcached/package.json b/packages/apollo-server-cache-memcached/package.json
@@ -1,6 +1,6 @@
 {
   "name": "apollo-server-cache-memcached",
-  "version": "0.1.3",
+  "version": "0.2.0-alpha.0",
   "author": "opensource@apollographql.com",
   "license": "MIT",
   "repository": {

diff --git a/packages/apollo-server-cache-redis/package.json b/packages/apollo-server-cache-redis/package.json
@@ -1,6 +1,6 @@
 {
   "name": "apollo-server-cache-redis",
-  "version": "0.1.3",
+  "version": "0.2.0-alpha.0",
   "author": "opensource@apollographql.com",
   "license": "MIT",
   "repository": {

diff --git a/packages/apollo-server-caching/package.json b/packages/apollo-server-caching/package.json
@@ -1,6 +1,6 @@
 {
   "name": "apollo-server-caching",
-  "version": "0.1.2",
+  "version": "0.2.0-alpha.0",
   "author": "opensource@apollographql.com",
   "license": "MIT",
   "repository": {

diff --git a/packages/apollo-server-cloud-function/package.json b/packages/apollo-server-cloud-function/package.json
@@ -1,6 +1,6 @@
 {
   "name": "apollo-server-cloud-functions",
-  "version": "2.1.0",
+  "version": "2.2.0-alpha.0",
   "description": "Production-ready Node.js GraphQL server for Google Cloud Functions",
   "keywords": [
     "GraphQL",

diff --git a/packages/apollo-server-cloudflare/package.json b/packages/apollo-server-cloudflare/package.json
@@ -1,6 +1,6 @@
 {
   "name": "apollo-server-cloudflare",
-  "version": "2.1.0",
+  "version": "2.2.0-alpha.0",
   "description": "Production-ready Node.js GraphQL server for Cloudflare workers",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/packages/apollo-server-core/package.json b/packages/apollo-server-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "apollo-server-core",
-  "version": "2.1.0",
+  "version": "2.2.0-alpha.0",
   "description": "Core engine for Apollo GraphQL server",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -25,7 +25,7 @@
   },
   "dependencies": {
     "@apollographql/apollo-upload-server": "^5.0.3",
-    "@types/ws": "^5.1.2",
+    "@types/ws": "^6.0.0",
     "apollo-cache-control": "file:../apollo-cache-control",
     "apollo-datasource": "file:../apollo-datasource",
     "apollo-engine-reporting": "file:../apollo-engine-reporting",
@@ -40,7 +40,7 @@
     "graphql-tools": "^4.0.0",
     "lodash": "^4.17.10",
     "subscriptions-transport-ws": "^0.9.11",
-    "ws": "^5.2.0"
+    "ws": "^6.0.0"
   },
   "peerDependencies": {
     "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0"

diff --git a/packages/apollo-server-env/package.json b/packages/apollo-server-env/package.json
@@ -1,6 +1,6 @@
 {
   "name": "apollo-server-env",
-  "version": "2.0.3",
+  "version": "2.1.0-alpha.0",
   "author": "opensource@apollographql.com",
   "license": "MIT",
   "repository": {

diff --git a/packages/apollo-server-errors/package.json b/packages/apollo-server-errors/package.json
@@ -1,6 +1,6 @@
 {
   "name": "apollo-server-errors",
-  "version": "2.0.2",
+  "version": "2.1.0-alpha.0",
   "author": "opensource@apollographql.com",
   "license": "MIT",
   "repository": {

diff --git a/packages/apollo-server-express/package.json b/packages/apollo-server-express/package.json
@@ -1,6 +1,6 @@
 {
   "name": "apollo-server-express",
-  "version": "2.1.0",
+  "version": "2.2.0-alpha.0",
   "description": "Production-ready Node.js GraphQL server for Express and Connect",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/packages/apollo-server-hapi/package.json b/packages/apollo-server-hapi/package.json
@@ -1,6 +1,6 @@
 {
   "name": "apollo-server-hapi",
-  "version": "2.1.0",
+  "version": "2.2.0-alpha.0",
   "description": "Production-ready Node.js GraphQL server for Hapi",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/packages/apollo-server-integration-testsuite/package.json b/packages/apollo-server-integration-testsuite/package.json
@@ -1,7 +1,7 @@
 {
   "name": "apollo-server-integration-testsuite",
   "private": true,
-  "version": "2.1.0",
+  "version": "2.2.0-alpha.0",
   "description": "Apollo Server Integrations testsuite",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/packages/apollo-server-koa/package.json b/packages/apollo-server-koa/package.json
@@ -1,6 +1,6 @@
 {
   "name": "apollo-server-koa",
-  "version": "2.1.0",
+  "version": "2.2.0-alpha.0",
   "description": "Production-ready Node.js GraphQL server for Koa",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/packages/apollo-server-lambda/package.json b/packages/apollo-server-lambda/package.json
@@ -1,6 +1,6 @@
 {
   "name": "apollo-server-lambda",
-  "version": "2.1.0",
+  "version": "2.2.0-alpha.0",
   "description": "Production-ready Node.js GraphQL server for AWS Lambda",
   "keywords": [
     "GraphQL",

diff --git a/packages/apollo-server-micro/package.json b/packages/apollo-server-micro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "apollo-server-micro",
-  "version": "2.1.0",
+  "version": "2.2.0-alpha.0",
   "description": "Production-ready Node.js GraphQL server for Micro",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/packages/apollo-server-plugin-base/package.json b/packages/apollo-server-plugin-base/package.json
@@ -1,6 +1,6 @@
 {
   "name": "apollo-server-plugin-base",
-  "version": "0.0.1",
+  "version": "0.1.0-alpha.0",
   "description": "Apollo Server plugin base classes",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/packages/apollo-server/package.json b/packages/apollo-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "apollo-server",
-  "version": "2.1.0",
+  "version": "2.2.0-alpha.0",
   "description": "Production ready GraphQL Server",
   "author": "opensource@apollographql.com",
   "main": "dist/index.js",

diff --git a/packages/apollo-tracing/package.json b/packages/apollo-tracing/package.json
@@ -1,6 +1,6 @@
 {
   "name": "apollo-tracing",
-  "version": "0.2.5",
+  "version": "0.3.0-alpha.0",
   "description": "Collect and expose trace data for GraphQL requests",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

diff --git a/packages/graphql-extensions/package.json b/packages/graphql-extensions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "graphql-extensions",
-  "version": "0.2.1",
+  "version": "0.3.0-alpha.0",
   "description": "Add extensions to GraphQL servers",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",