diff --git a/packages/gatsby-codemods/package.json b/packages/gatsby-codemods/package.json
index 745008eb08873..9184b5b0bbad1 100644
--- a/packages/gatsby-codemods/package.json
+++ b/packages/gatsby-codemods/package.json
@@ -30,7 +30,7 @@
     "@babel/plugin-syntax-typescript": "^7.14.0",
     "@babel/runtime": "^7.15.4",
     "execa": "^5.1.1",
-    "graphql": "^15.8.0",
+    "graphql": "^16.6.0",
     "jscodeshift": "^0.12.0",
     "recast": "^0.20.5"
   },
diff --git a/packages/gatsby-codemods/src/transforms/__testfixtures__/gatsby-plugin-image/baseline.output.js b/packages/gatsby-codemods/src/transforms/__testfixtures__/gatsby-plugin-image/baseline.output.js
index 8964d81574100..9d5254336e2e4 100644
--- a/packages/gatsby-codemods/src/transforms/__testfixtures__/gatsby-plugin-image/baseline.output.js
+++ b/packages/gatsby-codemods/src/transforms/__testfixtures__/gatsby-plugin-image/baseline.output.js
@@ -10,5 +10,4 @@ export const query = graphql`{
       gatsbyImageData(width: 125, height: 125, layout: FIXED)
     }
   }
-}
-`
+}`
diff --git a/packages/gatsby-codemods/src/transforms/__testfixtures__/gatsby-plugin-image/call-expression.output.js b/packages/gatsby-codemods/src/transforms/__testfixtures__/gatsby-plugin-image/call-expression.output.js
index ed7186133bfae..0f361dc9058a8 100644
--- a/packages/gatsby-codemods/src/transforms/__testfixtures__/gatsby-plugin-image/call-expression.output.js
+++ b/packages/gatsby-codemods/src/transforms/__testfixtures__/gatsby-plugin-image/call-expression.output.js
@@ -4,5 +4,4 @@ const result = graphql(`{
       gatsbyImageData(layout: FULL_WIDTH)
     }
   }
-}
-`)
\ No newline at end of file
+}`)
\ No newline at end of file
diff --git a/packages/gatsby-codemods/src/transforms/__testfixtures__/gatsby-plugin-image/fluid.output.js b/packages/gatsby-codemods/src/transforms/__testfixtures__/gatsby-plugin-image/fluid.output.js
index f1cf4686654ef..0ec7c9e397d84 100644
--- a/packages/gatsby-codemods/src/transforms/__testfixtures__/gatsby-plugin-image/fluid.output.js
+++ b/packages/gatsby-codemods/src/transforms/__testfixtures__/gatsby-plugin-image/fluid.output.js
@@ -15,5 +15,4 @@ export const query = graphql`{
       gatsbyImageData(width: 500, layout: CONSTRAINED)
     }
   }
-}
-`
+}`
diff --git a/packages/gatsby-codemods/src/transforms/__testfixtures__/gatsby-plugin-image/multiple.output.js b/packages/gatsby-codemods/src/transforms/__testfixtures__/gatsby-plugin-image/multiple.output.js
index 1826818eea0f8..6fcd2eff33f1f 100644
--- a/packages/gatsby-codemods/src/transforms/__testfixtures__/gatsby-plugin-image/multiple.output.js
+++ b/packages/gatsby-codemods/src/transforms/__testfixtures__/gatsby-plugin-image/multiple.output.js
@@ -19,5 +19,4 @@ export const query = graphql`{
       gatsbyImageData(placeholder: TRACED_SVG, layout: CONSTRAINED)
     }
   }
-}
-`
+}`
diff --git a/packages/gatsby-codemods/src/transforms/__testfixtures__/gatsby-plugin-image/placeholders.output.js b/packages/gatsby-codemods/src/transforms/__testfixtures__/gatsby-plugin-image/placeholders.output.js
index 0b2e7b73c7f0e..22188c44c3b57 100644
--- a/packages/gatsby-codemods/src/transforms/__testfixtures__/gatsby-plugin-image/placeholders.output.js
+++ b/packages/gatsby-codemods/src/transforms/__testfixtures__/gatsby-plugin-image/placeholders.output.js
@@ -11,5 +11,4 @@ export const query = graphql`{
       gatsbyImageData(placeholder: TRACED_SVG, layout: FULL_WIDTH)
     }
   }
-}
-`
+}`
diff --git a/packages/gatsby-codemods/src/transforms/__testfixtures__/gatsby-plugin-image/transform-options.output.js b/packages/gatsby-codemods/src/transforms/__testfixtures__/gatsby-plugin-image/transform-options.output.js
index 843367d25093b..ea5477fab6ad0 100644
--- a/packages/gatsby-codemods/src/transforms/__testfixtures__/gatsby-plugin-image/transform-options.output.js
+++ b/packages/gatsby-codemods/src/transforms/__testfixtures__/gatsby-plugin-image/transform-options.output.js
@@ -10,5 +10,4 @@ export const query = graphql`{
       )
     }
   }
-}
-`
+}`
diff --git a/packages/gatsby-codemods/src/transforms/__testfixtures__/gatsby-plugin-image/typescript.output.tsx b/packages/gatsby-codemods/src/transforms/__testfixtures__/gatsby-plugin-image/typescript.output.tsx
index 65ed2bc538890..1dcecb2473b44 100644
--- a/packages/gatsby-codemods/src/transforms/__testfixtures__/gatsby-plugin-image/typescript.output.tsx
+++ b/packages/gatsby-codemods/src/transforms/__testfixtures__/gatsby-plugin-image/typescript.output.tsx
@@ -8,8 +8,7 @@ export const Hero: React.SFC = ({ children }) => {
       gatsbyImageData(layout: FULL_WIDTH)
     }
   }
-}
-`);
+}`);
     return (
         <GatsbyImage
             image={data.file.childImageSharp.gatsbyImageData}
diff --git a/packages/gatsby-codemods/src/transforms/__tests__/sort-and-aggr-graphql.ts b/packages/gatsby-codemods/src/transforms/__tests__/sort-and-aggr-graphql.ts
index e0d79e9f73403..55b7d1b78ee5e 100644
--- a/packages/gatsby-codemods/src/transforms/__tests__/sort-and-aggr-graphql.ts
+++ b/packages/gatsby-codemods/src/transforms/__tests__/sort-and-aggr-graphql.ts
@@ -31,26 +31,24 @@ describe(transformName, () => {
       it(`single field (root field), no order`, () => {
         expect(run(`allMarkdownRemark(sort: {fields: excerpt})`))
           .toMatchInlineSnapshot(`
-                  "import { graphql } from \\"gatsby\\"
+          "import { graphql } from \\"gatsby\\"
 
-                  export const q = graphql\`{
-                    allMarkdownRemark(sort: {excerpt: ASC})
-                  }
-                  \`"
-              `)
+          export const q = graphql\`{
+            allMarkdownRemark(sort: {excerpt: ASC})
+          }\`"
+        `)
       })
 
       it(`single field (nested field), no order`, () => {
         expect(
           run(`allMarkdownRemark(sort: {fields: frontmatter___nested___date})`)
         ).toMatchInlineSnapshot(`
-                  "import { graphql } from \\"gatsby\\"
+          "import { graphql } from \\"gatsby\\"
 
-                  export const q = graphql\`{
-                    allMarkdownRemark(sort: {frontmatter: {nested: {date: ASC}}})
-                  }
-                  \`"
-              `)
+          export const q = graphql\`{
+            allMarkdownRemark(sort: {frontmatter: {nested: {date: ASC}}})
+          }\`"
+        `)
       })
 
       it(`single field, single order (ASC)`, () => {
@@ -62,13 +60,12 @@ describe(transformName, () => {
           })`
           )
         ).toMatchInlineSnapshot(`
-                  "import { graphql } from \\"gatsby\\"
+          "import { graphql } from \\"gatsby\\"
 
-                  export const q = graphql\`{
-                    allMarkdownRemark(sort: {frontmatter: {date: ASC}})
-                  }
-                  \`"
-              `)
+          export const q = graphql\`{
+            allMarkdownRemark(sort: {frontmatter: {date: ASC}})
+          }\`"
+        `)
       })
 
       it(`single field, single order (DESC)`, () => {
@@ -80,25 +77,23 @@ describe(transformName, () => {
           })`
           )
         ).toMatchInlineSnapshot(`
-                  "import { graphql } from \\"gatsby\\"
+          "import { graphql } from \\"gatsby\\"
 
-                  export const q = graphql\`{
-                    allMarkdownRemark(sort: {frontmatter: {date: DESC}})
-                  }
-                  \`"
-              `)
+          export const q = graphql\`{
+            allMarkdownRemark(sort: {frontmatter: {date: DESC}})
+          }\`"
+        `)
       })
 
       it(`list with single field, no order`, () => {
         expect(run(`allMarkdownRemark(sort: {fields: [frontmatter___date]})`))
           .toMatchInlineSnapshot(`
-                  "import { graphql } from \\"gatsby\\"
+          "import { graphql } from \\"gatsby\\"
 
-                  export const q = graphql\`{
-                    allMarkdownRemark(sort: {frontmatter: {date: ASC}})
-                  }
-                  \`"
-              `)
+          export const q = graphql\`{
+            allMarkdownRemark(sort: {frontmatter: {date: ASC}})
+          }\`"
+        `)
       })
 
       it(`list with multiple fields, no order`, () => {
@@ -107,15 +102,14 @@ describe(transformName, () => {
             `allMarkdownRemark(sort: {fields: [frontmatter___priority, frontmatter___date]})`
           )
         ).toMatchInlineSnapshot(`
-                  "import { graphql } from \\"gatsby\\"
-
-                  export const q = graphql\`{
-                    allMarkdownRemark(
-                      sort: [{frontmatter: {priority: ASC}}, {frontmatter: {date: ASC}}]
-                    )
-                  }
-                  \`"
-              `)
+          "import { graphql } from \\"gatsby\\"
+
+          export const q = graphql\`{
+            allMarkdownRemark(
+              sort: [{frontmatter: {priority: ASC}}, {frontmatter: {date: ASC}}]
+            )
+          }\`"
+        `)
       })
 
       it(`single field, list with single order`, () => {
@@ -127,13 +121,12 @@ describe(transformName, () => {
           })`
           )
         ).toMatchInlineSnapshot(`
-                  "import { graphql } from \\"gatsby\\"
+          "import { graphql } from \\"gatsby\\"
 
-                  export const q = graphql\`{
-                    allMarkdownRemark(sort: {frontmatter: {date: DESC}})
-                  }
-                  \`"
-              `)
+          export const q = graphql\`{
+            allMarkdownRemark(sort: {frontmatter: {date: DESC}})
+          }\`"
+        `)
       })
 
       it(`single field, list with multiple orders`, () => {
@@ -146,13 +139,12 @@ describe(transformName, () => {
           })`
           )
         ).toMatchInlineSnapshot(`
-                  "import { graphql } from \\"gatsby\\"
+          "import { graphql } from \\"gatsby\\"
 
-                  export const q = graphql\`{
-                    allMarkdownRemark(sort: {frontmatter: {date: DESC}})
-                  }
-                  \`"
-              `)
+          export const q = graphql\`{
+            allMarkdownRemark(sort: {frontmatter: {date: DESC}})
+          }\`"
+        `)
       })
 
       it(`list with single field, list with single order`, () => {
@@ -164,13 +156,12 @@ describe(transformName, () => {
           })`
           )
         ).toMatchInlineSnapshot(`
-                  "import { graphql } from \\"gatsby\\"
+          "import { graphql } from \\"gatsby\\"
 
-                  export const q = graphql\`{
-                    allMarkdownRemark(sort: {frontmatter: {date: DESC}})
-                  }
-                  \`"
-              `)
+          export const q = graphql\`{
+            allMarkdownRemark(sort: {frontmatter: {date: DESC}})
+          }\`"
+        `)
       })
 
       it(`list with multiple fields, list with single order`, () => {
@@ -182,15 +173,14 @@ describe(transformName, () => {
           })`
           )
         ).toMatchInlineSnapshot(`
-                  "import { graphql } from \\"gatsby\\"
-
-                  export const q = graphql\`{
-                    allMarkdownRemark(
-                      sort: [{frontmatter: {isFeatured: DESC}}, {frontmatter: {date: ASC}}]
-                    )
-                  }
-                  \`"
-              `)
+          "import { graphql } from \\"gatsby\\"
+
+          export const q = graphql\`{
+            allMarkdownRemark(
+              sort: [{frontmatter: {isFeatured: DESC}}, {frontmatter: {date: ASC}}]
+            )
+          }\`"
+        `)
       })
 
       it(`list with multiple fields, list with multiple orders`, () => {
@@ -202,15 +192,14 @@ describe(transformName, () => {
           })`
           )
         ).toMatchInlineSnapshot(`
-                  "import { graphql } from \\"gatsby\\"
-
-                  export const q = graphql\`{
-                    allMarkdownRemark(
-                      sort: [{frontmatter: {isFeatured: DESC}}, {frontmatter: {date: DESC}}]
-                    )
-                  }
-                  \`"
-              `)
+          "import { graphql } from \\"gatsby\\"
+
+          export const q = graphql\`{
+            allMarkdownRemark(
+              sort: [{frontmatter: {isFeatured: DESC}}, {frontmatter: {date: DESC}}]
+            )
+          }\`"
+        `)
       })
     })
 
@@ -250,13 +239,12 @@ describe(transformName, () => {
       it(`root field`, () => {
         expect(run(`distinct(field: frontmatter___category)`))
           .toMatchInlineSnapshot(`
-                  "import { graphql } from \\"gatsby\\"
+          "import { graphql } from \\"gatsby\\"
 
-                  export const q = graphql\`{
-                    distinct(field: {frontmatter: {category: SELECT}})
-                  }
-                  \`"
-              `)
+          export const q = graphql\`{
+            distinct(field: {frontmatter: {category: SELECT}})
+          }\`"
+        `)
       })
 
       it(`nested field`, () => {
@@ -266,8 +254,7 @@ describe(transformName, () => {
 
           export const q = graphql\`{
             distinct(field: {frontmatter: {nested_category: SELECT}})
-          }
-          \`"
+          }\`"
         `)
       })
     })
@@ -314,17 +301,16 @@ describe(transformName, () => {
           path: join(__dirname, `..`, `..`, `example.js`),
         })
       ).toMatchInlineSnapshot(`
-              "exports.createPages = ({ graphql, actions }) => {
-                        const { data } = graphql(\`{
-                allMarkdownRemark(sort: {frontmatter: {date: DESC}}) {
-                  nodes {
-                    id
-                  }
-                }
-              }
-              \`)
-                      }"
-          `)
+        "exports.createPages = ({ graphql, actions }) => {
+                  const { data } = graphql(\`{
+          allMarkdownRemark(sort: {frontmatter: {date: DESC}}) {
+            nodes {
+              id
+            }
+          }
+        }\`)
+                }"
+      `)
     })
 
     it(`graphql("...")`, () => {
@@ -345,8 +331,7 @@ describe(transformName, () => {
               id
             }
           }
-        }
-        \`)
+        }\`)
                 }"
       `)
     })
@@ -369,8 +354,7 @@ describe(transformName, () => {
               id
             }
           }
-        }
-        \`)
+        }\`)
                 }"
       `)
     })
diff --git a/packages/gatsby-plugin-utils/package.json b/packages/gatsby-plugin-utils/package.json
index 68d526f62b069..d4259b43bc291 100644
--- a/packages/gatsby-plugin-utils/package.json
+++ b/packages/gatsby-plugin-utils/package.json
@@ -52,7 +52,7 @@
     "fs-extra": "^10.1.0",
     "gatsby-core-utils": "^4.0.0-next.1",
     "gatsby-sharp": "^1.0.0-next.0",
-    "graphql-compose": "^9.0.7",
+    "graphql-compose": "^9.0.9",
     "import-from": "^4.0.0",
     "joi": "^17.4.2",
     "mime": "^3.0.0",
@@ -70,7 +70,7 @@
   },
   "peerDependencies": {
     "gatsby": "^5.0.0-alpha-v5",
-    "graphql": "^15.0.0"
+    "graphql": "^16.0.0"
   },
   "files": [
     "dist/"
diff --git a/packages/gatsby-source-contentful/src/__tests__/23df7612602d69edfc3eaf89c8c02248/347966-contentful-logo-wordmark-dark (1)-4cd185-original-1582664935 (1).png b/packages/gatsby-source-contentful/src/__tests__/23df7612602d69edfc3eaf89c8c02248/347966-contentful-logo-wordmark-dark (1)-4cd185-original-1582664935 (1).png
new file mode 100644
index 0000000000000..ca8c789fbe0a1
Binary files /dev/null and b/packages/gatsby-source-contentful/src/__tests__/23df7612602d69edfc3eaf89c8c02248/347966-contentful-logo-wordmark-dark (1)-4cd185-original-1582664935 (1).png differ
diff --git a/packages/gatsby-source-contentful/src/__tests__/47098b484f55425af2625391283f7f32/347966-contentful-logo-wordmark-dark (1)-4cd185-original-1582664935 (1).png b/packages/gatsby-source-contentful/src/__tests__/47098b484f55425af2625391283f7f32/347966-contentful-logo-wordmark-dark (1)-4cd185-original-1582664935 (1).png
new file mode 100644
index 0000000000000..9ae81f3e825a0
Binary files /dev/null and b/packages/gatsby-source-contentful/src/__tests__/47098b484f55425af2625391283f7f32/347966-contentful-logo-wordmark-dark (1)-4cd185-original-1582664935 (1).png differ
diff --git a/packages/gatsby-source-contentful/src/__tests__/85c405f72e68f1e90176d3220d41c5bf/347966-contentful-logo-wordmark-dark (1)-4cd185-original-1582664935 (1).png b/packages/gatsby-source-contentful/src/__tests__/85c405f72e68f1e90176d3220d41c5bf/347966-contentful-logo-wordmark-dark (1)-4cd185-original-1582664935 (1).png
new file mode 100644
index 0000000000000..28ac4de5c77fe
Binary files /dev/null and b/packages/gatsby-source-contentful/src/__tests__/85c405f72e68f1e90176d3220d41c5bf/347966-contentful-logo-wordmark-dark (1)-4cd185-original-1582664935 (1).png differ
diff --git a/packages/gatsby-source-contentful/src/__tests__/baec3798e6d3e16f3183ed0feb8a4023/347966-contentful-logo-wordmark-dark__1_-4cd185-original-1582664935__1_.png b/packages/gatsby-source-contentful/src/__tests__/baec3798e6d3e16f3183ed0feb8a4023/347966-contentful-logo-wordmark-dark__1_-4cd185-original-1582664935__1_.png
new file mode 100644
index 0000000000000..52be92e660e53
Binary files /dev/null and b/packages/gatsby-source-contentful/src/__tests__/baec3798e6d3e16f3183ed0feb8a4023/347966-contentful-logo-wordmark-dark__1_-4cd185-original-1582664935__1_.png differ
diff --git a/packages/gatsby-source-contentful/src/__tests__/df7930af6b8c743c76c43b86ffe5af75/347966-contentful-logo-wordmark-dark (1)-4cd185-original-1582664935 (1).png b/packages/gatsby-source-contentful/src/__tests__/df7930af6b8c743c76c43b86ffe5af75/347966-contentful-logo-wordmark-dark (1)-4cd185-original-1582664935 (1).png
new file mode 100644
index 0000000000000..8ebea1e1bb8d2
Binary files /dev/null and b/packages/gatsby-source-contentful/src/__tests__/df7930af6b8c743c76c43b86ffe5af75/347966-contentful-logo-wordmark-dark (1)-4cd185-original-1582664935 (1).png differ
diff --git a/packages/gatsby-source-contentful/src/__tests__/f6853f3e258800aa68463fa9565a9d80/347966-contentful-logo-wordmark-dark (1)-4cd185-original-1582664935 (1).png b/packages/gatsby-source-contentful/src/__tests__/f6853f3e258800aa68463fa9565a9d80/347966-contentful-logo-wordmark-dark (1)-4cd185-original-1582664935 (1).png
new file mode 100644
index 0000000000000..1429459d19b2e
Binary files /dev/null and b/packages/gatsby-source-contentful/src/__tests__/f6853f3e258800aa68463fa9565a9d80/347966-contentful-logo-wordmark-dark (1)-4cd185-original-1582664935 (1).png differ
diff --git a/packages/gatsby-source-graphql/src/__tests__/__snapshots__/transforms.js.snap b/packages/gatsby-source-graphql/src/__tests__/__snapshots__/transforms.js.snap
index 26505fde9be39..bc826990d6e33 100644
--- a/packages/gatsby-source-graphql/src/__tests__/__snapshots__/transforms.js.snap
+++ b/packages/gatsby-source-graphql/src/__tests__/__snapshots__/transforms.js.snap
@@ -11,13 +11,11 @@ type Mutation {
 
 type Wrapper {
   query: String
-}
-"
+}"
 `;
 
 exports[`StripNonQueryTransform works 1`] = `
 "type Query {
   query: String
-}
-"
+}"
 `;
diff --git a/packages/gatsby-transformer-remark/src/__tests__/extend-node.js b/packages/gatsby-transformer-remark/src/__tests__/extend-node.js
index 81870b84cc254..56bcb1247036c 100644
--- a/packages/gatsby-transformer-remark/src/__tests__/extend-node.js
+++ b/packages/gatsby-transformer-remark/src/__tests__/extend-node.js
@@ -108,15 +108,15 @@ async function queryResult(
   })
   const schema = sc.buildSchema()
 
-  const result = await graphql(
+  const result = await graphql({
     schema,
-    `query {
-        listNode {
-            ${fragment}
-        }
+    source: `query {
+      listNode {
+          ${fragment}
       }
-    `
-  )
+    }
+  `,
+  })
   return result
 }
 
diff --git a/packages/gatsby-transformer-remark/src/__tests__/on-node-create.js b/packages/gatsby-transformer-remark/src/__tests__/on-node-create.js
index f156b49f141f0..4380fde107e75 100644
--- a/packages/gatsby-transformer-remark/src/__tests__/on-node-create.js
+++ b/packages/gatsby-transformer-remark/src/__tests__/on-node-create.js
@@ -146,15 +146,15 @@ yadda yadda
       })
       const schema = sc.buildSchema()
 
-      const result = await graphql(
+      const result = await graphql({
         schema,
-        `query {
-                    listNode {
-                        ${fragment}
-                    }
-                }
-                `
-      )
+        source: `query {
+              listNode {
+                  ${fragment}
+              }
+          }
+          `,
+      })
       return result
     }
 
diff --git a/packages/gatsby-transformer-sharp/src/customize-schema.js b/packages/gatsby-transformer-sharp/src/customize-schema.js
index 9179a8967b9f3..88fdb4ef1e199 100644
--- a/packages/gatsby-transformer-sharp/src/customize-schema.js
+++ b/packages/gatsby-transformer-sharp/src/customize-schema.js
@@ -374,7 +374,7 @@ const fluidNodeType = ({
         defaultValue: ``,
       },
       srcSetBreakpoints: {
-        type: GraphQLList(GraphQLInt),
+        type: new GraphQLList(GraphQLInt),
         defaultValue: [],
         description: `A list of image widths to be generated. Example: [ 200, 340, 520, 890 ]`,
       },
@@ -461,7 +461,7 @@ const imageNodeType = ({
         description: `Options for traced placeholder SVGs. You also should set placeholder to "TRACED_SVG".`,
       },
       formats: {
-        type: GraphQLList(ImageFormatType),
+        type: new GraphQLList(ImageFormatType),
         description: stripIndent`
         The image formats to generate. Valid values are "AUTO" (meaning the same format as the source image), "JPG", "PNG", "WEBP" and "AVIF".
         The default value is [AUTO, WEBP], and you should rarely need to change this. Take care if you specify JPG or PNG when you do
@@ -470,14 +470,14 @@ const imageNodeType = ({
         `,
       },
       outputPixelDensities: {
-        type: GraphQLList(GraphQLFloat),
+        type: new GraphQLList(GraphQLFloat),
         description: stripIndent`
         A list of image pixel densities to generate. It will never generate images larger than the source, and will always include a 1x image.
         Default is [ 1, 2 ] for FIXED images, meaning 1x and 2x and [0.25, 0.5, 1, 2] for CONSTRAINED. In this case, an image with a constrained layout
         and width = 400 would generate images at 100, 200, 400 and 800px wide. Ignored for FULL_WIDTH images, which use breakpoints instead`,
       },
       breakpoints: {
-        type: GraphQLList(GraphQLInt),
+        type: new GraphQLList(GraphQLInt),
         description: stripIndent`
         Specifies the image widths to generate. For FIXED and CONSTRAINED images it is better to allow these to be determined automatically,
         based on the image size. For FULL_WIDTH images this can be used to override the default, which is [750, 1080, 1366, 1920].
diff --git a/packages/gatsby/package.json b/packages/gatsby/package.json
index fcab1f5995233..99b5bab81d473 100644
--- a/packages/gatsby/package.json
+++ b/packages/gatsby/package.json
@@ -108,8 +108,8 @@
     "glob": "^7.2.3",
     "globby": "^11.1.0",
     "got": "^11.8.5",
-    "graphql": "^15.7.2",
-    "graphql-compose": "^9.0.7",
+    "graphql": "^16.6.0",
+    "graphql-compose": "^9.0.9",
     "hasha": "^5.2.2",
     "invariant": "^2.2.4",
     "is-relative": "^1.0.0",
@@ -254,7 +254,7 @@
     "url": "git+https://github.com/gatsbyjs/gatsby.git"
   },
   "resolutions": {
-    "graphql": "^15.8.0"
+    "graphql": "^16.6.0"
   },
   "scripts": {
     "build": "npm run build:types && npm run build:src && npm run build:internal-plugins && npm run build:rawfiles && npm run build:cjs",
diff --git a/packages/gatsby/src/commands/repl.ts b/packages/gatsby/src/commands/repl.ts
index 0e8a3cac04d88..34739739720c0 100644
--- a/packages/gatsby/src/commands/repl.ts
+++ b/packages/gatsby/src/commands/repl.ts
@@ -19,7 +19,12 @@ module.exports = async (program: IProgram): Promise<void> => {
   const nodes = getNodes()
 
   const query = async (query: string): Promise<void> => {
-    const result = await graphql(schema, query, {}, {}, {})
+    const result = await graphql({
+      schema,
+      source: query,
+      rootValue: {},
+      contextValue: {},
+    })
     console.log(`query result: ${JSON.stringify(result)}`)
   }
 
diff --git a/packages/gatsby/src/query/__tests__/__snapshots__/query-compiler.js.snap b/packages/gatsby/src/query/__tests__/__snapshots__/query-compiler.js.snap
index 5e9bca667bdc4..e3106229f7ca0 100644
--- a/packages/gatsby/src/query/__tests__/__snapshots__/query-compiler.js.snap
+++ b/packages/gatsby/src/query/__tests__/__snapshots__/query-compiler.js.snap
@@ -31,8 +31,7 @@ query mockFileQuery {
       ...PostsJsonFragment
     }
   }
-}
-",
+}",
   },
 }
 `;
@@ -63,8 +62,7 @@ query mockFileQuery {
       ...PostsJsonFragment
     }
   }
-}
-",
+}",
 }
 `;
 
@@ -98,8 +96,7 @@ query mockFileQuery {
       ...PostsJsonFragment
     }
   }
-}
-",
+}",
 }
 `;
 
@@ -125,8 +122,7 @@ Object {
       id
     }
   }
-}
-",
+}",
 }
 `;
 
@@ -153,8 +149,7 @@ Object {
       id
     }
   }
-}
-",
+}",
 }
 `;
 
@@ -221,8 +216,7 @@ Map {
       id
     }
   }
-}
-",
+}",
   },
 }
 `;
@@ -258,8 +252,7 @@ query mockFileQuery {
       ...PostsJsonFragment
     }
   }
-}
-",
+}",
 }
 `;
 
@@ -297,7 +290,6 @@ query mockFileQuery {
       ...PostsJsonFragment
     }
   }
-}
-",
+}",
 }
 `;
diff --git a/packages/gatsby/src/query/__tests__/query-compiler.js b/packages/gatsby/src/query/__tests__/query-compiler.js
index e4b061f607a36..24a8ed709b2f3 100644
--- a/packages/gatsby/src/query/__tests__/query-compiler.js
+++ b/packages/gatsby/src/query/__tests__/query-compiler.js
@@ -296,8 +296,7 @@ describe(`actual compiling`, () => {
               id
             }
           }
-        }
-        ",
+        }",
         }
       `)
     })
@@ -480,8 +479,7 @@ describe(`actual compiling`, () => {
             ...Bar
           }
         }
-      }
-      ",
+      }",
       }
     `)
     expect(result.get(`mockFile2`)).toMatchInlineSnapshot(`
@@ -516,8 +514,7 @@ describe(`actual compiling`, () => {
             ...Bar
           }
         }
-      }
-      ",
+      }",
       }
     `)
   })
@@ -1136,8 +1133,7 @@ describe(`actual compiling`, () => {
             id
           }
         }
-      }
-      ",
+      }",
         },
       }
     `)
diff --git a/packages/gatsby/src/query/__tests__/transform-documents.ts b/packages/gatsby/src/query/__tests__/transform-documents.ts
index f7ff95dfe32a5..a764cdc23c420 100644
--- a/packages/gatsby/src/query/__tests__/transform-documents.ts
+++ b/packages/gatsby/src/query/__tests__/transform-documents.ts
@@ -26,8 +26,7 @@ if (_CFLAGS_.GATSBY_MAJOR === `5`) {
             .toMatchInlineSnapshot(`
             "{
               allMarkdownRemark(sort: {excerpt: ASC})
-            }
-            "
+            }"
           `)
         })
 
@@ -39,8 +38,7 @@ if (_CFLAGS_.GATSBY_MAJOR === `5`) {
           ).toMatchInlineSnapshot(`
             "{
               allMarkdownRemark(sort: {frontmatter: {nested: {date: ASC}}})
-            }
-            "
+            }"
           `)
         })
 
@@ -55,8 +53,7 @@ if (_CFLAGS_.GATSBY_MAJOR === `5`) {
           ).toMatchInlineSnapshot(`
             "{
               allMarkdownRemark(sort: {frontmatter: {date: ASC}})
-            }
-            "
+            }"
           `)
         })
 
@@ -71,8 +68,7 @@ if (_CFLAGS_.GATSBY_MAJOR === `5`) {
           ).toMatchInlineSnapshot(`
             "{
               allMarkdownRemark(sort: {frontmatter: {date: DESC}})
-            }
-            "
+            }"
           `)
         })
 
@@ -81,8 +77,7 @@ if (_CFLAGS_.GATSBY_MAJOR === `5`) {
             .toMatchInlineSnapshot(`
             "{
               allMarkdownRemark(sort: {frontmatter: {date: ASC}})
-            }
-            "
+            }"
           `)
         })
 
@@ -96,8 +91,7 @@ if (_CFLAGS_.GATSBY_MAJOR === `5`) {
               allMarkdownRemark(
                 sort: [{frontmatter: {priority: ASC}}, {frontmatter: {date: ASC}}]
               )
-            }
-            "
+            }"
           `)
         })
 
@@ -112,8 +106,7 @@ if (_CFLAGS_.GATSBY_MAJOR === `5`) {
           ).toMatchInlineSnapshot(`
             "{
               allMarkdownRemark(sort: {frontmatter: {date: DESC}})
-            }
-            "
+            }"
           `)
         })
 
@@ -129,8 +122,7 @@ if (_CFLAGS_.GATSBY_MAJOR === `5`) {
           ).toMatchInlineSnapshot(`
             "{
               allMarkdownRemark(sort: {frontmatter: {date: DESC}})
-            }
-            "
+            }"
           `)
         })
 
@@ -145,8 +137,7 @@ if (_CFLAGS_.GATSBY_MAJOR === `5`) {
           ).toMatchInlineSnapshot(`
             "{
               allMarkdownRemark(sort: {frontmatter: {date: DESC}})
-            }
-            "
+            }"
           `)
         })
 
@@ -163,8 +154,7 @@ if (_CFLAGS_.GATSBY_MAJOR === `5`) {
               allMarkdownRemark(
                 sort: [{frontmatter: {isFeatured: DESC}}, {frontmatter: {date: ASC}}]
               )
-            }
-            "
+            }"
           `)
         })
 
@@ -181,8 +171,7 @@ if (_CFLAGS_.GATSBY_MAJOR === `5`) {
               allMarkdownRemark(
                 sort: [{frontmatter: {isFeatured: DESC}}, {frontmatter: {date: DESC}}]
               )
-            }
-            "
+            }"
           `)
         })
       })
@@ -225,8 +214,7 @@ if (_CFLAGS_.GATSBY_MAJOR === `5`) {
             .toMatchInlineSnapshot(`
             "{
               distinct(field: {frontmatter: {category: SELECT}})
-            }
-            "
+            }"
           `)
         })
 
@@ -235,8 +223,7 @@ if (_CFLAGS_.GATSBY_MAJOR === `5`) {
             .toMatchInlineSnapshot(`
             "{
               distinct(field: {frontmatter: {nested_category: SELECT}})
-            }
-            "
+            }"
           `)
         })
       })
diff --git a/packages/gatsby/src/schema/__tests__/__snapshots__/build-schema.js.snap b/packages/gatsby/src/schema/__tests__/__snapshots__/build-schema.js.snap
index 78c09a5c5af40..afeb90d39d48f 100644
--- a/packages/gatsby/src/schema/__tests__/__snapshots__/build-schema.js.snap
+++ b/packages/gatsby/src/schema/__tests__/__snapshots__/build-schema.js.snap
@@ -2234,7 +2234,7 @@ type SitePage implements Node {
 \\"\\"\\"
 The \`JSON\` scalar type represents JSON values as specified by [ECMA-404](http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-404.pdf).
 \\"\\"\\"
-scalar JSON @specifiedBy(url: \\"http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-404.pdf\\")
+scalar JSON
 
 type SitePlugin implements Node {
   resolve: String
@@ -3079,6 +3079,5 @@ input SiteBuildMetadataSortInput {
   parent: NodeSortInput
   children: NodeSortInput
   internal: InternalSortInput
-}
-"
+}"
 `;
diff --git a/packages/gatsby/src/schema/__tests__/__snapshots__/rebuild-schema.js.snap b/packages/gatsby/src/schema/__tests__/__snapshots__/rebuild-schema.js.snap
index f5b7b96a1203b..e8ca70911a884 100644
--- a/packages/gatsby/src/schema/__tests__/__snapshots__/rebuild-schema.js.snap
+++ b/packages/gatsby/src/schema/__tests__/__snapshots__/rebuild-schema.js.snap
@@ -433,7 +433,7 @@ type SitePage implements Node {
 \\"\\"\\"
 The \`JSON\` scalar type represents JSON values as specified by [ECMA-404](http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-404.pdf).
 \\"\\"\\"
-scalar JSON @specifiedBy(url: \\"http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-404.pdf\\")
+scalar JSON
 
 type SitePlugin implements Node {
   resolve: String
@@ -1278,8 +1278,7 @@ input SiteBuildMetadataSortInput {
   parent: NodeSortInput
   children: NodeSortInput
   internal: InternalSortInput
-}
-"
+}"
 `;
 
 exports[`build and update individual types applies automatic extensions to inferred fields 1`] = `
diff --git a/packages/gatsby/src/schema/__tests__/build-node-connections.js b/packages/gatsby/src/schema/__tests__/build-node-connections.js
index 5948a0d6bb4d7..91a3ff77c347b 100644
--- a/packages/gatsby/src/schema/__tests__/build-node-connections.js
+++ b/packages/gatsby/src/schema/__tests__/build-node-connections.js
@@ -78,13 +78,18 @@ describe(`build-node-connections`, () => {
     store.dispatch({ type: `SET_SCHEMA`, payload: schema })
 
     const context = { path: `foo` }
-    const { data, errors } = await graphql(schema, query, undefined, {
-      ...context,
-      nodeModel: new LocalNodeModel({
-        schemaComposer,
-        schema,
-        createPageDependency,
-      }),
+    const { data, errors } = await graphql({
+      schema,
+      source: query,
+      rootValue: undefined,
+      contextValue: {
+        ...context,
+        nodeModel: new LocalNodeModel({
+          schemaComposer,
+          schema,
+          createPageDependency,
+        }),
+      },
     })
     expect(errors).not.toBeDefined()
     return data
diff --git a/packages/gatsby/src/schema/__tests__/build-node-types.js b/packages/gatsby/src/schema/__tests__/build-node-types.js
index dc2d4b10b8790..330f0d68c0c14 100644
--- a/packages/gatsby/src/schema/__tests__/build-node-types.js
+++ b/packages/gatsby/src/schema/__tests__/build-node-types.js
@@ -89,13 +89,18 @@ describe(`build-node-types`, () => {
     store.dispatch({ type: `SET_SCHEMA`, payload: schema })
 
     const context = { path: `foo` }
-    const { data, errors } = await graphql(schema, query, undefined, {
-      ...context,
-      nodeModel: new LocalNodeModel({
-        schemaComposer,
-        schema,
-        createPageDependency,
-      }),
+    const { data, errors } = await graphql({
+      schema,
+      source: query,
+      rootValue: undefined,
+      contextValue: {
+        ...context,
+        nodeModel: new LocalNodeModel({
+          schemaComposer,
+          schema,
+          createPageDependency,
+        }),
+      },
     })
     expect(errors).not.toBeDefined()
     return data
diff --git a/packages/gatsby/src/schema/__tests__/connection-filter-on-linked-nodes.js b/packages/gatsby/src/schema/__tests__/connection-filter-on-linked-nodes.js
index cb65d635b2bd7..f629c10b6cf80 100644
--- a/packages/gatsby/src/schema/__tests__/connection-filter-on-linked-nodes.js
+++ b/packages/gatsby/src/schema/__tests__/connection-filter-on-linked-nodes.js
@@ -47,17 +47,17 @@ async function queryResult(nodes, query) {
   const { schema, schemaCustomization } = store.getState()
 
   const context = { path: `foo` }
-  return graphql(
+  return graphql({
     schema,
-    query,
-    undefined,
-    withResolverContext({
+    source: query,
+    rootValue: undefined,
+    contextValue: withResolverContext({
       schema,
       schemaComposer: schemaCustomization.composer,
       context,
       customContext: schemaCustomization.context,
-    })
-  )
+    }),
+  })
 }
 
 describe(`filtering on linked nodes`, () => {
diff --git a/packages/gatsby/src/schema/__tests__/connection-input-fields.js b/packages/gatsby/src/schema/__tests__/connection-input-fields.js
index 25a5bd7e1f80b..52086cbe66cc8 100644
--- a/packages/gatsby/src/schema/__tests__/connection-input-fields.js
+++ b/packages/gatsby/src/schema/__tests__/connection-input-fields.js
@@ -158,13 +158,18 @@ async function queryResult(nodes, query) {
   store.dispatch({ type: `SET_SCHEMA_COMPOSER`, payload: schemaComposer })
 
   const context = { path: `foo` }
-  return graphql(schema, query, undefined, {
-    ...context,
-    nodeModel: new LocalNodeModel({
-      schemaComposer,
-      schema,
-      createPageDependency: jest.fn(),
-    }),
+  return graphql({
+    schema,
+    source: query,
+    rootValue: undefined,
+    contextValue: {
+      ...context,
+      nodeModel: new LocalNodeModel({
+        schemaComposer,
+        schema,
+        createPageDependency: jest.fn(),
+      }),
+    },
   })
 }
 
diff --git a/packages/gatsby/src/schema/__tests__/context.js b/packages/gatsby/src/schema/__tests__/context.js
index ff15c64f3a512..449a435d3cc44 100644
--- a/packages/gatsby/src/schema/__tests__/context.js
+++ b/packages/gatsby/src/schema/__tests__/context.js
@@ -225,16 +225,16 @@ describe(`Resolver context`, () => {
 const runQuery = async query => {
   await build({})
   const { schema, schemaCustomization } = store.getState()
-  const results = await graphql(
+  const results = await graphql({
     schema,
-    query,
-    undefined,
-    withResolverContext({
+    source: query,
+    rootValue: undefined,
+    contextValue: withResolverContext({
       schema,
       schemaComposer: schemaCustomization.composer,
       customContext: schemaCustomization.context,
-    })
-  )
+    }),
+  })
   expect(results.errors).toBeUndefined()
   return results.data
 }
diff --git a/packages/gatsby/src/schema/__tests__/kitchen-sink.js b/packages/gatsby/src/schema/__tests__/kitchen-sink.js
index c6ac7dc2fdebf..d232420c28f19 100644
--- a/packages/gatsby/src/schema/__tests__/kitchen-sink.js
+++ b/packages/gatsby/src/schema/__tests__/kitchen-sink.js
@@ -57,17 +57,17 @@ describe(`Kitchen sink schema test`, () => {
       query = print(ast)
     }
 
-    return graphql(
+    return graphql({
       schema,
-      query,
-      undefined,
-      withResolverContext({
+      source: query,
+      rootValue: undefined,
+      contextValue: withResolverContext({
         schema,
         schemaComposer,
         context: {},
         customContext: {},
-      })
-    )
+      }),
+    })
   }
 
   beforeAll(async () => {
diff --git a/packages/gatsby/src/schema/__tests__/queries-file.js b/packages/gatsby/src/schema/__tests__/queries-file.js
index 51c250e4d6857..ac6a9b835ab4a 100644
--- a/packages/gatsby/src/schema/__tests__/queries-file.js
+++ b/packages/gatsby/src/schema/__tests__/queries-file.js
@@ -114,15 +114,15 @@ describe(`Query fields of type File`, () => {
   let schemaComposer
 
   const runQuery = query =>
-    graphql(
+    graphql({
       schema,
-      query,
-      undefined,
-      withResolverContext({
+      source: query,
+      rootValue: undefined,
+      contextValue: withResolverContext({
         schema,
         schemaComposer,
-      })
-    )
+      }),
+    })
 
   beforeAll(async () => {
     store.dispatch({ type: `DELETE_CACHE` })
diff --git a/packages/gatsby/src/schema/__tests__/queries.js b/packages/gatsby/src/schema/__tests__/queries.js
index 692d0f4ac3687..ae48a7a3701c0 100644
--- a/packages/gatsby/src/schema/__tests__/queries.js
+++ b/packages/gatsby/src/schema/__tests__/queries.js
@@ -54,16 +54,16 @@ describe(`Query schema`, () => {
       query = print(ast)
     }
 
-    return graphql(
+    return graphql({
       schema,
-      query,
-      undefined,
-      withResolverContext({
+      source: query,
+      rootValue: undefined,
+      contextValue: withResolverContext({
         schema,
         schemaComposer,
       }),
-      variables
-    )
+      variableValues: variables,
+    })
   }
 
   beforeAll(async () => {
diff --git a/packages/gatsby/src/schema/extensions/__tests__/child-relations.js b/packages/gatsby/src/schema/extensions/__tests__/child-relations.js
index 0d9b7cab11c88..6f40aa0ca3621 100644
--- a/packages/gatsby/src/schema/extensions/__tests__/child-relations.js
+++ b/packages/gatsby/src/schema/extensions/__tests__/child-relations.js
@@ -903,15 +903,15 @@ const buildSchema = async () => {
 
 const runQuery = async query => {
   const { schema, schemaComposer } = await buildSchema()
-  const results = await graphql(
+  const results = await graphql({
     schema,
-    query,
-    undefined,
-    withResolverContext({
+    source: query,
+    rootValue: undefined,
+    contextValue: withResolverContext({
       schema,
       schemaComposer,
-    })
-  )
+    }),
+  })
   expect(results.errors).toBeUndefined()
   return results.data
 }
diff --git a/packages/gatsby/src/schema/extensions/__tests__/field-extensions.js b/packages/gatsby/src/schema/extensions/__tests__/field-extensions.js
index 00fa9e326e962..45a22970b70cb 100644
--- a/packages/gatsby/src/schema/extensions/__tests__/field-extensions.js
+++ b/packages/gatsby/src/schema/extensions/__tests__/field-extensions.js
@@ -1682,15 +1682,15 @@ const runQuery = async query => {
     schema,
     schemaCustomization: { composer: schemaComposer },
   } = store.getState()
-  const results = await graphql(
+  const results = await graphql({
     schema,
-    query,
-    undefined,
-    withResolverContext({
+    source: query,
+    rootValue: undefined,
+    contextValue: withResolverContext({
       schema,
       schemaComposer,
-    })
-  )
+    }),
+  })
   expect(results.errors).toBeUndefined()
   return results.data
 }
diff --git a/packages/gatsby/src/schema/extensions/__tests__/interfaces.js b/packages/gatsby/src/schema/extensions/__tests__/interfaces.js
index b79e5eba7b04e..8e7259a14f96d 100644
--- a/packages/gatsby/src/schema/extensions/__tests__/interfaces.js
+++ b/packages/gatsby/src/schema/extensions/__tests__/interfaces.js
@@ -585,15 +585,15 @@ const buildSchema = async () => {
 
 const runQuery = async query => {
   const { schema, schemaComposer } = await buildSchema()
-  const results = await graphql(
+  const results = await graphql({
     schema,
-    query,
-    undefined,
-    withResolverContext({
+    source: query,
+    rootValue: undefined,
+    contextValue: withResolverContext({
       schema,
       schemaComposer,
-    })
-  )
+    }),
+  })
   expect(results.errors).toBeUndefined()
   return results.data
 }
diff --git a/packages/gatsby/src/schema/infer/__tests__/infer-input.js b/packages/gatsby/src/schema/infer/__tests__/infer-input.js
index 87fc381bacd37..28558565ed283 100644
--- a/packages/gatsby/src/schema/infer/__tests__/infer-input.js
+++ b/packages/gatsby/src/schema/infer/__tests__/infer-input.js
@@ -48,12 +48,17 @@ const buildTestSchema = async nodes => {
 }
 const queryResult = async (nodes, query) => {
   const { schema, schemaComposer } = await buildTestSchema(nodes)
-  return graphql(schema, query, undefined, {
-    nodeModel: new LocalNodeModel({
-      schema,
-      createPageDependency,
-      schemaComposer,
-    }),
+  return graphql({
+    schema,
+    source: query,
+    rootValue: undefined,
+    contextValue: {
+      nodeModel: new LocalNodeModel({
+        schema,
+        createPageDependency,
+        schemaComposer,
+      }),
+    },
   })
 }
 
diff --git a/packages/gatsby/src/schema/infer/__tests__/infer.js b/packages/gatsby/src/schema/infer/__tests__/infer.js
index d1f1bf659f3d6..faee44315a0d8 100644
--- a/packages/gatsby/src/schema/infer/__tests__/infer.js
+++ b/packages/gatsby/src/schema/infer/__tests__/infer.js
@@ -271,22 +271,26 @@ describe(`GraphQL type inference`, () => {
       typeDefs
     )
     store.dispatch({ type: `SET_SCHEMA`, payload: schema })
-    return graphql(
+    return graphql({
       schema,
-      `query {
-        allTest {
-          edges {
-            node {
-              ${fragment}
-            }
-          }
+      source: `query {
+    allTest {
+      edges {
+        node {
+          ${fragment}
         }
-        ${extraquery}
       }
-      `,
-      undefined,
-      withResolverContext({ schema, schemaComposer, context: { path: `/` } })
-    )
+    }
+    ${extraquery}
+  }
+  `,
+      rootValue: undefined,
+      contextValue: withResolverContext({
+        schema,
+        schemaComposer,
+        context: { path: `/` },
+      }),
+    })
   }
 
   const getInferredFields = async (nodes, buildSchemaArgs) => {
@@ -643,27 +647,31 @@ describe(`GraphQL type inference`, () => {
     ]
     const { schema, schemaComposer } = await buildTestSchema(nodes)
     store.dispatch({ type: `SET_SCHEMA`, payload: schema })
-    const result = await graphql(
+    const result = await graphql({
       schema,
-      `
-        query {
-          allWordpressPage {
-            edges {
-              node {
-                __typename
-                id
-                acfFields {
-                  fooz
-                  __typename
-                }
-              }
+      source: `
+    query {
+      allWordpressPage {
+        edges {
+          node {
+            __typename
+            id
+            acfFields {
+              fooz
+              __typename
             }
           }
         }
-      `,
-      undefined,
-      withResolverContext({ schema, schemaComposer, context: { path: `/` } })
-    )
+      }
+    }
+  `,
+      rootValue: undefined,
+      contextValue: withResolverContext({
+        schema,
+        schemaComposer,
+        context: { path: `/` },
+      }),
+    })
 
     expect(result).toMatchSnapshot()
   })
diff --git a/packages/gatsby/src/schema/print.ts b/packages/gatsby/src/schema/print.ts
index dc7eb4dc755fe..7d1c38caba18d 100644
--- a/packages/gatsby/src/schema/print.ts
+++ b/packages/gatsby/src/schema/print.ts
@@ -108,8 +108,8 @@ const printDescription = (
   const lines = descriptionLines(description, 120 - indentation.length)
 
   const text = lines.join(`\n`)
-  const preferMultipleLines = text.length > 70
-  const blockString = printBlockString(text, ``, preferMultipleLines)
+  const isMultiline = text.length > 70
+  const blockString = printBlockString(text, { minimize: !isMultiline })
   const prefix = indentation && !firstInBlock ? `\n` + indentation : indentation
 
   return prefix + blockString.replace(/\n/g, `\n` + indentation) + `\n`
diff --git a/packages/gatsby/src/schema/types/type-builders.ts b/packages/gatsby/src/schema/types/type-builders.ts
index 399e46a5ffd7c..9ab40435ae44a 100644
--- a/packages/gatsby/src/schema/types/type-builders.ts
+++ b/packages/gatsby/src/schema/types/type-builders.ts
@@ -39,7 +39,7 @@ export type GatsbyGraphQLType<TSource, TContext> =
     }
   | {
       kind: GatsbyGraphQLTypeKind.SCALAR
-      config: ComposeScalarTypeConfig
+      config: ComposeScalarTypeConfig<any, any>
     }
 
 function buildObjectType<TSource, TContext>(
@@ -88,7 +88,7 @@ function buildEnumType<TSource, TContext>(
 }
 
 function buildScalarType<TSource, TContext>(
-  config: ComposeScalarTypeConfig
+  config: ComposeScalarTypeConfig<any, any>
 ): GatsbyGraphQLType<TSource, TContext> {
   return {
     kind: GatsbyGraphQLTypeKind.SCALAR,
diff --git a/packages/gatsby/src/utils/__tests__/prepare-regex.js b/packages/gatsby/src/utils/__tests__/prepare-regex.js
index e849cffb88435..06e40614d7517 100644
--- a/packages/gatsby/src/utils/__tests__/prepare-regex.js
+++ b/packages/gatsby/src/utils/__tests__/prepare-regex.js
@@ -38,15 +38,14 @@ describe(`Prepare regex for filtering`, () => {
       },
     })
     const schema = new GraphQLSchema({ query: QueryType })
-    /* prettier-ignore */
-    const results = await graphql(
+    const results = await graphql({
       schema,
-      `
+      source: `
         {
           regex(regex: "/\\\\w+/")
         }
-      `
-    )
+      `,
+    })
     expect(results.errors).toBeUndefined()
     expect(results.data).toEqual({ regex: `/\\w+/` })
 
diff --git a/packages/gatsby/src/utils/graphql-typegen/file-writes.ts b/packages/gatsby/src/utils/graphql-typegen/file-writes.ts
index 04a4b80f6d5f5..bdf3ac2e2a183 100644
--- a/packages/gatsby/src/utils/graphql-typegen/file-writes.ts
+++ b/packages/gatsby/src/utils/graphql-typegen/file-writes.ts
@@ -70,9 +70,7 @@ export async function writeGraphQLSchema(
   schema: GraphQLSchema
 ): Promise<void> {
   try {
-    const schemaSDLString = printSchema(stabilizeSchema(schema), {
-      commentDescriptions: true,
-    })
+    const schemaSDLString = printSchema(stabilizeSchema(schema))
 
     await fs.outputFile(join(directory, OUTPUT_PATHS.schema), schemaSDLString)
     reporter.verbose(`Successfully created schema.graphql`)
diff --git a/packages/gatsby/src/utils/start-server.ts b/packages/gatsby/src/utils/start-server.ts
index d834448810256..1806c7796fd46 100644
--- a/packages/gatsby/src/utils/start-server.ts
+++ b/packages/gatsby/src/utils/start-server.ts
@@ -6,12 +6,7 @@ import express from "express"
 import compression from "compression"
 import { graphqlHTTP, OptionsData } from "express-graphql"
 import graphiqlExplorer from "gatsby-graphiql-explorer"
-import {
-  formatError,
-  FragmentDefinitionNode,
-  GraphQLFormattedError,
-  Kind,
-} from "graphql"
+import { FragmentDefinitionNode, GraphQLFormattedError, Kind } from "graphql"
 import { slash, uuid } from "gatsby-core-utils"
 import http from "http"
 import https from "https"
@@ -213,11 +208,9 @@ export async function startServer(
           context: {},
           customContext: schemaCustomization.context,
         }),
-        customFormatErrorFn(
-          err
-        ): GraphQLFormattedError<{ stack: Array<string> }> {
+        customFormatErrorFn(err): GraphQLFormattedError {
           return {
-            ...formatError(err),
+            ...err.toJSON(),
             extensions: {
               stack: err.stack ? err.stack.split(`\n`) : [],
             },
diff --git a/packages/gatsby/src/utils/worker/__tests__/test-helpers/child-for-tests.ts b/packages/gatsby/src/utils/worker/__tests__/test-helpers/child-for-tests.ts
index 95f2fbee71c81..d0e10bbfcf08b 100644
--- a/packages/gatsby/src/utils/worker/__tests__/test-helpers/child-for-tests.ts
+++ b/packages/gatsby/src/utils/worker/__tests__/test-helpers/child-for-tests.ts
@@ -112,17 +112,17 @@ const runQuery = (
   schemaComposer,
   query: string
 ): Promise<ExecutionResult> =>
-  graphql(
+  graphql({
     schema,
-    query,
-    undefined,
-    withResolverContext({
+    source: query,
+    rootValue: undefined,
+    contextValue: withResolverContext({
       schema,
       schemaComposer,
       context: {},
       customContext: {},
-    })
-  )
+    }),
+  })
 
 // test: schema
 export async function getRunQueryResult(
diff --git a/yarn.lock b/yarn.lock
index 90545bb6d254a..2fa1d1d4f4f2c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -12021,10 +12021,10 @@ graphiql@^2.0.6:
     graphql-language-service "^5.1.0"
     markdown-it "^12.2.0"
 
-graphql-compose@^9.0.7:
-  version "9.0.7"
-  resolved "https://registry.yarnpkg.com/graphql-compose/-/graphql-compose-9.0.7.tgz#f9a2161d89691506466258ef54f279cbdd7ffeec"
-  integrity sha512-1EreO/vtdF/vaXYtPGW/RIlJbAAe8bWJ0mlvIa3s4YytsydbqiIFv80QUNlD9Bdl9iezLze70a6quC+3BAMzjw==
+graphql-compose@^9.0.9:
+  version "9.0.9"
+  resolved "https://registry.yarnpkg.com/graphql-compose/-/graphql-compose-9.0.9.tgz#ca919ce61cf5ec0545e5ce123bda2051c7c78a1e"
+  integrity sha512-kEXdwuBk7GKaThWY7eKDP+GLF9pGrGuMpYLu3O5w+lwDsgsfdiUCEC8jTsuPjm1qz9AxsspZHqc3jA4vKwyiNg==
   dependencies:
     graphql-type-json "0.3.2"
 
@@ -12059,12 +12059,7 @@ graphql-type-json@0.3.2:
   resolved "https://registry.yarnpkg.com/graphql-type-json/-/graphql-type-json-0.3.2.tgz#f53a851dbfe07bd1c8157d24150064baab41e115"
   integrity sha512-J+vjof74oMlCWXSvt0DOf2APEdZOCdubEvGDUAlqH//VBYcOYsGgRW7Xzorr44LvkjiuvecWc8fChxuZZbChtg==
 
-graphql@^15.7.2, graphql@^15.8.0:
-  version "15.8.0"
-  resolved "https://registry.yarnpkg.com/graphql/-/graphql-15.8.0.tgz#33410e96b012fa3bdb1091cc99a94769db212b38"
-  integrity sha512-5gghUc24tP9HRznNpV2+FIoq3xKkj5dTQqf4v0CpdPbFVwFkWoxOM+o+2OC9ZSvjEMTjfmG9QT+gcvggTwW1zw==
-
-graphql@^16.3.0:
+graphql@^16.3.0, graphql@^16.6.0:
   version "16.6.0"
   resolved "https://registry.yarnpkg.com/graphql/-/graphql-16.6.0.tgz#c2dcffa4649db149f6282af726c8c83f1c7c5fdb"
   integrity sha512-KPIBPDlW7NxrbT/eh4qPXz5FiFdL5UbaA0XUNz2Rp3Z3hqBSkbj0GVjwFDztsWVauZUWsbKHgMg++sk8UX0bkw==