Merge pull request #1 from gatsbyjs/master

swyxio · web-flow · commit 5cb12135b3cd · 2018-06-23T15:43:09.000-04:00
merge gatsby/master
diff --git a/docs/tutorial/part-seven/index.md b/docs/tutorial/part-seven/index.md
@@ -62,7 +62,7 @@ exports.onCreateNode = ({ node }) => {
 ```
 
 You want to use each markdown file name to create the page slug. So
-`pandas-and-bananas.md"` will become `/pandas-and-bananas/`. But how do you get
+`pandas-and-bananas.md` will become `/pandas-and-bananas/`. But how do you get
 the file name from the `MarkdownRemark` node? To get it, you need to _traverse_
 the "node graph" to its _parent_ `File` node, as `File` nodes contain data you
 need about files on disk. To do that, modify your function again:
@@ -187,7 +187,7 @@ exports.createPages = ({ graphql, actions }) => {
 ```
 
 You've added an implementation of the
-[`createPages`](/docs/node-apis/#createPages) API which API Gatsby calls so plugins can add
+[`createPages`](/docs/node-apis/#createPages) API which Gatsby calls so plugins can add
 pages.
 
 As mentioned in the intro to this part of the tutorial, the steps to programmatically creating pages are:
diff --git a/packages/gatsby-source-contentful/CHANGELOG.md b/packages/gatsby-source-contentful/CHANGELOG.md
@@ -3,6 +3,15 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+<a name="2.0.1-beta.6"></a>
+## [2.0.1-beta.6](https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-source-contentful/compare/gatsby-source-contentful@2.0.1-beta.5...gatsby-source-contentful@2.0.1-beta.6) (2018-06-23)
+
+**Note:** Version bump only for package gatsby-source-contentful
+
+
+
+
+
 <a name="2.0.1-beta.5"></a>
 ## [2.0.1-beta.5](https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-source-contentful/compare/gatsby-source-contentful@2.0.1-beta.4...gatsby-source-contentful@2.0.1-beta.5) (2018-06-21)
 
diff --git a/packages/gatsby-source-contentful/package.json b/packages/gatsby-source-contentful/package.json
@@ -1,7 +1,7 @@
 {
   "name": "gatsby-source-contentful",
   "description": "Gatsby source plugin for building websites using the Contentful CMS as a data source",
-  "version": "2.0.1-beta.5",
+  "version": "2.0.1-beta.6",
   "author": "Marcus Ericsson <mericsson@gmail.com> (mericsson.com)",
   "bugs": {
     "url": "https://github.com/gatsbyjs/gatsby/issues"
diff --git a/packages/gatsby-transformer-react-docgen/CHANGELOG.md b/packages/gatsby-transformer-react-docgen/CHANGELOG.md
@@ -3,6 +3,15 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+<a name="2.1.1-beta.3"></a>
+## [2.1.1-beta.3](https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-transformer-react-docgen/compare/gatsby-transformer-react-docgen@2.1.1-beta.2...gatsby-transformer-react-docgen@2.1.1-beta.3) (2018-06-23)
+
+**Note:** Version bump only for package gatsby-transformer-react-docgen
+
+
+
+
+
 <a name="2.1.1-beta.2"></a>
 ## [2.1.1-beta.2](https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-transformer-react-docgen/compare/gatsby-transformer-react-docgen@2.1.1-beta.1...gatsby-transformer-react-docgen@2.1.1-beta.2) (2018-06-20)
 
diff --git a/packages/gatsby-transformer-react-docgen/package.json b/packages/gatsby-transformer-react-docgen/package.json
@@ -1,7 +1,7 @@
 {
   "name": "gatsby-transformer-react-docgen",
   "description": "Expose React component metadata and prop information as GraphQL types",
-  "version": "2.1.1-beta.2",
+  "version": "2.1.1-beta.3",
   "author": "Jason Quense <monastic.panic@gmail.com>",
   "bugs": {
     "url": "https://github.com/gatsbyjs/gatsby/issues"
diff --git a/www/src/html.js b/www/src/html.js
@@ -6,6 +6,11 @@ export default class HTML extends React.Component {
     return (
       <html {...this.props.htmlAttributes}>
         <head>
+          <link
+            rel="preload"
+            href="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.css"
+            as="style"
+          />
           <link
             rel="preload"
             href="/static/ftn45-webfont.c2439033.woff2"
@@ -54,7 +59,7 @@ export default class HTML extends React.Component {
             color={colors.gatsby}
           />
           <meta name="msapplication-config" content={`/browserconfig.xml`} />
-          <script src="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.js" />
+          <script src="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.js" defer />
         </head>
         <body {...this.props.bodyAttributes}>
           <div

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "gatsby-source-contentful",`
`3`	`3`	`"description": "Gatsby source plugin for building websites using the Contentful CMS as a data source",`
`4`		`- "version": "2.0.1-beta.5",`
	`4`	`+ "version": "2.0.1-beta.6",`
`5`	`5`	`"author": "Marcus Ericsson <[email protected]> (mericsson.com)",`
`6`	`6`	`"bugs": {`
`7`	`7`	`"url": "https://github.com/gatsbyjs/gatsby/issues"`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "gatsby-transformer-react-docgen",`
`3`	`3`	`"description": "Expose React component metadata and prop information as GraphQL types",`
`4`		`- "version": "2.1.1-beta.2",`
	`4`	`+ "version": "2.1.1-beta.3",`
`5`	`5`	`"author": "Jason Quense <[email protected]>",`
`6`	`6`	`"bugs": {`
`7`	`7`	`"url": "https://github.com/gatsbyjs/gatsby/issues"`