Merge branch 'master' into chooser

# Conflicts: # src/pages/chooser.js
howtographql · Jun 22, 2017 · ffc54b0 · ffc54b0
2 parents 05dfdcb + 027c96e
commit ffc54b0
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 3 deletions.
diff --git a/.nvmrc b/.nvmrc
@@ -0,0 +1 @@
+7.9.0
diff --git a/README.md b/README.md
@@ -10,3 +10,4 @@ $ yarn install
 ```sh
 $ gatsby develop
 ```
+
diff --git a/package.json b/package.json
@@ -40,6 +40,7 @@
   "devDependencies": {
     "@types/node": "^8.0.1",
     "@types/react-router": "^4.0.11",
+    "lint-staged": "^4.0.0",
     "postcss-discard-comments": "^2.0.4",
     "prettier": "^1.4.4",
     "tslint": "^5.4.3",

diff --git a/plugins/styled-jsx-plugin/gatsby-ssr.js b/plugins/styled-jsx-plugin/gatsby-ssr.js
@@ -1,6 +1,6 @@
 exports.onRenderBody = ({setHeadComponents}, pluginOptions) => {
   if (process.env.NODE_ENV === `production`) {
-    const flush = require('styled-jsx-postcss/server')
+    const flush = require('styled-jsx-postcss/server').default
     const css = flush()
     setHeadComponents([css])
   }

diff --git a/tsconfig.json b/tsconfig.json
@@ -16,8 +16,6 @@
   },
   "exclude": [
     "node_modules",
-    "node_modules/**",
-    "node_modules/gatsby-link/index.d.ts",
     "dist",
     ".cache"
   ]