Skip to content

Commit 2271b6f

Browse files
authored
Merge branch 'master' into gsf-rfsbh
2 parents e70511f + 37c81fe commit 2271b6f

File tree

8 files changed

+67
-19
lines changed

8 files changed

+67
-19
lines changed

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
[![Travis CI Build Status](https://travis-ci.org/gatsbyjs/gatsby.svg?branch=master)](https://travis-ci.org/gatsbyjs/gatsby)
22
[![npm package](https://img.shields.io/npm/v/gatsby.svg?style=flat-square)](https://www.npmjs.org/package/gatsby)
3+
[![npm package](https://img.shields.io/npm/dm/gatsby.svg)](https://www.npmjs.org/package/gatsby)
34
[![Join the community on Spectrum](https://withspectrum.github.io/badge/badge.svg)](https://spectrum.chat/gatsby-js)
45
[![gatsby channel on discord](https://img.shields.io/badge/discord-gatsby%40reactiflux-738bd7.svg?style=flat-square)](https://discord.gg/0ZcbPKXt5bVoxkfV)
56
[![Twitter Follow](https://img.shields.io/twitter/follow/gatsbyjs.svg?style=social)](https://twitter.com/gatsbyjs)
@@ -77,14 +78,15 @@ Websites built with Gatsby:
7778
* [greglobinski.com](https://greglobinski.com) ([source](https://github.com/greglobinski/greglobinski-com))
7879
* [Vibert Thio's Portfolio](https://vibertthio.com/portfolio/)([source](https://github.com/vibertthio/portfolio))
7980
* [hunterchang.com](https://hunterchang.com) ([source](https://github.com/ChangoMan/hc-gatsby))
81+
* [YouFoundRon.com](https://youfoundron.com) ([source](https://github.com/rongierlach/yfr-dot-com))
8082

8183
## Docs
8284

8385
**[View the docs on gatsbyjs.org](https://www.gatsbyjs.org/docs/)**
8486

8587
[Migrating from v0 to v1?](https://www.gatsbyjs.org/docs/migrating-from-v0-to-v1/)
8688

87-
[v0 docs](/v0-README.md)
89+
[v0 docs](https://github.com/gatsbyjs/gatsby/blob/v0.12.48/docs/index.md)
8890

8991
## Packages
9092

docs/docs/gatsby-starters.md

Lines changed: 46 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,11 @@ Community:
122122
* Uses data from local json files
123123
* Contains Node.js server code for easy, secure, and fast hosting
124124

125+
* [gatsby-starter-typescript](https://github.com/haysclark/gatsby-starter-typescript) [(demo)](https://haysclark.github.io/gatsby-starter-typescript/)
126+
127+
Features:
128+
* TypeScript
129+
125130
* [gatsby-starter-default-i18n](https://github.com/angeloocana/gatsby-starter-default-i18n) [(demo)](https://gatsby-starter-default-i18n.netlify.com)
126131

127132
Features:
@@ -148,7 +153,7 @@ Community:
148153
* [gatsby-starter-netlify-cms](https://github.com/AustinGreen/gatsby-starter-netlify-cms) [(demo)](https://gatsby-netlify-cms.netlify.com/)
149154

150155
Features:
151-
* A simple blog built with Netlify CMS
156+
* A simple blog built with Netlify CMS
152157
* Basic directory organization
153158
* Uses [Bulma](https://bulma.io/) for styling
154159
* 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:
165170
* And other good stuff (SEO, Offline Support, WebApp Manifest Support)
166171

167172
* [gatsby-starter-bootstrap-netlify](https://github.com/konsumer/gatsby-starter-bootstrap-netlify) [(demo)](https://gatsby-starter-bootstrap-netlify.netlify.com)
168-
173+
169174
Features:
170175
* 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
176+
177+
* [open-crowd-fund](https://github.com/rwieruch/open-crowd-fund) [(demo)](https://www.roadtolearnreact.com/)
178+
179+
Features:
180+
* Open source crowdfunding for your own ideas
181+
* Alternative for Kickstarter, GoFundMe, etc.
182+
* Secured Credit Card payments with Stripe
183+
* Storing of funding information in Firebase
184+
185+
* [gatsby-starter-dimension](https://github.com/ChangoMan/gatsby-starter-dimension) [(demo)](http://gatsby-dimension.surge.sh/)
186+
187+
Features:
188+
* Based off of the Dimension site template. Designed by [HTML5 UP](https://html5up.net/dimension)
189+
* Simple one page site that's perfect for personal portfolios
190+
* Fully Responsive
191+
* Styling with SCSS
192+
193+
* [gatsby-starter-docs](https://github.com/ericwindmill/gatsby-starter-docs) [(demo)](https://gatsby-docs-starter.netlify.com/)
194+
195+
Features:
196+
* All the features from [gatsby-advanced-starter](https://github.com/Vagr9K/gatsby-advanced-starter), plus:
197+
* Designed for Documentation / Tutorial Websites
198+
* 'Table of Contents' Component: Auto generates ToC from posts - just follow the file frontmatter conventions from markdown files in 'lessons'.
199+
* Styled Components w/ ThemeProvider
200+
* Basic UI
201+
* A few extra components
202+
* Custom prismjs theme
203+
* React Icons
204+
205+
* [gatsby-styled-blog-starter](https://github.com/greglobinski/gatsby-styled-blog-starter) [(demo)](https://gsbs.greglobinski.com/)
206+
207+
Features:
208+
* sidebar navigation
209+
* look like an app
210+
* page transitions
211+
* pwa
212+
* styling with styled-components
213+
* easily restyled through theme object
214+
* [README](https://github.com/greglobinski/gatsby-styled-blog-starter)

docs/docs/plugins.md

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,9 @@ you can place the files in a `src` subfolder and build them to the plugin folder
9696
* [gatsby-plugin-typescript](/packages/gatsby-plugin-typescript/)
9797
* [gatsby-remark-autolink-headers](/packages/gatsby-remark-autolink-headers/)
9898
* [gatsby-remark-copy-linked-files](/packages/gatsby-remark-copy-linked-files/)
99+
* [gatsby-remark-images](/packages/gatsby-remark-images/)
99100
* [gatsby-remark-prismjs](/packages/gatsby-remark-prismjs/)
100101
* [gatsby-remark-responsive-iframe](/packages/gatsby-remark-responsive-iframe/)
101-
* [gatsby-remark-images](/packages/gatsby-remark-images/)
102102
* [gatsby-remark-smartypants](/packages/gatsby-remark-smartypants/)
103103
* [gatsby-source-contentful](/packages/gatsby-source-contentful/)
104104
* [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
113113
* [gatsby-transformer-json](/packages/gatsby-transformer-json/)
114114
* [gatsby-transformer-remark](/packages/gatsby-transformer-remark/)
115115
* [gatsby-transformer-sharp](/packages/gatsby-transformer-sharp/)
116-
* [gatsby-transformer-yaml](/packages/gatsby-transformer-yaml/)
117116
* [gatsby-transformer-toml](/packages/gatsby-transformer-toml/)
117+
* [gatsby-transformer-yaml](/packages/gatsby-transformer-yaml/)
118+
118119

119120
## Official components
120121

121-
* [gatsby-link](/packages/gatsby-link/)
122122
* [gatsby-image](/packages/gatsby-image/)
123+
* [gatsby-link](/packages/gatsby-link/)
123124

124125
## Community Plugins
125126

126127
* [gatsby-plugin-antd](https://github.com/bskimball/gatsby-plugin-antd)
127128
* [gatsby-plugin-copy](https://github.com/aquilio/gatsby-plugin-copy)
128129
* [gatsby-plugin-google-fonts](https://github.com/didierfranc/gatsby-plugin-google-fonts)
129-
* [gatsby-plugin-i18n](https://github.com/angeloocana/gatsby-plugin-i18n)
130-
* [gatsby-plugin-i18n-tags](https://github.com/angeloocana/gatsby-plugin-i18n-tags)
131130
* [gatsby-plugin-i18n-readnext](https://github.com/angeloocana/gatsby-plugin-i18n-readnext)
131+
* [gatsby-plugin-i18n-tags](https://github.com/angeloocana/gatsby-plugin-i18n-tags)
132+
* [gatsby-plugin-i18n](https://github.com/angeloocana/gatsby-plugin-i18n)
132133
* [gatsby-plugin-intercom-spa](https://github.com/toriihq/gatsby-plugin-intercom-spa)
134+
* [gatsby-plugin-klipse](https://github.com/ahmedelgabri/gatsby-plugin-klipse)
133135
* [gatsby-plugin-protoculture](https://github.com/atrauzzi/gatsby-plugin-protoculture)
136+
* [gatsby-plugin-segment-js](https://github.com/benjaminhoffman/gatsby-plugin-segment-js)
134137
* [gatsby-plugin-purify-css](https://github.com/rongierlach/gatsby-plugin-purify-css)
135-
* [gatsby-plugin-yandex-metrika](https://github.com/viatsko/gatsby-plugin-yandex-metrika)
136-
* [gatsby-plugin-klipse](https://github.com/ahmedelgabri/gatsby-plugin-klipse)
137138
* [gatsby-plugin-stripe-checkout](https://github.com/njosefbeck/gatsby-plugin-stripe-checkout)
138139
* [gatsby-plugin-stripe-elements](https://github.com/njosefbeck/gatsby-plugin-stripe-elements)
140+
* [gatsby-plugin-yandex-metrika](https://github.com/viatsko/gatsby-plugin-yandex-metrika)
141+
* [gatsby-plugin-hotjar](https://github.com/pavloko/gatsby-plugin-hotjar)
139142
* [gatsby-remark-emoji](https://github.com/Rulikkk/gatsby-remark-emoji)
140143
* [gatsby-remark-external-links](https://github.com/JLongley/gatsby-remark-external-links)
141-
* [gatsby-source-workable](https://github.com/tumblbug/gatsby-source-workable)
144+
* [gatsby-remark-graph](https://github.com/konsumer/gatsby-remark-graph)
142145
* [gatsby-source-github](https://github.com/mosch/gatsby-source-github)
143146
* [gatsby-source-google-sheets](https://github.com/brandonmp/gatsby-source-google-sheets)
147+
* [gatsby-source-soundcloud](https://github.com/jedidiah/gatsby-source-soundcloud)
144148
* [gatsby-source-stripe](https://github.com/njosefbeck/gatsby-source-stripe)
145-
* [gatsby-remark-graph](https://github.com/konsumer/gatsby-remark-graph)
149+
* [gatsby-source-twitch](https://github.com/jedidiah/gatsby-source-twitch)
150+
* [gatsby-source-workable](https://github.com/tumblbug/gatsby-source-workable)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class IndexComponent extends React.Component {
2424
<p>
2525
<a
2626
className={indexStyles.link}
27-
href="https://github.com/gatsbyjs/gatsby/tree/1.0/examples/using-css-modules"
27+
href="https://github.com/gatsbyjs/gatsby/tree/master/examples/using-css-modules"
2828
>
2929
cODe for eXAMple sIte on GiTHUb
3030
</a>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class Index extends React.Component {
1818
<a href="#">Logout</a>
1919
</li>
2020
<li>
21-
<a href="https://github.com/gatsbyjs/gatsby/tree/1.0/examples/using-sass">
21+
<a href="https://github.com/gatsbyjs/gatsby/tree/master/examples/using-sass">
2222
Code for site on GitHub
2323
</a>
2424
</li>

packages/gatsby-source-contentful/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
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.
44

55
An example site for using this plugin is at
6-
https://using-contentful.netlify.com/
6+
https://using-contentful.gatsbyjs.org/
77

88
## Install
99

packages/gatsby/src/commands/develop.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,6 @@ module.exports = async (program: any) => {
203203
typeof program.port === `string` ? parseInt(program.port, 10) : program.port
204204

205205
let compiler
206-
let listener
207206
await new Promise(resolve => {
208207
detect(port, (err, _port) => {
209208
if (err) {
@@ -223,14 +222,12 @@ module.exports = async (program: any) => {
223222

224223
startServer(program).then(([c, l]) => {
225224
compiler = c
226-
listener = l
227225
resolve()
228226
})
229227
})
230228
} else {
231229
startServer(program).then(([c, l]) => {
232230
compiler = c
233-
listener = l
234231
resolve()
235232
})
236233
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
- title: Adding Tags and Categories to Blog Posts*
5050
link: /docs/adding-tags-and-categories-to-blog-posts/
5151
- title: Adding Markdown Pages*
52-
link: /adding-markdown-pages/
52+
link: /docs/adding-markdown-pages/
5353
- title: Creating Dynamically-Rendered Navigation*
5454
link: /docs/creating-dynamically-rendered-navigation/
5555
- title: Dropping Images into Static Folders*

0 commit comments

Comments
 (0)