From 034fdea5ad290f90fe2ae9b98d7bea2622de7cb2 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 4 Jul 2019 21:08:29 +0300 Subject: [PATCH] =?UTF-8?q?Update=20GraphQL=20Playground=20to=20fix=20tab?= =?UTF-8?q?=20colors=20when=20`theme:=20"light=E2=80=A6=20(#2989)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update GraphQL Playground to fix tab colors when `theme: "light"`. Fixes https://github.com/apollographql/apollo-server/issues/2979 * Add CHANGELOG.md --- CHANGELOG.md | 1 + package-lock.json | 84 +++++++++++++++---- .../package.json | 2 +- .../package.json | 2 +- packages/apollo-server-core/package.json | 2 +- packages/apollo-server-core/src/playground.ts | 2 +- packages/apollo-server-express/package.json | 2 +- packages/apollo-server-fastify/package.json | 2 +- packages/apollo-server-hapi/package.json | 2 +- packages/apollo-server-koa/package.json | 2 +- packages/apollo-server-lambda/package.json | 2 +- packages/apollo-server-micro/package.json | 2 +- 12 files changed, 81 insertions(+), 24 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 74210f52f0b..b130f6953fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ The version headers in this history reflect the versions of Apollo Server itself - `apollo-engine-reporting`: **BEHAVIOR CHANGE**: If the error returned from the `engine.rewriteError` hook has an `extensions` property, that property will be used instead of the original error's extensions. Document that changes to most other `GraphQLError` fields by `engine.rewriteError` are ignored. [PR #2932](https://github.com/apollographql/apollo-server/pull/2932) - `apollo-engine-reporting`: **BEHAVIOR CHANGE**: The `engine.maskErrorDetails` option, deprecated by `engine.rewriteError` in v2.5.0, now behaves a bit more like the new option: while all error messages will be redacted, they will still show up on the appropriate nodes in a trace. [PR #2932](https://github.com/apollographql/apollo-server/pull/2932) - `apollo-engine-reporting`: **BEHAVIOR CHANGE**: By default, send no GraphQL variable values to Apollo's servers instead of sending all variable values. Adding the new EngineReportingOption `sendVariableValues` to send some or all variable values, possibly after transforming them. This replaces the `privateVariables` option, which is now deprecated. [PR #2931](https://github.com/apollographql/apollo-server/pull/2931) +- Update `graphql-playground` to resolve incorrect background color on tabs when using the `light` theme. [PR #2989](https://github.com/apollographql/apollo-server/pull/2989) [Issue #2979](https://github.com/apollographql/apollo-server/issues/2979) - `apollo-server-express`, `apollo-server-koa`: A new `getMiddleware` method, which accepts the same parameters as `applyMiddleware` with the exception of the `app`, has been added. This allows implementors to obtain the composed middleware and "`use`" it within an existing `app`. This was previously only possible by passing an `app` to `applyMiddleware` or reaching into Apollo Server internals, but `getMiddleware` should allow a more natural method and will hopefully resolve many issues raised around the previous pattern. [PR #2435](https://github.com/apollographql/apollo-server/pull/2435) > Note: In order to keep shipping all GraphQL variable values to Apollo Engine, pass in the option: diff --git a/package-lock.json b/package-lock.json index 4b424f9342d..b7ad1550358 100644 --- a/package-lock.json +++ b/package-lock.json @@ -50,11 +50,6 @@ } } }, - "@apollographql/graphql-playground-html": { - "version": "1.6.20", - "resolved": "https://registry.npmjs.org/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.20.tgz", - "integrity": "sha512-3LWZa80HcP70Pl+H4KhLDJ7S0px+9/c8GTXdl6SpunRecUaB27g/oOQnAjNHLHdbWuGE0uyqcuGiTfbKB3ilaQ==" - }, "@azure/functions": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/@azure/functions/-/functions-1.0.3.tgz", @@ -3387,10 +3382,17 @@ "apollo-server-azure-functions": { "version": "file:packages/apollo-server-azure-functions", "requires": { - "@apollographql/graphql-playground-html": "1.6.20", + "@apollographql/graphql-playground-html": "1.6.22", "apollo-server-core": "file:packages/apollo-server-core", "apollo-server-env": "file:packages/apollo-server-env", "graphql-tools": "^4.0.0" + }, + "dependencies": { + "@apollographql/graphql-playground-html": { + "version": "1.6.22", + "resolved": "https://registry.npmjs.org/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.22.tgz", + "integrity": "sha512-WVLyiEWyaa8iqbATa+sm41IcCc134wp8r2ECVtgpShUI2AFRA1uy+it9OwCjTKY4dgaQhS16qKzsDA/qK/GENA==" + } } }, "apollo-server-cache-memcached": { @@ -3419,10 +3421,17 @@ "apollo-server-cloud-functions": { "version": "file:packages/apollo-server-cloud-functions", "requires": { - "@apollographql/graphql-playground-html": "1.6.20", + "@apollographql/graphql-playground-html": "1.6.22", "apollo-server-core": "file:packages/apollo-server-core", "apollo-server-env": "file:packages/apollo-server-env", "graphql-tools": "^4.0.0" + }, + "dependencies": { + "@apollographql/graphql-playground-html": { + "version": "1.6.22", + "resolved": "https://registry.npmjs.org/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.22.tgz", + "integrity": "sha512-WVLyiEWyaa8iqbATa+sm41IcCc134wp8r2ECVtgpShUI2AFRA1uy+it9OwCjTKY4dgaQhS16qKzsDA/qK/GENA==" + } } }, "apollo-server-cloudflare": { @@ -3436,7 +3445,7 @@ "version": "file:packages/apollo-server-core", "requires": { "@apollographql/apollo-tools": "^0.3.6", - "@apollographql/graphql-playground-html": "1.6.20", + "@apollographql/graphql-playground-html": "1.6.22", "@types/ws": "^6.0.0", "apollo-cache-control": "file:packages/apollo-cache-control", "apollo-datasource": "file:packages/apollo-datasource", @@ -3455,6 +3464,13 @@ "sha.js": "^2.4.11", "subscriptions-transport-ws": "^0.9.11", "ws": "^6.0.0" + }, + "dependencies": { + "@apollographql/graphql-playground-html": { + "version": "1.6.22", + "resolved": "https://registry.npmjs.org/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.22.tgz", + "integrity": "sha512-WVLyiEWyaa8iqbATa+sm41IcCc134wp8r2ECVtgpShUI2AFRA1uy+it9OwCjTKY4dgaQhS16qKzsDA/qK/GENA==" + } } }, "apollo-server-env": { @@ -3470,7 +3486,7 @@ "apollo-server-express": { "version": "file:packages/apollo-server-express", "requires": { - "@apollographql/graphql-playground-html": "1.6.20", + "@apollographql/graphql-playground-html": "1.6.22", "@types/accepts": "^1.3.5", "@types/body-parser": "1.17.0", "@types/cors": "^2.8.4", @@ -3486,6 +3502,11 @@ "type-is": "^1.6.16" }, "dependencies": { + "@apollographql/graphql-playground-html": { + "version": "1.6.22", + "resolved": "https://registry.npmjs.org/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.22.tgz", + "integrity": "sha512-WVLyiEWyaa8iqbATa+sm41IcCc134wp8r2ECVtgpShUI2AFRA1uy+it9OwCjTKY4dgaQhS16qKzsDA/qK/GENA==" + }, "@types/express": { "version": "4.17.0", "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.0.tgz", @@ -3501,23 +3522,37 @@ "apollo-server-fastify": { "version": "file:packages/apollo-server-fastify", "requires": { - "@apollographql/graphql-playground-html": "1.6.20", + "@apollographql/graphql-playground-html": "1.6.22", "apollo-server-core": "file:packages/apollo-server-core", "fastify-accepts": "^0.5.0", "fastify-cors": "^0.2.0", "graphql-subscriptions": "^1.0.0", "graphql-tools": "^4.0.0" + }, + "dependencies": { + "@apollographql/graphql-playground-html": { + "version": "1.6.22", + "resolved": "https://registry.npmjs.org/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.22.tgz", + "integrity": "sha512-WVLyiEWyaa8iqbATa+sm41IcCc134wp8r2ECVtgpShUI2AFRA1uy+it9OwCjTKY4dgaQhS16qKzsDA/qK/GENA==" + } } }, "apollo-server-hapi": { "version": "file:packages/apollo-server-hapi", "requires": { - "@apollographql/graphql-playground-html": "1.6.20", + "@apollographql/graphql-playground-html": "1.6.22", "accept": "^3.0.2", "apollo-server-core": "file:packages/apollo-server-core", "boom": "^7.1.0", "graphql-subscriptions": "^1.0.0", "graphql-tools": "^4.0.0" + }, + "dependencies": { + "@apollographql/graphql-playground-html": { + "version": "1.6.22", + "resolved": "https://registry.npmjs.org/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.22.tgz", + "integrity": "sha512-WVLyiEWyaa8iqbATa+sm41IcCc134wp8r2ECVtgpShUI2AFRA1uy+it9OwCjTKY4dgaQhS16qKzsDA/qK/GENA==" + } } }, "apollo-server-integration-testsuite": { @@ -3529,7 +3564,7 @@ "apollo-server-koa": { "version": "file:packages/apollo-server-koa", "requires": { - "@apollographql/graphql-playground-html": "1.6.20", + "@apollographql/graphql-playground-html": "1.6.22", "@koa/cors": "^2.2.1", "@types/accepts": "^1.3.5", "@types/cors": "^2.8.4", @@ -3545,24 +3580,45 @@ "koa-bodyparser": "^3.0.0", "koa-router": "^7.4.0", "type-is": "^1.6.16" + }, + "dependencies": { + "@apollographql/graphql-playground-html": { + "version": "1.6.22", + "resolved": "https://registry.npmjs.org/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.22.tgz", + "integrity": "sha512-WVLyiEWyaa8iqbATa+sm41IcCc134wp8r2ECVtgpShUI2AFRA1uy+it9OwCjTKY4dgaQhS16qKzsDA/qK/GENA==" + } } }, "apollo-server-lambda": { "version": "file:packages/apollo-server-lambda", "requires": { - "@apollographql/graphql-playground-html": "1.6.20", + "@apollographql/graphql-playground-html": "1.6.22", "apollo-server-core": "file:packages/apollo-server-core", "apollo-server-env": "file:packages/apollo-server-env", "graphql-tools": "^4.0.0" + }, + "dependencies": { + "@apollographql/graphql-playground-html": { + "version": "1.6.22", + "resolved": "https://registry.npmjs.org/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.22.tgz", + "integrity": "sha512-WVLyiEWyaa8iqbATa+sm41IcCc134wp8r2ECVtgpShUI2AFRA1uy+it9OwCjTKY4dgaQhS16qKzsDA/qK/GENA==" + } } }, "apollo-server-micro": { "version": "file:packages/apollo-server-micro", "requires": { - "@apollographql/graphql-playground-html": "1.6.20", + "@apollographql/graphql-playground-html": "1.6.22", "accept": "^3.0.2", "apollo-server-core": "file:packages/apollo-server-core", "micro": "^9.3.2" + }, + "dependencies": { + "@apollographql/graphql-playground-html": { + "version": "1.6.22", + "resolved": "https://registry.npmjs.org/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.22.tgz", + "integrity": "sha512-WVLyiEWyaa8iqbATa+sm41IcCc134wp8r2ECVtgpShUI2AFRA1uy+it9OwCjTKY4dgaQhS16qKzsDA/qK/GENA==" + } } }, "apollo-server-plugin-base": { diff --git a/packages/apollo-server-azure-functions/package.json b/packages/apollo-server-azure-functions/package.json index d54b0b6cdb6..bbeb577a91d 100644 --- a/packages/apollo-server-azure-functions/package.json +++ b/packages/apollo-server-azure-functions/package.json @@ -25,7 +25,7 @@ "node": ">=6" }, "dependencies": { - "@apollographql/graphql-playground-html": "1.6.20", + "@apollographql/graphql-playground-html": "1.6.23", "apollo-server-core": "file:../apollo-server-core", "apollo-server-env": "file:../apollo-server-env", "graphql-tools": "^4.0.0" diff --git a/packages/apollo-server-cloud-functions/package.json b/packages/apollo-server-cloud-functions/package.json index b035650c288..54410b24538 100644 --- a/packages/apollo-server-cloud-functions/package.json +++ b/packages/apollo-server-cloud-functions/package.json @@ -25,7 +25,7 @@ "node": ">=6" }, "dependencies": { - "@apollographql/graphql-playground-html": "1.6.20", + "@apollographql/graphql-playground-html": "1.6.23", "apollo-server-core": "file:../apollo-server-core", "apollo-server-env": "file:../apollo-server-env", "graphql-tools": "^4.0.0" diff --git a/packages/apollo-server-core/package.json b/packages/apollo-server-core/package.json index 7ddf000f74c..908da017848 100644 --- a/packages/apollo-server-core/package.json +++ b/packages/apollo-server-core/package.json @@ -25,7 +25,7 @@ }, "dependencies": { "@apollographql/apollo-tools": "^0.3.6", - "@apollographql/graphql-playground-html": "1.6.20", + "@apollographql/graphql-playground-html": "1.6.23", "@types/ws": "^6.0.0", "apollo-cache-control": "file:../apollo-cache-control", "apollo-datasource": "file:../apollo-datasource", diff --git a/packages/apollo-server-core/src/playground.ts b/packages/apollo-server-core/src/playground.ts index c203bb663ab..6fc39148437 100644 --- a/packages/apollo-server-core/src/playground.ts +++ b/packages/apollo-server-core/src/playground.ts @@ -10,7 +10,7 @@ export { // This specifies the version of `graphql-playground-react` that will be served // from `graphql-playground-html`. It's passed to ``graphql-playground-html`'s // renderPlaygroundPage` via the integration packages' playground configuration. -const playgroundVersion = '1.7.26'; +const playgroundVersion = '1.7.28'; // https://stackoverflow.com/a/51365037 type RecursivePartial = { diff --git a/packages/apollo-server-express/package.json b/packages/apollo-server-express/package.json index 6ac83d8d8e7..0ff96eadc39 100644 --- a/packages/apollo-server-express/package.json +++ b/packages/apollo-server-express/package.json @@ -26,7 +26,7 @@ "node": ">=6" }, "dependencies": { - "@apollographql/graphql-playground-html": "1.6.20", + "@apollographql/graphql-playground-html": "1.6.23", "@types/accepts": "^1.3.5", "@types/body-parser": "1.17.0", "@types/cors": "^2.8.4", diff --git a/packages/apollo-server-fastify/package.json b/packages/apollo-server-fastify/package.json index 54fab2aa245..80fc5acc01d 100644 --- a/packages/apollo-server-fastify/package.json +++ b/packages/apollo-server-fastify/package.json @@ -25,7 +25,7 @@ "node": ">=6" }, "dependencies": { - "@apollographql/graphql-playground-html": "1.6.20", + "@apollographql/graphql-playground-html": "1.6.23", "apollo-server-core": "file:../apollo-server-core", "fastify-accepts": "^0.5.0", "fastify-cors": "^0.2.0", diff --git a/packages/apollo-server-hapi/package.json b/packages/apollo-server-hapi/package.json index 3dc681d8632..482187d60bc 100644 --- a/packages/apollo-server-hapi/package.json +++ b/packages/apollo-server-hapi/package.json @@ -25,7 +25,7 @@ "node": ">=8" }, "dependencies": { - "@apollographql/graphql-playground-html": "1.6.20", + "@apollographql/graphql-playground-html": "1.6.23", "accept": "^3.0.2", "apollo-server-core": "file:../apollo-server-core", "boom": "^7.1.0", diff --git a/packages/apollo-server-koa/package.json b/packages/apollo-server-koa/package.json index aaf05f20f1b..6cb113debab 100644 --- a/packages/apollo-server-koa/package.json +++ b/packages/apollo-server-koa/package.json @@ -25,7 +25,7 @@ "node": ">=6" }, "dependencies": { - "@apollographql/graphql-playground-html": "1.6.20", + "@apollographql/graphql-playground-html": "1.6.23", "@koa/cors": "^2.2.1", "@types/accepts": "^1.3.5", "@types/cors": "^2.8.4", diff --git a/packages/apollo-server-lambda/package.json b/packages/apollo-server-lambda/package.json index b0ff38edab2..1d25a45fea6 100644 --- a/packages/apollo-server-lambda/package.json +++ b/packages/apollo-server-lambda/package.json @@ -25,7 +25,7 @@ "node": ">=6" }, "dependencies": { - "@apollographql/graphql-playground-html": "1.6.20", + "@apollographql/graphql-playground-html": "1.6.23", "apollo-server-core": "file:../apollo-server-core", "apollo-server-env": "file:../apollo-server-env", "graphql-tools": "^4.0.0" diff --git a/packages/apollo-server-micro/package.json b/packages/apollo-server-micro/package.json index c76073c2216..5c3bfd1feeb 100644 --- a/packages/apollo-server-micro/package.json +++ b/packages/apollo-server-micro/package.json @@ -23,7 +23,7 @@ }, "homepage": "https://github.com/apollographql/apollo-server#readme", "dependencies": { - "@apollographql/graphql-playground-html": "1.6.20", + "@apollographql/graphql-playground-html": "1.6.23", "accept": "^3.0.2", "apollo-server-core": "file:../apollo-server-core", "micro": "^9.3.2"