Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: apollographql/apollo-server
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: apollo-server@2.25.2
Choose a base ref
...
head repository: apollographql/apollo-server
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: apollo-server@2.25.3
Choose a head ref
8 contributors

Commits on Mar 23, 2021

  1. WIP on custom directive article

    Stephen Barlow authored and Stephen Barlow committed Mar 23, 2021
    Copy the full SHA
    567c468 View commit details

  2. First chunk of custom directive work ready for review

    Stephen Barlow authored and Stephen Barlow committed Mar 23, 2021
    Copy the full SHA
    74f52ae View commit details

Commits on Mar 24, 2021

  1. Incorporate initial feedback from glasser, plus some clarity improvem… 

    …ents
    Stephen Barlow committed Mar 24, 2021
    Copy the full SHA
    e78b9ee View commit details

Commits on Jun 24, 2021

  1. docs: fix small typo

    @hamstu
    hamstu authored Jun 24, 2021
    Copy the full SHA
    35e0de6 View commit details

Commits on Jun 28, 2021

  1. Merge pull request #5368 from hamstu/patch-1 

    Fix small typo in docs
    Stephen Barlow authored Jun 28, 2021
    Copy the full SHA
    6a99e90 View commit details

  2. Bump docs theme version

    Stephen Barlow committed Jun 28, 2021
    Copy the full SHA
    c926472 View commit details

  3. Merge pull request #5380 from apollographql/sb/gatsby-theme 

    Bump docs theme version
    Stephen Barlow authored Jun 28, 2021
    Copy the full SHA
    eefa7c2 View commit details

Commits on Jun 29, 2021

  1. Updating blog post link (#5392)

    @aaronpowell
    aaronpowell authored Jun 29, 2021
    Copy the full SHA
    0922120 View commit details

Commits on Jul 1, 2021

  1. Add AS3 preview docs to nav (#5164) 

    Co-authored-by: David Glasser <glasser@davidglasser.net>
    @glasser
    Stephen Barlow and glasser authored Jul 1, 2021
    Copy the full SHA
    c0bc794 View commit details

Commits on Jul 7, 2021

  1. renovate config: group non-major dependencies 

    Inspired by https://github.com/open-telemetry/opentelemetry-js-contrib/ (with non-deprecated name for `matchUpdateTypes`).
    @glasser
    glasser authored Jul 7, 2021
    Copy the full SHA
    e456b41 View commit details

  2. Add 3.0 release notice to 2.0 docs (#5443)

    Stephen Barlow authored Jul 7, 2021
    Copy the full SHA
    06151ad View commit details

Commits on Jul 8, 2021

  1. Clean package-lock.json (#5446)

    @mjfaga
    mjfaga authored Jul 8, 2021
    Copy the full SHA
    43f3b5b View commit details

  2. Support graphql@15 in operation registry plugin (#5445)

    @mjfaga
    mjfaga authored Jul 8, 2021
    Copy the full SHA
    08c92eb View commit details

  3. Mess around more with package-lock until it's happy 

    This is all in better shape on release-3.0.
    @glasser
    glasser committed Jul 8, 2021
    Copy the full SHA
    6f894bb View commit details

  4. Release 

     - apollo-server-plugin-operation-registry@0.11.1
    @glasser
    glasser committed Jul 8, 2021
    Copy the full SHA
    4ccdae0 View commit details

Commits on Jul 12, 2021

  1. Revert "Add 3.0 release notice to 2.0 docs (#5443)" 

    This reverts commit 06151ad.
    @glasser
    glasser committed Jul 12, 2021
    Copy the full SHA
    a121f86 View commit details

Commits on Jul 14, 2021

  1. docs(fix typo: saem -> same) (#5474) 

    typo found in "options-for-apolloserverpluginschemareporting"
    @waptik
    waptik authored Jul 14, 2021
    Copy the full SHA
    18ec8e8 View commit details

Commits on Jul 20, 2021

  1. Update v2 codesandbox links (#5520)

    Stephen Barlow authored Jul 20, 2021
    Copy the full SHA
    851cdba View commit details

Commits on Aug 17, 2021

  1. Merge pull request #5022 from apollographql/sb/custom-directive-edits 

    First batch of edits to custom directives article
    Stephen Barlow authored Aug 17, 2021
    Copy the full SHA
    378cce6 View commit details

Commits on Nov 4, 2021

  1. apollo-server-core: update GraphQL Playground React app 

    See
GHSA-qm7x-rc44-rrqw
for details.
    @glasser
    glasser committed Nov 4, 2021
    Copy the full SHA
    5069bd8 View commit details

  2. Release 

     - apollo-server-azure-functions@2.25.3
 - apollo-server-cloud-functions@2.25.3
 - apollo-server-cloudflare@2.25.3
 - apollo-server-core@2.25.3
 - apollo-server-express@2.25.3
 - apollo-server-fastify@2.25.3
 - apollo-server-hapi@2.25.3
 - apollo-server-integration-testsuite@2.25.3
 - apollo-server-koa@2.25.3
 - apollo-server-lambda@2.25.3
 - apollo-server-micro@2.25.3
 - apollo-server-testing@2.25.3
 - apollo-server@2.25.3
    @glasser
    glasser committed Nov 4, 2021
    Copy the full SHA
    a725306 View commit details
Showing with 532 additions and 370 deletions.
  1. +5 −0 CHANGELOG.md
  2. +9 −1 docs/gatsby-config.js
  3. +90 −199 docs/package-lock.json
  4. +1 −1 docs/package.json
  5. +1 −1 docs/source/api/graphql-tools.md
  6. +3 −2 docs/source/data/subscriptions.mdx
  7. +3 −2 docs/source/getting-started.mdx
  8. +45 −0 docs/source/installing-graphql-tools.md
  9. +1 −1 docs/source/migration-engine-plugins.md
  10. +325 −133 docs/source/schema/{creating-directives.md → creating-directives.mdx}
  11. +1 −1 docs/source/schema/directives.md
  12. +1 −1 docs/source/security/authentication.md
  13. +1 −1 docs/source/testing/testing.md
  14. +4 −0 docs/static/_redirects
  15. +15 −10 package-lock.json
  16. +1 −0 package.json
  17. +1 −1 packages/apollo-server-azure-functions/package.json
  18. +1 −1 packages/apollo-server-cloud-functions/package.json
  19. +1 −1 packages/apollo-server-cloudflare/package.json
  20. +1 −1 packages/apollo-server-core/package.json
  21. +1 −1 packages/apollo-server-core/src/playground.ts
  22. +1 −1 packages/apollo-server-express/package.json
  23. +1 −1 packages/apollo-server-fastify/package.json
  24. +1 −1 packages/apollo-server-hapi/package.json
  25. +1 −1 packages/apollo-server-integration-testsuite/package.json
  26. +1 −1 packages/apollo-server-koa/package.json
  27. +1 −1 packages/apollo-server-lambda/package.json
  28. +1 −1 packages/apollo-server-micro/package.json
  29. +2 −2 packages/apollo-server-plugin-operation-registry/package.json
  30. +1 −1 packages/apollo-server-testing/package.json
  31. +1 −1 packages/apollo-server/package.json
  32. +10 −1 renovate.json5
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -11,6 +11,11 @@ The version headers in this history reflect the versions of Apollo Server itself

> The changes noted within this `vNEXT` section have not been released yet. New PRs and commits which introduce changes should include an entry in this `vNEXT` section as part of their development. With few exceptions, the format of the entry should follow convention (i.e., prefix with package name, use markdown `backtick formatting` for package names and code, suffix with a link to the change-set à la `[PR #YYY](https://link/pull/YYY)`, etc.). When a release is being prepared, a new header will be (manually) created below and the appropriate changes within that release will be moved into the new section.

## v2.25.3

- ⚠️ **SECURITY** `apollo-server-core`: Update default version of the GraphQL Playground React app loaded from the CDN to be `@apollographql/graphql-playground-react@1.7.42`. This patches an XSS vulnerability. Note that if you are pinning the Playground React app version in your app with `new ApolloServer({playground: {version: 'some version'}})`, you will need to update the specified version to 1.7.42 or later to avoid this vulnerability. If you disable GraphQL Playground with `new ApolloServer({playground: false})`, this vulnerability does not affect you. See [advisory GHSA-qm7x-rc44-rrqw](https://github.com/apollographql/apollo-server/security/advisories/GHSA-qm7x-rc44-rrqw) for more details.

## v2.25.2

- `apollo-server-express`: Update dependencies on `@types/express` and `@types/express-serve-static-core`. [PR #5352](https://github.com/apollographql/apollo-server/pull/5352)
10 changes: 9 additions & 1 deletion docs/gatsby-config.js
View file
Original file line number Diff line number Diff line change
@@ -14,6 +14,14 @@ module.exports = {
defaultVersion: '2',
versions: {
'1': 'version-1',
'3': 'release-3.0',
},
// This link shows up inside the v3 docs and doesn't work in this
// context, but will work once v3 is default and v2 is old.
checkLinksOptions: {
exceptions: [
'/v2/migration-engine-plugins/',
],
},
sidebarCategories: {
null: [
@@ -67,7 +75,7 @@ module.exports = {
],
Appendices: [
'proxy-configuration',
'migration-two-dot',
'installing-graphql-tools',
'migration-file-uploads',
'migration-engine-plugins',
],
Loading