diff --git a/.eslintignore b/.eslintignore
index 3a4f3989dbcdf..e6c2203b7bb13 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1 +1,2 @@
-interfaces
\ No newline at end of file
+interfaces
+**/__tests__/fixtures/
diff --git a/.eslintrc b/.eslintrc
index 6ecc7c48c5e5e..960579931c9e8 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -69,5 +69,20 @@
         "ignore": ["children"]
       }
     ]
-  }
+  },
+  "overrides": [
+    {
+      "files": [
+        "packages/**/gatsby-browser.js",
+        "pacakges/gatsby/cache-dir/**/*"
+      ],
+      "env": {
+        "browser": true
+      },
+      "globals": {
+        "___loader": false,
+        "___emitter": false
+      }
+    }
+  ]
 }
diff --git a/.travis.yml b/.travis.yml
index 15d374da163f3..24e4651bcd3a3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,4 +17,4 @@ install:
   - yarn run bootstrap
 
 script:
-  - npm test
+  - yarn test
diff --git a/examples/using-gatsby-image/src/pages/index.js b/examples/using-gatsby-image/src/pages/index.js
index c4046c236cc4c..74b2be6e084b7 100644
--- a/examples/using-gatsby-image/src/pages/index.js
+++ b/examples/using-gatsby-image/src/pages/index.js
@@ -26,7 +26,7 @@ class IndexComponent extends React.Component {
           <p>
             <a href="https://www.gatsbyjs.org/packages/gatsby-image/">
               gatsby-image
-            </a>{" "}
+            </a>{` `}
             is the official Image component for use in building Gatsby websites.
             It provides the fastest, most optimized image loading performance
             possible for Gatsby (and other React) websites.
@@ -39,7 +39,7 @@ class IndexComponent extends React.Component {
           <p>
             <a href="https://github.com/gatsbyjs/gatsby/blob/master/examples/using-gatsby-image/">
               See the site source
-            </a>{" "}
+            </a>{` `}
             on how to start using gatsby-image on your site. Full documentation
             coming soon.
           </p>
diff --git a/package.json b/package.json
index 41d99e75ae713..5a0231eb0dc8a 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
     "format-scripts": "prettier-eslint --write \"scripts/**/*.js\"",
     "format-www": "prettier-eslint --write \"www/*.js\" \"www/src/**/*.js\"",
     "lerna": "lerna",
-    "lint": "npm run check-versions && eslint --ext .js,.jsx --ignore-path .gitignore .",
+    "lint": "eslint --ext .js,.jsx packages/**/src",
     "lint:flow": "babel-node scripts/flow-check.js",
     "plop": "plop",
     "bootstrap": "yarn && npm run check-versions && lerna run prepublish",
@@ -56,7 +56,7 @@
     "publish-canary": "lerna publish --canary --yes",
     "publish-next": "lerna publish --npm-tag=next",
     "remotedev": "remotedev --hostname=localhost --port=19999",
-    "test": "jest",
+    "test": "yarn run lint && jest",
     "test:update": "jest --updateSnapshot",
     "test:watch": "jest --watch",
     "test_bkup": "npm run lint && npm run test-node && npm run test-integration",
diff --git a/packages/gatsby-dev-cli/src/watch.js b/packages/gatsby-dev-cli/src/watch.js
index 4db686cee6baa..47d87cf287703 100644
--- a/packages/gatsby-dev-cli/src/watch.js
+++ b/packages/gatsby-dev-cli/src/watch.js
@@ -13,7 +13,8 @@ const debouncedQuit = _.debounce(() => {
 const copyPath = (oldPath, newPath, quiet) => {
   fs.copy(oldPath, newPath, err => {
     if (err) {
-      return console.error(err)
+      console.error(err)
+      return
     }
 
     numCopied += 1
@@ -28,7 +29,7 @@ function watch(root, packages, { scanOnce, quiet }) {
     const prefix = syspath.join(root, `/packages/`, p)
 
     const ignoreRegs = [
-      /[\/\\]node_modules[\/\\]/i,
+      /[/\\]node_modules[/\\]/i,
       /\.git/i,
       new RegExp(`${p}[\\/\\\\]src[\\/\\\\]`, `i`),
     ]
diff --git a/packages/gatsby-image/.eslintrc b/packages/gatsby-image/.eslintrc
new file mode 100644
index 0000000000000..5c9fc4c255341
--- /dev/null
+++ b/packages/gatsby-image/.eslintrc
@@ -0,0 +1,2 @@
+env:
+  browser: true
diff --git a/packages/gatsby-image/src/index.js b/packages/gatsby-image/src/index.js
index 01740af2656c5..aa5dd5e57a791 100644
--- a/packages/gatsby-image/src/index.js
+++ b/packages/gatsby-image/src/index.js
@@ -49,7 +49,7 @@ const Img = props => {
 
 Img.propTypes = {
   opacity: PropTypes.number,
-  onLoad: PropTypes.func
+  onLoad: PropTypes.func,
 }
 
 class Image extends React.Component {
diff --git a/packages/gatsby-link/.eslintrc b/packages/gatsby-link/.eslintrc
new file mode 100644
index 0000000000000..6f3b6683ff79e
--- /dev/null
+++ b/packages/gatsby-link/.eslintrc
@@ -0,0 +1,4 @@
+env:
+  browser: true
+globals:
+  ___loader: false
diff --git a/packages/gatsby-link/src/__tests__/index.js b/packages/gatsby-link/src/__tests__/index.js
index 3ccbc7629320d..dbc70acff3916 100644
--- a/packages/gatsby-link/src/__tests__/index.js
+++ b/packages/gatsby-link/src/__tests__/index.js
@@ -1,5 +1,3 @@
-import React from "react"
-
 const getInstance = (props, pathPrefix = ``) => {
   Object.assign(global.window, {
     __PREFIX_PATHS__: pathPrefix ? true : false,
diff --git a/packages/gatsby-link/src/index.js b/packages/gatsby-link/src/index.js
index 2c58f5c435024..1560cfbdb2fd9 100644
--- a/packages/gatsby-link/src/index.js
+++ b/packages/gatsby-link/src/index.js
@@ -28,11 +28,6 @@ class GatsbyLink extends React.Component {
       to: normalizePath(pathPrefix + props.to),
     }
   }
-  propTypes: {
-    ...NavLinkPropTypes,
-    to: PropTypes.string.isRequired,
-    onClick: PropTypes.func,
-  }
 
   componentWillReceiveProps(nextProps) {
     if (this.props.to !== nextProps.to) {
@@ -49,16 +44,19 @@ class GatsbyLink extends React.Component {
 
   render() {
     const { onClick, ...rest } = this.props
+    let El
     if (Object.keys(NavLinkPropTypes).some(propName => this.props[propName])) {
-      var El = NavLink
+      El = NavLink
     } else {
-      var El = Link
+      El = Link
     }
 
     return (
       <El
         onClick={e => {
+          // eslint-disable-line
           onClick && onClick(e)
+
           if (
             e.button === 0 && // ignore right clicks
             !this.props.target && // let browser handle "target=_blank"
@@ -104,6 +102,12 @@ class GatsbyLink extends React.Component {
   }
 }
 
+GatsbyLink.propTypes = {
+  ...NavLinkPropTypes,
+  to: PropTypes.string.isRequired,
+  onClick: PropTypes.func,
+}
+
 GatsbyLink.contextTypes = {
   router: PropTypes.object,
 }
diff --git a/packages/gatsby-module-loader/src/patch.js b/packages/gatsby-module-loader/src/patch.js
index d4383d2e52ab2..9f6595f4aa1d4 100644
--- a/packages/gatsby-module-loader/src/patch.js
+++ b/packages/gatsby-module-loader/src/patch.js
@@ -1,3 +1,4 @@
+/* global document: false, __webpack_require__: false */
 patch()
 
 function patch() {
diff --git a/packages/gatsby-plugin-catch-links/.eslintrc b/packages/gatsby-plugin-catch-links/.eslintrc
new file mode 100644
index 0000000000000..5c9fc4c255341
--- /dev/null
+++ b/packages/gatsby-plugin-catch-links/.eslintrc
@@ -0,0 +1,2 @@
+env:
+  browser: true
diff --git a/packages/gatsby-plugin-glamor/src/gatsby-ssr.js b/packages/gatsby-plugin-glamor/src/gatsby-ssr.js
index ffb5d658f056d..0bc84f63b7338 100644
--- a/packages/gatsby-plugin-glamor/src/gatsby-ssr.js
+++ b/packages/gatsby-plugin-glamor/src/gatsby-ssr.js
@@ -14,9 +14,14 @@ exports.replaceRenderer = ({
   replaceBodyHTMLString(html)
 
   setHeadComponents([
-    <style id="glamor-styles" dangerouslySetInnerHTML={{ __html: css }} />,
+    <style
+      id="glamor-styles"
+      key="glamor-styles"
+      dangerouslySetInnerHTML={{ __html: css }}
+    />,
     <script
       id="glamor-ids"
+      key="glamor-ids"
       dangerouslySetInnerHTML={{
         __html: `
         // <![CDATA[
diff --git a/packages/gatsby-plugin-google-analytics/src/gatsby-browser.js b/packages/gatsby-plugin-google-analytics/src/gatsby-browser.js
index 1355d0aab43e2..f7e5891cd0daa 100644
--- a/packages/gatsby-plugin-google-analytics/src/gatsby-browser.js
+++ b/packages/gatsby-plugin-google-analytics/src/gatsby-browser.js
@@ -1,7 +1,7 @@
 exports.onRouteUpdate = function({ location }) {
   // Don't track while developing.
   if (process.env.NODE_ENV === `production` && typeof ga === `function`) {
-    ga(`set`, `page`, (location || {}).pathname)
-    ga(`send`, `pageview`)
+    window.ga(`set`, `page`, (location || {}).pathname)
+    window.ga(`send`, `pageview`)
   }
 }
diff --git a/packages/gatsby-plugin-google-analytics/src/gatsby-ssr.js b/packages/gatsby-plugin-google-analytics/src/gatsby-ssr.js
index ddb5f2c86c908..e72bedfa60d55 100644
--- a/packages/gatsby-plugin-google-analytics/src/gatsby-ssr.js
+++ b/packages/gatsby-plugin-google-analytics/src/gatsby-ssr.js
@@ -19,4 +19,6 @@ exports.onRenderBody = ({ setPostBodyComponents }, pluginOptions) => {
       />,
     ])
   }
+
+  return null
 }
diff --git a/packages/gatsby-plugin-netlify/src/build-headers-program.js b/packages/gatsby-plugin-netlify/src/build-headers-program.js
index babf73501804c..b648da0d9c326 100644
--- a/packages/gatsby-plugin-netlify/src/build-headers-program.js
+++ b/packages/gatsby-plugin-netlify/src/build-headers-program.js
@@ -1,9 +1,8 @@
 import _ from "lodash"
-import { writeFile } from "fs-extra"
+import { writeFile, existsSync } from "fs-extra"
 import { HEADER_COMMENT } from "./constants"
 
 import {
-  ROOT_WILDCARD,
   COMMON_BUNDLES,
   SECURITY_HEADERS,
   CACHING_HEADERS,
@@ -93,7 +92,7 @@ function transformLink(manifest, publicFolder, pathPrefix) {
       const hashed = manifest[file]
       if (hashed) {
         return `${prefix}${pathPrefix}${hashed}${suffix}`
-      } else if (fs.existsSync(publicFolder(file))) {
+      } else if (existsSync(publicFolder(file))) {
         return `${prefix}${pathPrefix}${file}${suffix}`
       } else {
         throw new Error(
diff --git a/packages/gatsby-plugin-netlify/src/create-redirects.js b/packages/gatsby-plugin-netlify/src/create-redirects.js
index f4e4fb81fbef2..7ad4b94f268ac 100644
--- a/packages/gatsby-plugin-netlify/src/create-redirects.js
+++ b/packages/gatsby-plugin-netlify/src/create-redirects.js
@@ -4,33 +4,33 @@ import { appendFile, exists, readFile, writeFile } from "fs-extra"
 export default async function writeRedirectsFile(pluginData, redirects) {
   const { publicFolder } = pluginData
 
-  if (redirects.length > 0) {
-    const FILE_PATH = publicFolder(`_redirects`)
-
-    // Map redirect data to the format Netlify expects
-    // https://www.netlify.com/docs/redirects/
-    redirects = redirects.map(redirect => {
-      const status = redirect.isPermanent ? 301 : 302
-      return `${redirect.fromPath}  ${redirect.toPath}  ${status}`
-    })
-
-    let appendToFile = false
-
-    // Websites may also have statically defined redirects
-    // In that case we should append to them (not overwrite)
-    // Make sure we aren't just looking at previous build results though
-    const fileExists = await exists(FILE_PATH)
-    if (fileExists) {
-      const fileContents = await readFile(FILE_PATH)
-      if (fileContents.indexOf(HEADER_COMMENT) < 0) {
-        appendToFile = true
-      }
-    }
+  if (!redirects.length) return null
+
+  const FILE_PATH = publicFolder(`_redirects`)
+
+  // Map redirect data to the format Netlify expects
+  // https://www.netlify.com/docs/redirects/
+  redirects = redirects.map(redirect => {
+    const status = redirect.isPermanent ? 301 : 302
+    return `${redirect.fromPath}  ${redirect.toPath}  ${status}`
+  })
 
-    const data = `${HEADER_COMMENT}\n\n${redirects.join(`\n`)}`
+  let appendToFile = false
 
-    return appendToFile
-      ? appendFile(FILE_PATH, `\n\n${data}`)
-      : writeFile(FILE_PATH, data)
+  // Websites may also have statically defined redirects
+  // In that case we should append to them (not overwrite)
+  // Make sure we aren't just looking at previous build results though
+  const fileExists = await exists(FILE_PATH)
+  if (fileExists) {
+    const fileContents = await readFile(FILE_PATH)
+    if (fileContents.indexOf(HEADER_COMMENT) < 0) {
+      appendToFile = true
+    }
   }
+
+  const data = `${HEADER_COMMENT}\n\n${redirects.join(`\n`)}`
+
+  return appendToFile
+    ? appendFile(FILE_PATH, `\n\n${data}`)
+    : writeFile(FILE_PATH, data)
 }
diff --git a/packages/gatsby-plugin-react-css-modules/src/__tests__/gatsby-node.js b/packages/gatsby-plugin-react-css-modules/src/__tests__/gatsby-node.js
index 30e8aa0c171e8..78c4ce294ff78 100644
--- a/packages/gatsby-plugin-react-css-modules/src/__tests__/gatsby-node.js
+++ b/packages/gatsby-plugin-react-css-modules/src/__tests__/gatsby-node.js
@@ -17,7 +17,7 @@ describe(`gatsby-plugin-react-css-modules`, () => {
 
   it(`includes custom options when modifying babelrc`, () => {
     const options = {
-      exclude: `\/global\/`,
+      exclude: `/global/`,
       filetypes: {
         ".scss": { syntax: `postcss-scss` },
       },
diff --git a/packages/gatsby-plugin-twitter/src/gatsby-browser.js b/packages/gatsby-plugin-twitter/src/gatsby-browser.js
index def55b758a949..88ac2acca4ff2 100644
--- a/packages/gatsby-plugin-twitter/src/gatsby-browser.js
+++ b/packages/gatsby-plugin-twitter/src/gatsby-browser.js
@@ -1,9 +1,9 @@
 exports.onRouteUpdate = function({ location }) {
   if (
     typeof twttr !== `undefined` &&
-    twttr.widgets &&
-    typeof twttr.widgets.load === `function`
+    window.twttr.widgets &&
+    typeof window.twttr.widgets.load === `function`
   ) {
-    twttr.widgets.load()
+    window.twttr.widgets.load()
   }
 }
diff --git a/packages/gatsby-react-router-scroll/.eslintrc b/packages/gatsby-react-router-scroll/.eslintrc
new file mode 100644
index 0000000000000..d48b606212fe6
--- /dev/null
+++ b/packages/gatsby-react-router-scroll/.eslintrc
@@ -0,0 +1,4 @@
+env:
+  browser: true
+globals:
+  __DEV__: false
diff --git a/packages/gatsby-remark-responsive-iframe/src/index.js b/packages/gatsby-remark-responsive-iframe/src/index.js
index b521ace0a8782..b1aeba3de55c1 100644
--- a/packages/gatsby-remark-responsive-iframe/src/index.js
+++ b/packages/gatsby-remark-responsive-iframe/src/index.js
@@ -15,7 +15,7 @@ module.exports = ({ markdownAST }, pluginOptions = {}) =>
       if (iframe) {
         const width = iframe.attr(`width`)
         const height = iframe.attr(`height`)
-        const src = iframe.attr(`src`)
+
         if (width && height) {
           $(`iframe, object`).attr(
             `style`,
diff --git a/packages/gatsby-remark-smartypants/src/__tests__/index.js b/packages/gatsby-remark-smartypants/src/__tests__/index.js
index c231be9c689b5..16cc58c7251e4 100644
--- a/packages/gatsby-remark-smartypants/src/__tests__/index.js
+++ b/packages/gatsby-remark-smartypants/src/__tests__/index.js
@@ -11,7 +11,7 @@ const remark = new Remark().data(`settings`, {
 
 describe(`gatsby-remark-smartypants`, () => {
   it(`applies smartypants to text nodes`, () => {
-    const sentence = `He said, "A \'simple\' english sentence. . .`
+    const sentence = `He said, "A 'simple' english sentence. . .`
 
     const markdownAST = remark.parse(`
 ${sentence}
diff --git a/packages/gatsby-remark-smartypants/src/index.js b/packages/gatsby-remark-smartypants/src/index.js
index 3c17de3402d08..9570bf73aeddc 100644
--- a/packages/gatsby-remark-smartypants/src/index.js
+++ b/packages/gatsby-remark-smartypants/src/index.js
@@ -1,7 +1,6 @@
 const retext = require(`retext`)
 const visit = require(`unist-util-visit`)
 const smartypants = require(`retext-smartypants`)
-const _ = require(`lodash`)
 
 module.exports = ({ markdownAST }, pluginOptions = {}) => {
   visit(markdownAST, `text`, node => {
diff --git a/packages/gatsby-source-contentful/src/extend-node-type.js b/packages/gatsby-source-contentful/src/extend-node-type.js
index 688444dd3ee3d..32665a0e1ec45 100644
--- a/packages/gatsby-source-contentful/src/extend-node-type.js
+++ b/packages/gatsby-source-contentful/src/extend-node-type.js
@@ -75,7 +75,6 @@ const isImage = image =>
 const getBase64Image = (imgUrl, args = {}) => {
   const requestUrl = `https:${imgUrl}?w=20`
   // TODO add caching.
-  const urlArgs = { width: 20, height: 20 / args.aspectRatio }
   return new Promise(resolve => {
     base64Img.requestBase64(requestUrl, (a, b, body) => {
       resolve(body)
@@ -122,216 +121,215 @@ const createUrl = (imgUrl, options = {}) => {
 exports.createUrl = createUrl
 
 const resolveResponsiveResolution = (image, options) => {
-  if (isImage(image)) {
-    return new Promise(resolve => {
-      getBase64ImageAndBasicMeasurements(
-        image,
-        options
-      ).then(({ contentType, base64Str, width, height, aspectRatio }) => {
-        let desiredAspectRatio = aspectRatio
-
-        // If we're cropping, calculate the specified aspect ratio.
-        if (options.height) {
-          desiredAspectRatio = options.width / options.height
-        }
+  if (!isImage(image)) return null
 
-        // If the user selected a height (so cropping) and options for focus
-        // and fit aren't set, we'll set our defaults
-        if (options.height) {
-          if (!options.resizingBehavior) {
-            options.resizingBehavior = `fill`
-          }
-          if (!options.cropFocus) {
-            options.cropFocus = `faces`
-          }
-        }
+  return new Promise(resolve => {
+    getBase64ImageAndBasicMeasurements(
+      image,
+      options
+    ).then(({ contentType, base64Str, width, height, aspectRatio }) => {
+      let desiredAspectRatio = aspectRatio
+
+      // If we're cropping, calculate the specified aspect ratio.
+      if (options.height) {
+        desiredAspectRatio = options.width / options.height
+      }
 
-        // Create sizes (in width) for the image. If the width of the
-        // image is 800px, the sizes would then be: 800, 1200, 1600,
-        // 2400.
-        //
-        // This is enough sizes to provide close to the optimal image size for every
-        // device size / screen resolution
-        let sizes = []
-        sizes.push(options.width)
-        sizes.push(options.width * 1.5)
-        sizes.push(options.width * 2)
-        sizes.push(options.width * 3)
-        sizes = sizes.map(Math.round)
-
-        // Filter out sizes larger than the image's width.
-        const filteredSizes = sizes.filter(size => size < width)
-
-        // Sort sizes for prettiness.
-        const sortedSizes = _.sortBy(filteredSizes)
-
-        // Create the srcSet.
-        const srcSet = sortedSizes
-          .map((size, i) => {
-            let resolution
-            switch (i) {
-              case 0:
-                resolution = `1x`
-                break
-              case 1:
-                resolution = `1.5x`
-                break
-              case 2:
-                resolution = `2x`
-                break
-              case 3:
-                resolution = `3x`
-                break
-              default:
-            }
-            const h = Math.round(size / desiredAspectRatio)
-            return `${createUrl(image.file.url, {
-              ...options,
-              width: size,
-              height: h,
-            })} ${resolution}`
-          })
-          .join(`,\n`)
-
-        let pickedHeight
-        if (options.height) {
-          pickedHeight = options.height
-        } else {
-          pickedHeight = options.width / desiredAspectRatio
+      // If the user selected a height (so cropping) and options for focus
+      // and fit aren't set, we'll set our defaults
+      if (options.height) {
+        if (!options.resizingBehavior) {
+          options.resizingBehavior = `fill`
         }
+        if (!options.cropFocus) {
+          options.cropFocus = `faces`
+        }
+      }
+
+      // Create sizes (in width) for the image. If the width of the
+      // image is 800px, the sizes would then be: 800, 1200, 1600,
+      // 2400.
+      //
+      // This is enough sizes to provide close to the optimal image size for every
+      // device size / screen resolution
+      let sizes = []
+      sizes.push(options.width)
+      sizes.push(options.width * 1.5)
+      sizes.push(options.width * 2)
+      sizes.push(options.width * 3)
+      sizes = sizes.map(Math.round)
 
-        return resolve({
-          base64: base64Str,
-          aspectRatio: aspectRatio,
-          width: Math.round(options.width),
-          height: Math.round(pickedHeight),
-          src: createUrl(image.file.url, {
+      // Filter out sizes larger than the image's width.
+      const filteredSizes = sizes.filter(size => size < width)
+
+      // Sort sizes for prettiness.
+      const sortedSizes = _.sortBy(filteredSizes)
+
+      // Create the srcSet.
+      const srcSet = sortedSizes
+        .map((size, i) => {
+          let resolution
+          switch (i) {
+            case 0:
+              resolution = `1x`
+              break
+            case 1:
+              resolution = `1.5x`
+              break
+            case 2:
+              resolution = `2x`
+              break
+            case 3:
+              resolution = `3x`
+              break
+            default:
+          }
+          const h = Math.round(size / desiredAspectRatio)
+          return `${createUrl(image.file.url, {
             ...options,
-            width: options.width,
-          }),
-          srcSet,
+            width: size,
+            height: h,
+          })} ${resolution}`
         })
+        .join(`,\n`)
+
+      let pickedHeight
+      if (options.height) {
+        pickedHeight = options.height
+      } else {
+        pickedHeight = options.width / desiredAspectRatio
+      }
+
+      return resolve({
+        base64: base64Str,
+        aspectRatio: aspectRatio,
+        width: Math.round(options.width),
+        height: Math.round(pickedHeight),
+        src: createUrl(image.file.url, {
+          ...options,
+          width: options.width,
+        }),
+        srcSet,
       })
     })
-    return null
-  }
+  })
 }
 exports.resolveResponsiveResolution = resolveResponsiveResolution
 
 const resolveResponsiveSizes = (image, options) => {
-  if (isImage(image)) {
-    return new Promise(resolve => {
-      getBase64ImageAndBasicMeasurements(
-        image,
-        options
-      ).then(({ contentType, base64Str, width, height, aspectRatio }) => {
-        let desiredAspectRatio = aspectRatio
-
-        // If we're cropping, calculate the specified aspect ratio.
-        if (options.maxHeight) {
-          desiredAspectRatio = options.maxWidth / options.maxHeight
-        }
+  if (!isImage(image)) return null
+  return new Promise(resolve => {
+    getBase64ImageAndBasicMeasurements(
+      image,
+      options
+    ).then(({ contentType, base64Str, width, height, aspectRatio }) => {
+      let desiredAspectRatio = aspectRatio
 
-        // If the users didn't set a default sizes, we'll make one.
-        if (!options.sizes) {
-          options.sizes = `(max-width: ${options.maxWidth}px) 100vw, ${options.maxWidth}px`
-        }
+      // If we're cropping, calculate the specified aspect ratio.
+      if (options.maxHeight) {
+        desiredAspectRatio = options.maxWidth / options.maxHeight
+      }
+
+      // If the users didn't set a default sizes, we'll make one.
+      if (!options.sizes) {
+        options.sizes = `(max-width: ${options.maxWidth}px) 100vw, ${options.maxWidth}px`
+      }
 
-        // Create sizes (in width) for the image. If the max width of the container
-        // for the rendered markdown file is 800px, the sizes would then be: 200,
-        // 400, 800, 1200, 1600, 2400.
-        //
-        // This is enough sizes to provide close to the optimal image size for every
-        // device size / screen resolution
-        let sizes = []
-        sizes.push(options.maxWidth / 4)
-        sizes.push(options.maxWidth / 2)
-        sizes.push(options.maxWidth)
-        sizes.push(options.maxWidth * 1.5)
-        sizes.push(options.maxWidth * 2)
-        sizes.push(options.maxWidth * 3)
-        sizes = sizes.map(Math.round)
-
-        // Filter out sizes larger than the image's maxWidth.
-        const filteredSizes = sizes.filter(size => size < width)
-
-        // Add the original image to ensure the largest image possible
-        // is available for small images.
-        filteredSizes.push(width)
-
-        // Sort sizes for prettiness.
-        const sortedSizes = _.sortBy(filteredSizes)
-
-        // Create the srcSet.
-        const srcSet = sortedSizes
-          .map(width => {
-            const h = Math.round(width * desiredAspectRatio)
-            return `${createUrl(image.file.url, {
-              ...options,
-              width,
-              height: h,
-            })} ${Math.round(width)}w`
-          })
-          .join(`,\n`)
-
-        return resolve({
-          base64: base64Str,
-          aspectRatio: aspectRatio,
-          src: createUrl(image.file.url, {
+      // Create sizes (in width) for the image. If the max width of the container
+      // for the rendered markdown file is 800px, the sizes would then be: 200,
+      // 400, 800, 1200, 1600, 2400.
+      //
+      // This is enough sizes to provide close to the optimal image size for every
+      // device size / screen resolution
+      let sizes = []
+      sizes.push(options.maxWidth / 4)
+      sizes.push(options.maxWidth / 2)
+      sizes.push(options.maxWidth)
+      sizes.push(options.maxWidth * 1.5)
+      sizes.push(options.maxWidth * 2)
+      sizes.push(options.maxWidth * 3)
+      sizes = sizes.map(Math.round)
+
+      // Filter out sizes larger than the image's maxWidth.
+      const filteredSizes = sizes.filter(size => size < width)
+
+      // Add the original image to ensure the largest image possible
+      // is available for small images.
+      filteredSizes.push(width)
+
+      // Sort sizes for prettiness.
+      const sortedSizes = _.sortBy(filteredSizes)
+
+      // Create the srcSet.
+      const srcSet = sortedSizes
+        .map(width => {
+          const h = Math.round(width * desiredAspectRatio)
+          return `${createUrl(image.file.url, {
             ...options,
-            width: options.maxWidth,
-            height: options.maxHeight,
-          }),
-          srcSet,
-          sizes: options.sizes,
+            width,
+            height: h,
+          })} ${Math.round(width)}w`
         })
+        .join(`,\n`)
+
+      return resolve({
+        base64: base64Str,
+        aspectRatio: aspectRatio,
+        src: createUrl(image.file.url, {
+          ...options,
+          width: options.maxWidth,
+          height: options.maxHeight,
+        }),
+        srcSet,
+        sizes: options.sizes,
       })
     })
-    return null
-  }
+  })
 }
 exports.resolveResponsiveSizes = resolveResponsiveSizes
 
 const resolveResize = (image, options) =>
   new Promise(resolve => {
-    if (isImage(image)) {
-      getBase64ImageAndBasicMeasurements(
-        image,
-        options
-      ).then(({ contentType, base64Str, width, height, aspectRatio }) => {
-        // If the user selected a height (so cropping) and options for focus
-        // and fit aren't set, we'll set our defaults
-        if (options.height) {
-          if (!options.resizingBehavior) {
-            options.resizingBehavior = `fill`
-          }
-          if (!options.cropFocus) {
-            options.cropFocus = `faces`
-          }
-        }
+    if (!isImage(image)) {
+      resolve()
+      return
+    }
 
-        if (options.base64) {
-          return resolve(base64Str)
-        } else {
-          const pickedWidth = options.width
-          let pickedHeight
-          if (options.height) {
-            pickedHeight = options.height
-          } else {
-            pickedHeight = pickedWidth / aspectRatio
-          }
-          resolve({
-            src: createUrl(image.file.url, options),
-            width: Math.round(pickedWidth),
-            height: Math.round(pickedHeight),
-            aspectRatio,
-            base64: base64Str,
-          })
+    getBase64ImageAndBasicMeasurements(
+      image,
+      options
+    ).then(({ contentType, base64Str, width, height, aspectRatio }) => {
+      // If the user selected a height (so cropping) and options for focus
+      // and fit aren't set, we'll set our defaults
+      if (options.height) {
+        if (!options.resizingBehavior) {
+          options.resizingBehavior = `fill`
         }
+        if (!options.cropFocus) {
+          options.cropFocus = `faces`
+        }
+      }
+
+      if (options.base64) {
+        resolve(base64Str)
+        return
+      }
+
+      const pickedWidth = options.width
+      let pickedHeight
+      if (options.height) {
+        pickedHeight = options.height
+      } else {
+        pickedHeight = pickedWidth / aspectRatio
+      }
+      resolve({
+        src: createUrl(image.file.url, options),
+        width: Math.round(pickedWidth),
+        height: Math.round(pickedHeight),
+        aspectRatio,
+        base64: base64Str,
       })
-    } else {
-      resolve()
-    }
+    })
   })
 
 exports.resolveResize = resolveResize
diff --git a/packages/gatsby-source-contentful/src/fetch.js b/packages/gatsby-source-contentful/src/fetch.js
index 05d46be279b55..2e5180c377056 100644
--- a/packages/gatsby-source-contentful/src/fetch.js
+++ b/packages/gatsby-source-contentful/src/fetch.js
@@ -63,21 +63,25 @@ module.exports = async ({ spaceId, accessToken, host, syncToken }) => {
     if (e) {
       return normalize.fixIds(e)
     }
+    return null
   })
   currentSyncData.assets = currentSyncData.assets.map(a => {
     if (a) {
       return normalize.fixIds(a)
     }
+    return null
   })
   currentSyncData.deletedEntries = currentSyncData.deletedEntries.map(e => {
     if (e) {
       return normalize.fixIds(e)
     }
+    return null
   })
   currentSyncData.deletedAssets = currentSyncData.deletedAssets.map(a => {
     if (a) {
       return normalize.fixIds(a)
     }
+    return null
   })
 
   return {
diff --git a/packages/gatsby-source-drupal/src/gatsby-node.js b/packages/gatsby-source-drupal/src/gatsby-node.js
index 4c4009e000fe2..5228cf1b785ad 100644
--- a/packages/gatsby-source-drupal/src/gatsby-node.js
+++ b/packages/gatsby-source-drupal/src/gatsby-node.js
@@ -78,8 +78,6 @@ exports.sourceNodes = async (
 
   const nodes = processEntities(result.data.data)
   nodes.forEach((node, i) => {
-    const nodeStr = JSON.stringify(node)
-
     const gatsbyNode = {
       ...node,
       children: [],
@@ -106,12 +104,10 @@ exports.sourceNodes = async (
   const userUrl = `${baseUrl}/jsonapi/user/user`
   const userResult = await axios.get(userUrl)
   const users = processEntities(userResult.data.data)
-  const blue = await Promise.all(
+  await Promise.all(
     users.map(
       (user, i) =>
         new Promise(resolve => {
-          const userStr = JSON.stringify(user)
-
           const gatsbyUser = {
             ...user,
             children: [],
@@ -122,7 +118,8 @@ exports.sourceNodes = async (
           }
 
           if (gatsbyUser.uid === 1) {
-            return resolve()
+            resolve()
+            return
           }
 
           axios
@@ -150,6 +147,4 @@ exports.sourceNodes = async (
         })
     )
   )
-
-  return
 }
diff --git a/packages/gatsby-source-filesystem/src/__tests__/gatsby-node.js b/packages/gatsby-source-filesystem/src/__tests__/gatsby-node.js
deleted file mode 100644
index cc96b0aae9174..0000000000000
--- a/packages/gatsby-source-filesystem/src/__tests__/gatsby-node.js
+++ /dev/null
@@ -1,3 +0,0 @@
-const { sourceNodes } = require(`../gatsby-node`)
-
-test(`it has a test`, () => {})
diff --git a/packages/gatsby-source-filesystem/src/create-remote-file-node.js b/packages/gatsby-source-filesystem/src/create-remote-file-node.js
index b9cbb5ae741d4..57923826f792c 100644
--- a/packages/gatsby-source-filesystem/src/create-remote-file-node.js
+++ b/packages/gatsby-source-filesystem/src/create-remote-file-node.js
@@ -9,7 +9,8 @@ const cacheId = url => `create-remote-file-node-${url}`
 module.exports = ({ url, store, cache, createNode }) =>
   new Promise(async (resolve, reject) => {
     if (!url) {
-      return resolve()
+      resolve()
+      return
     }
 
     // Ensure our cache directory exists.
diff --git a/packages/gatsby-source-hacker-news/src/gatsby-node.js b/packages/gatsby-source-hacker-news/src/gatsby-node.js
index cc54626d6d328..09b686356c41c 100644
--- a/packages/gatsby-source-hacker-news/src/gatsby-node.js
+++ b/packages/gatsby-source-hacker-news/src/gatsby-node.js
@@ -13,7 +13,7 @@ exports.sourceNodes = async ({
   getNode,
   hasNodeChanged,
 }) => {
-  const { createNode, updateSourcePluginStatus } = boundActionCreators
+  const { createNode } = boundActionCreators
 
   // Do the initial fetch
   console.time(`fetch HN data`)
@@ -162,7 +162,5 @@ fragment commentsFragment on HackerNewsItem {
     createCommentNodes(kids.kids, story.id)
   })
 
-  const ready = true
-
   return
 }
diff --git a/packages/gatsby-source-lever/src/normalize.js b/packages/gatsby-source-lever/src/normalize.js
index 99777951f80dc..8df8c38bc2d77 100644
--- a/packages/gatsby-source-lever/src/normalize.js
+++ b/packages/gatsby-source-lever/src/normalize.js
@@ -1,6 +1,5 @@
 const crypto = require(`crypto`)
 const deepMapKeys = require(`deep-map-keys`)
-const _ = require(`lodash`)
 const uuidv5 = require(`uuid/v5`)
 const stringify = require(`json-stringify-safe`)
 
diff --git a/packages/gatsby-source-mongodb/src/gatsby-node.js b/packages/gatsby-source-mongodb/src/gatsby-node.js
index e4907367a12d0..8055cd93b6017 100644
--- a/packages/gatsby-source-mongodb/src/gatsby-node.js
+++ b/packages/gatsby-source-mongodb/src/gatsby-node.js
@@ -1,9 +1,7 @@
-const Db = require(`mongodb`).Db,
-  MongoClient = require(`mongodb`).MongoClient,
-  ObjectID = require(`mongodb`).ObjectID,
-  crypto = require(`crypto`),
-  createMappingChildNodes = require(`./mapping`),
-  _ = require(`lodash`)
+const MongoClient = require(`mongodb`).MongoClient
+const crypto = require(`crypto`)
+const createMappingChildNodes = require(`./mapping`)
+const _ = require(`lodash`)
 
 exports.sourceNodes = (
   { boundActionCreators, getNode, hasNodeChanged },
diff --git a/packages/gatsby-source-wordpress/src/fetch.js b/packages/gatsby-source-wordpress/src/fetch.js
index c6f0856f569e0..82caba401d511 100644
--- a/packages/gatsby-source-wordpress/src/fetch.js
+++ b/packages/gatsby-source-wordpress/src/fetch.js
@@ -1,6 +1,6 @@
 const querystring = require(`querystring`)
 const axios = require(`axios`)
-
+const _ = require(`lodash`)
 const colorized = require(`./output-color`)
 const httpExceptionHandler = require(`./http-exception-handler`)
 
@@ -248,7 +248,7 @@ async function fetchData({
  * @returns
  */
 async function getPages(
-  { url, _perPage, _hostingWPCOM, _auth, _accessToken },
+  { url, _perPage, _hostingWPCOM, _auth, _accessToken, _verbose },
   page = 1
 ) {
   try {
diff --git a/packages/gatsby-source-wordpress/src/gatsby-node.js b/packages/gatsby-source-wordpress/src/gatsby-node.js
index 2095ba76af4bc..ec0351d2a21cd 100644
--- a/packages/gatsby-source-wordpress/src/gatsby-node.js
+++ b/packages/gatsby-source-wordpress/src/gatsby-node.js
@@ -1,13 +1,4 @@
-const crypto = require(`crypto`)
-const querystring = require(`querystring`)
-const _ = require(`lodash`)
-const stringify = require(`json-stringify-safe`)
-const { createRemoteFileNode } = require(`gatsby-source-filesystem`)
-const path = require(`path`)
-
 const fetch = require(`./fetch`)
-const colorized = require(`./output-color`)
-const httpExceptionHandler = require(`./http-exception-handler`)
 const normalize = require(`./normalize`)
 
 const typePrefix = `wordpress__`
@@ -21,12 +12,10 @@ const refactoredEntityTypes = {
 /* If true, will output many console logs. */
 let _verbose
 let _siteURL
-let _getNode
 let _useACF = true
 let _hostingWPCOM
 let _auth
 let _perPage
-let _accessToken
 
 exports.sourceNodes = async (
   { boundActionCreators, getNode, store, cache },
@@ -43,7 +32,6 @@ exports.sourceNodes = async (
   const { createNode } = boundActionCreators
   _verbose = verboseOutput
   _siteURL = `${protocol}://${baseUrl}`
-  _getNode = getNode
   _useACF = useACF
   _hostingWPCOM = hostingWPCOM
   _auth = auth
diff --git a/packages/gatsby-source-wordpress/src/normalize.js b/packages/gatsby-source-wordpress/src/normalize.js
index 81be384bf990e..03dda7b4adbf8 100644
--- a/packages/gatsby-source-wordpress/src/normalize.js
+++ b/packages/gatsby-source-wordpress/src/normalize.js
@@ -342,7 +342,7 @@ const createACFChildNodes = (
 exports.createNodesFromEntities = ({ entities, createNode }) => {
   entities.forEach(e => {
     // Create subnodes for ACF Flexible layouts
-    let { __type, ...entity } = e
+    let { __type, ...entity } = e // eslint-disable-line no-unused-vars
     let children = []
     if (entity.acf) {
       _.each(entity.acf, (value, key) => {
diff --git a/packages/gatsby-transformer-javascript-static-exports/src/gatsby-node.js b/packages/gatsby-transformer-javascript-static-exports/src/gatsby-node.js
index afadd23b42bf5..95e51dbba7cbf 100644
--- a/packages/gatsby-transformer-javascript-static-exports/src/gatsby-node.js
+++ b/packages/gatsby-transformer-javascript-static-exports/src/gatsby-node.js
@@ -135,8 +135,6 @@ async function onCreateNode({
 
     createNode(nodeData)
     createParentChildLink({ parent: node, child: nodeData })
-
-    return
   }
 }
 
diff --git a/packages/gatsby-transformer-json/src/gatsby-node.js b/packages/gatsby-transformer-json/src/gatsby-node.js
index 663cc6bf1d203..568263db49c26 100644
--- a/packages/gatsby-transformer-json/src/gatsby-node.js
+++ b/packages/gatsby-transformer-json/src/gatsby-node.js
@@ -1,5 +1,3 @@
-const Promise = require(`bluebird`)
-const fs = require(`fs`)
 const _ = require(`lodash`)
 const crypto = require(`crypto`)
 
diff --git a/packages/gatsby-transformer-react-docgen/src/on-node-create.js b/packages/gatsby-transformer-react-docgen/src/on-node-create.js
index 3e4512d275859..a02fa7226f9e7 100644
--- a/packages/gatsby-transformer-react-docgen/src/on-node-create.js
+++ b/packages/gatsby-transformer-react-docgen/src/on-node-create.js
@@ -35,7 +35,7 @@ function createDescriptionNode(node, entry, boundActionCreators) {
 }
 
 function createPropNodes(node, component, boundActionCreators) {
-  const { createNode, updateNode } = boundActionCreators
+  const { createNode } = boundActionCreators
   let children = new Array(component.props.length)
 
   component.props.forEach((prop, i) => {
diff --git a/packages/gatsby-transformer-react-docgen/src/parse.js b/packages/gatsby-transformer-react-docgen/src/parse.js
index 394b67b4582b3..c68279df5a3a2 100644
--- a/packages/gatsby-transformer-react-docgen/src/parse.js
+++ b/packages/gatsby-transformer-react-docgen/src/parse.js
@@ -13,6 +13,7 @@ function getAssignedIdenifier(path) {
     if (types.isVariableDeclarator(property.node)) return property.node.id.name
     property = property.parentPath
   }
+  return null
 }
 
 let fileCount = 0
diff --git a/packages/gatsby-transformer-sharp/src/__tests__/gatsby-node.js b/packages/gatsby-transformer-sharp/src/__tests__/gatsby-node.js
index 8194d671afcbc..6604d85d3bcc6 100644
--- a/packages/gatsby-transformer-sharp/src/__tests__/gatsby-node.js
+++ b/packages/gatsby-transformer-sharp/src/__tests__/gatsby-node.js
@@ -1,5 +1,3 @@
-const Promise = require(`bluebird`)
-
 const { onCreateNode } = require(`../gatsby-node`)
 
 describe(`Process image nodes correctly`, () => {
diff --git a/packages/gatsby-transformer-toml/src/__tests__/gatsby-node.js b/packages/gatsby-transformer-toml/src/__tests__/gatsby-node.js
index 7e1425a6049ed..9286ecf7b6e67 100644
--- a/packages/gatsby-transformer-toml/src/__tests__/gatsby-node.js
+++ b/packages/gatsby-transformer-toml/src/__tests__/gatsby-node.js
@@ -1,6 +1,3 @@
-const Promise = require(`bluebird`)
-const _ = require(`lodash`)
-
 const { onCreateNode } = require(`../gatsby-node`)
 
 describe(`Process TOML nodes correctly`, () => {
diff --git a/packages/gatsby-transformer-yaml/src/gatsby-node.js b/packages/gatsby-transformer-yaml/src/gatsby-node.js
index f7b758b6b7e05..74939abef7061 100644
--- a/packages/gatsby-transformer-yaml/src/gatsby-node.js
+++ b/packages/gatsby-transformer-yaml/src/gatsby-node.js
@@ -1,5 +1,3 @@
-const select = require(`unist-util-select`)
-const fs = require(`fs`)
 const jsYaml = require(`js-yaml`)
 const _ = require(`lodash`)
 const crypto = require(`crypto`)
diff --git a/packages/gatsby/cache-dir/find-page.js b/packages/gatsby/cache-dir/find-page.js
index b8d6581556c86..f32c2f0ea16a4 100644
--- a/packages/gatsby/cache-dir/find-page.js
+++ b/packages/gatsby/cache-dir/find-page.js
@@ -59,7 +59,7 @@ module.exports = (pages, pathPrefix = ``) => rawPathname => {
       // Finally, try and match request with default document.
       if (
         matchPath(trimmedPathname, {
-          path: page.path + 'index.html'
+          path: page.path + `index.html`,
         })
       ) {
         foundPage = page
diff --git a/packages/gatsby/src/internal-plugins/component-layout-creator/gatsby-node.js b/packages/gatsby/src/internal-plugins/component-layout-creator/gatsby-node.js
index d0d3df108d31c..8af3386a4b53f 100644
--- a/packages/gatsby/src/internal-plugins/component-layout-creator/gatsby-node.js
+++ b/packages/gatsby/src/internal-plugins/component-layout-creator/gatsby-node.js
@@ -45,7 +45,7 @@ exports.createLayouts = async (
         .layouts.filter(p => p.component === path)
         .forEach(layout => {
           deleteLayout({ name: layout.name })
-          files = files.filter(f => f !== name)
+          files = files.filter(f => f !== layout.name)
         })
     })
     .on(`ready`, () => doneCb())
diff --git a/packages/gatsby/src/internal-plugins/dev-404-page/raw_dev-404-page.js b/packages/gatsby/src/internal-plugins/dev-404-page/raw_dev-404-page.js
index aa9ae57f30713..0c2151f4e5d90 100644
--- a/packages/gatsby/src/internal-plugins/dev-404-page/raw_dev-404-page.js
+++ b/packages/gatsby/src/internal-plugins/dev-404-page/raw_dev-404-page.js
@@ -1,7 +1,12 @@
+/* global graphql: false */
 import React from "react"
 import Link from "gatsby-link"
 
 class Dev404Page extends React.Component {
+  static propTypes = {
+    data: () => {},
+    location: () => {},
+  }
   render() {
     const pathname = this.props.location.pathname
     let newFilePath
@@ -16,7 +21,8 @@ class Dev404Page extends React.Component {
       <div>
         <h1>Gatsby.js development 404 page</h1>
         <p>
-          There's not a page yet at <code>{pathname}</code>
+          {`There's not a page yet at `}
+          <code>{pathname}</code>
         </p>
         <p>
           Create a React.js component in your site directory at
diff --git a/packages/gatsby/src/internal-plugins/query-runner/gatsby-node.js b/packages/gatsby/src/internal-plugins/query-runner/gatsby-node.js
index 2468777b0e688..613d9925e12d6 100644
--- a/packages/gatsby/src/internal-plugins/query-runner/gatsby-node.js
+++ b/packages/gatsby/src/internal-plugins/query-runner/gatsby-node.js
@@ -1,5 +1,4 @@
 const fs = require(`fs`)
-const path = require(`path`)
 const { joinPath } = require(`../../utils/path`)
 const { watchComponent } = require(`./query-watcher`)
 
diff --git a/packages/gatsby/src/internal-plugins/query-runner/page-query-runner.js b/packages/gatsby/src/internal-plugins/query-runner/page-query-runner.js
index a7c12bf0b2772..67c1645d62d26 100644
--- a/packages/gatsby/src/internal-plugins/query-runner/page-query-runner.js
+++ b/packages/gatsby/src/internal-plugins/query-runner/page-query-runner.js
@@ -99,6 +99,7 @@ const runQueriesForIds = ids => {
       if (plObj) {
         return queryRunner(plObj, state.components[plObj.component])
       }
+      return null
     })
   )
 }
diff --git a/packages/gatsby/src/internal-plugins/query-runner/query-compiler.js b/packages/gatsby/src/internal-plugins/query-runner/query-compiler.js
index 73edd8664e84c..c306562e07017 100644
--- a/packages/gatsby/src/internal-plugins/query-runner/query-compiler.js
+++ b/packages/gatsby/src/internal-plugins/query-runner/query-compiler.js
@@ -4,7 +4,6 @@ const normalize = require(`normalize-path`)
 import glob from "glob"
 
 import { validate } from "graphql"
-import invariant from "invariant"
 import { IRTransforms } from "relay-compiler"
 import ASTConvert from "relay-compiler/lib/ASTConvert"
 import RelayCompilerContext from "relay-compiler/lib/RelayCompilerContext"
diff --git a/packages/gatsby/src/internal-plugins/query-runner/query-printer.js b/packages/gatsby/src/internal-plugins/query-runner/query-printer.js
index 2aca767337757..98ab33b6b1e43 100644
--- a/packages/gatsby/src/internal-plugins/query-runner/query-printer.js
+++ b/packages/gatsby/src/internal-plugins/query-runner/query-printer.js
@@ -61,6 +61,7 @@ function print(node: Root | Fragment): string {
   } else {
     invariant(false, `RelayPrinter: Unsupported IR node \`%s\`.`, node.kind)
   }
+  return null
 }
 
 function printSelections(
diff --git a/packages/gatsby/src/redux/__tests__/jobs.js b/packages/gatsby/src/redux/__tests__/jobs.js
index a506a6ea2d8f0..65c7ee51a79f3 100644
--- a/packages/gatsby/src/redux/__tests__/jobs.js
+++ b/packages/gatsby/src/redux/__tests__/jobs.js
@@ -1,4 +1,4 @@
-const { actions, boundActions } = require(`../actions`)
+const { actions } = require(`../actions`)
 const jobsReducer = require(`../reducers/jobs`)
 
 Date.now = jest.fn(() => 1482363367071)
@@ -45,6 +45,7 @@ describe(`Job actions/reducer`, () => {
         state,
         actions.endJob({ id: `test job` }, { name: `test-plugin` })
       )
+      return state
     }
 
     expect(runReducer).toThrowErrorMatchingSnapshot()
diff --git a/packages/gatsby/src/redux/__tests__/nodes.js b/packages/gatsby/src/redux/__tests__/nodes.js
index 541180b5eb049..5a701d40dd6c5 100644
--- a/packages/gatsby/src/redux/__tests__/nodes.js
+++ b/packages/gatsby/src/redux/__tests__/nodes.js
@@ -1,4 +1,4 @@
-const { actions, boundActions } = require(`../actions`)
+const { actions } = require(`../actions`)
 const nodeReducer = require(`../reducers/nodes`)
 const nodeTouchedReducer = require(`../reducers/nodes-touched`)
 
diff --git a/packages/gatsby/src/redux/__tests__/pages.js b/packages/gatsby/src/redux/__tests__/pages.js
index 683a242bf5404..82b881a8f0a9f 100644
--- a/packages/gatsby/src/redux/__tests__/pages.js
+++ b/packages/gatsby/src/redux/__tests__/pages.js
@@ -1,7 +1,6 @@
 const reducer = require(`../reducers/pages`)
 const { actions } = require(`../actions`)
 
-const start = Date.now()
 Date.now = jest.fn(
   () =>
     // const diff = new Date().getTime() - start
diff --git a/packages/gatsby/src/redux/__tests__/status.js b/packages/gatsby/src/redux/__tests__/status.js
index 45fc8a7b4cf33..6d2f8d02a5ade 100644
--- a/packages/gatsby/src/redux/__tests__/status.js
+++ b/packages/gatsby/src/redux/__tests__/status.js
@@ -1,4 +1,4 @@
-const { actions, boundActions } = require(`../actions`)
+const { actions } = require(`../actions`)
 const statusReducer = require(`../reducers/status`)
 
 Date.now = jest.fn(() => 1482363367071)
diff --git a/packages/gatsby/src/redux/actions.js b/packages/gatsby/src/redux/actions.js
index a9fbb2bc68529..a19208d4540db 100644
--- a/packages/gatsby/src/redux/actions.js
+++ b/packages/gatsby/src/redux/actions.js
@@ -83,7 +83,7 @@ actions.createPage = (page, plugin = ``, traceId) => {
     console.log(chalk.blue.bgYellow(`The upserted page didn't pass validation`))
     console.log(chalk.bold.red(result.error))
     console.log(page)
-    return
+    return null
   }
 
   // If the path doesn't have an initial forward slash, add it.
@@ -153,7 +153,7 @@ actions.createLayout = (layout, plugin = ``, traceId) => {
     )
     console.log(chalk.bold.red(result.error))
     console.log(layout)
-    return
+    return null
   }
 
   return {
diff --git a/packages/gatsby/src/redux/actions/add-page-dependency.js b/packages/gatsby/src/redux/actions/add-page-dependency.js
index 162c9d52877a3..d971edb4faafa 100644
--- a/packages/gatsby/src/redux/actions/add-page-dependency.js
+++ b/packages/gatsby/src/redux/actions/add-page-dependency.js
@@ -29,7 +29,7 @@ exports.createPageDependency = ({ path, nodeId, connection }) => {
     connectionDependencyExists = true
   }
   if (nodeDependencyExists && connectionDependencyExists) {
-    return false
+    return
   }
 
   // It's new, let's dispatch it
diff --git a/packages/gatsby/src/redux/plugin-runner.js b/packages/gatsby/src/redux/plugin-runner.js
index 6e5658ffd051a..40cce42576366 100644
--- a/packages/gatsby/src/redux/plugin-runner.js
+++ b/packages/gatsby/src/redux/plugin-runner.js
@@ -2,7 +2,6 @@
 
 const { store, emitter } = require(`./index`)
 const apiRunnerNode = require(`../utils/api-runner-node`)
-const _ = require(`lodash`)
 
 emitter.on(`CREATE_NODE`, action => {
   const node = store.getState().nodes[action.payload.id]
diff --git a/packages/gatsby/src/redux/reducers/config.js b/packages/gatsby/src/redux/reducers/config.js
index 86b85605efe49..58b065bd232dd 100644
--- a/packages/gatsby/src/redux/reducers/config.js
+++ b/packages/gatsby/src/redux/reducers/config.js
@@ -6,7 +6,7 @@ const { gatsbyConfigSchema } = require(`../../joi-schemas/joi`)
 
 module.exports = (state = {}, action) => {
   switch (action.type) {
-    case `SET_SITE_CONFIG`:
+    case `SET_SITE_CONFIG`: {
       // Validate the config.
       const result = Joi.validate(action.payload, gatsbyConfigSchema)
       // TODO use Redux for capturing errors from different
@@ -48,6 +48,7 @@ module.exports = (state = {}, action) => {
       return {
         ...action.payload,
       }
+    }
     default:
       return state
   }
diff --git a/packages/gatsby/src/redux/reducers/jobs.js b/packages/gatsby/src/redux/reducers/jobs.js
index a6dca65a2e271..7968411b082ce 100644
--- a/packages/gatsby/src/redux/reducers/jobs.js
+++ b/packages/gatsby/src/redux/reducers/jobs.js
@@ -4,7 +4,7 @@ const moment = require(`moment`)
 module.exports = (state = { active: [], done: [] }, action) => {
   switch (action.type) {
     case `CREATE_JOB`:
-    case `SET_JOB`:
+    case `SET_JOB`: {
       if (!action.payload.id) {
         throw new Error(`An ID must be provided when creating or setting job`)
       }
@@ -36,8 +36,8 @@ module.exports = (state = { active: [], done: [] }, action) => {
           ]),
         }
       }
-
-    case `END_JOB`:
+    }
+    case `END_JOB`: {
       if (!action.payload.id) {
         throw new Error(`An ID must be provided when ending a job`)
       }
@@ -61,6 +61,7 @@ module.exports = (state = { active: [], done: [] }, action) => {
         ]),
         active: state.active.filter(j => j.id !== action.payload.id),
       }
+    }
   }
 
   return state
diff --git a/packages/gatsby/src/redux/reducers/layouts.js b/packages/gatsby/src/redux/reducers/layouts.js
index 817f445876ff4..c83ed0cd14b20 100644
--- a/packages/gatsby/src/redux/reducers/layouts.js
+++ b/packages/gatsby/src/redux/reducers/layouts.js
@@ -5,7 +5,7 @@ module.exports = (state = [], action) => {
   switch (action.type) {
     case `DELETE_CACHE`:
       return []
-    case `CREATE_LAYOUT`:
+    case `CREATE_LAYOUT`: {
       action.payload.component = normalize(action.payload.component)
       action.payload.componentWrapperPath = normalize(
         action.payload.componentWrapperPath
@@ -33,6 +33,7 @@ module.exports = (state = [], action) => {
       } else {
         return [...state.concat(action.payload)]
       }
+    }
     case `DELETE_LAYOUT`:
       return state.filter(l => l.id !== action.payload.id)
     default:
diff --git a/packages/gatsby/src/redux/reducers/pages.js b/packages/gatsby/src/redux/reducers/pages.js
index 84ff6650a5c9c..0aafba3cff0f9 100644
--- a/packages/gatsby/src/redux/reducers/pages.js
+++ b/packages/gatsby/src/redux/reducers/pages.js
@@ -5,7 +5,7 @@ module.exports = (state = [], action) => {
   switch (action.type) {
     case `DELETE_CACHE`:
       return []
-    case `CREATE_PAGE`:
+    case `CREATE_PAGE`: {
       action.payload.component = normalize(action.payload.component)
       if (!action.plugin && !action.plugin.name) {
         console.log(``)
@@ -32,6 +32,7 @@ module.exports = (state = [], action) => {
       } else {
         return [...state.concat(action.payload)]
       }
+    }
     case `DELETE_PAGE`:
       return state.filter(p => p.path !== action.payload.path)
     default:
diff --git a/packages/gatsby/src/schema/__tests__/infer-graphql-input-type-from-fields-test.js b/packages/gatsby/src/schema/__tests__/infer-graphql-input-type-from-fields-test.js
index 6a6156ea6d7e0..ee823fe4ca83b 100644
--- a/packages/gatsby/src/schema/__tests__/infer-graphql-input-type-from-fields-test.js
+++ b/packages/gatsby/src/schema/__tests__/infer-graphql-input-type-from-fields-test.js
@@ -1,6 +1,4 @@
-const _ = require(`lodash`)
 const {
-  graphql,
   GraphQLBoolean,
   GraphQLFloat,
   GraphQLInt,
@@ -9,13 +7,11 @@ const {
   GraphQLObjectType,
   GraphQLScalarType,
   GraphQLList,
-  GraphQLSchema,
   GraphQLInputObjectType,
+  Kind,
 } = require(`graphql`)
-const { connectionArgs, connectionDefinitions } = require(`graphql-skip-limit`)
 
 const {
-  createSortField,
   inferInputObjectStructureFromFields,
 } = require(`../infer-graphql-input-fields-from-fields.js`)
 
diff --git a/packages/gatsby/src/schema/__tests__/infer-graphql-input-type-test.js b/packages/gatsby/src/schema/__tests__/infer-graphql-input-type-test.js
index 5a32256d9c315..5bf162ef23c6b 100644
--- a/packages/gatsby/src/schema/__tests__/infer-graphql-input-type-test.js
+++ b/packages/gatsby/src/schema/__tests__/infer-graphql-input-type-test.js
@@ -14,9 +14,7 @@ const buildConnectionFields = require(`../build-connection-fields`)
 const {
   inferInputObjectStructureFromNodes,
 } = require(`../infer-graphql-input-fields`)
-const {
-  createSortField,
-} = require(`../infer-graphql-input-fields-from-fields.js`)
+const createSortField = require(`../create-sort-field`)
 
 function queryResult(nodes, query, { types = [] } = {}) {
   const nodeType = new GraphQLObjectType({
diff --git a/packages/gatsby/src/schema/__tests__/prepare-regex.js b/packages/gatsby/src/schema/__tests__/prepare-regex.js
index c0da88929a3dd..674c2c55acec0 100644
--- a/packages/gatsby/src/schema/__tests__/prepare-regex.js
+++ b/packages/gatsby/src/schema/__tests__/prepare-regex.js
@@ -8,6 +8,6 @@ describe(`Prepare regex for Sift.js`, () => {
     expect(prepareRegex(`/blue/i`)).toMatchSnapshot()
   })
   it(`handles slashes`, () => {
-    expect(prepareRegex(`/bl\/ue/i`)).toMatchSnapshot()
+    expect(prepareRegex(`/bl/ue/i`)).toMatchSnapshot()
   })
 })
diff --git a/packages/gatsby/src/schema/build-node-connections.js b/packages/gatsby/src/schema/build-node-connections.js
index a90697e6845e3..d2596daeef6f4 100644
--- a/packages/gatsby/src/schema/build-node-connections.js
+++ b/packages/gatsby/src/schema/build-node-connections.js
@@ -7,9 +7,8 @@ const {
 } = require(`./infer-graphql-input-fields`)
 const {
   inferInputObjectStructureFromFields,
-  createSortField,
 } = require(`./infer-graphql-input-fields-from-fields`)
-
+const createSortField = require(`./create-sort-field`)
 const buildConnectionFields = require(`./build-connection-fields`)
 const { getNodes } = require(`../redux`)
 
diff --git a/packages/gatsby/src/schema/build-node-types.js b/packages/gatsby/src/schema/build-node-types.js
index 7839a192c3e1c..b5af54e61db89 100644
--- a/packages/gatsby/src/schema/build-node-types.js
+++ b/packages/gatsby/src/schema/build-node-types.js
@@ -5,9 +5,7 @@ const {
   GraphQLNonNull,
   GraphQLID,
   GraphQLList,
-  GraphQLString,
 } = require(`graphql`)
-import { NAMED_TYPE } from "graphql/language/kinds"
 
 const apiRunner = require(`../utils/api-runner-node`)
 const { inferObjectStructureFromNodes } = require(`./infer-graphql-type`)
diff --git a/packages/gatsby/src/schema/create-sort-field.js b/packages/gatsby/src/schema/create-sort-field.js
new file mode 100644
index 0000000000000..9b3f780f79621
--- /dev/null
+++ b/packages/gatsby/src/schema/create-sort-field.js
@@ -0,0 +1,48 @@
+// @flow
+const {
+  GraphQLInputObjectType,
+  GraphQLList,
+  GraphQLEnumType,
+  GraphQLNonNull,
+} = require(`graphql`)
+const _ = require(`lodash`)
+const createKey = require(`./create-key`)
+
+// builds an input field for sorting, given an array of names to sort on
+module.exports = function createSortField(
+  typeName: string,
+  fieldNames: string[]
+) {
+  const enumValues = {}
+  fieldNames.forEach(field => {
+    enumValues[createKey(field)] = { value: field }
+  })
+
+  const SortByType = new GraphQLEnumType({
+    name: `${typeName}SortByFieldsEnum`,
+    values: enumValues,
+  })
+
+  return {
+    type: new GraphQLInputObjectType({
+      name: _.camelCase(`${typeName} sort`),
+      fields: {
+        fields: {
+          name: _.camelCase(`${typeName} sortFields`),
+          type: new GraphQLNonNull(new GraphQLList(SortByType)),
+        },
+        order: {
+          name: _.camelCase(`${typeName} sortOrder`),
+          defaultValue: `asc`,
+          type: new GraphQLEnumType({
+            name: _.camelCase(`${typeName} sortOrderValues`),
+            values: {
+              ASC: { value: `asc` },
+              DESC: { value: `desc` },
+            },
+          }),
+        },
+      },
+    }),
+  }
+}
diff --git a/packages/gatsby/src/schema/infer-graphql-input-fields-from-fields.js b/packages/gatsby/src/schema/infer-graphql-input-fields-from-fields.js
index 1e7e0723be6a8..9655fb2f93dd9 100644
--- a/packages/gatsby/src/schema/infer-graphql-input-fields-from-fields.js
+++ b/packages/gatsby/src/schema/infer-graphql-input-fields-from-fields.js
@@ -17,22 +17,10 @@ const {
 
 import type { GraphQLInputType, GraphQLType } from "graphql"
 
-const { oneLine } = require(`common-tags`)
 const _ = require(`lodash`)
-const invariant = require(`invariant`)
-const typeOf = require(`type-of`)
+const report = require(`../reporter`)
 const createTypeName = require(`./create-type-name`)
 const createKey = require(`./create-key`)
-const {
-  extractFieldExamples,
-  buildFieldEnumValues,
-  isEmptyObjectOrArray,
-} = require(`./data-tree-utils`)
-
-import type {
-  GraphQLInputFieldConfig,
-  GraphQLInputFieldConfigMap,
-} from "graphql/type/definition"
 
 type GraphQLNullableInputType<T> =
   | GraphQLScalarType
@@ -47,34 +35,36 @@ function makeNullable(type: GraphQLInputType): GraphQLNullableInputType<any> {
   return type
 }
 
-function convertToInputType(type: GraphQLType): GraphQLInputType {
+function convertToInputType(type: GraphQLType): ?GraphQLInputType {
   if (type instanceof GraphQLScalarType || type instanceof GraphQLEnumType) {
     return type
   } else if (type instanceof GraphQLObjectType) {
     return new GraphQLInputObjectType({
       name: createTypeName(`${type.name}InputObject`),
       fields: _.transform(type.getFields(), (out, fieldConfig, key) => {
-        try {
-          const type = convertToInputType(fieldConfig.type)
-          out[key] = { type }
-        } catch (e) {
-          console.log(e)
-        }
+        const type = convertToInputType(fieldConfig.type)
+        if (type) out[key] = { type }
       }),
     })
   } else if (type instanceof GraphQLList) {
-    return new GraphQLList(makeNullable(convertToInputType(type.ofType)))
+    let innerType = convertToInputType(type.ofType)
+    return innerType ? new GraphQLList(makeNullable(innerType)) : null
   } else if (type instanceof GraphQLNonNull) {
-    return new GraphQLNonNull(makeNullable(convertToInputType(type.ofType)))
-  } else if (type instanceof GraphQLInterfaceType) {
-    throw new Error(`GraphQLInterfaceType not yet implemented`)
-  } else if (type instanceof GraphQLUnionType) {
-    throw new Error(`GraphQLUnionType not yet implemented`)
+    let innerType = convertToInputType(type.ofType)
+    return innerType ? new GraphQLNonNull(makeNullable(innerType)) : null
   } else {
-    throw new Error(
-      `Invalid input type ${type && type.constructor && type.constructor.name}`
-    )
+    let message = type ? `for type: ${type.name}` : ``
+    if (type instanceof GraphQLInterfaceType) {
+      message = `GraphQLInterfaceType not yet implemented ${message}`
+    } else if (type instanceof GraphQLUnionType) {
+      message = `GraphQLUnionType not yet implemented ${message}`
+    } else {
+      message = `Invalid input type ${message}`
+    }
+    report.verbose(message)
   }
+
+  return null
 }
 
 const scalarFilterMap = {
@@ -101,15 +91,12 @@ const scalarFilterMap = {
 function convertToInputFilter(
   prefix: string,
   type: GraphQLInputType
-): GraphQLInputObjectType {
+): ?GraphQLInputObjectType {
   if (type instanceof GraphQLScalarType) {
     const name = type.name
     const fields = scalarFilterMap[name]
 
-    if (fields == null) {
-      throw new Error(`Unknown scalar type for input filter`)
-    }
-
+    if (fields == null) return null
     return new GraphQLInputObjectType({
       name: createTypeName(`${prefix}Query${name}`),
       fields: fields,
@@ -118,28 +105,19 @@ function convertToInputFilter(
     return new GraphQLInputObjectType({
       name: createTypeName(`${prefix}{type.name}`),
       fields: _.transform(type.getFields(), (out, fieldConfig, key) => {
-        try {
-          const type = convertToInputFilter(
-            `${prefix}${_.upperFirst(key)}`,
-            fieldConfig.type
-          )
-          out[key] = { type }
-        } catch (e) {
-          console.log(e)
-        }
+        const type = convertToInputFilter(
+          `${prefix}${_.upperFirst(key)}`,
+          fieldConfig.type
+        )
+        if (type) out[key] = { type }
       }),
     })
   } else if (type instanceof GraphQLList) {
     const innerType = type.ofType
-    let innerFields = {}
-    try {
-      innerFields = convertToInputFilter(
-        `${prefix}ListElem`,
-        innerType
-      ).getFields()
-    } catch (e) {
-      console.log(e)
-    }
+    const innerFilter =
+      convertToInputFilter(`${prefix}ListElem`, innerType) || {}
+
+    const innerFields = innerFilter ? innerFilter.getFields() : {}
 
     return new GraphQLInputObjectType({
       name: createTypeName(`${prefix}QueryList`),
@@ -152,7 +130,7 @@ function convertToInputFilter(
     return convertToInputFilter(prefix, type.ofType)
   }
 
-  throw new Error(`Unknown input field type`)
+  return null
 }
 
 function extractFieldNamesFromInputField(
@@ -172,8 +150,6 @@ function extractFieldNamesFromInputField(
     })
   } else if (type instanceof GraphQLNonNull) {
     extractFieldNamesFromInputField(prefix, type.ofType, accu)
-  } else {
-    throw new Error(`Unknown input field type`)
   }
 }
 
@@ -186,58 +162,19 @@ export function inferInputObjectStructureFromFields({
   const sort = []
 
   _.each(fields, (fieldConfig, key) => {
-    try {
-      const inputType = convertToInputType(fieldConfig.type)
-      const filterType = convertToInputFilter(_.upperFirst(key), inputType)
-
-      inferredFields[createKey(key)] = {
-        type: filterType,
-      }
-
-      // Add sorting (but only to the top level).
-      if (typeName) {
-        extractFieldNamesFromInputField(key, inputType, sort)
-      }
-    } catch (e) {
-      console.log(key, fieldConfig, e)
-    }
-  })
+    const inputType = convertToInputType(fieldConfig.type)
+    const inputFilter =
+      inputType && convertToInputFilter(_.upperFirst(key), inputType)
 
-  return { inferredFields, sort }
-}
+    if (!inputFilter) return
 
-// builds an input field for sorting, given an array of names to sort on
-export function createSortField(typeName: string, fieldNames: string[]) {
-  const enumValues = {}
-  fieldNames.forEach(field => {
-    enumValues[createKey(field)] = { value: field }
-  })
+    inferredFields[createKey(key)] = { type: inputFilter }
 
-  const SortByType = new GraphQLEnumType({
-    name: `${typeName}SortByFieldsEnum`,
-    values: enumValues,
+    // Add sorting (but only to the top level).
+    if (typeName) {
+      extractFieldNamesFromInputField(key, inputType, sort)
+    }
   })
 
-  return {
-    type: new GraphQLInputObjectType({
-      name: _.camelCase(`${typeName} sort`),
-      fields: {
-        fields: {
-          name: _.camelCase(`${typeName} sortFields`),
-          type: new GraphQLNonNull(new GraphQLList(SortByType)),
-        },
-        order: {
-          name: _.camelCase(`${typeName} sortOrder`),
-          defaultValue: `asc`,
-          type: new GraphQLEnumType({
-            name: _.camelCase(`${typeName} sortOrderValues`),
-            values: {
-              ASC: { value: `asc` },
-              DESC: { value: `desc` },
-            },
-          }),
-        },
-      },
-    }),
-  }
+  return { inferredFields, sort }
 }
diff --git a/packages/gatsby/src/schema/infer-graphql-input-fields.js b/packages/gatsby/src/schema/infer-graphql-input-fields.js
index 945c9d8606ec6..d3d6aa103d220 100644
--- a/packages/gatsby/src/schema/infer-graphql-input-fields.js
+++ b/packages/gatsby/src/schema/infer-graphql-input-fields.js
@@ -6,8 +6,6 @@ const {
   GraphQLFloat,
   GraphQLInt,
   GraphQLList,
-  GraphQLEnumType,
-  GraphQLNonNull,
 } = require(`graphql`)
 const { oneLine } = require(`common-tags`)
 const _ = require(`lodash`)
diff --git a/packages/gatsby/src/schema/infer-graphql-type.js b/packages/gatsby/src/schema/infer-graphql-type.js
index 4ad8c99e46826..4caa429187034 100644
--- a/packages/gatsby/src/schema/infer-graphql-type.js
+++ b/packages/gatsby/src/schema/infer-graphql-type.js
@@ -67,13 +67,13 @@ function inferGraphQLType({
   selector,
   ...otherArgs
 }): ?GraphQLFieldConfig<*, *> {
-  if (exampleValue == null || isEmptyObjectOrArray(exampleValue)) return
+  if (exampleValue == null || isEmptyObjectOrArray(exampleValue)) return null
   let fieldName = selector.split(`.`).pop()
 
   if (Array.isArray(exampleValue)) {
     exampleValue = exampleValue[0]
 
-    if (exampleValue == null) return
+    if (exampleValue == null) return null
 
     let headType
     // If the array contains objects, than treat them as "nodes"
@@ -133,7 +133,7 @@ function inferGraphQLType({
         if (object[fieldName]) {
           date = JSON.parse(JSON.stringify(object[fieldName]))
         } else {
-          return
+          return null
         }
         if (formatString) {
           return moment.utc(date, ISO_8601_FORMAT, true).format(formatString)
@@ -187,7 +187,7 @@ function inferFromMapping(
   )
   if (_.isEmpty(matchedTypes)) {
     console.log(`Couldn't find a matching node type for "${fieldSelector}"`)
-    return
+    return null
   }
 
   const findNode = (fieldValue, path) => {
@@ -200,6 +200,7 @@ function inferFromMapping(
       createPageDependency({ path, nodeId: linkedNode.id })
       return linkedNode
     }
+    return null
   }
 
   if (_.isArray(value)) {
@@ -242,11 +243,10 @@ function findLinkedNode(value, linkedField, path) {
   }
 
   if (linkedNode) {
-    if (path) {
-      createPageDependency({ path, nodeId: linkedNode.id })
-    }
+    if (path) createPageDependency({ path, nodeId: linkedNode.id })
     return linkedNode
   }
+  return null
 }
 
 function inferFromFieldName(value, selector, types): GraphQLFieldConfig<*, *> {
@@ -460,7 +460,7 @@ function shouldInferFile(nodes, key, value) {
 function inferFromUri(key, types) {
   const fileField = types.find(type => type.name === `File`)
 
-  if (!fileField) return
+  if (!fileField) return null
 
   return {
     type: fileField.nodeObjectType,
diff --git a/packages/gatsby/src/schema/node.js b/packages/gatsby/src/schema/node.js
index b4a91a113012b..9289dcfa9eef9 100644
--- a/packages/gatsby/src/schema/node.js
+++ b/packages/gatsby/src/schema/node.js
@@ -1,8 +1,4 @@
 // @flow
 import { nodeDefinitions } from "graphql-relay"
 
-// const { nodeInterface, nodeField } = nodeDefinitions(
-module.exports = nodeDefinitions(globalId => {
-  const { type, id } = fromGlobalId(globalId)
-  return null
-}, obj => (obj.ships ? factionType : shipType))
+module.exports = nodeDefinitions(globalId => null)
diff --git a/packages/gatsby/src/schema/run-sift.js b/packages/gatsby/src/schema/run-sift.js
index 073c0ef5c5726..aabe83ea68bbe 100644
--- a/packages/gatsby/src/schema/run-sift.js
+++ b/packages/gatsby/src/schema/run-sift.js
@@ -2,16 +2,10 @@
 const sift = require(`sift`)
 const _ = require(`lodash`)
 const { connectionFromArray } = require(`graphql-skip-limit`)
-const { store } = require(`../redux/`)
 const { createPageDependency } = require(`../redux/actions/add-page-dependency`)
 const prepareRegex = require(`./prepare-regex`)
 const Promise = require(`bluebird`)
 
-type Node = {
-  id: String,
-  type: String,
-}
-
 function awaitSiftField(fields, node, k) {
   const field = fields[k]
   if (field.resolve) {
@@ -133,7 +127,7 @@ module.exports = ({
       ? myNodes
       : sift({ $and: siftArgs }, myNodes)
 
-    if (!result || !result.length) return
+    if (!result || !result.length) return null
 
     // Sort results.
     if (clonedArgs.sort) {
diff --git a/packages/gatsby/src/utils/develop.js b/packages/gatsby/src/utils/develop.js
index 9bd477d1af479..0d4713958d228 100644
--- a/packages/gatsby/src/utils/develop.js
+++ b/packages/gatsby/src/utils/develop.js
@@ -108,25 +108,28 @@ async function startServer(program) {
   // Check if the file exists in the public folder.
   app.get(`*`, (req, res, next) => {
     // Load file but ignore errors.
-    res.sendFile(directoryPath(`/public/${decodeURIComponent(req.url)}`), err => {
-      // No err so a file was sent successfully.
-      if (!err || !err.path) {
-        next()
-      } else if (err) {
-        // There was an error. Let's check if the error was because it
-        // couldn't find an HTML file. We ignore these as we want to serve
-        // all HTML from our single empty SSR html file.
-        const parsedPath = parsePath(err.path)
-        if (
-          parsedPath.extname === `` ||
-          parsedPath.extname.startsWith(`.html`)
-        ) {
+    res.sendFile(
+      directoryPath(`/public/${decodeURIComponent(req.url)}`),
+      err => {
+        // No err so a file was sent successfully.
+        if (!err || !err.path) {
           next()
-        } else {
-          res.status(404).end()
+        } else if (err) {
+          // There was an error. Let's check if the error was because it
+          // couldn't find an HTML file. We ignore these as we want to serve
+          // all HTML from our single empty SSR html file.
+          const parsedPath = parsePath(err.path)
+          if (
+            parsedPath.extname === `` ||
+            parsedPath.extname.startsWith(`.html`)
+          ) {
+            next()
+          } else {
+            res.status(404).end()
+          }
         }
       }
-    })
+    )
   })
 
   // Render an HTML page and serve it.
diff --git a/packages/gatsby/src/utils/webpack.config.js b/packages/gatsby/src/utils/webpack.config.js
index 7001c283ebf38..510088f71a4c5 100644
--- a/packages/gatsby/src/utils/webpack.config.js
+++ b/packages/gatsby/src/utils/webpack.config.js
@@ -277,7 +277,7 @@ module.exports = async (
               ]
               const isFramework = some(
                 vendorModuleList.map(vendor => {
-                  const regex = new RegExp(`\/node_modules\/${vendor}\/.*`, `i`)
+                  const regex = new RegExp(`/node_modules/${vendor}/.*`, `i`)
                   return regex.test(module.resource)
                 })
               )
diff --git a/packages/graphql-skip-limit/src/connection/__tests__/connection.js b/packages/graphql-skip-limit/src/connection/__tests__/connection.js
index 7dbc59cea3393..2887a05b884e9 100644
--- a/packages/graphql-skip-limit/src/connection/__tests__/connection.js
+++ b/packages/graphql-skip-limit/src/connection/__tests__/connection.js
@@ -56,11 +56,6 @@ const { connectionType: friendConnection } = connectionDefinitions({
   },
 })
 
-const { connectionType: userConnection } = connectionDefinitions({
-  nodeType: userType,
-  resolveNode: edge => allUsers[edge.node],
-})
-
 const queryType = new GraphQLObjectType({
   name: `Query`,
   fields: () => {
diff --git a/yarn.lock b/yarn.lock
index b9957e427a3e9..b1cc62e49b0c0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4910,18 +4910,12 @@ gitconfiglocal@^1.0.0:
   dependencies:
     ini "^1.3.2"
 
-github-slugger@1.1.3:
+github-slugger@1.1.3, github-slugger@^1.0.0, github-slugger@^1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/github-slugger/-/github-slugger-1.1.3.tgz#314a6e759a18c2b0cc5760d512ccbab549c549a7"
   dependencies:
     emoji-regex ">=6.0.0 <=6.1.1"
 
-github-slugger@^1.0.0, github-slugger@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/github-slugger/-/github-slugger-1.2.0.tgz#8ada3286fd046d8951c3c952a8d7854cfd90fd9a"
-  dependencies:
-    emoji-regex ">=6.0.0 <=6.1.1"
-
 glamor@^2.20.29:
   version "2.20.40"
   resolved "https://registry.yarnpkg.com/glamor/-/glamor-2.20.40.tgz#f606660357b7cf18dface731ad1a2cfa93817f05"
@@ -7756,10 +7750,6 @@ mime@1.3.x:
   version "1.3.6"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.6.tgz#591d84d3653a6b0b4a3b9df8de5aa8108e72e5e0"
 
-mime@1.4.1, mime@^1.2.11, mime@^1.3.4, mime@^1.3.6:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
-
 mimic-fn@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18"