Merge branch 'master' into release-vNEXT

This commit is contained in:
Jesse Rosenberger 2018-12-13 15:33:53 +02:00
commit 3fea8033b4
No known key found for this signature in database
GPG key ID: C0CCCF81AA6C08D8
22 changed files with 653 additions and 384 deletions

View file

@ -1,6 +1,6 @@
# Changelog # 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). - **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.** **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
### v2.2.7-alpha.0
- `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) - `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)

969
package-lock.json generated

File diff suppressed because it is too large Load diff

View file

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

View file

@ -1,6 +1,6 @@
{ {
"name": "apollo-cache-control", "name": "apollo-cache-control",
"version": "0.4.0-alpha.0", "version": "0.4.0",
"description": "A GraphQL extension for cache control", "description": "A GraphQL extension for cache control",
"main": "./dist/index.js", "main": "./dist/index.js",
"types": "./dist/index.d.ts", "types": "./dist/index.d.ts",

View file

@ -1,6 +1,6 @@
{ {
"name": "apollo-engine-reporting-protobuf", "name": "apollo-engine-reporting-protobuf",
"version": "0.2.0-alpha.0", "version": "0.2.0",
"description": "Protobuf format for Apollo Engine", "description": "Protobuf format for Apollo Engine",
"main": "dist/index.js", "main": "dist/index.js",
"types": "dist/index.d.ts", "types": "dist/index.d.ts",

View file

@ -1,6 +1,6 @@
{ {
"name": "apollo-engine-reporting", "name": "apollo-engine-reporting",
"version": "0.2.0-alpha.0", "version": "0.2.0",
"description": "Send reports about your GraphQL services to Apollo Engine", "description": "Send reports about your GraphQL services to Apollo Engine",
"main": "./dist/index.js", "main": "./dist/index.js",
"types": "./dist/index.d.ts", "types": "./dist/index.d.ts",

View file

@ -1,6 +1,6 @@
{ {
"name": "apollo-server-azure-functions", "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", "description": "Production-ready Node.js GraphQL server for Azure Functions",
"keywords": [ "keywords": [
"GraphQL", "GraphQL",

View file

@ -1,6 +1,6 @@
{ {
"name": "apollo-server-cloud-functions", "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", "description": "Production-ready Node.js GraphQL server for Google Cloud Functions",
"keywords": [ "keywords": [
"GraphQL", "GraphQL",

View file

@ -1,6 +1,6 @@
{ {
"name": "apollo-server-cloudflare", "name": "apollo-server-cloudflare",
"version": "2.3.0-alpha.0", "version": "2.3.0",
"description": "Production-ready Node.js GraphQL server for Cloudflare workers", "description": "Production-ready Node.js GraphQL server for Cloudflare workers",
"main": "dist/index.js", "main": "dist/index.js",
"types": "dist/index.d.ts", "types": "dist/index.d.ts",

View file

@ -1,6 +1,6 @@
{ {
"name": "apollo-server-core", "name": "apollo-server-core",
"version": "2.3.0-alpha.0", "version": "2.3.0",
"description": "Core engine for Apollo GraphQL server", "description": "Core engine for Apollo GraphQL server",
"main": "dist/index.js", "main": "dist/index.js",
"types": "dist/index.d.ts", "types": "dist/index.d.ts",

View file

@ -1,6 +1,6 @@
{ {
"name": "apollo-server-express", "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", "description": "Production-ready Node.js GraphQL server for Express and Connect",
"main": "dist/index.js", "main": "dist/index.js",
"types": "dist/index.d.ts", "types": "dist/index.d.ts",

View file

@ -1,6 +1,6 @@
{ {
"name": "apollo-server-hapi", "name": "apollo-server-hapi",
"version": "2.3.0-alpha.0", "version": "2.3.0",
"description": "Production-ready Node.js GraphQL server for Hapi", "description": "Production-ready Node.js GraphQL server for Hapi",
"main": "dist/index.js", "main": "dist/index.js",
"types": "dist/index.d.ts", "types": "dist/index.d.ts",

View file

@ -1,7 +1,7 @@
{ {
"name": "apollo-server-integration-testsuite", "name": "apollo-server-integration-testsuite",
"private": true, "private": true,
"version": "2.3.0-alpha.0", "version": "2.3.0",
"description": "Apollo Server Integrations testsuite", "description": "Apollo Server Integrations testsuite",
"main": "dist/index.js", "main": "dist/index.js",
"types": "dist/index.d.ts", "types": "dist/index.d.ts",

View file

@ -1,6 +1,6 @@
{ {
"name": "apollo-server-koa", "name": "apollo-server-koa",
"version": "2.3.0-alpha.0", "version": "2.3.0",
"description": "Production-ready Node.js GraphQL server for Koa", "description": "Production-ready Node.js GraphQL server for Koa",
"main": "dist/index.js", "main": "dist/index.js",
"types": "dist/index.d.ts", "types": "dist/index.d.ts",

View file

@ -1,6 +1,6 @@
{ {
"name": "apollo-server-lambda", "name": "apollo-server-lambda",
"version": "2.3.0-alpha.0", "version": "2.3.0",
"description": "Production-ready Node.js GraphQL server for AWS Lambda", "description": "Production-ready Node.js GraphQL server for AWS Lambda",
"keywords": [ "keywords": [
"GraphQL", "GraphQL",

View file

@ -1,6 +1,6 @@
{ {
"name": "apollo-server-micro", "name": "apollo-server-micro",
"version": "2.3.0-alpha.0", "version": "2.3.0",
"description": "Production-ready Node.js GraphQL server for Micro", "description": "Production-ready Node.js GraphQL server for Micro",
"main": "dist/index.js", "main": "dist/index.js",
"types": "dist/index.d.ts", "types": "dist/index.d.ts",

View file

@ -1,6 +1,6 @@
{ {
"name": "apollo-server-plugin-base", "name": "apollo-server-plugin-base",
"version": "0.2.0-alpha.0", "version": "0.2.0",
"description": "Apollo Server plugin base classes", "description": "Apollo Server plugin base classes",
"main": "dist/index.js", "main": "dist/index.js",
"types": "dist/index.d.ts", "types": "dist/index.d.ts",

View file

@ -1,6 +1,6 @@
{ {
"name": "apollo-server-testing", "name": "apollo-server-testing",
"version": "2.3.0-alpha.0", "version": "2.3.0",
"description": "Test utils for apollo-server", "description": "Test utils for apollo-server",
"main": "dist/index.js", "main": "dist/index.js",
"types": "dist/index.d.ts", "types": "dist/index.d.ts",

View file

@ -1,6 +1,6 @@
{ {
"name": "apollo-server", "name": "apollo-server",
"version": "2.3.0-alpha.0", "version": "2.3.0",
"description": "Production ready GraphQL Server", "description": "Production ready GraphQL Server",
"author": "opensource@apollographql.com", "author": "opensource@apollographql.com",
"main": "dist/index.js", "main": "dist/index.js",

View file

@ -1,6 +1,6 @@
{ {
"name": "apollo-tracing", "name": "apollo-tracing",
"version": "0.4.0-alpha.0", "version": "0.4.0",
"description": "Collect and expose trace data for GraphQL requests", "description": "Collect and expose trace data for GraphQL requests",
"main": "./dist/index.js", "main": "./dist/index.js",
"types": "./dist/index.d.ts", "types": "./dist/index.d.ts",

View file

@ -1,6 +1,6 @@
{ {
"name": "graphql-extensions", "name": "graphql-extensions",
"version": "0.4.0-alpha.0", "version": "0.4.0",
"description": "Add extensions to GraphQL servers", "description": "Add extensions to GraphQL servers",
"main": "./dist/index.js", "main": "./dist/index.js",
"types": "./dist/index.d.ts", "types": "./dist/index.d.ts",

View file

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