From dec2b94a0e309c1c75b3e9f3d7b4011e36a7e48a Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Wed, 10 Oct 2018 22:30:54 +0300 Subject: [PATCH 1/7] Publish - apollo-cache-control@0.3.0-alpha.0 - apollo-datasource-rest@0.2.0-alpha.0 - apollo-datasource@0.2.0-alpha.0 - apollo-engine-reporting-protobuf@0.1.0-alpha.0 - apollo-engine-reporting@0.1.0-alpha.0 - apollo-server-cache-memcached@0.2.0-alpha.0 - apollo-server-cache-redis@0.2.0-alpha.0 - apollo-server-caching@0.2.0-alpha.0 - apollo-server-cloud-functions@2.2.0-alpha.0 - apollo-server-cloudflare@2.2.0-alpha.0 - apollo-server-core@2.2.0-alpha.0 - apollo-server-env@2.1.0-alpha.0 - apollo-server-errors@2.1.0-alpha.0 - apollo-server-express@2.2.0-alpha.0 - apollo-server-hapi@2.2.0-alpha.0 - apollo-server-integration-testsuite@2.2.0-alpha.0 - apollo-server-koa@2.2.0-alpha.0 - apollo-server-lambda@2.2.0-alpha.0 - apollo-server-micro@2.2.0-alpha.0 - apollo-server-plugin-base@0.1.0-alpha.0 - apollo-server@2.2.0-alpha.0 - apollo-tracing@0.3.0-alpha.0 - graphql-extensions@0.3.0-alpha.0 --- packages/apollo-cache-control/package.json | 2 +- packages/apollo-datasource-rest/package.json | 2 +- packages/apollo-datasource/package.json | 2 +- packages/apollo-engine-reporting-protobuf/package.json | 2 +- packages/apollo-engine-reporting/package.json | 2 +- packages/apollo-server-cache-memcached/package.json | 2 +- packages/apollo-server-cache-redis/package.json | 2 +- packages/apollo-server-caching/package.json | 2 +- packages/apollo-server-cloud-function/package.json | 2 +- packages/apollo-server-cloudflare/package.json | 2 +- packages/apollo-server-core/package.json | 2 +- packages/apollo-server-env/package.json | 2 +- packages/apollo-server-errors/package.json | 2 +- packages/apollo-server-express/package.json | 2 +- packages/apollo-server-hapi/package.json | 2 +- packages/apollo-server-integration-testsuite/package.json | 2 +- packages/apollo-server-koa/package.json | 2 +- packages/apollo-server-lambda/package.json | 2 +- packages/apollo-server-micro/package.json | 2 +- packages/apollo-server-plugin-base/package.json | 2 +- packages/apollo-server/package.json | 2 +- packages/apollo-tracing/package.json | 2 +- packages/graphql-extensions/package.json | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/packages/apollo-cache-control/package.json b/packages/apollo-cache-control/package.json index 78a84392b18..6f8bf86974c 100644 --- 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 index fa8ae64de02..2ee3a5d50ce 100644 --- 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 index 23ee4bcb10c..54551f66623 100644 --- 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 index 00154fbee7f..84438fd3123 100644 --- 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 index b08b4030964..0e2b7c737d5 100644 --- 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 index bd09f1b7b7b..c0d5f84ca85 100644 --- 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 index 8b2179fc91a..c6b41b19f3d 100644 --- 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 index 15b06a53128..e88f5810aa9 100644 --- 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 index 2f3f09370ce..4f9fc056cee 100644 --- 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 index c8c9a5c2f0c..59d960c7d23 100644 --- 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 index c26ab2b59d8..af01a870f89 100644 --- 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", diff --git a/packages/apollo-server-env/package.json b/packages/apollo-server-env/package.json index 6957c45b76c..f90a73c48bf 100644 --- 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 index 26a767d038c..257a21ad7df 100644 --- 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 index 45b1821c712..fc7e5caad91 100644 --- 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 index 2d4a82200a4..812e6c04f0e 100644 --- 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 index 7101f33855c..bbe497a9294 100644 --- 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 index 99162abc309..95a0512f918 100644 --- 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 index d8d4b659b15..51775fc8ae5 100644 --- 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 index c4ad4ff3323..fbdf19b0c98 100644 --- 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 index 0b01c4e303d..218c6e7157c 100644 --- 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 index b58aa209bd8..e47df61c3a3 100644 --- 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 index e2d4dd76594..c2429089aa3 100644 --- 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 index 206af4235f2..0d918c73737 100644 --- 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", From 48bfc82f1336a8fcb5711f9dc15321fee6a6bf7a Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 11 Oct 2018 02:20:35 +0000 Subject: [PATCH 2/7] chore(deps): update dependency @types/node to v10.11.7 --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index fbab21e242c..f3a12d0babe 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1391,9 +1391,9 @@ } }, "@types/node": { - "version": "10.11.6", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.11.6.tgz", - "integrity": "sha512-fnA7yvqg3oKQDb3skBif9w5RRKVKAaeKeNuLzZL37XcSiWL4IoSXQnnbchR3UnBu2EMLHBip7ZVEkqoIVBP8QQ==" + "version": "10.11.7", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.11.7.tgz", + "integrity": "sha512-yOxFfkN9xUFLyvWaeYj90mlqTJ41CsQzWKS3gXdOMOyPVacUsymejKxJ4/pMW7exouubuEeZLJawGgcNGYlTeg==" }, "@types/podium": { "version": "1.0.0", diff --git a/package.json b/package.json index efe208d5562..cbf01f9d8cf 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,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/redis": "2.8.7", "@types/request": "2.47.1", "@types/type-is": "^1.6.2", From bc9492eb5badfd4a41e261572581edfaa7bbee50 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Thu, 11 Oct 2018 12:04:52 +0300 Subject: [PATCH 3/7] chore(deps): pin dependencies to 1.6.2 (#1797) --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index cbf01f9d8cf..f07cc64102d 100644 --- a/package.json +++ b/package.json @@ -75,8 +75,8 @@ "@types/node": "10.11.7", "@types/redis": "2.8.7", "@types/request": "2.47.1", - "@types/type-is": "^1.6.2", - "@types/ws": "^6.0.1", + "@types/type-is": "1.6.2", + "@types/ws": "6.0.1", "apollo-fetch": "0.7.0", "apollo-link": "1.2.3", "apollo-link-http": "1.5.5", From 11979a0740f4e68e3ae533678d3c8df4a869c708 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Thu, 11 Oct 2018 12:05:06 +0300 Subject: [PATCH 4/7] chore(deps): update dependency husky to v1.1.2 (#1801) --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index f3a12d0babe..bcc678bcecb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6460,9 +6460,9 @@ } }, "husky": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/husky/-/husky-1.1.1.tgz", - "integrity": "sha512-D8ly8eIZdWzWVG4mh4apaX1PP47uLSaN8CS0RyuuLtHJ20Gt6Ccky5pSecaPsqxNzQj0zon3x6QX/0kCc5/TOQ==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/husky/-/husky-1.1.2.tgz", + "integrity": "sha512-9TdkUpBeEOjz0AnFdUN4i3w8kEbOsVs9/WSeJqWLq2OO6bcKQhVW64Zi+pVd/AMRLpN3QTINb6ZXiELczvdmqQ==", "dev": true, "requires": { "cosmiconfig": "^5.0.6", diff --git a/package.json b/package.json index f07cc64102d..70b877b986d 100644 --- a/package.json +++ b/package.json @@ -92,7 +92,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", From 73cbd03be0a1280c92f9e8a7a395d889844bcb59 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Thu, 11 Oct 2018 12:05:19 +0300 Subject: [PATCH 5/7] chore(deps): update dependency @types/ws to v6 (#1609) --- package-lock.json | 8 ++++---- packages/apollo-server-core/package.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index bcc678bcecb..bc931647665 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2038,7 +2038,7 @@ "version": "file:packages/apollo-server-core", "requires": { "@apollographql/apollo-upload-server": "^5.0.3", - "@types/ws": "^5.1.2", + "@types/ws": "^6.0.0", "apollo-cache-control": "file:packages/apollo-cache-control", "apollo-datasource": "file:packages/apollo-datasource", "apollo-engine-reporting": "file:packages/apollo-engine-reporting", @@ -2053,11 +2053,11 @@ "graphql-tools": "^4.0.0", "lodash": "^4.17.10", "subscriptions-transport-ws": "^0.9.11", - "ws": "^5.2.0" + "ws": "^6.0.0" }, "dependencies": { "@types/ws": { - "version": "5.1.2", + "version": "6.0.1", "bundled": true, "requires": { "@types/events": "*", @@ -2065,7 +2065,7 @@ } }, "ws": { - "version": "5.2.2", + "version": "6.1.0", "bundled": true, "requires": { "async-limiter": "~1.0.0" diff --git a/packages/apollo-server-core/package.json b/packages/apollo-server-core/package.json index af01a870f89..33cf0e01941 100644 --- a/packages/apollo-server-core/package.json +++ b/packages/apollo-server-core/package.json @@ -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" From 7966db5d3dc7170e8263dce51ff6f701c741c591 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 11 Oct 2018 13:00:32 +0300 Subject: [PATCH 6/7] Add a Codecov configuration file to adjust the defaults. In particular, we're not 100% sold on the Codecov charts - which add some noise, but seem like they could be helpful at higher coverage percentages. Also, for the time-being, we'll lower the target for `patch`s (i.e. PRs) to zero, just to see how the values get reported in the CI checks. Ref: https://docs.codecov.io/docs/commit-status --- codecov.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 codecov.yml diff --git a/codecov.yml b/codecov.yml new file mode 100644 index 00000000000..d4919272c08 --- /dev/null +++ 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 + From 94fc935d3c874e31929aaf825212fc2d214a3a5e Mon Sep 17 00:00:00 2001 From: Nicolas Marien Date: Thu, 11 Oct 2018 13:36:31 +0000 Subject: [PATCH 7/7] "Fix incorrect documentation for enum value" (#1802) --- docs/source/features/scalars-enums.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/features/scalars-enums.md b/docs/source/features/scalars-enums.md index 4c8cbacd2ec..a2dcc2553f0 100644 --- 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' }, } };