Merge branch 'master' into sync-db-autosaves

gatsbyjs · Dec 4, 2018 · 6d757fb · 6d757fb
2 parents 83421d4 + 5e1c836
commit 6d757fb
Show file tree

Hide file tree

Showing 47 changed files with 543 additions and 59 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,12 +1,6 @@
 <!--
   Q. Which branch should I use for my pull request?
-  A. Use `master` branch (probably).
-
-  Q. Which branch if my change is a bug fix for Gatsby v1?
-  A. In this case, you should use the `v1` branch
-
-  Q. Which branch if I'm still not sure?
-  A. Use `master` branch. Ask in the PR if you're not sure and a Gatsby maintainer will be happy to help :)
+  A. Your best bet is to go for `master`. If you are unsure, ask in the PR, and a Gatsby mantainer will be happy to help :)
 
   Note: We will only accept bug fixes for Gatsby v1. New features should be added to Gatsby v2.
 

diff --git a/docs/docs/testing-react-components.md b/docs/docs/testing-react-components.md
@@ -29,11 +29,11 @@ import "react-testing-library/cleanup-after-each"
 
 This file gets run automatically by Jest before every test and therefore you don't need to add the imports to every single test file.
 
-Lastly you need to tell Jest where to find this file. Open your `package.json` and add this entry to your `"jest"` section:
+Lastly you need to tell Jest where to find this file. Open your `jest.config.js` and add this entry to the bottom after 'setupFiles':
 
-```json:title=package.json
-"jest": {
-  "setupTestFrameworkScriptFile": "<rootDir>/setup-test-env.js"
+```js:title=jest.config.js
+module.exports = {
+  setupTestFrameworkScriptFile: "<rootDir>/setup-test-env.js",
 }
 ```
 

diff --git a/docs/sites.yml b/docs/sites.yml
@@ -3150,6 +3150,17 @@
   built_by: Gabe Ragland
   built_by_url: https://twitter.com/gabe_ragland
   featured: false
+- title: Disrupting Nate
+  description: >
+    Ketogenic Diet, Podcasts, and Blockchain.
+  url: https://www.disruptingnate.com/
+  main_url: https://disruptingnate.com/
+  categories:
+    - Technology
+    - Podcasts
+  built_by: Nathan Olmstead
+  built_by_url: https://twitter.com/disruptingnate
+  featured: false
 - title: Ambassador
   url: https://www.getambassador.io
   main_url: https://www.getambassador.io
@@ -3611,3 +3622,37 @@
     - Education
   built_by: Michael Uloth
   built_by_url: "https://www.michaeluloth.com"
+- title: Grooovinger
+  url: https://www.grooovinger.com
+  main_url: https://www.grooovinger.com
+  description: >
+    Martin Grubinger, a web developer from Austria
+  categories:
+    - Portfolio
+    - Web Development
+  built_by: Martin Grubinger
+  built_by_url: https://www.grooovinger.com
+  featured: false
+- title: LXDX - the Crypto Derivatives Exchange
+  main_url: https://www.lxdx.co/
+  url: https://www.lxdx.co/
+  description: >
+    LXDX is the world's fastest crypto exchange. Our mission is to bring innovative financial products to retail crypto investors, providing access to the same speed and scalability that institutional investors already depend on us to deliver each and every day.
+  categories:
+    - Marketing
+    - Blockchain
+    - Finance
+  built_by: Corey Ward
+  built_by_url: http://www.coreyward.me/
+  featured: false
+- title: Kyle McDonald
+  url: https://kylemcd.com
+  main_url: https://kylemcd.com
+  source_url: https://github.com/kylemcd/personal-site-react
+  description: >
+    Personal site + blog for Kyle McDonald
+  categories:
+    - Blog
+  built_by: Kyle McDonald
+  built_by_url: https://kylemcd.com
+  featured: false
diff --git a/docs/starters.yml b/docs/starters.yml
@@ -843,15 +843,19 @@
     - Blog
     - Markdown
     - PWA
+    - Disqus
+    - SEO
+    - Styling:CSS-in-JS
   features:
     - Blog post listing with previews (image + summary) for each blog post
     - Fully configurable
     - Multilang support (blog post only)
     - Syntax highlighting
+    - css-in-js (with styled-components)
     - Fully Responsive
     - Tags
     - Google Analytics
-    - Disqus
+    - Disqus comments support
     - Offline support
     - Web App Manifest
     - ESLint
@@ -1312,3 +1316,31 @@
     - Google Analytics Integration
     - Uses Gatsby v2
     - SEO
+- url: http://starter-ghost-blog.surge.sh/
+  repo: https://github.com/little-wolf-studio/gatsby-starter-ghost-blog
+  description: Ghost Blog Starter Kit
+  tags:
+    - Ghost
+    - Blog
+    - Linting
+    - Headless CMS
+    - Styling:CSS-in-JS
+  features:
+    - Uses the Ghost CMS source
+    - Renders pages for posts, tags and authors
+    - Responsive Design
+    - Google Analytics Integration
+    - Uses Gatsby v2
+    - ESLint and Prettier
+    - Offline support
+- url: https://gatsby-starter-notes.netlify.com/
+  repo: https://github.com/patricoferris/gatsby-starter-notes
+  description: Gatsby starter for creating notes organised by subject and topic
+  tags:
+    - Markdown
+    - Pagination
+  features:
+    - Create by topic per subject notes that are organised using pagination
+    - Support for code syntax highlighting
+    - Support for mathematical expressions
+    - Support for images
diff --git a/docs/tutorial/part-one/index.md b/docs/tutorial/part-one/index.md
@@ -19,7 +19,7 @@ When creating a new Gatsby site, you can use the following command structure to
 gatsby new [SITE_DIRECTORY_NAME] [URL_OF_STARTER_GITHUB_REPO]
 ```
 
-> 💡 See a list of the existing [**official and community starters**](/docs/gatsby-starters/)!
+> 💡 See a list of the existing [**official and community starters**](/starters/)!
 
 If you omit a URL from the end, Gatsby will automatically generate a site for you based on the [**default starter**](https://github.com/gatsbyjs/gatsby-starter-default). For this section of the tutorial, stick with the “Hello World” site you already created in tutorial part zero.
 

diff --git a/packages/babel-preset-gatsby/CHANGELOG.md b/packages/babel-preset-gatsby/CHANGELOG.md
@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+<a name="0.1.6"></a>
+
+## [0.1.6](https://github.com/gatsbyjs/gatsby/compare/[email protected]@0.1.6) (2018-12-01)
+
+**Note:** Version bump only for package babel-preset-gatsby
+
 <a name="0.1.5"></a>
 
 ## [0.1.5](https://github.com/gatsbyjs/gatsby/compare/[email protected]@0.1.5) (2018-11-29)

diff --git a/packages/babel-preset-gatsby/README.md b/packages/babel-preset-gatsby/README.md
@@ -9,9 +9,9 @@ For more information on how to customize the Babel configuration of your Gatsby
 - [`@babel/preset-env`](https://babeljs.io/docs/en/babel-preset-env)
 - [`@babel/preset-react`](https://babeljs.io/docs/en/babel-preset-react)
 - [`@babel/plugin-proposal-class-properties`](https://babeljs.io/docs/en/babel-plugin-proposal-class-properties)
-- [`babel-plugin-macros`](https://github.com/kentcdodds/babel-plugin-macros)
-- [`@babel/plugin-proposal-optional-chaining`](https://babeljs.io/docs/en/babel-plugin-proposal-optional-chaining)
+- [`@babel/plugin-syntax-dynamic-import`](https://babeljs.io/docs/en/babel-plugin-syntax-dynamic-import)
 - [`@babel/plugin-transform-runtime`](https://babeljs.io/docs/en/babel-plugin-transform-runtime#docsNav)
+- [`babel-plugin-macros`](https://github.com/kentcdodds/babel-plugin-macros)
 
 ## Usage
 

diff --git a/packages/babel-preset-gatsby/package.json b/packages/babel-preset-gatsby/package.json
@@ -1,6 +1,6 @@
 {
   "name": "babel-preset-gatsby",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "author": "Philipp Spiess <[email protected]>",
   "dependencies": {
     "@babel/plugin-proposal-class-properties": "^7.0.0",

diff --git a/packages/gatsby-plugin-feed/CHANGELOG.md b/packages/gatsby-plugin-feed/CHANGELOG.md
@@ -3,6 +3,12 @@
 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.11"></a>
+
+## [2.0.11](https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-plugin-feed/compare/[email protected]@2.0.11) (2018-12-01)
+
+**Note:** Version bump only for package gatsby-plugin-feed
+
 <a name="2.0.10"></a>
 
 ## [2.0.10](https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-plugin-feed/compare/[email protected]@2.0.10) (2018-11-29)

diff --git a/packages/gatsby-plugin-feed/README.md b/packages/gatsby-plugin-feed/README.md
@@ -49,6 +49,7 @@ plugins: [
             return allMarkdownRemark.edges.map(edge => {
               return Object.assign({}, edge.node.frontmatter, {
                 description: edge.node.excerpt,
+                date: edge.node.frontmatter.date,
                 url: site.siteMetadata.siteUrl + edge.node.fields.slug,
                 guid: site.siteMetadata.siteUrl + edge.node.fields.slug,
                 custom_elements: [{ "content:encoded": edge.node.html }],
@@ -85,4 +86,6 @@ plugins: [
 ]
 ```
 
+To see what option keys are valid, see [the itemOptions section](https://www.npmjs.com/package/rss#itemoptions) of the RSS module.
+
 NOTE: This plugin only generates the `/rss.xml` file when run in `production` mode! To test your feed, run: `gatsby build && gatsby serve`.
diff --git a/packages/gatsby-plugin-feed/package.json b/packages/gatsby-plugin-feed/package.json
@@ -1,7 +1,7 @@
 {
   "name": "gatsby-plugin-feed",
   "description": "Creates an RSS feed for your Gatsby site.",
-  "version": "2.0.10",
+  "version": "2.0.11",
   "author": "Nicholas Young <[email protected]>",
   "bugs": {
     "url": "https://github.com/gatsbyjs/gatsby/issues"

diff --git a/packages/gatsby-plugin-react-helmet/CHANGELOG.md b/packages/gatsby-plugin-react-helmet/CHANGELOG.md
@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+<a name="3.0.4"></a>
+
+## [3.0.4](https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-plugin-react-helmet/compare/[email protected]@3.0.4) (2018-12-01)
+
+**Note:** Version bump only for package gatsby-plugin-react-helmet
+
 <a name="3.0.3"></a>
 
 ## [3.0.3](https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-plugin-react-helmet/compare/[email protected]@3.0.3) (2018-11-29)

diff --git a/packages/gatsby-plugin-react-helmet/README.md b/packages/gatsby-plugin-react-helmet/README.md
@@ -25,5 +25,5 @@ plugins: [`gatsby-plugin-react-helmet`]
 
 ## Examples
 
-- [GatsbyJS.org](https://github.com/gatsbyjs/gatsby/blob/master/www/src/components/layout.js)
+- [GatsbyJS.org](https://github.com/gatsbyjs/gatsby/blob/master/www/src/components/site-metadata.js)
 - [Jason Lengstorf personal website](https://github.com/jlengstorf/lengstorf.com/blob/master/src/components/SEO/SEO.js)
diff --git a/packages/gatsby-plugin-react-helmet/package.json b/packages/gatsby-plugin-react-helmet/package.json
@@ -1,7 +1,7 @@
 {
   "name": "gatsby-plugin-react-helmet",
   "description": "Manage document head data with react-helmet. Provides drop-in server rendering support for Gatsby.",
-  "version": "3.0.3",
+  "version": "3.0.4",
   "author": "Kyle Mathews <[email protected]>",
   "bugs": {
     "url": "https://github.com/gatsbyjs/gatsby/issues"

diff --git a/packages/gatsby-remark-embed-snippet/CHANGELOG.md b/packages/gatsby-remark-embed-snippet/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+<a name="3.1.2"></a>
+
+## [3.1.2](https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-remark-embed-snippet/compare/[email protected]@3.1.2) (2018-11-30)
+
+### Bug Fixes
+
+- **gatsby-remark-prismjs:** prevent additional blank line from appearing ([#10209](https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-remark-embed-snippet/issues/10209)) ([71d7f23](https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-remark-embed-snippet/commit/71d7f23))
+
 <a name="3.1.1"></a>
 
 ## [3.1.1](https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-remark-embed-snippet/compare/[email protected]@3.1.1) (2018-11-29)

diff --git a/packages/gatsby-remark-embed-snippet/package.json b/packages/gatsby-remark-embed-snippet/package.json
@@ -1,7 +1,7 @@
 {
   "name": "gatsby-remark-embed-snippet",
   "description": "Gatsby plugin to embed formatted code snippets within markdown",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "author": "Brian Vaughn <[email protected]>",
   "bugs": {
     "url": "https://github.com/gatsbyjs/gatsby/issues"

diff --git a/packages/gatsby-remark-prismjs/CHANGELOG.md b/packages/gatsby-remark-prismjs/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+<a name="3.1.3"></a>
+
+## [3.1.3](https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-remark-prismjs/compare/[email protected]@3.1.3) (2018-12-03)
+
+### Features
+
+- **gatsby-remark-prismjs:** Allow global line number config ([#10076](https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-remark-prismjs/issues/10076)) ([2efec7a](https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-remark-prismjs/commit/2efec7a))
+
+<a name="3.1.2"></a>
+
+## [3.1.2](https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-remark-prismjs/compare/[email protected]@3.1.2) (2018-11-30)
+
+### Bug Fixes
+
+- **gatsby-remark-prismjs:** prevent additional blank line from appearing ([#10209](https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-remark-prismjs/issues/10209)) ([71d7f23](https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-remark-prismjs/commit/71d7f23))
+
 <a name="3.1.1"></a>
 
 ## [3.1.1](https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-remark-prismjs/compare/[email protected]@3.1.1) (2018-11-29)

diff --git a/packages/gatsby-remark-prismjs/README.md b/packages/gatsby-remark-prismjs/README.md
@@ -39,11 +39,13 @@ plugins: [
             // the language "sh" which will highlight using the
             // bash highlighter.
             aliases: {},
-            // This toggles the display of line numbers alongside the code.
+            // This toggles the display of line numbers globally alongside the code.
             // To use it, add the following line in src/layouts/index.js
             // right after importing the prism color scheme:
             //  `require("prismjs/plugins/line-numbers/prism-line-numbers.css");`
             // Defaults to false.
+            // If you wish to only show line numbers on certain code blocks,
+            // leave false and use the {numberLines: true} syntax below
             showLineNumbers: false,
             // If setting this to true, the parser won't handle and highlight inline
             // code used in markdown i.e. single backtick code like `this`.

diff --git a/packages/gatsby-remark-prismjs/package.json b/packages/gatsby-remark-prismjs/package.json
@@ -1,7 +1,7 @@
 {
   "name": "gatsby-remark-prismjs",
   "description": "Adds syntax highlighting to code blocks at build time using PrismJS",
-  "version": "3.1.1",
+  "version": "3.1.3",
   "author": "Kyle Mathews <[email protected]>",
   "bugs": {
     "url": "https://github.com/gatsbyjs/gatsby/issues"