From c6ea883d1ff40601b512a6de25c6f36be12e1688 Mon Sep 17 00:00:00 2001
From: Jesse Rosenberger <git@jro.cc>
Date: Wed, 24 Jun 2020 10:19:34 +0000
Subject: [PATCH 1/9] Update URLs to use new default branch name (i.e.,
 `main`).

---
 .github/APOLLO_RELEASE_TEMPLATE.md             |  6 +++---
 .github/ISSUE_TEMPLATE.md                      |  8 ++++----
 .github/PULL_REQUEST_TEMPLATE.md               |  2 +-
 CHANGELOG.md                                   |  4 ++--
 DEVELOPMENT.md                                 |  8 ++++----
 docs/gatsby-config.js                          |  2 +-
 docs/source/api/apollo-gateway.mdx             |  2 +-
 docs/source/data/resolvers.mdx                 |  2 +-
 docs/source/data/subscriptions.md              |  2 +-
 docs/source/federation/metrics.md              |  2 +-
 docs/source/federation/other-servers.md        |  2 +-
 docs/source/integrations/plugins.md            |  6 +++---
 docs/source/monitoring/metrics.md              |  4 ++--
 docs/source/performance/apq.md                 |  2 +-
 docs/static/_redirects                         |  2 +-
 packages/apollo-datasource-rest/README.md      |  8 ++++----
 packages/apollo-datasource-rest/package.json   |  2 +-
 packages/apollo-datasource/package.json        |  2 +-
 .../package.json                               |  2 +-
 .../src/reports.proto                          |  2 +-
 packages/apollo-federation/README.md           |  2 +-
 packages/apollo-gateway/CHANGELOG.md           |  2 +-
 packages/apollo-gateway/README.md              |  2 +-
 .../apollo-server-azure-functions/README.md    |  4 ++--
 .../apollo-server-azure-functions/package.json |  2 +-
 .../apollo-server-cache-memcached/package.json |  2 +-
 .../apollo-server-cache-redis/package.json     |  2 +-
 packages/apollo-server-caching/package.json    |  2 +-
 .../apollo-server-cloud-functions/README.md    |  4 ++--
 .../apollo-server-cloud-functions/package.json |  2 +-
 packages/apollo-server-cloudflare/package.json |  2 +-
 packages/apollo-server-core/README.md          |  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/README.md       |  4 ++--
 packages/apollo-server-express/package.json    |  2 +-
 packages/apollo-server-fastify/README.md       |  4 ++--
 packages/apollo-server-fastify/package.json    |  2 +-
 packages/apollo-server-hapi/README.md          |  4 ++--
 packages/apollo-server-hapi/package.json       |  2 +-
 .../package.json                               |  2 +-
 packages/apollo-server-koa/README.md           |  4 ++--
 packages/apollo-server-koa/package.json        |  2 +-
 packages/apollo-server-lambda/README.md        |  4 ++--
 packages/apollo-server-lambda/package.json     |  2 +-
 packages/apollo-server-micro/README.md         |  2 +-
 packages/apollo-server-micro/package.json      |  2 +-
 .../package.json                               |  2 +-
 packages/apollo-server-testing/README.md       |  2 +-
 packages/apollo-server-testing/package.json    |  2 +-
 packages/apollo-server/README.md               | 18 +++++++++---------
 packages/apollo-server/package.json            |  2 +-
 53 files changed, 83 insertions(+), 83 deletions(-)

diff --git a/.github/APOLLO_RELEASE_TEMPLATE.md b/.github/APOLLO_RELEASE_TEMPLATE.md
index fc1f71a4724..6a3700e1c95 100644
--- a/.github/APOLLO_RELEASE_TEMPLATE.md
+++ b/.github/APOLLO_RELEASE_TEMPLATE.md
@@ -4,8 +4,8 @@ As with [release PRs in the past](https://github.com/apollographql/apollo-server
 
 Check the appropriate milestone (to the right) for more details on what we hope to get into this release!
 
-The intention of these release branches is to gather changes which are intended to land in a specific version (again, indiciated by the subject of this PR).  Release branches allow additional clarity into what is being staged, provide a forum for comments from the community pertaining to the release's stability, and to facilitate the creation of pre-releases (e.g. `alpha`, `beta`, `rc`) without affecting the `master` branch.
+The intention of these release branches is to gather changes which are intended to land in a specific version (again, indiciated by the subject of this PR).  Release branches allow additional clarity into what is being staged, provide a forum for comments from the community pertaining to the release's stability, and to facilitate the creation of pre-releases (e.g. `alpha`, `beta`, `rc`) without affecting the `main` branch.
 
-PRs for new features might be opened against or re-targeted to this branch by the project maintainers.  The `master` branch may be periodically merged into this branch up until the point in time that this branch is being prepared for release.  Depending on the size of the release, this may be once it reaches RC (release candidate) stage with an `-rc.x` release suffix.  Some less substantial releases may be short-lived and may never have pre-release versions.
+PRs for new features might be opened against or re-targeted to this branch by the project maintainers.  The `main` branch may be periodically merged into this branch up until the point in time that this branch is being prepared for release.  Depending on the size of the release, this may be once it reaches RC (release candidate) stage with an `-rc.x` release suffix.  Some less substantial releases may be short-lived and may never have pre-release versions.
 
-When this version is officially released onto the `latest` npm tag, this PR will be merged into `master`.
+When this version is officially released onto the `latest` npm tag, this PR will be merged into `main`.
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 60984819969..ac650791bfc 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -4,9 +4,9 @@
           or discuss it on our Spectrum.chat community (https://spectrum.chat/apollo).
 * 💡 Feature requests?
           Please search for an existing feature request before opening a new one.
-          If there is an existing feature request, use the 👍 to show your support 
-          for it.  If the specifics of your use case are not covered in the existing 
-          conversation, please take the time to *add new conversation* which helps 
+          If there is an existing feature request, use the 👍 to show your support
+          for it.  If the specifics of your use case are not covered in the existing
+          conversation, please take the time to *add new conversation* which helps
           move the feature's design forward.
 * ❗️ Bug?
           This is the right place! 😄
@@ -14,7 +14,7 @@
 Before reporting a bug, please check for existing or closed issues
 first and read the instructions for filing a bug report:
 
-https://github.com/apollographql/apollo-server/blob/master/CONTRIBUTING.md#reporting-bugs
+https://github.com/apollographql/apollo-server/blob/main/CONTRIBUTING.md#reporting-bugs
 
 ### This bug report should include:
 
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 80ffe749dee..0446ccc1cc4 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -24,7 +24,7 @@ Here are some important details to follow:
           please _try_ to add a test which verifies the fix.  If you cannot, you should
           still submit the PR but we may still ask you (and help you!) to create a test.
 * 📖 Contribution guidelines
-          Follow https://github.com/apollographql/apollo-server/blob/master/CONTRIBUTING.md
+          Follow https://github.com/apollographql/apollo-server/blob/main/CONTRIBUTING.md
           when submitting a pull request.  Make sure existing tests still pass, and add
           tests for all new behavior.
 * ✏️ Explain your pull request
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 90caeabc224..caca618c9ca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,8 +2,8 @@
 
 The version headers in this history reflect the versions of Apollo Server itself.  Versions of other packages (e.g. which are not actual HTTP integrations; packages not prefixed with `apollo-server`) may use different versions.  For more details, check the publish commit for that version in the Git history, or check the individual CHANGELOGs for specific packages which are maintained separately:
 
-- [__CHANGELOG for `@apollo/gateway`__](https://github.com/apollographql/apollo-server/blob/master/packages/apollo-gateway/CHANGELOG.md)
-- [__CHANGELOG for `@apollo/federation`__](https://github.com/apollographql/apollo-server/blob/master/packages/apollo-federation/CHANGELOG.md)
+- [__CHANGELOG for `@apollo/gateway`__](https://github.com/apollographql/apollo-server/blob/main/packages/apollo-gateway/CHANGELOG.md)
+- [__CHANGELOG for `@apollo/federation`__](https://github.com/apollographql/apollo-server/blob/main/packages/apollo-federation/CHANGELOG.md)
 
 ### vNEXT
 
diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
index 04468fa8f29..7c60fdeabd1 100644
--- a/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@@ -8,8 +8,8 @@ For now, this will be a collection of tips and tricks for the maintainers of the
 
 Depending on the size of the release, it may be ideal to have a staging PR which gathers the various features we're intending on releasing into the version.  This can be a great way for the community to understand the scope of a release and a clear way for maintainers to publicize it and gather feedback.
 
-1. Create a branch off `master` named `release-X.Y.Z`, where `X.Y.Z` is the intended release.
-2. Edit the `CHANGELOG.md`, removing the `vNEXT` section entirely.  This section will remain on `master` and be resolved during the merge.
+1. Create a branch off `main` named `release-X.Y.Z`, where `X.Y.Z` is the intended release.
+2. Edit the `CHANGELOG.md`, removing the `vNEXT` section entirely.  This section will remain on `main` and be resolved during the merge.
 3. Add a new section for `### vX.Y.Z` with a bullet indicating that something is coming soon:
 
    ```
@@ -18,9 +18,9 @@ Depending on the size of the release, it may be ideal to have a staging PR which
    - Nothing yet! Stay tuned.
    ```
 
-4. Commit this change so GitHub will allow a PR to be opened against `master` with a notable change.  A suggested commit message is `Prepare CHANGELOG.md for upcoming vX.Y.Z release.`
+4. Commit this change so GitHub will allow a PR to be opened against `main` with a notable change.  A suggested commit message is `Prepare CHANGELOG.md for upcoming vX.Y.Z release.`
 5. Push the branch to GitHub
-6. On GitHub, open a PR from the new release branch which targets `master`.
+6. On GitHub, open a PR from the new release branch which targets `main`.
    __For the title of the PR__, use "Release X.Y.Z".  __For the body,__ use the contents of the template in the `.github/APOLLO_RELEASE_TEMPLATE.md` file in this repository.  Adjust the body as you see necessary.
 
 ## Publishing a release
diff --git a/docs/gatsby-config.js b/docs/gatsby-config.js
index f0c11ab3565..56f35e6103d 100644
--- a/docs/gatsby-config.js
+++ b/docs/gatsby-config.js
@@ -19,7 +19,7 @@ module.exports = {
           null: [
             'index',
             'getting-started',
-            '[Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)',
+            '[Changelog](https://github.com/apollographql/apollo-server/blob/main/CHANGELOG.md)',
           ],
           'Defining a Schema': [
             'schema/schema',
diff --git a/docs/source/api/apollo-gateway.mdx b/docs/source/api/apollo-gateway.mdx
index 0260576b152..ad0e91d475a 100644
--- a/docs/source/api/apollo-gateway.mdx
+++ b/docs/source/api/apollo-gateway.mdx
@@ -61,7 +61,7 @@ example of using `ApolloGateway`, see [The gateway](/federation/gateway/).
 
     If you provide this function, `ApolloGateway` calls it for every
     implementing service in your data graph. The function must return an object
-    that implements the [`GraphQLDataSource` interface](https://github.com/apollographql/apollo-server/blob/master/packages/apollo-gateway/src/datasources/types.ts), such as an instance of [RemoteGraphQLDataSource](#remotegraphqldatasource) or a subclass of it.
+    that implements the [`GraphQLDataSource` interface](https://github.com/apollographql/apollo-server/blob/570f548b88/packages/apollo-gateway/src/datasources/types.ts), such as an instance of [RemoteGraphQLDataSource](#remotegraphqldatasource) or a subclass of it.
 
     The example below demonstrates adding an `x-user-id`
     HTTP header to every request the gateway sends to an implementing service:
diff --git a/docs/source/data/resolvers.mdx b/docs/source/data/resolvers.mdx
index 8a7f8521b42..af20f2618ee 100644
--- a/docs/source/data/resolvers.mdx
+++ b/docs/source/data/resolvers.mdx
@@ -358,7 +358,7 @@ Resolver functions take the following positional arguments, in order:
 | `parent` | <p>The return value of the resolver for this field's parent (i.e., the previous resolver in the [resolver chain](#resolver-chains)).</p><p>For resolvers of top-level fields with no parent (such as fields of `Query`), this value is obtained from the `rootValue` function passed to [Apollo Server's constructor](/api/apollo-server/#apolloserver).</p>  |
 | `args` |  <p>An object that contains all GraphQL arguments provided for this field.</p><p> For example, when executing `query{ user(id: "4") }`, the `args` object passed to the `user` resolver is `{ "id": "4" }`.</p> |
 | `context` | <p>An object shared across all resolvers that are executing for a particular operation. Use this to share per-operation state, including authentication information, dataloader instances, and anything else to track across resolvers. </p><p>See [The `context` argument](#the-context-argument) for more information.</p> |
-| `info` | <p>Contains information about the operation's execution state, including the field name, the path to the field from the root, and more. </p><p>Its core fields are listed in the [GraphQL.js source code](https://github.com/graphql/graphql-js/blob/master/src/type/definition.js#L917-L928), and it is extended with additional functionality by other modules, like [`apollo-cache-control`](https://github.com/apollographql/apollo-server/tree/master/packages/apollo-cache-control).</p> |
+| `info` | <p>Contains information about the operation's execution state, including the field name, the path to the field from the root, and more. </p><p>Its core fields are listed in the [GraphQL.js source code](https://github.com/graphql/graphql-js/blob/master/src/type/definition.js#L917-L928), and it is extended with additional functionality by other modules, like [`apollo-cache-control`](https://github.com/apollographql/apollo-server/tree/570f548b887/packages/apollo-cache-control).</p> |
 
 ### The `context` argument
 
diff --git a/docs/source/data/subscriptions.md b/docs/source/data/subscriptions.md
index a6e7c4bd4d9..deae03ba48f 100644
--- a/docs/source/data/subscriptions.md
+++ b/docs/source/data/subscriptions.md
@@ -247,6 +247,6 @@ The Apollo Server implementation of `PubSub` can be replaced by another implemen
 - [Kafka](https://github.com/ancashoria/graphql-kafka-subscriptions)
 - [Postgres](https://github.com/GraphQLCollege/graphql-postgres-subscriptions)
 - [Google Cloud Firestore](https://github.com/MrBoolean/graphql-firestore-subscriptions)
-- [Add your implementation...](https://github.com/apollographql/apollo-server/pull/new/master)
+- [Add your implementation...](https://github.com/apollographql/apollo-server/pull/new/main)
 
 You can implement a `PubSub` of your own, using the exported `PubSubEngine` interface from `apollo-server` or another integration. If you want to set up a GraphQL server using the `graphql-subscriptions` package (not recommended for production), follow [this guide](https://www.apollographql.com/docs/graphql-subscriptions/).
diff --git a/docs/source/federation/metrics.md b/docs/source/federation/metrics.md
index 0f3a94ddf8d..dd5944e12e2 100644
--- a/docs/source/federation/metrics.md
+++ b/docs/source/federation/metrics.md
@@ -26,7 +26,7 @@ These options will cause the Apollo gateway to collect tracing information from
 
 > NOTE: this section details how the gateway communicates with federated services around encoded tracing information and is not necessary to understand in order to enable federated tracing.
 
-The Apollo gateway looks to the `extensions` field of all service responses for the presence of an `ftv1` field. This field contains a representation of the tracing information for the sub-query that was executed against the service, sent as the Base64 encoding of the [protobuf representation](https://github.com/apollographql/apollo-server/blob/master/packages/apollo-engine-reporting-protobuf/src/reports.proto) of the trace. In order to request this information of federated services, the gateway will send the header pair `'apollo-federation-include-trace': 'ftv1'` on fetches if configured to collect metrics, as per above. By default a federated Apollo Server service will recognize this header pair and attach tracing information in extensions of the response.
+The Apollo gateway looks to the `extensions` field of all service responses for the presence of an `ftv1` field. This field contains a representation of the tracing information for the sub-query that was executed against the service, sent as the Base64 encoding of the [protobuf representation](https://github.com/apollographql/apollo-server/blob/main/packages/apollo-engine-reporting-protobuf/src/reports.proto) of the trace. In order to request this information of federated services, the gateway will send the header pair `'apollo-federation-include-trace': 'ftv1'` on fetches if configured to collect metrics, as per above. By default a federated Apollo Server service will recognize this header pair and attach tracing information in extensions of the response.
 
 ## How traces are constructed and aggregated
 
diff --git a/docs/source/federation/other-servers.md b/docs/source/federation/other-servers.md
index 2cfa5020241..34ea616a456 100644
--- a/docs/source/federation/other-servers.md
+++ b/docs/source/federation/other-servers.md
@@ -19,4 +19,4 @@ The following is a list of known open source GraphQL server libraries that have
 | Ruby        | graphql-ruby  | [apollo-federation-ruby](https://github.com/Gusto/apollo-federation-ruby)        |
 | Rust        | async-graphql | [async-graphql](https://github.com/async-graphql/async-graphql)                  |
 
-Do you maintain a library that implements Apollo Federation that isn't listed here? Please [submit a PR](https://github.com/apollographql/apollo-server/tree/master/docs/source/federation/other-servers.md) to be added to the list!
+Do you maintain a library that implements Apollo Federation that isn't listed here? Please [submit a PR](https://github.com/apollographql/apollo-server/tree/main/docs/source/federation/other-servers.md) to be added to the list!
diff --git a/docs/source/integrations/plugins.md b/docs/source/integrations/plugins.md
index 578e62f6a3e..7f39a076df8 100644
--- a/docs/source/integrations/plugins.md
+++ b/docs/source/integrations/plugins.md
@@ -25,7 +25,7 @@ const myPlugin = {
 };
 ```
 
-> If you're using TypeScript to create a plugin, the `apollo-server-plugin-base` module exports the [`ApolloServerPlugin` interface](https://github.com/apollographql/apollo-server/blob/master/packages/apollo-server-plugin-base/src/index.ts) for plugins to implement.
+> If you're using TypeScript to create a plugin, the `apollo-server-plugin-base` module exports the [`ApolloServerPlugin` interface](https://github.com/apollographql/apollo-server/blob/main/packages/apollo-server-plugin-base/src/index.ts) for plugins to implement.
 
 You can define a plugin in the same file where you initialize Apollo Server, or
 you can export it as a separate module:
@@ -194,7 +194,7 @@ As the example above shows, `requestDidStart` and request lifecycle functions ac
 parameter. This parameter is of type `GraphQLRequestContext`, which includes a
 `request` (of type `GraphQLRequest`), along with a `response` field (of type `GraphQLResponse`) if it's available.
 
-These types and their related subtypes are all defined in [`apollo-server-types/src/index.ts`](https://github.com/apollographql/apollo-server/blob/master/packages/apollo-server-types/src/index.ts).
+These types and their related subtypes are all defined in [`apollo-server-types/src/index.ts`](https://github.com/apollographql/apollo-server/blob/main/packages/apollo-server-types/src/index.ts).
 
 ## Installing a plugin
 
@@ -312,7 +312,7 @@ should not return a value.
 
 ### Request lifecycle events
 
-> If you're using TypeScript to create your plugin, implement the [ `GraphQLRequestListener` interface](https://github.com/apollographql/apollo-server/blob/master/packages/apollo-server-plugin-base/src/index.ts) from the `apollo-server-plugin-base` module to define functions for request lifecycle events.
+> If you're using TypeScript to create your plugin, implement the [ `GraphQLRequestListener` interface](https://github.com/apollographql/apollo-server/blob/main/packages/apollo-server-plugin-base/src/index.ts) from the `apollo-server-plugin-base` module to define functions for request lifecycle events.
 
 ### `didResolveSource`
 
diff --git a/docs/source/monitoring/metrics.md b/docs/source/monitoring/metrics.md
index 49c3a08e3dd..5ec1d295d6f 100644
--- a/docs/source/monitoring/metrics.md
+++ b/docs/source/monitoring/metrics.md
@@ -26,7 +26,7 @@ APOLLO_KEY=YOUR_API_KEY APOLLO_GRAPH_VARIANT=development node start-server.js
 
 ### Debugging Apollo Studio reporting
 
-You can set the [`debugPrintReports` option](https://github.com/apollographql/apollo-server/blob/master/packages/apollo-engine-reporting/src/agent.ts#L429-L433) in the `engine` section of the `ApolloServer` constructor to automatically log debugging information for all reporting requests sent to Apollo Studio.  For example:
+You can set the [`debugPrintReports` option](https://github.com/apollographql/apollo-server/blob/main/packages/apollo-engine-reporting/src/agent.ts#L429-L433) in the `engine` section of the `ApolloServer` constructor to automatically log debugging information for all reporting requests sent to Apollo Studio.  For example:
 
 ```js{8}
 const { ApolloServer } = require("apollo-server");
@@ -98,7 +98,7 @@ server.listen().then(({ url }) => {
 });
 ```
 
-Specifying this function overrides the [`defaultGenerateClientInfo` function](https://github.com/apollographql/apollo-server/blob/master/packages/apollo-engine-reporting/src/extension.ts#L205-L228) that Apollo Server calls otherwise.
+Specifying this function overrides the [`defaultGenerateClientInfo` function](https://github.com/apollographql/apollo-server/blob/main/packages/apollo-engine-reporting/src/extension.ts#L205-L228) that Apollo Server calls otherwise.
 
 ## Logging
 
diff --git a/docs/source/performance/apq.md b/docs/source/performance/apq.md
index 506caa703ce..3d1bf76be62 100644
--- a/docs/source/performance/apq.md
+++ b/docs/source/performance/apq.md
@@ -95,7 +95,7 @@ type Author @cacheControl(maxAge: 60) {
 }
 ```
 
-See [the cache control documentation](https://github.com/apollographql/apollo-server/tree/master/packages/apollo-cache-control#add-cache-hints-to-your-schema) for more details, including how to specify hints dynamically inside resolvers, how to set a default `maxAge` for all fields, and how to specify that a field should be cached for specific users only (in which case CDNs should ignore it). For example, to set a default max age other than `0` modify the Apollo Server constructor to include `cacheControl`:
+See [the cache control documentation](https://github.com/apollographql/apollo-server/tree/main/packages/apollo-cache-control#add-cache-hints-to-your-schema) for more details, including how to specify hints dynamically inside resolvers, how to set a default `maxAge` for all fields, and how to specify that a field should be cached for specific users only (in which case CDNs should ignore it). For example, to set a default max age other than `0` modify the Apollo Server constructor to include `cacheControl`:
 
 ```js
 const server = new ApolloServer({
diff --git a/docs/static/_redirects b/docs/static/_redirects
index 48ff558fd49..c520fb2ecd9 100644
--- a/docs/static/_redirects
+++ b/docs/static/_redirects
@@ -17,7 +17,7 @@
 /docs/apollo-server/features/test-utils.html /docs/apollo-server/features/testing.html
 
 # Redirects associated with revamp of Apollo Server information architecture
-/docs/apollo-server/whats-new https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md
+/docs/apollo-server/whats-new https://github.com/apollographql/apollo-server/blob/main/CHANGELOG.md
 /docs/apollo-server/essentials/data/ /docs/apollo-server/data/data/
 /docs/apollo-server/essentials/schema/ /docs/apollo-server/schema/schema/
 /docs/apollo-server/essentials/server /docs/apollo-server/getting-started/
diff --git a/packages/apollo-datasource-rest/README.md b/packages/apollo-datasource-rest/README.md
index ac3ac4ccf6c..aed614df182 100644
--- a/packages/apollo-datasource-rest/README.md
+++ b/packages/apollo-datasource-rest/README.md
@@ -1,6 +1,6 @@
 # Apollo REST Data Source
 
-This package exports a ([`RESTDataSource`](https://github.com/apollographql/apollo-server/tree/master/packages/apollo-datasource-rest)) class which is used for fetching data from a REST API and exposing it via GraphQL within Apollo Server.
+This package exports a ([`RESTDataSource`](https://github.com/apollographql/apollo-server/tree/main/packages/apollo-datasource-rest)) class which is used for fetching data from a REST API and exposing it via GraphQL within Apollo Server.
 
 ## Documentation
 
@@ -14,9 +14,9 @@ To get started, install the `apollo-datasource-rest` package:
 npm install apollo-datasource-rest
 ```
 
-To define a data source, extend the [`RESTDataSource`](https://github.com/apollographql/apollo-server/tree/master/packages/apollo-datasource-rest) class and implement the data fetching methods that your resolvers require.  Data sources can then be provided via the `dataSources` property to the `ApolloServer` constructor, as demonstrated in the _Accessing data sources from resolvers_ section below.
+To define a data source, extend the [`RESTDataSource`](https://github.com/apollographql/apollo-server/tree/main/packages/apollo-datasource-rest) class and implement the data fetching methods that your resolvers require.  Data sources can then be provided via the `dataSources` property to the `ApolloServer` constructor, as demonstrated in the _Accessing data sources from resolvers_ section below.
 
-Your implementation of these methods can call on convenience methods built into the [RESTDataSource](https://github.com/apollographql/apollo-server/tree/master/packages/apollo-datasource-rest) class to perform HTTP requests, while making it easy to build up query parameters, parse JSON results, and handle errors.
+Your implementation of these methods can call on convenience methods built into the [RESTDataSource](https://github.com/apollographql/apollo-server/tree/main/packages/apollo-datasource-rest) class to perform HTTP requests, while making it easy to build up query parameters, parse JSON results, and handle errors.
 
 ```javascript
 const { RESTDataSource } = require('apollo-datasource-rest');
@@ -43,7 +43,7 @@ class MoviesAPI extends RESTDataSource {
 
 ### HTTP Methods
 
-The `get` method on the [RESTDataSource](https://github.com/apollographql/apollo-server/tree/master/packages/apollo-datasource-rest) makes an HTTP `GET` request. Similarly, there are methods built-in to allow for POST, PUT, PATCH, and DELETE requests.
+The `get` method on the [RESTDataSource](https://github.com/apollographql/apollo-server/tree/main/packages/apollo-datasource-rest) makes an HTTP `GET` request. Similarly, there are methods built-in to allow for POST, PUT, PATCH, and DELETE requests.
 
 ```javascript
 class MoviesAPI extends RESTDataSource {
diff --git a/packages/apollo-datasource-rest/package.json b/packages/apollo-datasource-rest/package.json
index 2c70ce1a3c1..a1937693460 100644
--- a/packages/apollo-datasource-rest/package.json
+++ b/packages/apollo-datasource-rest/package.json
@@ -5,7 +5,7 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/apollographql/apollo-server/tree/master/packages/apollo-datasource-rest"
+    "url": "https://github.com/apollographql/apollo-server/tree/main/packages/apollo-datasource-rest"
   },
   "homepage": "https://github.com/apollographql/apollo-server#readme",
   "bugs": {
diff --git a/packages/apollo-datasource/package.json b/packages/apollo-datasource/package.json
index 96c6ceda088..d3c30719fd9 100644
--- a/packages/apollo-datasource/package.json
+++ b/packages/apollo-datasource/package.json
@@ -5,7 +5,7 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/apollographql/apollo-server/tree/master/packages/apollo-datasource"
+    "url": "https://github.com/apollographql/apollo-server/tree/main/packages/apollo-datasource"
   },
   "homepage": "https://github.com/apollographql/apollo-server#readme",
   "bugs": {
diff --git a/packages/apollo-engine-reporting-protobuf/package.json b/packages/apollo-engine-reporting-protobuf/package.json
index c022754150f..545d6700acd 100644
--- a/packages/apollo-engine-reporting-protobuf/package.json
+++ b/packages/apollo-engine-reporting-protobuf/package.json
@@ -15,7 +15,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/apollographql/apollo-engine-reporting/tree/master/packages/apollo-engine-reporting-protobuf"
+    "url": "https://github.com/apollographql/apollo-engine-reporting/tree/main/packages/apollo-engine-reporting-protobuf"
   },
   "keywords": [
     "GraphQL",
diff --git a/packages/apollo-engine-reporting-protobuf/src/reports.proto b/packages/apollo-engine-reporting-protobuf/src/reports.proto
index 0c6bc319d78..b5c70dcffa9 100644
--- a/packages/apollo-engine-reporting-protobuf/src/reports.proto
+++ b/packages/apollo-engine-reporting-protobuf/src/reports.proto
@@ -115,7 +115,7 @@ message Trace {
 
 	// represents a node in the query plan, under which there is a trace tree for that service fetch.
 	// In particular, each fetch node represents a call to an implementing service, and calls to implementing
-	// services may not be unique. See https://github.com/apollographql/apollo-server/blob/master/packages/apollo-gateway/src/QueryPlan.ts
+	// services may not be unique. See https://github.com/apollographql/apollo-server/blob/main/packages/apollo-gateway/src/QueryPlan.ts
 	// for more information and details.
 	message QueryPlanNode {
 		// This represents a set of nodes to be executed sequentially by the Gateway executor
diff --git a/packages/apollo-federation/README.md b/packages/apollo-federation/README.md
index 240602a95b7..7980e3bdb4c 100644
--- a/packages/apollo-federation/README.md
+++ b/packages/apollo-federation/README.md
@@ -1,6 +1,6 @@
 # `Apollo Federation Utilities`
 
-This package provides utilities for creating GraphQL microservices, which can be combined into a single endpoint through tools like [Apollo Gateway](https://github.com/apollographql/apollo-server/tree/master/packages/apollo-gateway).
+This package provides utilities for creating GraphQL microservices, which can be combined into a single endpoint through tools like [Apollo Gateway](https://github.com/apollographql/apollo-server/tree/main/packages/apollo-gateway).
 
 For complete documentation, see the [Apollo Federation API reference](https://www.apollographql.com/docs/apollo-server/api/apollo-federation/).
 
diff --git a/packages/apollo-gateway/CHANGELOG.md b/packages/apollo-gateway/CHANGELOG.md
index fedeaa00673..0326a69ff00 100644
--- a/packages/apollo-gateway/CHANGELOG.md
+++ b/packages/apollo-gateway/CHANGELOG.md
@@ -92,7 +92,7 @@
 
 ## v0.12.1
 
-- Update to include [fixes from `@apollo/federation`](https://github.com/apollographql/apollo-server/blob/master/packages/apollo-federation/CHANGELOG.md).
+- Update to include [fixes from `@apollo/federation`](https://github.com/apollographql/apollo-server/blob/main/packages/apollo-federation/CHANGELOG.md).
 
 ## v0.12.0
 
diff --git a/packages/apollo-gateway/README.md b/packages/apollo-gateway/README.md
index b6349e4cb49..53904a29b1b 100644
--- a/packages/apollo-gateway/README.md
+++ b/packages/apollo-gateway/README.md
@@ -2,7 +2,7 @@
 
 This package provides utilities for combining multiple GraphQL microservices into a single GraphQL endpoint.
 
-Each microservice should implement the [federation schema specification](https://www.apollographql.com/docs/apollo-server/federation/federation-spec/). This can be done either through [Apollo Federation](https://github.com/apollographql/apollo-server/tree/master/packages/apollo-federation) or a variety of other open source products.
+Each microservice should implement the [federation schema specification](https://www.apollographql.com/docs/apollo-server/federation/federation-spec/). This can be done either through [Apollo Federation](https://github.com/apollographql/apollo-server/tree/main/packages/apollo-federation) or a variety of other open source products.
 
 For complete documentation, see the [Apollo Gateway API reference](https://www.apollographql.com/docs/apollo-server/api/apollo-gateway/).
 
diff --git a/packages/apollo-server-azure-functions/README.md b/packages/apollo-server-azure-functions/README.md
index cc614ff9d36..47906b08920 100644
--- a/packages/apollo-server-azure-functions/README.md
+++ b/packages/apollo-server-azure-functions/README.md
@@ -1,4 +1,4 @@
-This is the Azure functions integration of GraphQL Server. Apollo Server is a community-maintained open-source GraphQL server that works with many Node.js HTTP server frameworks. [Read the docs](https://www.apollographql.com/docs/apollo-server/v2). [Read the CHANGELOG](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md).
+This is the Azure functions integration of GraphQL Server. Apollo Server is a community-maintained open-source GraphQL server that works with many Node.js HTTP server frameworks. [Read the docs](https://www.apollographql.com/docs/apollo-server/v2). [Read the CHANGELOG](https://github.com/apollographql/apollo-server/blob/main/CHANGELOG.md).
 
 ```shell
 npm install apollo-server-azure-functions
@@ -146,4 +146,4 @@ GraphQL Server is built with the following principles in mind:
 * **Simplicity**: by keeping things simple, GraphQL Server is easier to use, easier to contribute to, and more secure
 * **Performance**: GraphQL Server is well-tested and production-ready - no modifications needed
 
-Anyone is welcome to contribute to GraphQL Server, just read [CONTRIBUTING.md](https://github.com/apollographql/apollo-server/blob/master/CONTRIBUTING.md), take a look at the [roadmap](https://github.com/apollographql/apollo-server/blob/master/ROADMAP.md) and make your first PR!
+Anyone is welcome to contribute to GraphQL Server, just read [CONTRIBUTING.md](https://github.com/apollographql/apollo-server/blob/main/CONTRIBUTING.md), take a look at the [roadmap](https://github.com/apollographql/apollo-server/blob/main/ROADMAP.md) and make your first PR!
diff --git a/packages/apollo-server-azure-functions/package.json b/packages/apollo-server-azure-functions/package.json
index 02ef30a8833..ba58644daaa 100644
--- a/packages/apollo-server-azure-functions/package.json
+++ b/packages/apollo-server-azure-functions/package.json
@@ -13,7 +13,7 @@
 	"license": "MIT",
 	"repository": {
 		"type": "git",
-		"url": "https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-azure-functions"
+		"url": "https://github.com/apollographql/apollo-server/tree/main/packages/apollo-server-azure-functions"
 	},
 	"homepage": "https://github.com/apollographql/apollo-server#readme",
 	"bugs": {
diff --git a/packages/apollo-server-cache-memcached/package.json b/packages/apollo-server-cache-memcached/package.json
index 233ac509ecd..3ce34ef1ba2 100644
--- a/packages/apollo-server-cache-memcached/package.json
+++ b/packages/apollo-server-cache-memcached/package.json
@@ -5,7 +5,7 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-cache-memcached"
+    "url": "https://github.com/apollographql/apollo-server/tree/main/packages/apollo-server-cache-memcached"
   },
   "homepage": "https://github.com/apollographql/apollo-server#readme",
   "bugs": {
diff --git a/packages/apollo-server-cache-redis/package.json b/packages/apollo-server-cache-redis/package.json
index 3d1cef1cdef..6f76834a1fc 100644
--- a/packages/apollo-server-cache-redis/package.json
+++ b/packages/apollo-server-cache-redis/package.json
@@ -5,7 +5,7 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-cache-redis"
+    "url": "https://github.com/apollographql/apollo-server/tree/main/packages/apollo-server-cache-redis"
   },
   "homepage": "https://github.com/apollographql/apollo-server#readme",
   "bugs": {
diff --git a/packages/apollo-server-caching/package.json b/packages/apollo-server-caching/package.json
index 58b36b80ca3..c9c221db421 100644
--- a/packages/apollo-server-caching/package.json
+++ b/packages/apollo-server-caching/package.json
@@ -5,7 +5,7 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-caching"
+    "url": "https://github.com/apollographql/apollo-server/tree/main/packages/apollo-server-caching"
   },
   "homepage": "https://github.com/apollographql/apollo-server#readme",
   "bugs": {
diff --git a/packages/apollo-server-cloud-functions/README.md b/packages/apollo-server-cloud-functions/README.md
index 9234375ee8a..3b695d954fb 100644
--- a/packages/apollo-server-cloud-functions/README.md
+++ b/packages/apollo-server-cloud-functions/README.md
@@ -1,7 +1,7 @@
 [![npm version](https://badge.fury.io/js/apollo-server-cloud-functions.svg)](https://badge.fury.io/js/apollo-server-cloud-functions) [![Build Status](https://circleci.com/gh/apollographql/apollo-server.svg?style=svg)](https://circleci.com/gh/apollographql/apollo-server) [![Join the community on Spectrum](https://withspectrum.github.io/badge/badge.svg)](https://spectrum.chat/apollo)
 
 
-This is the Google Cloud Function integration of GraphQL Server. Apollo Server is a community-maintained open-source GraphQL server that works with many Node.js HTTP server frameworks. [Read the docs](https://www.apollographql.com/docs/apollo-server/v2). [Read the CHANGELOG](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md).
+This is the Google Cloud Function integration of GraphQL Server. Apollo Server is a community-maintained open-source GraphQL server that works with many Node.js HTTP server frameworks. [Read the docs](https://www.apollographql.com/docs/apollo-server/v2). [Read the CHANGELOG](https://github.com/apollographql/apollo-server/blob/main/CHANGELOG.md).
 
 ```shell
 npm install apollo-server-cloud-functions graphql
@@ -170,4 +170,4 @@ GraphQL Server is built with the following principles in mind:
 - **Simplicity**: by keeping things simple, GraphQL Server is easier to use, easier to contribute to, and more secure
 - **Performance**: GraphQL Server is well-tested and production-ready - no modifications needed
 
-Anyone is welcome to contribute to GraphQL Server, just read [CONTRIBUTING.md](https://github.com/apollographql/apollo-server/blob/master/CONTRIBUTING.md), take a look at the [roadmap](https://github.com/apollographql/apollo-server/blob/master/ROADMAP.md) and make your first PR!
+Anyone is welcome to contribute to GraphQL Server, just read [CONTRIBUTING.md](https://github.com/apollographql/apollo-server/blob/main/CONTRIBUTING.md), take a look at the [roadmap](https://github.com/apollographql/apollo-server/blob/main/ROADMAP.md) and make your first PR!
diff --git a/packages/apollo-server-cloud-functions/package.json b/packages/apollo-server-cloud-functions/package.json
index a54a5fc8d57..76acfdf1c38 100644
--- a/packages/apollo-server-cloud-functions/package.json
+++ b/packages/apollo-server-cloud-functions/package.json
@@ -13,7 +13,7 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-cloud-functions"
+    "url": "https://github.com/apollographql/apollo-server/tree/main/packages/apollo-server-cloud-functions"
   },
   "homepage": "https://github.com/apollographql/apollo-server#readme",
   "bugs": {
diff --git a/packages/apollo-server-cloudflare/package.json b/packages/apollo-server-cloudflare/package.json
index 7eb5a3fe2c2..53710d55b45 100644
--- a/packages/apollo-server-cloudflare/package.json
+++ b/packages/apollo-server-cloudflare/package.json
@@ -6,7 +6,7 @@
   "types": "dist/index.d.ts",
   "repository": {
     "type": "git",
-    "url": "https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-cloudflare-workers"
+    "url": "https://github.com/apollographql/apollo-server/tree/main/packages/apollo-server-cloudflare-workers"
   },
   "keywords": [
     "GraphQL",
diff --git a/packages/apollo-server-core/README.md b/packages/apollo-server-core/README.md
index 741aaec2f35..06f30e1d8d8 100644
--- a/packages/apollo-server-core/README.md
+++ b/packages/apollo-server-core/README.md
@@ -4,4 +4,4 @@
 [![Build Status](https://circleci.com/gh/apollographql/apollo-server.svg?style=svg)](https://circleci.com/gh/apollographql/apollo-server)
 
 This is the core module of the Apollo community GraphQL Server. [Read the docs.](https://www.apollographql.com/docs/apollo-server/)
-[Read the CHANGELOG.](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
+[Read the CHANGELOG.](https://github.com/apollographql/apollo-server/blob/main/CHANGELOG.md)
diff --git a/packages/apollo-server-core/package.json b/packages/apollo-server-core/package.json
index ee7f4a508dd..e571f4a262e 100644
--- a/packages/apollo-server-core/package.json
+++ b/packages/apollo-server-core/package.json
@@ -6,7 +6,7 @@
   "types": "dist/index.d.ts",
   "repository": {
     "type": "git",
-    "url": "https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-core"
+    "url": "https://github.com/apollographql/apollo-server/tree/main/packages/apollo-server-core"
   },
   "keywords": [
     "GraphQL",
diff --git a/packages/apollo-server-env/package.json b/packages/apollo-server-env/package.json
index 0a6028862a6..fbd3b4b61c6 100644
--- a/packages/apollo-server-env/package.json
+++ b/packages/apollo-server-env/package.json
@@ -5,7 +5,7 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-env"
+    "url": "https://github.com/apollographql/apollo-server/tree/main/packages/apollo-server-env"
   },
   "homepage": "https://github.com/apollographql/apollo-server#readme",
   "bugs": {
diff --git a/packages/apollo-server-errors/package.json b/packages/apollo-server-errors/package.json
index 92fb6ed0183..19394cf2942 100644
--- a/packages/apollo-server-errors/package.json
+++ b/packages/apollo-server-errors/package.json
@@ -5,7 +5,7 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-errors"
+    "url": "https://github.com/apollographql/apollo-server/tree/main/packages/apollo-server-errors"
   },
   "homepage": "https://github.com/apollographql/apollo-server#readme",
   "bugs": {
diff --git a/packages/apollo-server-express/README.md b/packages/apollo-server-express/README.md
index b3d9df5c5e2..93ecc98b87f 100644
--- a/packages/apollo-server-express/README.md
+++ b/packages/apollo-server-express/README.md
@@ -1,7 +1,7 @@
 [![npm version](https://badge.fury.io/js/apollo-server-express.svg)](https://badge.fury.io/js/apollo-server-express) [![Build Status](https://circleci.com/gh/apollographql/apollo-server.svg?style=svg)](https://circleci.com/gh/apollographql/apollo-server) [![Join the community on Spectrum](https://withspectrum.github.io/badge/badge.svg)](https://spectrum.chat/apollo)
 
 
-This is the Express and Connect integration of GraphQL Server. Apollo Server is a community-maintained open-source GraphQL server that works with many Node.js HTTP server frameworks. [Read the docs](https://www.apollographql.com/docs/apollo-server/). [Read the CHANGELOG.](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
+This is the Express and Connect integration of GraphQL Server. Apollo Server is a community-maintained open-source GraphQL server that works with many Node.js HTTP server frameworks. [Read the docs](https://www.apollographql.com/docs/apollo-server/). [Read the CHANGELOG.](https://github.com/apollographql/apollo-server/blob/main/CHANGELOG.md)
 
 ```shell
 npm install apollo-server-express
@@ -90,4 +90,4 @@ GraphQL Server is built with the following principles in mind:
 * **Simplicity**: by keeping things simple, GraphQL Server is easier to use, easier to contribute to, and more secure
 * **Performance**: GraphQL Server is well-tested and production-ready - no modifications needed
 
-Anyone is welcome to contribute to GraphQL Server, just read [CONTRIBUTING.md](https://github.com/apollographql/apollo-server/blob/master/CONTRIBUTING.md), take a look at the [roadmap](https://github.com/apollographql/apollo-server/blob/master/ROADMAP.md) and make your first PR!
+Anyone is welcome to contribute to GraphQL Server, just read [CONTRIBUTING.md](https://github.com/apollographql/apollo-server/blob/main/CONTRIBUTING.md), take a look at the [roadmap](https://github.com/apollographql/apollo-server/blob/main/ROADMAP.md) and make your first PR!
diff --git a/packages/apollo-server-express/package.json b/packages/apollo-server-express/package.json
index 62115d478e8..75b26ceea8d 100644
--- a/packages/apollo-server-express/package.json
+++ b/packages/apollo-server-express/package.json
@@ -6,7 +6,7 @@
   "types": "dist/index.d.ts",
   "repository": {
     "type": "git",
-    "url": "https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-express"
+    "url": "https://github.com/apollographql/apollo-server/tree/main/packages/apollo-server-express"
   },
   "keywords": [
     "GraphQL",
diff --git a/packages/apollo-server-fastify/README.md b/packages/apollo-server-fastify/README.md
index dd452ce21cf..c6fefd2bc61 100644
--- a/packages/apollo-server-fastify/README.md
+++ b/packages/apollo-server-fastify/README.md
@@ -1,7 +1,7 @@
 [![npm version](https://badge.fury.io/js/apollo-server-fastify.svg)](https://badge.fury.io/js/apollo-server-fastify) [![Build Status](https://circleci.com/gh/apollographql/apollo-server.svg?style=svg)](https://circleci.com/gh/apollographql/apollo-server) [![Join the community on Spectrum](https://withspectrum.github.io/badge/badge.svg)](https://spectrum.chat/apollo)
 
 
-This is the Fastify integration of GraphQL Server. Apollo Server is a community-maintained open-source GraphQL server that works with many Node.js HTTP server frameworks. [Read the docs](https://www.apollographql.com/docs/apollo-server/). [Read the CHANGELOG.](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
+This is the Fastify integration of GraphQL Server. Apollo Server is a community-maintained open-source GraphQL server that works with many Node.js HTTP server frameworks. [Read the docs](https://www.apollographql.com/docs/apollo-server/). [Read the CHANGELOG.](https://github.com/apollographql/apollo-server/blob/main/CHANGELOG.md)
 
 ```shell
 npm install apollo-server-fastify
@@ -34,4 +34,4 @@ GraphQL Server is built with the following principles in mind:
 * **Simplicity**: by keeping things simple, GraphQL Server is easier to use, easier to contribute to, and more secure
 * **Performance**: GraphQL Server is well-tested and production-ready - no modifications needed
 
-Anyone is welcome to contribute to GraphQL Server, just read [CONTRIBUTING.md](https://github.com/apollographql/apollo-server/blob/master/CONTRIBUTING.md), take a look at the [roadmap](https://github.com/apollographql/apollo-server/blob/master/ROADMAP.md) and make your first PR!
+Anyone is welcome to contribute to GraphQL Server, just read [CONTRIBUTING.md](https://github.com/apollographql/apollo-server/blob/main/CONTRIBUTING.md), take a look at the [roadmap](https://github.com/apollographql/apollo-server/blob/main/ROADMAP.md) and make your first PR!
diff --git a/packages/apollo-server-fastify/package.json b/packages/apollo-server-fastify/package.json
index 0ff12ba6d4b..1367412e2b4 100644
--- a/packages/apollo-server-fastify/package.json
+++ b/packages/apollo-server-fastify/package.json
@@ -6,7 +6,7 @@
   "types": "dist/index.d.ts",
   "repository": {
     "type": "git",
-    "url": "https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-fastify"
+    "url": "https://github.com/apollographql/apollo-server/tree/main/packages/apollo-server-fastify"
   },
   "keywords": [
     "GraphQL",
diff --git a/packages/apollo-server-hapi/README.md b/packages/apollo-server-hapi/README.md
index 44ec205e226..111005d7943 100644
--- a/packages/apollo-server-hapi/README.md
+++ b/packages/apollo-server-hapi/README.md
@@ -1,7 +1,7 @@
 [![npm version](https://badge.fury.io/js/apollo-server-hapi.svg)](https://badge.fury.io/js/apollo-server-hapi) [![Build Status](https://circleci.com/gh/apollographql/apollo-server.svg?style=svg)](https://circleci.com/gh/apollographql/apollo-server) [![Join the community on Spectrum](https://withspectrum.github.io/badge/badge.svg)](https://spectrum.chat/apollo)
 
 
-This is the Hapi integration of Apollo Server. Apollo Server is a community-maintained open-source Apollo Server that works with many Node.js HTTP server frameworks. [Read the docs](https://www.apollographql.com/docs/apollo-server/). [Read the CHANGELOG.](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
+This is the Hapi integration of Apollo Server. Apollo Server is a community-maintained open-source Apollo Server that works with many Node.js HTTP server frameworks. [Read the docs](https://www.apollographql.com/docs/apollo-server/). [Read the CHANGELOG.](https://github.com/apollographql/apollo-server/blob/main/CHANGELOG.md)
 
 ```shell
 npm install apollo-server-hapi
@@ -56,4 +56,4 @@ Apollo Server is built with the following principles in mind:
 * **Simplicity**: by keeping things simple, Apollo Server is easier to use, easier to contribute to, and more secure
 * **Performance**: Apollo Server is well-tested and production-ready - no modifications needed
 
-Anyone is welcome to contribute to Apollo Server, just read [CONTRIBUTING.md](https://github.com/apollographql/apollo-server/blob/master/CONTRIBUTING.md), take a look at the [roadmap](https://github.com/apollographql/apollo-server/blob/master/ROADMAP.md) and make your first PR!
+Anyone is welcome to contribute to Apollo Server, just read [CONTRIBUTING.md](https://github.com/apollographql/apollo-server/blob/main/CONTRIBUTING.md), take a look at the [roadmap](https://github.com/apollographql/apollo-server/blob/main/ROADMAP.md) and make your first PR!
diff --git a/packages/apollo-server-hapi/package.json b/packages/apollo-server-hapi/package.json
index b0df1e0efe8..91d1526a4e4 100644
--- a/packages/apollo-server-hapi/package.json
+++ b/packages/apollo-server-hapi/package.json
@@ -6,7 +6,7 @@
   "types": "dist/index.d.ts",
   "repository": {
     "type": "git",
-    "url": "https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-hapi"
+    "url": "https://github.com/apollographql/apollo-server/tree/main/packages/apollo-server-hapi"
   },
   "keywords": [
     "GraphQL",
diff --git a/packages/apollo-server-integration-testsuite/package.json b/packages/apollo-server-integration-testsuite/package.json
index 47f683344b5..3c3136bcc0d 100644
--- a/packages/apollo-server-integration-testsuite/package.json
+++ b/packages/apollo-server-integration-testsuite/package.json
@@ -7,7 +7,7 @@
   "types": "dist/index.d.ts",
   "repository": {
     "type": "git",
-    "url": "https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-integration-testsuite"
+    "url": "https://github.com/apollographql/apollo-server/tree/main/packages/apollo-server-integration-testsuite"
   },
   "keywords": [],
   "author": "Jonas Helfer <jonas@helfer.email>",
diff --git a/packages/apollo-server-koa/README.md b/packages/apollo-server-koa/README.md
index 35ad2cb04b0..f0cba368a64 100644
--- a/packages/apollo-server-koa/README.md
+++ b/packages/apollo-server-koa/README.md
@@ -1,7 +1,7 @@
 [![npm version](https://badge.fury.io/js/apollo-server-koa.svg)](https://badge.fury.io/js/apollo-server-koa) [![Build Status](https://circleci.com/gh/apollographql/apollo-server.svg?style=svg)](https://circleci.com/gh/apollographql/apollo-server) [![Join the community on Spectrum](https://withspectrum.github.io/badge/badge.svg)](https://spectrum.chat/apollo)
 
 
-This is the Koa integration of GraphQL Server. Apollo Server is a community-maintained open-source GraphQL server that works with many Node.js HTTP server frameworks. [Read the docs](https://www.apollographql.com/docs/apollo-server/). [Read the CHANGELOG.](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
+This is the Koa integration of GraphQL Server. Apollo Server is a community-maintained open-source GraphQL server that works with many Node.js HTTP server frameworks. [Read the docs](https://www.apollographql.com/docs/apollo-server/). [Read the CHANGELOG.](https://github.com/apollographql/apollo-server/blob/main/CHANGELOG.md)
 
 ```shell
 npm install apollo-server-koa graphql
@@ -47,4 +47,4 @@ GraphQL Server is built with the following principles in mind:
 - **Simplicity**: by keeping things simple, GraphQL Server is easier to use, easier to contribute to, and more secure
 - **Performance**: GraphQL Server is well-tested and production-ready - no modifications needed
 
-Anyone is welcome to contribute to GraphQL Server, just read [CONTRIBUTING.md](https://github.com/apollographql/apollo-server/blob/master/CONTRIBUTING.md), take a look at the [roadmap](https://github.com/apollographql/apollo-server/blob/master/ROADMAP.md) and make your first PR!
+Anyone is welcome to contribute to GraphQL Server, just read [CONTRIBUTING.md](https://github.com/apollographql/apollo-server/blob/main/CONTRIBUTING.md), take a look at the [roadmap](https://github.com/apollographql/apollo-server/blob/main/ROADMAP.md) and make your first PR!
diff --git a/packages/apollo-server-koa/package.json b/packages/apollo-server-koa/package.json
index 9b92531ff83..727c261cf1a 100644
--- a/packages/apollo-server-koa/package.json
+++ b/packages/apollo-server-koa/package.json
@@ -6,7 +6,7 @@
   "types": "dist/index.d.ts",
   "repository": {
     "type": "git",
-    "url": "https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-koa"
+    "url": "https://github.com/apollographql/apollo-server/tree/main/packages/apollo-server-koa"
   },
   "keywords": [
     "GraphQL",
diff --git a/packages/apollo-server-lambda/README.md b/packages/apollo-server-lambda/README.md
index 9c582a34cb8..92fc2c231c5 100644
--- a/packages/apollo-server-lambda/README.md
+++ b/packages/apollo-server-lambda/README.md
@@ -1,7 +1,7 @@
 [![npm version](https://badge.fury.io/js/apollo-server-lambda.svg)](https://badge.fury.io/js/apollo-server-lambda) [![Build Status](https://circleci.com/gh/apollographql/apollo-server.svg?style=svg)](https://circleci.com/gh/apollographql/apollo-server) [![Join the community on Spectrum](https://withspectrum.github.io/badge/badge.svg)](https://spectrum.chat/apollo)
 
 
-This is the AWS Lambda integration of GraphQL Server. Apollo Server is a community-maintained open-source GraphQL server that works with many Node.js HTTP server frameworks. [Read the docs](https://www.apollographql.com/docs/apollo-server/v2). [Read the CHANGELOG](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md).
+This is the AWS Lambda integration of GraphQL Server. Apollo Server is a community-maintained open-source GraphQL server that works with many Node.js HTTP server frameworks. [Read the docs](https://www.apollographql.com/docs/apollo-server/v2). [Read the CHANGELOG](https://github.com/apollographql/apollo-server/blob/main/CHANGELOG.md).
 
 ```shell
 npm install apollo-server-lambda graphql
@@ -223,4 +223,4 @@ GraphQL Server is built with the following principles in mind:
 * **Simplicity**: by keeping things simple, GraphQL Server is easier to use, easier to contribute to, and more secure
 * **Performance**: GraphQL Server is well-tested and production-ready - no modifications needed
 
-Anyone is welcome to contribute to GraphQL Server, just read [CONTRIBUTING.md](https://github.com/apollographql/apollo-server/blob/master/CONTRIBUTING.md), take a look at the [roadmap](https://github.com/apollographql/apollo-server/blob/master/ROADMAP.md) and make your first PR!
+Anyone is welcome to contribute to GraphQL Server, just read [CONTRIBUTING.md](https://github.com/apollographql/apollo-server/blob/main/CONTRIBUTING.md), take a look at the [roadmap](https://github.com/apollographql/apollo-server/blob/main/ROADMAP.md) and make your first PR!
diff --git a/packages/apollo-server-lambda/package.json b/packages/apollo-server-lambda/package.json
index 52eea9de0b8..5721c20413d 100644
--- a/packages/apollo-server-lambda/package.json
+++ b/packages/apollo-server-lambda/package.json
@@ -13,7 +13,7 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-lambda"
+    "url": "https://github.com/apollographql/apollo-server/tree/main/packages/apollo-server-lambda"
   },
   "homepage": "https://github.com/apollographql/apollo-server#readme",
   "bugs": {
diff --git a/packages/apollo-server-micro/README.md b/packages/apollo-server-micro/README.md
index 11d60a6c83d..edae2d0ecf1 100644
--- a/packages/apollo-server-micro/README.md
+++ b/packages/apollo-server-micro/README.md
@@ -1,7 +1,7 @@
 [![npm version](https://badge.fury.io/js/apollo-server-core.svg)](https://badge.fury.io/js/apollo-server-core) [![Build Status](https://circleci.com/gh/apollographql/apollo-server.svg?style=svg)](https://circleci.com/gh/apollographql/apollo-server) [![Join the community on Spectrum](https://withspectrum.github.io/badge/badge.svg)](https://spectrum.chat/apollo)
 
 
-This is the [Micro](https://github.com/zeit/micro) integration for the Apollo community GraphQL Server. [Read the docs.](https://www.apollographql.com/docs/apollo-server/) [Read the CHANGELOG.](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
+This is the [Micro](https://github.com/zeit/micro) integration for the Apollo community GraphQL Server. [Read the docs.](https://www.apollographql.com/docs/apollo-server/) [Read the CHANGELOG.](https://github.com/apollographql/apollo-server/blob/main/CHANGELOG.md)
 
 ## Basic GraphQL Microservice
 
diff --git a/packages/apollo-server-micro/package.json b/packages/apollo-server-micro/package.json
index a5c2da0da15..80a55f76552 100644
--- a/packages/apollo-server-micro/package.json
+++ b/packages/apollo-server-micro/package.json
@@ -6,7 +6,7 @@
   "types": "dist/index.d.ts",
   "repository": {
     "type": "git",
-    "url": "https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-micro"
+    "url": "https://github.com/apollographql/apollo-server/tree/main/packages/apollo-server-micro"
   },
   "keywords": [
     "GraphQL",
diff --git a/packages/apollo-server-plugin-response-cache/package.json b/packages/apollo-server-plugin-response-cache/package.json
index d17a5f7cbbf..657eed2b3b6 100644
--- a/packages/apollo-server-plugin-response-cache/package.json
+++ b/packages/apollo-server-plugin-response-cache/package.json
@@ -6,7 +6,7 @@
   "types": "dist/index.d.ts",
   "repository": {
     "type": "git",
-    "url": "https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-plugin-response-cache"
+    "url": "https://github.com/apollographql/apollo-server/tree/main/packages/apollo-server-plugin-response-cache"
   },
   "keywords": [],
   "author": "Apollo <npm@apollographql.com>",
diff --git a/packages/apollo-server-testing/README.md b/packages/apollo-server-testing/README.md
index a9ecec5d2b8..c1269b7a5f5 100644
--- a/packages/apollo-server-testing/README.md
+++ b/packages/apollo-server-testing/README.md
@@ -4,4 +4,4 @@
 [![Build Status](https://circleci.com/gh/apollographql/apollo-server.svg?style=svg)](https://circleci.com/gh/apollographql/apollo-server)
 
 This is the testing module of the Apollo community GraphQL Server. [Read the docs.](https://www.apollographql.com/docs/apollo-server/)
-[Read the CHANGELOG.](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
+[Read the CHANGELOG.](https://github.com/apollographql/apollo-server/blob/main/CHANGELOG.md)
diff --git a/packages/apollo-server-testing/package.json b/packages/apollo-server-testing/package.json
index 698341bace3..900b2feab12 100644
--- a/packages/apollo-server-testing/package.json
+++ b/packages/apollo-server-testing/package.json
@@ -6,7 +6,7 @@
   "types": "dist/index.d.ts",
   "repository": {
     "type": "git",
-    "url": "https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-testing"
+    "url": "https://github.com/apollographql/apollo-server/tree/main/packages/apollo-server-testing"
   },
   "keywords": [
     "GraphQL",
diff --git a/packages/apollo-server/README.md b/packages/apollo-server/README.md
index 6f9948c5783..44d4b8388f8 100644
--- a/packages/apollo-server/README.md
+++ b/packages/apollo-server/README.md
@@ -89,15 +89,15 @@ While the standalone installation above can be used without making a decision ab
 
 The following web frameworks have Apollo Server integrations, and each of these linked integrations has its own installation instructions and examples on its package `README.md`:
 
-- [Express](https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-express) _(Most popular)_
-- [Koa](https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-koa)
-- [Hapi](https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-hapi)
-- [Fastify](https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-fastify)
-- [Amazon Lambda](https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-lambda)
-- [Micro](https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-micro)
-- [Azure Functions](https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-azure-functions)
-- [Google Cloud Functions](https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-cloud-functions)
-- [Cloudflare](https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-cloudflare) _(Experimental)_
+- [Express](https://github.com/apollographql/apollo-server/tree/main/packages/apollo-server-express) _(Most popular)_
+- [Koa](https://github.com/apollographql/apollo-server/tree/main/packages/apollo-server-koa)
+- [Hapi](https://github.com/apollographql/apollo-server/tree/main/packages/apollo-server-hapi)
+- [Fastify](https://github.com/apollographql/apollo-server/tree/main/packages/apollo-server-fastify)
+- [Amazon Lambda](https://github.com/apollographql/apollo-server/tree/main/packages/apollo-server-lambda)
+- [Micro](https://github.com/apollographql/apollo-server/tree/main/packages/apollo-server-micro)
+- [Azure Functions](https://github.com/apollographql/apollo-server/tree/main/packages/apollo-server-azure-functions)
+- [Google Cloud Functions](https://github.com/apollographql/apollo-server/tree/main/packages/apollo-server-cloud-functions)
+- [Cloudflare](https://github.com/apollographql/apollo-server/tree/main/packages/apollo-server-cloudflare) _(Experimental)_
 
 ## Context
 
diff --git a/packages/apollo-server/package.json b/packages/apollo-server/package.json
index 0fa9112cf78..09379d8f65b 100644
--- a/packages/apollo-server/package.json
+++ b/packages/apollo-server/package.json
@@ -7,7 +7,7 @@
   "types": "dist/index.d.ts",
   "repository": {
     "type": "git",
-    "url": "https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server"
+    "url": "https://github.com/apollographql/apollo-server/tree/main/packages/apollo-server"
   },
   "keywords": [
     "GraphQL",

From bd8ae7aa9bb1327c4d48bde0f738070b6fa22ec1 Mon Sep 17 00:00:00 2001
From: Jesse Rosenberger <git@jro.cc>
Date: Wed, 24 Jun 2020 10:20:37 +0000
Subject: [PATCH 2/9] Update documentation references to remove unnecessary
 branch mentions.

---
 docs/source/deployment/heroku.md  | 2 +-
 docs/source/deployment/netlify.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/source/deployment/heroku.md b/docs/source/deployment/heroku.md
index e4875ba4f21..8ed288f21e9 100644
--- a/docs/source/deployment/heroku.md
+++ b/docs/source/deployment/heroku.md
@@ -51,7 +51,7 @@ $ heroku git:remote -a <HEROKU_APP_NAME>
 
 $ git add .
 $ git commit -am "make it better"
-$ git push heroku master # or your branch name
+$ git push heroku # Specify your branch name, if necessary.
 ```
 
 Send a query to your GraphQL service at your Heroku Application at `<HEROKU_APP_NAME>.herokuapp.com`
diff --git a/docs/source/deployment/netlify.md b/docs/source/deployment/netlify.md
index 60bf0406072..acc30166085 100644
--- a/docs/source/deployment/netlify.md
+++ b/docs/source/deployment/netlify.md
@@ -127,7 +127,7 @@ Now, commit and push:
 ```bash
 git add .
 git commit -m "Add Apollo Server and Client"
-git push -u origin master
+git push -u origin # Specify your branch name, if necessary.
 ```
 
 Check the repository to make sure the code showed up.

From 78c680b99065158539f448095e384631219929d9 Mon Sep 17 00:00:00 2001
From: Jesse Rosenberger <git@jro.cc>
Date: Wed, 24 Jun 2020 10:21:45 +0000
Subject: [PATCH 3/9] docs: Reference absolute Git URL for `lerna` link.

This makes it more permanent anyways.
---
 DEVELOPMENT.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
index 7c60fdeabd1..d14babab297 100644
--- a/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@@ -35,7 +35,7 @@ To bump the version, use the `release:version-bump` npm script.
 
    __Option 1__: _(Recommended)_ Bump all packages by the same version bump (e.g. patch, minor, prerelease, etc.).
 
-   > __Note__: Be sure to replace `<version-bump>` in the following command with the appropriate [version bump keyword](https://github.com/lerna/lerna/tree/master/commands/version#semver-bump).
+   > __Note__: Be sure to replace `<version-bump>` in the following command with the appropriate [version bump keyword](https://github.com/lerna/lerna/tree/f6e7a13e60/commands/version#semver-bump)
 
    ```
    npm run release:version-bump -- <version-bump>

From e173d93515c709a61bf85cae6dd783bd0fde7f6b Mon Sep 17 00:00:00 2001
From: Jesse Rosenberger <git@jro.cc>
Date: Wed, 24 Jun 2020 10:22:19 +0000
Subject: [PATCH 4/9] docs: Fix spelling mistake in documentation.

---
 DEVELOPMENT.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
index d14babab297..54455968045 100644
--- a/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@@ -67,7 +67,7 @@ __In the event that publishing via CI/CD is not possible, it may be done manuall
 1. Log into `npm` with the `apollo-bot` user.
 
 The `apollo-bot` user credentials are available to project owners, but generally used by CI/CD.
-Logging in with the follwing command will use a different npm user configuration file at `$HOME/.npmrc-apollo-bot` so as not to override personal login credentials which may already be used.
+Logging in with the following command will use a different npm user configuration file at `$HOME/.npmrc-apollo-bot` so as not to override personal login credentials which may already be used.
 
 ```
 NPM_CONFIG_USERCONFIG="$HOME/.npmrc-apollo-bot" npm login

From 0aef210bdc017879376064667787da83a8a32dca Mon Sep 17 00:00:00 2001
From: Jesse Rosenberger <git@jro.cc>
Date: Wed, 24 Jun 2020 10:23:00 +0000
Subject: [PATCH 5/9] Update `package.json` files to specify `directory` within
 `repository`.

According to the documentation for `package.json` (referenced below), this
is the correct way to reference packages that live within a monorepo within
the `package.json`.

Ref: https://docs.npmjs.com/files/package.json#repository
---
 packages/apollo-datasource-rest/package.json              | 3 ++-
 packages/apollo-datasource/package.json                   | 3 ++-
 packages/apollo-engine-reporting-protobuf/package.json    | 3 ++-
 packages/apollo-server-azure-functions/package.json       | 3 ++-
 packages/apollo-server-cache-memcached/package.json       | 3 ++-
 packages/apollo-server-cache-redis/package.json           | 3 ++-
 packages/apollo-server-caching/package.json               | 3 ++-
 packages/apollo-server-cloud-functions/package.json       | 3 ++-
 packages/apollo-server-cloudflare/package.json            | 3 ++-
 packages/apollo-server-core/package.json                  | 3 ++-
 packages/apollo-server-env/package.json                   | 3 ++-
 packages/apollo-server-errors/package.json                | 3 ++-
 packages/apollo-server-express/package.json               | 3 ++-
 packages/apollo-server-fastify/package.json               | 3 ++-
 packages/apollo-server-hapi/package.json                  | 3 ++-
 packages/apollo-server-integration-testsuite/package.json | 3 ++-
 packages/apollo-server-koa/package.json                   | 3 ++-
 packages/apollo-server-lambda/package.json                | 3 ++-
 packages/apollo-server-micro/package.json                 | 3 ++-
 packages/apollo-server-plugin-response-cache/package.json | 3 ++-
 packages/apollo-server-testing/package.json               | 3 ++-
 packages/apollo-server/package.json                       | 3 ++-
 22 files changed, 44 insertions(+), 22 deletions(-)

diff --git a/packages/apollo-datasource-rest/package.json b/packages/apollo-datasource-rest/package.json
index a1937693460..f57857a03d0 100644
--- a/packages/apollo-datasource-rest/package.json
+++ b/packages/apollo-datasource-rest/package.json
@@ -5,7 +5,8 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/apollographql/apollo-server/tree/main/packages/apollo-datasource-rest"
+    "url": "https://github.com/apollographql/apollo-server",
+    "directory": "packages/apollo-datasource-rest"
   },
   "homepage": "https://github.com/apollographql/apollo-server#readme",
   "bugs": {
diff --git a/packages/apollo-datasource/package.json b/packages/apollo-datasource/package.json
index d3c30719fd9..7fa30110ff3 100644
--- a/packages/apollo-datasource/package.json
+++ b/packages/apollo-datasource/package.json
@@ -5,7 +5,8 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/apollographql/apollo-server/tree/main/packages/apollo-datasource"
+    "url": "https://github.com/apollographql/apollo-server",
+    "directory": "packages/apollo-datasource"
   },
   "homepage": "https://github.com/apollographql/apollo-server#readme",
   "bugs": {
diff --git a/packages/apollo-engine-reporting-protobuf/package.json b/packages/apollo-engine-reporting-protobuf/package.json
index 545d6700acd..70bf9bd4012 100644
--- a/packages/apollo-engine-reporting-protobuf/package.json
+++ b/packages/apollo-engine-reporting-protobuf/package.json
@@ -15,7 +15,8 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/apollographql/apollo-engine-reporting/tree/main/packages/apollo-engine-reporting-protobuf"
+    "url": "https://github.com/apollographql/apollo-server",
+    "directory": "packages/apollo-engine-reporting-protobuf"
   },
   "keywords": [
     "GraphQL",
diff --git a/packages/apollo-server-azure-functions/package.json b/packages/apollo-server-azure-functions/package.json
index ba58644daaa..1f83e792ef6 100644
--- a/packages/apollo-server-azure-functions/package.json
+++ b/packages/apollo-server-azure-functions/package.json
@@ -13,7 +13,8 @@
 	"license": "MIT",
 	"repository": {
 		"type": "git",
-		"url": "https://github.com/apollographql/apollo-server/tree/main/packages/apollo-server-azure-functions"
+		"url": "https://github.com/apollographql/apollo-server",
+		"directory": "packages/apollo-server-azure-functions"
 	},
 	"homepage": "https://github.com/apollographql/apollo-server#readme",
 	"bugs": {
diff --git a/packages/apollo-server-cache-memcached/package.json b/packages/apollo-server-cache-memcached/package.json
index 3ce34ef1ba2..05c0d99251c 100644
--- a/packages/apollo-server-cache-memcached/package.json
+++ b/packages/apollo-server-cache-memcached/package.json
@@ -5,7 +5,8 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/apollographql/apollo-server/tree/main/packages/apollo-server-cache-memcached"
+    "url": "https://github.com/apollographql/apollo-server",
+    "directory": "packages/apollo-server-cache-memcached"
   },
   "homepage": "https://github.com/apollographql/apollo-server#readme",
   "bugs": {
diff --git a/packages/apollo-server-cache-redis/package.json b/packages/apollo-server-cache-redis/package.json
index 6f76834a1fc..b1735f4d0ce 100644
--- a/packages/apollo-server-cache-redis/package.json
+++ b/packages/apollo-server-cache-redis/package.json
@@ -5,7 +5,8 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/apollographql/apollo-server/tree/main/packages/apollo-server-cache-redis"
+    "url": "https://github.com/apollographql/apollo-server",
+    "directory": "packages/apollo-server-cache-redis"
   },
   "homepage": "https://github.com/apollographql/apollo-server#readme",
   "bugs": {
diff --git a/packages/apollo-server-caching/package.json b/packages/apollo-server-caching/package.json
index c9c221db421..7a2757c3109 100644
--- a/packages/apollo-server-caching/package.json
+++ b/packages/apollo-server-caching/package.json
@@ -5,7 +5,8 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/apollographql/apollo-server/tree/main/packages/apollo-server-caching"
+    "url": "https://github.com/apollographql/apollo-server",
+    "directory": "packages/apollo-server-caching"
   },
   "homepage": "https://github.com/apollographql/apollo-server#readme",
   "bugs": {
diff --git a/packages/apollo-server-cloud-functions/package.json b/packages/apollo-server-cloud-functions/package.json
index 76acfdf1c38..3713b21fd5e 100644
--- a/packages/apollo-server-cloud-functions/package.json
+++ b/packages/apollo-server-cloud-functions/package.json
@@ -13,7 +13,8 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/apollographql/apollo-server/tree/main/packages/apollo-server-cloud-functions"
+    "url": "https://github.com/apollographql/apollo-server",
+    "directory": "packages/apollo-server-cloud-functions"
   },
   "homepage": "https://github.com/apollographql/apollo-server#readme",
   "bugs": {
diff --git a/packages/apollo-server-cloudflare/package.json b/packages/apollo-server-cloudflare/package.json
index 53710d55b45..1d4d280d7f4 100644
--- a/packages/apollo-server-cloudflare/package.json
+++ b/packages/apollo-server-cloudflare/package.json
@@ -6,7 +6,8 @@
   "types": "dist/index.d.ts",
   "repository": {
     "type": "git",
-    "url": "https://github.com/apollographql/apollo-server/tree/main/packages/apollo-server-cloudflare-workers"
+    "url": "https://github.com/apollographql/apollo-server",
+    "directory": "packages/apollo-server-cloudflare-workers"
   },
   "keywords": [
     "GraphQL",
diff --git a/packages/apollo-server-core/package.json b/packages/apollo-server-core/package.json
index e571f4a262e..56222672f50 100644
--- a/packages/apollo-server-core/package.json
+++ b/packages/apollo-server-core/package.json
@@ -6,7 +6,8 @@
   "types": "dist/index.d.ts",
   "repository": {
     "type": "git",
-    "url": "https://github.com/apollographql/apollo-server/tree/main/packages/apollo-server-core"
+    "url": "https://github.com/apollographql/apollo-server",
+    "directory": "packages/apollo-server-core"
   },
   "keywords": [
     "GraphQL",
diff --git a/packages/apollo-server-env/package.json b/packages/apollo-server-env/package.json
index fbd3b4b61c6..a0299d53466 100644
--- a/packages/apollo-server-env/package.json
+++ b/packages/apollo-server-env/package.json
@@ -5,7 +5,8 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/apollographql/apollo-server/tree/main/packages/apollo-server-env"
+    "url": "https://github.com/apollographql/apollo-server",
+    "directory": "packages/apollo-server-env"
   },
   "homepage": "https://github.com/apollographql/apollo-server#readme",
   "bugs": {
diff --git a/packages/apollo-server-errors/package.json b/packages/apollo-server-errors/package.json
index 19394cf2942..59b895c1fe7 100644
--- a/packages/apollo-server-errors/package.json
+++ b/packages/apollo-server-errors/package.json
@@ -5,7 +5,8 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/apollographql/apollo-server/tree/main/packages/apollo-server-errors"
+    "url": "https://github.com/apollographql/apollo-server",
+    "directory": "packages/apollo-server-errors"
   },
   "homepage": "https://github.com/apollographql/apollo-server#readme",
   "bugs": {
diff --git a/packages/apollo-server-express/package.json b/packages/apollo-server-express/package.json
index 75b26ceea8d..d98ad02a680 100644
--- a/packages/apollo-server-express/package.json
+++ b/packages/apollo-server-express/package.json
@@ -6,7 +6,8 @@
   "types": "dist/index.d.ts",
   "repository": {
     "type": "git",
-    "url": "https://github.com/apollographql/apollo-server/tree/main/packages/apollo-server-express"
+    "url": "https://github.com/apollographql/apollo-server",
+    "directory": "packages/apollo-server-express"
   },
   "keywords": [
     "GraphQL",
diff --git a/packages/apollo-server-fastify/package.json b/packages/apollo-server-fastify/package.json
index 1367412e2b4..ab2f15263c0 100644
--- a/packages/apollo-server-fastify/package.json
+++ b/packages/apollo-server-fastify/package.json
@@ -6,7 +6,8 @@
   "types": "dist/index.d.ts",
   "repository": {
     "type": "git",
-    "url": "https://github.com/apollographql/apollo-server/tree/main/packages/apollo-server-fastify"
+    "url": "https://github.com/apollographql/apollo-server",
+    "directory": "packages/apollo-server-fastify"
   },
   "keywords": [
     "GraphQL",
diff --git a/packages/apollo-server-hapi/package.json b/packages/apollo-server-hapi/package.json
index 91d1526a4e4..796e6c30281 100644
--- a/packages/apollo-server-hapi/package.json
+++ b/packages/apollo-server-hapi/package.json
@@ -6,7 +6,8 @@
   "types": "dist/index.d.ts",
   "repository": {
     "type": "git",
-    "url": "https://github.com/apollographql/apollo-server/tree/main/packages/apollo-server-hapi"
+    "url": "https://github.com/apollographql/apollo-server",
+    "directory": "packages/apollo-server-hapi"
   },
   "keywords": [
     "GraphQL",
diff --git a/packages/apollo-server-integration-testsuite/package.json b/packages/apollo-server-integration-testsuite/package.json
index 3c3136bcc0d..4ea6b385a6b 100644
--- a/packages/apollo-server-integration-testsuite/package.json
+++ b/packages/apollo-server-integration-testsuite/package.json
@@ -7,7 +7,8 @@
   "types": "dist/index.d.ts",
   "repository": {
     "type": "git",
-    "url": "https://github.com/apollographql/apollo-server/tree/main/packages/apollo-server-integration-testsuite"
+    "url": "https://github.com/apollographql/apollo-server",
+    "directory": "packages/apollo-server-integration-testsuite"
   },
   "keywords": [],
   "author": "Jonas Helfer <jonas@helfer.email>",
diff --git a/packages/apollo-server-koa/package.json b/packages/apollo-server-koa/package.json
index 727c261cf1a..3b1bc988260 100644
--- a/packages/apollo-server-koa/package.json
+++ b/packages/apollo-server-koa/package.json
@@ -6,7 +6,8 @@
   "types": "dist/index.d.ts",
   "repository": {
     "type": "git",
-    "url": "https://github.com/apollographql/apollo-server/tree/main/packages/apollo-server-koa"
+    "url": "https://github.com/apollographql/apollo-server",
+    "directory": "packages/apollo-server-koa"
   },
   "keywords": [
     "GraphQL",
diff --git a/packages/apollo-server-lambda/package.json b/packages/apollo-server-lambda/package.json
index 5721c20413d..2d919ef5c6f 100644
--- a/packages/apollo-server-lambda/package.json
+++ b/packages/apollo-server-lambda/package.json
@@ -13,7 +13,8 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/apollographql/apollo-server/tree/main/packages/apollo-server-lambda"
+    "url": "https://github.com/apollographql/apollo-server",
+    "directory": "packages/apollo-server-lambda"
   },
   "homepage": "https://github.com/apollographql/apollo-server#readme",
   "bugs": {
diff --git a/packages/apollo-server-micro/package.json b/packages/apollo-server-micro/package.json
index 80a55f76552..2f1b96ab752 100644
--- a/packages/apollo-server-micro/package.json
+++ b/packages/apollo-server-micro/package.json
@@ -6,7 +6,8 @@
   "types": "dist/index.d.ts",
   "repository": {
     "type": "git",
-    "url": "https://github.com/apollographql/apollo-server/tree/main/packages/apollo-server-micro"
+    "url": "https://github.com/apollographql/apollo-server",
+    "directory": "packages/apollo-server-micro"
   },
   "keywords": [
     "GraphQL",
diff --git a/packages/apollo-server-plugin-response-cache/package.json b/packages/apollo-server-plugin-response-cache/package.json
index 657eed2b3b6..3028deb19bb 100644
--- a/packages/apollo-server-plugin-response-cache/package.json
+++ b/packages/apollo-server-plugin-response-cache/package.json
@@ -6,7 +6,8 @@
   "types": "dist/index.d.ts",
   "repository": {
     "type": "git",
-    "url": "https://github.com/apollographql/apollo-server/tree/main/packages/apollo-server-plugin-response-cache"
+    "url": "https://github.com/apollographql/apollo-server",
+    "directory": "packages/apollo-server-plugin-response-cache"
   },
   "keywords": [],
   "author": "Apollo <npm@apollographql.com>",
diff --git a/packages/apollo-server-testing/package.json b/packages/apollo-server-testing/package.json
index 900b2feab12..80476b8c668 100644
--- a/packages/apollo-server-testing/package.json
+++ b/packages/apollo-server-testing/package.json
@@ -6,7 +6,8 @@
   "types": "dist/index.d.ts",
   "repository": {
     "type": "git",
-    "url": "https://github.com/apollographql/apollo-server/tree/main/packages/apollo-server-testing"
+    "url": "https://github.com/apollographql/apollo-server",
+    "directory": "packages/apollo-server-testing"
   },
   "keywords": [
     "GraphQL",
diff --git a/packages/apollo-server/package.json b/packages/apollo-server/package.json
index 09379d8f65b..a1199cc9dff 100644
--- a/packages/apollo-server/package.json
+++ b/packages/apollo-server/package.json
@@ -7,7 +7,8 @@
   "types": "dist/index.d.ts",
   "repository": {
     "type": "git",
-    "url": "https://github.com/apollographql/apollo-server/tree/main/packages/apollo-server"
+    "url": "https://github.com/apollographql/apollo-server",
+    "directory": "packages/apollo-server"
   },
   "keywords": [
     "GraphQL",

From dc1b6766c6c2940692e557b63fbe53d9eb86e491 Mon Sep 17 00:00:00 2001
From: Jesse Rosenberger <git@jro.cc>
Date: Wed, 24 Jun 2020 10:24:12 +0000
Subject: [PATCH 6/9] Update test to refer to another branch name.

---
 .../src/__tests__/agent.test.ts                                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts
index fd3b81f090b..8e799a9a0ae 100644
--- a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts
+++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts
@@ -443,7 +443,7 @@ describe('Agent', () => {
       });
 
       describe('When given a graphVariant', () => {
-        const graphVariant = 'master';
+        const graphVariant = 'main';
         const getOperationManifestRelativeUrl = (
           ...args: Parameters<typeof getOperationManifestUrl>
         ) =>

From 38df804912435b6a6764614dc71b9c10caa5c34d Mon Sep 17 00:00:00 2001
From: Jesse Rosenberger <git@jro.cc>
Date: Wed, 24 Jun 2020 10:24:26 +0000
Subject: [PATCH 7/9] Update name of default branch to renovate for docs in
 Renovate config.

---
 renovate.json5 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/renovate.json5 b/renovate.json5
index f22ff3bbc07..371cf87089d 100644
--- a/renovate.json5
+++ b/renovate.json5
@@ -68,7 +68,7 @@
       // We need to tell Renovate to check the branches for each major version
       // of Apollo Server.  "Past" major versions should be added here!
       "baseBranches": [
-        "master",
+        "main",
         "version-2"
       ]
     }

From 9c5a3c8cbd3b694b571d5919b235ebfd31916066 Mon Sep 17 00:00:00 2001
From: Jesse Rosenberger <git@jro.cc>
Date: Wed, 24 Jun 2020 10:36:33 +0000
Subject: [PATCH 8/9] Align all of this repository's `package.json`'s `author`
 declarations.

Historically, there have been a few varieties chosen here, but we should
keep them all the same now that we have a standard that has emerged!
---
 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-gateway/package.json                          | 2 +-
 packages/apollo-server-azure-functions/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-functions/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-fastify/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-operation-registry/package.json | 2 +-
 packages/apollo-server-plugin-response-cache/package.json     | 2 +-
 packages/apollo-server-testing/package.json                   | 2 +-
 packages/apollo-server/package.json                           | 2 +-
 packages/apollo-tracing/package.json                          | 2 +-
 packages/graphql-extensions/package.json                      | 2 +-
 27 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/packages/apollo-cache-control/package.json b/packages/apollo-cache-control/package.json
index b0366f16e2a..f440956c1f9 100644
--- a/packages/apollo-cache-control/package.json
+++ b/packages/apollo-cache-control/package.json
@@ -6,7 +6,7 @@
   "types": "./dist/index.d.ts",
   "license": "MIT",
   "repository": "apollographql/apollo-cache-control-js",
-  "author": "Martijn Walraven <martijn@martijnwalraven.com>",
+  "author": "Apollo <opensource@apollographql.com>",
   "engines": {
     "node": ">=6.0"
   },
diff --git a/packages/apollo-datasource-rest/package.json b/packages/apollo-datasource-rest/package.json
index f57857a03d0..be0833ab7d9 100644
--- a/packages/apollo-datasource-rest/package.json
+++ b/packages/apollo-datasource-rest/package.json
@@ -1,7 +1,7 @@
 {
   "name": "apollo-datasource-rest",
   "version": "0.9.2",
-  "author": "opensource@apollographql.com",
+  "author": "Apollo <opensource@apollographql.com>",
   "license": "MIT",
   "repository": {
     "type": "git",
diff --git a/packages/apollo-datasource/package.json b/packages/apollo-datasource/package.json
index 7fa30110ff3..c73bf3f8047 100644
--- a/packages/apollo-datasource/package.json
+++ b/packages/apollo-datasource/package.json
@@ -1,7 +1,7 @@
 {
   "name": "apollo-datasource",
   "version": "0.7.1",
-  "author": "opensource@apollographql.com",
+  "author": "Apollo <opensource@apollographql.com>",
   "license": "MIT",
   "repository": {
     "type": "git",
diff --git a/packages/apollo-engine-reporting-protobuf/package.json b/packages/apollo-engine-reporting-protobuf/package.json
index 70bf9bd4012..4f81980eb42 100644
--- a/packages/apollo-engine-reporting-protobuf/package.json
+++ b/packages/apollo-engine-reporting-protobuf/package.json
@@ -25,7 +25,7 @@
     "Server",
     "Javascript"
   ],
-  "author": "Apollo <community@apollographql.com>",
+  "author": "Apollo <opensource@apollographql.com>",
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/apollographql/apollo-engine-reporting/issues"
diff --git a/packages/apollo-engine-reporting/package.json b/packages/apollo-engine-reporting/package.json
index fa407f57946..27ca424b3fb 100644
--- a/packages/apollo-engine-reporting/package.json
+++ b/packages/apollo-engine-reporting/package.json
@@ -6,7 +6,7 @@
   "types": "./dist/index.d.ts",
   "license": "MIT",
   "repository": "https://github.com/apollographql/apollo-engine-reporting",
-  "author": "Apollo <community@apollographql.com>",
+  "author": "Apollo <opensource@apollographql.com>",
   "engines": {
     "node": ">=6.0"
   },
diff --git a/packages/apollo-gateway/package.json b/packages/apollo-gateway/package.json
index 24246656a93..6a2729188bc 100644
--- a/packages/apollo-gateway/package.json
+++ b/packages/apollo-gateway/package.json
@@ -2,7 +2,7 @@
   "name": "@apollo/gateway",
   "version": "0.16.9",
   "description": "Apollo Gateway",
-  "author": "opensource@apollographql.com",
+  "author": "Apollo <opensource@apollographql.com>",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "keywords": [
diff --git a/packages/apollo-server-azure-functions/package.json b/packages/apollo-server-azure-functions/package.json
index 1f83e792ef6..ab5afbfa0bb 100644
--- a/packages/apollo-server-azure-functions/package.json
+++ b/packages/apollo-server-azure-functions/package.json
@@ -9,7 +9,7 @@
 		"Azure",
 		"Javascript"
 	],
-	"author": "opensource@apollographql.com",
+	"author": "Apollo <opensource@apollographql.com>",
 	"license": "MIT",
 	"repository": {
 		"type": "git",
diff --git a/packages/apollo-server-cache-memcached/package.json b/packages/apollo-server-cache-memcached/package.json
index 05c0d99251c..ac19fd1f53c 100644
--- a/packages/apollo-server-cache-memcached/package.json
+++ b/packages/apollo-server-cache-memcached/package.json
@@ -1,7 +1,7 @@
 {
   "name": "apollo-server-cache-memcached",
   "version": "0.6.5",
-  "author": "opensource@apollographql.com",
+  "author": "Apollo <opensource@apollographql.com>",
   "license": "MIT",
   "repository": {
     "type": "git",
diff --git a/packages/apollo-server-cache-redis/package.json b/packages/apollo-server-cache-redis/package.json
index b1735f4d0ce..600b80ae709 100644
--- a/packages/apollo-server-cache-redis/package.json
+++ b/packages/apollo-server-cache-redis/package.json
@@ -1,7 +1,7 @@
 {
   "name": "apollo-server-cache-redis",
   "version": "1.2.1",
-  "author": "opensource@apollographql.com",
+  "author": "Apollo <opensource@apollographql.com>",
   "license": "MIT",
   "repository": {
     "type": "git",
diff --git a/packages/apollo-server-caching/package.json b/packages/apollo-server-caching/package.json
index 7a2757c3109..41eabd4cf2f 100644
--- a/packages/apollo-server-caching/package.json
+++ b/packages/apollo-server-caching/package.json
@@ -1,7 +1,7 @@
 {
   "name": "apollo-server-caching",
   "version": "0.5.1",
-  "author": "opensource@apollographql.com",
+  "author": "Apollo <opensource@apollographql.com>",
   "license": "MIT",
   "repository": {
     "type": "git",
diff --git a/packages/apollo-server-cloud-functions/package.json b/packages/apollo-server-cloud-functions/package.json
index 3713b21fd5e..ddac72b1a6d 100644
--- a/packages/apollo-server-cloud-functions/package.json
+++ b/packages/apollo-server-cloud-functions/package.json
@@ -9,7 +9,7 @@
     "Google Cloud Functions",
     "Javascript"
   ],
-  "author": "opensource@apollographql.com",
+  "author": "Apollo <opensource@apollographql.com>",
   "license": "MIT",
   "repository": {
     "type": "git",
diff --git a/packages/apollo-server-core/package.json b/packages/apollo-server-core/package.json
index 56222672f50..ecb04fc9d9b 100644
--- a/packages/apollo-server-core/package.json
+++ b/packages/apollo-server-core/package.json
@@ -15,7 +15,7 @@
     "Server",
     "Javascript"
   ],
-  "author": "Jonas Helfer <jonas@helfer.email>",
+  "author": "Apollo <opensource@apollographql.com>",
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/apollographql/apollo-server/issues"
diff --git a/packages/apollo-server-env/package.json b/packages/apollo-server-env/package.json
index a0299d53466..5e83ca81f5d 100644
--- a/packages/apollo-server-env/package.json
+++ b/packages/apollo-server-env/package.json
@@ -1,7 +1,7 @@
 {
   "name": "apollo-server-env",
   "version": "2.4.4",
-  "author": "opensource@apollographql.com",
+  "author": "Apollo <opensource@apollographql.com>",
   "license": "MIT",
   "repository": {
     "type": "git",
diff --git a/packages/apollo-server-errors/package.json b/packages/apollo-server-errors/package.json
index 59b895c1fe7..27d48fb19a6 100644
--- a/packages/apollo-server-errors/package.json
+++ b/packages/apollo-server-errors/package.json
@@ -1,7 +1,7 @@
 {
   "name": "apollo-server-errors",
   "version": "2.4.1",
-  "author": "opensource@apollographql.com",
+  "author": "Apollo <opensource@apollographql.com>",
   "license": "MIT",
   "repository": {
     "type": "git",
diff --git a/packages/apollo-server-express/package.json b/packages/apollo-server-express/package.json
index d98ad02a680..d8daa8cb192 100644
--- a/packages/apollo-server-express/package.json
+++ b/packages/apollo-server-express/package.json
@@ -17,7 +17,7 @@
     "Connect",
     "Javascript"
   ],
-  "author": "opensource@apollographql.com",
+  "author": "Apollo <opensource@apollographql.com>",
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/apollographql/apollo-server/issues"
diff --git a/packages/apollo-server-fastify/package.json b/packages/apollo-server-fastify/package.json
index ab2f15263c0..df2a0454315 100644
--- a/packages/apollo-server-fastify/package.json
+++ b/packages/apollo-server-fastify/package.json
@@ -16,7 +16,7 @@
     "Fastify",
     "Javascript"
   ],
-  "author": "opensource@apollographql.com",
+  "author": "Apollo <opensource@apollographql.com>",
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/apollographql/apollo-server/issues"
diff --git a/packages/apollo-server-hapi/package.json b/packages/apollo-server-hapi/package.json
index 796e6c30281..f798d6e3434 100644
--- a/packages/apollo-server-hapi/package.json
+++ b/packages/apollo-server-hapi/package.json
@@ -16,7 +16,7 @@
     "Server",
     "Javascript"
   ],
-  "author": "Jonas Helfer <jonas@helfer.email>",
+  "author": "Apollo <opensource@apollographql.com>",
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/apollographql/apollo-server/issues"
diff --git a/packages/apollo-server-integration-testsuite/package.json b/packages/apollo-server-integration-testsuite/package.json
index 4ea6b385a6b..4726517c732 100644
--- a/packages/apollo-server-integration-testsuite/package.json
+++ b/packages/apollo-server-integration-testsuite/package.json
@@ -11,7 +11,7 @@
     "directory": "packages/apollo-server-integration-testsuite"
   },
   "keywords": [],
-  "author": "Jonas Helfer <jonas@helfer.email>",
+  "author": "Apollo <opensource@apollographql.com>",
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/apollographql/apollo-server/issues"
diff --git a/packages/apollo-server-koa/package.json b/packages/apollo-server-koa/package.json
index 3b1bc988260..e62599865e4 100644
--- a/packages/apollo-server-koa/package.json
+++ b/packages/apollo-server-koa/package.json
@@ -16,7 +16,7 @@
     "Koa",
     "Javascript"
   ],
-  "author": "opensource@apollographql.com",
+  "author": "Apollo <opensource@apollographql.com>",
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/apollographql/apollo-server/issues"
diff --git a/packages/apollo-server-lambda/package.json b/packages/apollo-server-lambda/package.json
index 2d919ef5c6f..8cf76efde4a 100644
--- a/packages/apollo-server-lambda/package.json
+++ b/packages/apollo-server-lambda/package.json
@@ -9,7 +9,7 @@
     "Lambda",
     "Javascript"
   ],
-  "author": "opensource@apollographql.com",
+  "author": "Apollo <opensource@apollographql.com>",
   "license": "MIT",
   "repository": {
     "type": "git",
diff --git a/packages/apollo-server-micro/package.json b/packages/apollo-server-micro/package.json
index 2f1b96ab752..bbfa061fdde 100644
--- a/packages/apollo-server-micro/package.json
+++ b/packages/apollo-server-micro/package.json
@@ -17,7 +17,7 @@
     "Javascript",
     "ZEIT"
   ],
-  "author": "opensource@apollographql.com",
+  "author": "Apollo <opensource@apollographql.com>",
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/apollographql/apollo-server/issues"
diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json
index 6edb623cc39..fa4e088107d 100644
--- a/packages/apollo-server-plugin-operation-registry/package.json
+++ b/packages/apollo-server-plugin-operation-registry/package.json
@@ -5,7 +5,7 @@
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "keywords": [],
-  "author": "Apollo <npm@apollographql.com>",
+  "author": "Apollo <opensource@apollographql.com>",
   "repository": {
     "type": "git",
     "url": "apollographql/apollo-server",
diff --git a/packages/apollo-server-plugin-response-cache/package.json b/packages/apollo-server-plugin-response-cache/package.json
index 3028deb19bb..8a0e4e29275 100644
--- a/packages/apollo-server-plugin-response-cache/package.json
+++ b/packages/apollo-server-plugin-response-cache/package.json
@@ -10,7 +10,7 @@
     "directory": "packages/apollo-server-plugin-response-cache"
   },
   "keywords": [],
-  "author": "Apollo <npm@apollographql.com>",
+  "author": "Apollo <opensource@apollographql.com>",
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/apollographql/apollo-server/issues"
diff --git a/packages/apollo-server-testing/package.json b/packages/apollo-server-testing/package.json
index 80476b8c668..86e0228dbad 100644
--- a/packages/apollo-server-testing/package.json
+++ b/packages/apollo-server-testing/package.json
@@ -15,7 +15,7 @@
     "Server",
     "Javascript"
   ],
-  "author": "Jonas Helfer <jonas@helfer.email>",
+  "author": "Apollo <opensource@apollographql.com>",
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/apollographql/apollo-server/issues"
diff --git a/packages/apollo-server/package.json b/packages/apollo-server/package.json
index a1199cc9dff..219f2af03c6 100644
--- a/packages/apollo-server/package.json
+++ b/packages/apollo-server/package.json
@@ -2,7 +2,7 @@
   "name": "apollo-server",
   "version": "2.15.0",
   "description": "Production ready GraphQL Server",
-  "author": "opensource@apollographql.com",
+  "author": "Apollo <opensource@apollographql.com>",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "repository": {
diff --git a/packages/apollo-tracing/package.json b/packages/apollo-tracing/package.json
index db4bf3abc66..7437bba99d7 100644
--- a/packages/apollo-tracing/package.json
+++ b/packages/apollo-tracing/package.json
@@ -6,7 +6,7 @@
   "types": "./dist/index.d.ts",
   "license": "MIT",
   "repository": "apollographql/apollo-tracing-js",
-  "author": "Martijn Walraven <martijn@martijnwalraven.com>",
+  "author": "Apollo <opensource@apollographql.com>",
   "engines": {
     "node": ">=4.0"
   },
diff --git a/packages/graphql-extensions/package.json b/packages/graphql-extensions/package.json
index 7048e1677be..55236bd8740 100644
--- a/packages/graphql-extensions/package.json
+++ b/packages/graphql-extensions/package.json
@@ -9,7 +9,7 @@
     "url": "apollographql/apollo-server",
     "directory": "packages/graphql-extensions"
   },
-  "author": "Martijn Walraven <martijn@martijnwalraven.com>",
+  "author": "Apollo <opensource@apollographql.com>",
   "license": "MIT",
   "engines": {
     "node": ">=6.0"

From aa22b2c78a3be5bb2f592c1c8fff3d1ae0312d43 Mon Sep 17 00:00:00 2001
From: Jesse Rosenberger <git@jro.cc>
Date: Wed, 24 Jun 2020 10:55:33 +0000
Subject: [PATCH 9/9] Add CHANGELOG.md for #4302.

This PR will result in a release being created for this repository.
---
 CHANGELOG.md                            | 2 +-
 packages/apollo-federation/CHANGELOG.md | 2 +-
 packages/apollo-gateway/CHANGELOG.md    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index caca618c9ca..4955ade8a0f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,7 @@ 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.
 
-- _Nothing yet! Stay tuned!_
+- The default branch of the repository has been changed to `main`.  As this changed a number of references in the repository's `package.json` and `README.md` files (e.g., for badges, links, etc.), this necessitates a release to publish those changes to npm. [PR #4302](https://github.com/apollographql/apollo-server/pull/4302)
 
 ### v2.15.0
 
diff --git a/packages/apollo-federation/CHANGELOG.md b/packages/apollo-federation/CHANGELOG.md
index 5938ae6d0da..308d2593d94 100644
--- a/packages/apollo-federation/CHANGELOG.md
+++ b/packages/apollo-federation/CHANGELOG.md
@@ -4,7 +4,7 @@
 
 > 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.  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.
 
-- _Nothing yet! Stay tuned._
+- The default branch of the repository has been changed to `main`.  As this changed a number of references in the repository's `package.json` and `README.md` files (e.g., for badges, links, etc.), this necessitates a release to publish those changes to npm. [PR #4302](https://github.com/apollographql/apollo-server/pull/4302)
 
 ## 0.16.9
 
diff --git a/packages/apollo-gateway/CHANGELOG.md b/packages/apollo-gateway/CHANGELOG.md
index 0326a69ff00..9daee467aab 100644
--- a/packages/apollo-gateway/CHANGELOG.md
+++ b/packages/apollo-gateway/CHANGELOG.md
@@ -4,7 +4,7 @@
 
 > 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.  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.
 
-- _Nothing yet! Stay tuned._
+- The default branch of the repository has been changed to `main`.  As this changed a number of references in the repository's `package.json` and `README.md` files (e.g., for badges, links, etc.), this necessitates a release to publish those changes to npm. [PR #4302](https://github.com/apollographql/apollo-server/pull/4302)
 
 ## 0.16.9