Merge branch 'master' into release-vNEXT

rkorrelboom · Dec 13, 2018 · 3fea803 · 3fea803
2 parents ef31818 + 3545c32
commit 3fea803
Show file tree

Hide file tree

Showing 22 changed files with 655 additions and 386 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-### v2.3.0-alpha
+### v2.3.0
 
 - **BREAKING FOR NODE.JS <= 8.5.0 ONLY**: To continue using Apollo Server 2.x in versions of Node.js prior to v8.5.0, file uploads must be disabled by setting `uploads: false` on the `ApolloServer` constructor options.  Without explicitly disabling file-uploads, the server will `throw` at launch (with instructions and a link to our documentation).
 
@@ -10,9 +10,7 @@
 
   **We intend to drop support for Node.js 6.x in the next major version of Apollo Server.**
 
-### v2.2.7-beta.0
-
-### v2.2.7-alpha.0
+### v2.2.7
 
 - `apollo-engine-reporting`: When multiple instances of `apollo-engine-reporting` are loaded (an uncommon edge case), ensure that `encodedTraces` are handled only once rather than once per loaded instance. [PR #2040](https://github.com/apollographql/apollo-server/pull/2040)
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -73,12 +73,12 @@
     "@types/json-stable-stringify": "1.0.32",
     "@types/koa-multer": "1.0.0",
     "@types/koa-router": "7.0.35",
-    "@types/lodash": "4.14.118",
+    "@types/lodash": "4.14.119",
     "@types/lru-cache": "4.1.1",
     "@types/memcached": "2.2.5",
     "@types/micro": "7.3.3",
     "@types/multer": "1.3.7",
-    "@types/node": "10.12.12",
+    "@types/node": "10.12.14",
     "@types/node-fetch": "2.1.4",
     "@types/redis": "2.8.8",
     "@types/request": "2.48.1",
@@ -108,25 +108,25 @@
     "js-sha256": "0.9.0",
     "koa": "2.6.2",
     "koa-multer": "1.0.2",
-    "lerna": "3.5.1",
+    "lerna": "3.6.0",
     "lint-staged": "8.1.0",
     "memcached-mock": "0.1.0",
-    "meteor-promise": "0.8.6",
+    "meteor-promise": "0.8.7",
     "mock-req": "0.2.0",
     "multer": "1.4.1",
     "node-fetch": "2.3.0",
     "prettier": "1.15.3",
     "prettier-check": "2.0.0",
     "qs-middleware": "1.0.3",
-    "redis-mock": "0.40.0",
+    "redis-mock": "0.41.0",
     "request": "2.88.0",
     "request-promise": "4.2.2",
     "subscriptions-transport-ws": "0.9.15",
     "supertest": "3.3.0",
     "test-listen": "1.1.0",
     "ts-jest": "23.10.5",
     "tslint": "5.11.0",
-    "typescript": "3.2.1",
+    "typescript": "3.2.2",
     "ws": "6.1.0",
     "yup": "0.26.5"
   },

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.4.0-alpha.0",
+  "version": "0.4.0",
   "description": "A GraphQL extension for cache control",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

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.2.0-alpha.0",
+  "version": "0.2.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.2.0-alpha.0",
+  "version": "0.2.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-azure-functions/package.json b/packages/apollo-server-azure-functions/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "apollo-server-azure-functions",
-	"version": "2.3.0-alpha.0",
+	"version": "2.3.0",
 	"description": "Production-ready Node.js GraphQL server for Azure Functions",
 	"keywords": [
 		"GraphQL",

diff --git a/packages/apollo-server-cloud-functions/package.json b/packages/apollo-server-cloud-functions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "apollo-server-cloud-functions",
-  "version": "2.3.0-alpha.0",
+  "version": "2.3.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.3.0-alpha.0",
+  "version": "2.3.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.3.0-alpha.0",
+  "version": "2.3.0",
   "description": "Core engine for Apollo GraphQL server",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

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.3.0-alpha.0",
+  "version": "2.3.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.3.0-alpha.0",
+  "version": "2.3.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.3.0-alpha.0",
+  "version": "2.3.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.3.0-alpha.0",
+  "version": "2.3.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.3.0-alpha.0",
+  "version": "2.3.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.3.0-alpha.0",
+  "version": "2.3.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.2.0-alpha.0",
+  "version": "0.2.0",
   "description": "Apollo Server plugin base classes",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/packages/apollo-server-testing/package.json b/packages/apollo-server-testing/package.json
@@ -1,6 +1,6 @@
 {
   "name": "apollo-server-testing",
-  "version": "2.3.0-alpha.0",
+  "version": "2.3.0",
   "description": "Test utils for apollo-server",
   "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.3.0-alpha.0",
+  "version": "2.3.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.4.0-alpha.0",
+  "version": "0.4.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.4.0-alpha.0",
+  "version": "0.4.0",
   "description": "Add extensions to GraphQL servers",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

diff --git a/renovate.json b/renovate.json
@@ -1,9 +1,15 @@
 {
-  "extends": ["apollo-open-source"],
-  "pathRules": [
+  "extends": [
+    "apollo-open-source"
+  ],
+  "packageRules": [
     {
-      "paths": ["docs/package.json"],
-      "extends": ["apollo-docs"],
+      "paths": [
+        "docs/package.json"
+      ],
+      "extends": [
+        "apollo-docs"
+      ],
       "baseBranches": [
         "master",
         "version-2"