[v2] WIP merge in master

.dockerignore

@@ -0,0 +1,5 @@
+node_modules
+**/node_modules
+**/public
+npm-debug.log
+.git

.github/ISSUE_TEMPLATE.md

@@ -6,6 +6,7 @@
   Useful Links:
   - Documentation: https://www.gatsbyjs.org/docs/
   - How to Contribute: https://www.gatsbyjs.org/docs/how-to-contribute/
+  - How to File an Issue: https://www.gatsbyjs.org/docs/how-to-file-an-issue/
   - Become a Sponsor: https://opencollective.com/gatsby#sponsor
 
   Before opening a new issue, please search existing issues (https://github.com/gatsbyjs/gatsby/issues)

CONTRIBUTING.md

@@ -2,15 +2,6 @@
 title: How to contribute
 ---
 
-## Filing an issue
-
-If you want your issue to be resolved quickly, please include in your issue:
-
-* Gatsby version, node.js version, OS version
-* The contents of your `gatsby-config.js` and `package.json` as well as your
-  `gatsby-node.js`, `gatsby-browser.js` `gatsby-ssr.js` files depending on
-  changes you've made there.
-
 ## Contributing
 
 We want contributing to Gatsby to be fun, enjoyable, and educational for anyone and everyone. Contributions go far beyond pull requests and commits; we are thrilled to receive a variety of other contributions including the following:
@@ -21,24 +12,15 @@ We want contributing to Gatsby to be fun, enjoyable, and educational for anyone
 * Submitting documentation updates, enhancements, designs, or bugfixes
 * Submitting spelling or grammar fixes
 * Adding unit or functional tests
-* Triaging GitHub issues -- especially determining whether an issue still persists or is reproducible
+* Triaging [GitHub issues](https://github.com/gatsbyjs/gatsby/issues) -- especially determining whether an issue still persists or is reproducible
+* [Reporting bugs or issues](/docs/how-to-file-an-issue/)
 * Searching for Gatsby on Discord or Spectrum and helping someone else who needs help
 * Teaching others how to contribute to Gatsby's repo!
 
 If you are worried or don't know where to start, you can always reach out to Shannon Soper(@shannonb_ux) on Twitter or simply submit an issue and a maintainer can help give you guidance!
 
 Looking to speak about Gatsby? We'd love to review your talk abstract/CFP! You can email it to shannon [at] gatsbyjs [dot] com and we can give pointers or tips!!!
 
-### Special Note on Issues
-
-If an issue is affecting you, start at the top of this list and complete as many tasks on the list as you can:
-
-1. If there is an issue, +1 the issue to indicate that it's affecting you
-2. If there's an issue and you can add more detail, write a comment describing how the bug is affecting OR if you can, write up a work-around for the bug
-3. If there's not an issue, write the most complete description of what's happening, preferably with link to a Gatsby site that reproduces the problem
-4. Offer to help fix the bug (and it's totally expected that you ask for help; open-source maintainers want to help contributors)
-5. Deliver a well-crafted, tested PR
-
 ### Creating your own plugins and loaders
 
 If you create a loader or plugin, we would <3 for you to open source it, and put it on npm.
@@ -62,9 +44,7 @@ The usual contributing steps are:
 * setup up repo and Install dependencies: `yarn run bootstrap`
 * Make sure tests are passing for you: `yarn test`
 * Create a topic branch: `git checkout -b topics/new-feature-name`
-* Run `npm run watch` from the root of the repo to first do an initial Babel
-  build of all packages and then watch for changes to packages' source code and
-  compile these changes on-the-fly as you work.
+* Run `npm run watch` from the root of the repo to watch for changes to packages' source code and compile these changes on-the-fly as you work. Note that the watch command can be resource intensive. To limit it to the packages you're working on, add a scope flag, like `npm run watch -- --scope={gatsby,gatsby-cli}`. To watch just one package, run `npm run watch -- --scope=gatsby`.
 * Install [gatsby-dev-cli](/packages/gatsby-dev-cli/) globally: `yarn global add gatsby-dev-cli`
 * Run `yarn install` in each of the sites you're testing with.
 * For each of your Gatsby test sites, run the `gatsby-dev` command there to copy
@@ -78,7 +58,7 @@ The usual contributing steps are:
 
 ### Contributing to the documentation.
 
-Gatsby, unsurprisingly, uses Gatsby for it's documentation website.
+Gatsby, unsurprisingly, uses Gatsby for its documentation website.
 
 If you want to add/modify any Gatsby documentation, go to the
 [docs folder on Github](https://github.com/gatsbyjs/gatsby/tree/master/docs) and

Dockerfile

@@ -0,0 +1,27 @@
+# Create a standalone instance of GraphiQL populated with gatsbyjs.org's data
+# ---
+# libvips needed for image manipulation
+FROM marcbachmann/libvips:8.4.1 as build
+
+# Node.js version 8 and build tools for sharp
+RUN apt-get update && apt-get install -y build-essential g++ curl
+RUN curl -sL https://deb.nodesource.com/setup_8.x | bash - && apt-get install -y nodejs && rm -rf /var/lib/apt/lists/*
+
+RUN npm install -g yarn@1.3.2
+
+WORKDIR /usr/src/app
+
+COPY . .
+RUN yarn && cd www && yarn
+RUN cd www && yarn run build
+
+# Start again and just copy across the built files (+ node_modules)
+# TODO: Can we do this all on Alpine for a much smaller image? This node:8 image is ~600MB
+FROM node:8 as dist
+
+COPY --from=build /usr/src/app /usr/src/app
+WORKDIR /usr/src/app
+
+# To run this image, set the port as an env var with `-e PORT=xxxx` e.g.
+# docker run -p 8080:8080 --rm -it -e PORT=8080 <registryUsername>/<imageName>
+CMD [ "node","./scripts/www-data-explorer.js" ]

README.md

@@ -20,6 +20,7 @@ Websites built with Gatsby:
 * [Sourcegraph](https://about.sourcegraph.com)
 * [Simply](https://simply.co.za)
 * [The freeCodeCamp Guide](https://guide.freecodecamp.org)
+  ([source](https://github.com/freeCodeCamp/guides))
 * [FloydHub's Blog](https://blog.floydhub.com)
 * [mParticle's Documentation](https://docs.mparticle.com)
 * [Segment's Blog](https://segment.com/blog/)
@@ -31,6 +32,8 @@ Websites built with Gatsby:
   ([source](https://github.com/reasonml/reasonml.github.io))
 * [Bricolage.io](https://www.bricolage.io/)
   ([source](https://github.com/KyleAMathews/blog))
+* [Hack Club](https://hackclub.com/)
+  ([source](https://github.com/hackclub/site))
 * [Jamie Henson's Blog](http://jamiehenson.com/)
   ([source](https://github.com/jamiehenson/jh47-gatsby))
 * [Sean Coker's Blog](https://sean.is/)
@@ -144,6 +147,18 @@ Websites built with Gatsby:
 * [several levels](https://severallevels.io/) ([source](https://github.com/Harrison1/several-levels))
 * [Flooring Factories Outlets](https://www.flooringfactoriesoutlets.com/)
 * [Nortcast](https://nortcast.com/)
+* [VisitGemer](https://visitgemer.sk/)
+* [Nexit](https://nexit.sk/)
+* [ERC dEX](https://ercdex.com)
+* [iContract Blog](https://blog.icontract.co.uk)
+* [Dona Rita](https://donarita.co.uk) ([source](https://github.com/peduarte/dona-rita-website))
+* [Andy Slezak](https://www.aslezak.com) ([source](https://github.com/amslezak))
+* [Odayaka](http://odayaka.net) ([source](https://github.com/odayakanaasa/odayaka))
+* [Ventura Digitalagentur Köln](https://www.ventura-digital.de)
+* [Cardiogram](https://cardiogr.am/)
+* [LaserTime Clinic](https://lasertime.ru) ([source](https://github.com/oleglegun/lasertime))
+* [Gatsby Manor - themes for GatsbyJS](https://gatsbymanor.com)
+* [Darren Britton's Portfolio](https://darrenbritton.com) ([source](https://github.com/darrenbritton/darrenbritton.github.io))
 
 ## Docs
 

docs/blog/2017-09-18-gatsby-modern-static-generation/index.md

@@ -20,7 +20,7 @@ production by creating a landing page very fast.
 
 Static site generators like Jekyll all work pretty similarly:
 
-* Describe your content in some common templating language ([Pug](pugjs.org),
+* Describe your content in some common templating language ([Pug](http://pugjs.org),
   [Handlebars](http://handlebarsjs.com), etc)
 * While in development, start a local web server and add file "watchers" that
   will listen for content changes and re-render the site

docs/blog/2018-02-09-announcing-gatsby-manor-themes-for-gatsbyjs/index.md

@@ -0,0 +1,88 @@
+---
+title: Announcing Gatsby Manor, themes for Gatsby 🎉🎊
+date: "2018-02-09"
+image: "gatsbymanor.jpg"
+author: "Steven Natera"
+---
+
+I am proud to announce [Gatsby Manor](https://www.gatsbymanor.com/), a gallery
+of themes for [Gatsby](https://www.Gatsby.org/). After 5 months of
+development, Gatsby Manor is now in public beta. Check out our
+[themes](https://www.gatsbymanor.com/themes) then use our [getting started](https://www.gatsbymanor.com/docs/quick-start/getting-started) guide to
+kickstart your Gatsby project.
+
+## Overview
+
+Gatsby Manor is built on top of Gatsby to provide a painless way of building
+websites with reusable React components we call themes. We even have a
+cleverly named npm module for theme management called
+[Jay](https://github.com/gatsbymanor/gatsby-jay) 😄.
+
+With Jay you can download a theme from our collection, and mount it as a default
+theme. Styles are applied instantly without server restarts or additional lines
+of code. Because of React, interactivity is supported out of the box.
+
+Want to switch themes? No problem. Jay can archive themes for later use in a
+themes folder in your local directory. Edit and swap themes as often as you want
+and Jay will manage the process. Want to learn more? Read our
+[docs](https://www.gatsbymanor.com/docs/cli/)!
+
+## How it all started
+
+The idea began when I decided to update my personal website. I wanted a way to
+rebuild my website with ease however the approaches were less than exciting.
+
+Building a new site myself would require a lot of time. My imagination often
+runs wild when it comes to web design and what is supposed take a day of work
+turns into weeks of site iterations. The joys of web development often causes me
+to over-engineer simple websites. Not to mention that building a development
+environment alone is the biggest requirement when starting from scratch.
+Therefore another option needed to be explored.
+
+[Wordpress](https://wordpress.org/) would be the fastest solution to build a
+website but I wanted to be able to rapidly prototype on customs themes.
+Unfortunately, understanding the architecture to develop themes on this stack
+would require additional time. Not to mention I dislike PHP (#sorryNotSorry 😅)
+therefore this option was a clear loser. I tried [Hugo](https://gohugo.io/) and
+[Jekyll](https://jekyllrb.com/). They gave me the right mix of speed and
+control. But their templating languages were unappealing as long term options.
+
+When I stumbled onto Gatsby, I found the golden goose. I already worked with
+React before, therefore I could prototype rapidly. The development environment
+gave me a tight feedback loop out of the box. And I had all the control in the
+world for enhanced interactive features.
+
+## The development process
+
+Once settled on Gatsby, I started working on my personal website. Within 2
+hours I wanted to prototype with different design elements because I found
+inspiration from [html5up](https://html5up.net/) templates. However I did not
+want to discard my work so far.
+
+I decided to make a new directory to store my outdated work, like a true digital
+hoarder. A few more hours passed and I found myself yarning for
+my original design choice because the new design was too complex. I knew this
+situation would occur again (sometimes I can be indecisive 😅) so I decided to build
+a small cli tool to switch between themes easily. But first I needed a name, and
+Jay seemed the most clever since I was working with Gatsby.
+
+As I was debugging code one day, I stumbled onto a feature request for a
+[theme system](https://github.com/gatsbyjs/gatsby/issues/2662). At that moment,
+I decided I was going to build a theme solution for the community. Five
+months later, Gatsby Manor was born.
+
+## Final notes
+
+Gatsby Manor is in public beta until we reach v1. There are plenty of
+[Github](https://github.com/gatsbymanor) contributions to go around. To get
+started, try out a Gatsby Manor theme using our tutorial on [getting started](https://www.gatsbymanor.com/docs/quick-start/getting-started). Open an
+issue if you see an area of improvement. Follow and send us positive vibes on
+Twitter using [@TheGatsbyManor](https://twitter.com/TheGatsbyManor).
+
+TL;DR [Gatsby Manor](https://www.gatsbymanor.com/) is a place to get themes for
+your Gatsby project. Use our [getting started](https://www.gatsbymanor.com/docs/quick-start/getting-started) tutorial to use
+a [theme](https://www.gatsbymanor.com/themes) in your Gatsby project today.
+
+Cheers! 🎉🎊
+
+[@StevenNatera](https://twitter.com/stevennatera).