Merge branch 'master' into patch-1

README.md

@@ -1,5 +1,6 @@
 [![Travis CI Build Status](https://travis-ci.org/gatsbyjs/gatsby.svg?branch=master)](https://travis-ci.org/gatsbyjs/gatsby)
 [![npm package](https://img.shields.io/npm/v/gatsby.svg?style=flat-square)](https://www.npmjs.org/package/gatsby)
+[![npm package](https://img.shields.io/npm/dm/gatsby.svg)](https://www.npmjs.org/package/gatsby)
 [![Join the community on Spectrum](https://withspectrum.github.io/badge/badge.svg)](https://spectrum.chat/gatsby-js)
 [![gatsby channel on discord](https://img.shields.io/badge/discord-gatsby%40reactiflux-738bd7.svg?style=flat-square)](https://discord.gg/0ZcbPKXt5bVoxkfV)
 [![Twitter Follow](https://img.shields.io/twitter/follow/gatsbyjs.svg?style=social)](https://twitter.com/gatsbyjs)
@@ -86,7 +87,7 @@ Websites built with Gatsby:
 
 [Migrating from v0 to v1?](https://www.gatsbyjs.org/docs/migrating-from-v0-to-v1/)
 
-[v0 docs](/v0-README.md)
+[v0 docs](https://github.com/gatsbyjs/gatsby/blob/v0.12.48/docs/index.md)
 
 ## Packages
 

docs/docs/gatsby-starters.md

@@ -122,6 +122,11 @@ Community:
   * Uses data from local json files
   * Contains Node.js server code for easy, secure, and fast hosting
 
+* [gatsby-starter-typescript](https://github.com/haysclark/gatsby-starter-typescript) [(demo)](https://haysclark.github.io/gatsby-starter-typescript/)
+
+  Features:
+  * TypeScript
+
 * [gatsby-starter-default-i18n](https://github.com/angeloocana/gatsby-starter-default-i18n) [(demo)](https://gatsby-starter-default-i18n.netlify.com)
 
   Features:
@@ -148,7 +153,7 @@ Community:
 * [gatsby-starter-netlify-cms](https://github.com/AustinGreen/gatsby-starter-netlify-cms) [(demo)](https://gatsby-netlify-cms.netlify.com/)
 
   Features:
-  * A simple blog built with Netlify CMS 
+  * A simple blog built with Netlify CMS
   * Basic directory organization
   * Uses [Bulma](https://bulma.io/) for styling
   * Visit [the repo](https://github.com/AustinGreen/gatsby-starter-netlify-cms) to learn how to set up authentication, and begin modeling your content.
@@ -165,6 +170,45 @@ Community:
   * And other good stuff (SEO, Offline Support, WebApp Manifest Support)
 
 * [gatsby-starter-bootstrap-netlify](https://github.com/konsumer/gatsby-starter-bootstrap-netlify) [(demo)](https://gatsby-starter-bootstrap-netlify.netlify.com)
-  
+
   Features:
   * Very similar to [gatsby-starter-netlify-cms](https://github.com/AustinGreen/gatsby-starter-netlify-cms), slightly more configurable (eg set site-title in `gatsby-config`) with bootstrap/bootswatch instead of bulma
+
+* [open-crowd-fund](https://github.com/rwieruch/open-crowd-fund) [(demo)](https://www.roadtolearnreact.com/)
+
+  Features:
+  * Open source crowdfunding for your own ideas
+  * Alternative for Kickstarter, GoFundMe, etc.
+  * Secured Credit Card payments with Stripe
+  * Storing of funding information in Firebase
+
+* [gatsby-starter-dimension](https://github.com/ChangoMan/gatsby-starter-dimension) [(demo)](http://gatsby-dimension.surge.sh/)
+
+  Features:
+  * Based off of the Dimension site template. Designed by [HTML5 UP](https://html5up.net/dimension)
+  * Simple one page site that's perfect for personal portfolios
+  * Fully Responsive
+  * Styling with SCSS
+
+* [gatsby-starter-docs](https://github.com/ericwindmill/gatsby-starter-docs) [(demo)](https://gatsby-docs-starter.netlify.com/)
+
+  Features:
+  * All the features from [gatsby-advanced-starter](https://github.com/Vagr9K/gatsby-advanced-starter), plus:
+  * Designed for Documentation / Tutorial Websites
+  * 'Table of Contents' Component: Auto generates ToC from posts - just follow the file frontmatter conventions from markdown files in 'lessons'. 
+  * Styled Components w/ ThemeProvider
+  * Basic UI
+  * A few extra components
+  * Custom prismjs theme
+  * React Icons
+
+* [gatsby-styled-blog-starter](https://github.com/greglobinski/gatsby-styled-blog-starter) [(demo)](https://gsbs.greglobinski.com/)
+
+  Features:
+  * sidebar navigation
+  * look like an app
+  * page transitions
+  * pwa
+  * styling with styled-components
+  * easily restyled through theme object
+  * [README](https://github.com/greglobinski/gatsby-styled-blog-starter)

docs/docs/plugins.md

@@ -96,9 +96,9 @@ you can place the files in a `src` subfolder and build them to the plugin folder
 * [gatsby-plugin-typescript](/packages/gatsby-plugin-typescript/)
 * [gatsby-remark-autolink-headers](/packages/gatsby-remark-autolink-headers/)
 * [gatsby-remark-copy-linked-files](/packages/gatsby-remark-copy-linked-files/)
+* [gatsby-remark-images](/packages/gatsby-remark-images/)
 * [gatsby-remark-prismjs](/packages/gatsby-remark-prismjs/)
 * [gatsby-remark-responsive-iframe](/packages/gatsby-remark-responsive-iframe/)
-* [gatsby-remark-images](/packages/gatsby-remark-images/)
 * [gatsby-remark-smartypants](/packages/gatsby-remark-smartypants/)
 * [gatsby-source-contentful](/packages/gatsby-source-contentful/)
 * [gatsby-source-drupal](/packages/gatsby-source-drupal/)
@@ -113,33 +113,38 @@ you can place the files in a `src` subfolder and build them to the plugin folder
 * [gatsby-transformer-json](/packages/gatsby-transformer-json/)
 * [gatsby-transformer-remark](/packages/gatsby-transformer-remark/)
 * [gatsby-transformer-sharp](/packages/gatsby-transformer-sharp/)
-* [gatsby-transformer-yaml](/packages/gatsby-transformer-yaml/)
 * [gatsby-transformer-toml](/packages/gatsby-transformer-toml/)
+* [gatsby-transformer-yaml](/packages/gatsby-transformer-yaml/)
+
 
 ## Official components
 
-* [gatsby-link](/packages/gatsby-link/)
 * [gatsby-image](/packages/gatsby-image/)
+* [gatsby-link](/packages/gatsby-link/)
 
 ## Community Plugins
 
 * [gatsby-plugin-antd](https://github.com/bskimball/gatsby-plugin-antd)
 * [gatsby-plugin-copy](https://github.com/aquilio/gatsby-plugin-copy)
 * [gatsby-plugin-google-fonts](https://github.com/didierfranc/gatsby-plugin-google-fonts)
-* [gatsby-plugin-i18n](https://github.com/angeloocana/gatsby-plugin-i18n)
-* [gatsby-plugin-i18n-tags](https://github.com/angeloocana/gatsby-plugin-i18n-tags)
 * [gatsby-plugin-i18n-readnext](https://github.com/angeloocana/gatsby-plugin-i18n-readnext)
+* [gatsby-plugin-i18n-tags](https://github.com/angeloocana/gatsby-plugin-i18n-tags)
+* [gatsby-plugin-i18n](https://github.com/angeloocana/gatsby-plugin-i18n)
 * [gatsby-plugin-intercom-spa](https://github.com/toriihq/gatsby-plugin-intercom-spa)
+* [gatsby-plugin-klipse](https://github.com/ahmedelgabri/gatsby-plugin-klipse)
 * [gatsby-plugin-protoculture](https://github.com/atrauzzi/gatsby-plugin-protoculture)
+* [gatsby-plugin-segment-js](https://github.com/benjaminhoffman/gatsby-plugin-segment-js)
 * [gatsby-plugin-purify-css](https://github.com/rongierlach/gatsby-plugin-purify-css)
-* [gatsby-plugin-yandex-metrika](https://github.com/viatsko/gatsby-plugin-yandex-metrika)
-* [gatsby-plugin-klipse](https://github.com/ahmedelgabri/gatsby-plugin-klipse)
 * [gatsby-plugin-stripe-checkout](https://github.com/njosefbeck/gatsby-plugin-stripe-checkout)
 * [gatsby-plugin-stripe-elements](https://github.com/njosefbeck/gatsby-plugin-stripe-elements)
+* [gatsby-plugin-yandex-metrika](https://github.com/viatsko/gatsby-plugin-yandex-metrika)
+* [gatsby-plugin-hotjar](https://github.com/pavloko/gatsby-plugin-hotjar)
 * [gatsby-remark-emoji](https://github.com/Rulikkk/gatsby-remark-emoji)
 * [gatsby-remark-external-links](https://github.com/JLongley/gatsby-remark-external-links)
-* [gatsby-source-workable](https://github.com/tumblbug/gatsby-source-workable)
+* [gatsby-remark-graph](https://github.com/konsumer/gatsby-remark-graph)
 * [gatsby-source-github](https://github.com/mosch/gatsby-source-github)
 * [gatsby-source-google-sheets](https://github.com/brandonmp/gatsby-source-google-sheets)
+* [gatsby-source-soundcloud](https://github.com/jedidiah/gatsby-source-soundcloud)
 * [gatsby-source-stripe](https://github.com/njosefbeck/gatsby-source-stripe)
-* [gatsby-remark-graph](https://github.com/konsumer/gatsby-remark-graph)
+* [gatsby-source-twitch](https://github.com/jedidiah/gatsby-source-twitch)
+* [gatsby-source-workable](https://github.com/tumblbug/gatsby-source-workable)

examples/using-css-modules/src/pages/index.js

@@ -24,7 +24,7 @@ class IndexComponent extends React.Component {
         <p>
           <a
             className={indexStyles.link}
-            href="https://github.com/gatsbyjs/gatsby/tree/1.0/examples/using-css-modules"
+            href="https://github.com/gatsbyjs/gatsby/tree/master/examples/using-css-modules"
           >
             cODe for eXAMple sIte on GiTHUb
           </a>

examples/using-sass/src/pages/index.js

@@ -18,7 +18,7 @@ class Index extends React.Component {
               <a href="#">Logout</a>
             </li>
             <li>
-              <a href="https://github.com/gatsbyjs/gatsby/tree/1.0/examples/using-sass">
+              <a href="https://github.com/gatsbyjs/gatsby/tree/master/examples/using-sass">
                 Code for site on GitHub
               </a>
             </li>

packages/gatsby-source-contentful/README.md

@@ -3,7 +3,7 @@
 Source plugin for pulling content types, entries, and assets into Gatsby from Contentful spaces. It creates links between entry types and asset so they can be queried in Gatsby using GraphQL.
 
 An example site for using this plugin is at
-https://using-contentful.netlify.com/
+https://using-contentful.gatsbyjs.org/
 
 ## Install
 

packages/gatsby/src/commands/develop.js

@@ -203,7 +203,6 @@ module.exports = async (program: any) => {
     typeof program.port === `string` ? parseInt(program.port, 10) : program.port
 
   let compiler
-  let listener
   await new Promise(resolve => {
     detect(port, (err, _port) => {
       if (err) {
@@ -223,14 +222,12 @@ module.exports = async (program: any) => {
 
           startServer(program).then(([c, l]) => {
             compiler = c
-            listener = l
             resolve()
           })
         })
       } else {
         startServer(program).then(([c, l]) => {
           compiler = c
-          listener = l
           resolve()
         })
       }

www/src/pages/docs/doc-links.yaml

@@ -49,7 +49,7 @@
     - title: Adding Tags and Categories to Blog Posts*
       link: /docs/adding-tags-and-categories-to-blog-posts/
     - title: Adding Markdown Pages*
-      link: /adding-markdown-pages/
+      link: /docs/adding-markdown-pages/
     - title: Creating Dynamically-Rendered Navigation*
       link: /docs/creating-dynamically-rendered-navigation/
     - title: Dropping Images into Static Folders*