Merge branch 'master' into gatsby-source-medium/fetch-users-and-publications

Author: racedale

README.md

@@ -138,6 +138,8 @@ Websites built with Gatsby:
 * [Landing page of Put.io](https://put.io/)
 * [Ryan Wiemer's Portfolio](https://www.ryanwiemer.com)
   ([source](https://github.com/ryanwiemer/rw))
+* [yerevancoder](https://yerevancoder.com)
+  ([source](https://github.com/yerevancoder/yerevancoder.github.io))
 
 ## Docs
 

docs/blog/2018-01-18-how-boston-gov-used-gatsby-to-be-selected-as-an-amazon-hq2-candidate-city/index.md

@@ -10,7 +10,7 @@ Today, the team and the city scored a huge victory when Amazon announced that Bo
 
 ![Amazon Boston homepage](./amazon-boston.jpg "Boston city")
 
-When Amazon announced in September that it was looking to build a new headquarters,  bringing 50,000 jobs and billions of investment to the chosen city, Boston’s city government jumped to throw their hat in the ring.
+When Amazon announced in September that it was looking to build a new headquarters, bringing 50,000 jobs and billions of investment to the chosen city, Boston’s city government jumped to throw their hat in the ring.
 
 As a technology hub, the city wanted to put their best digital foot forward, so they turned to the Boston.gov team to build a website as the city’s application — [amazon.boston.gov](http://amazon.boston.gov) .
 

docs/docs/building-apps-with-gatsby.md

@@ -2,7 +2,7 @@
 title: "Building apps with Gatsby"
 ---
 
-Gatsby can be used to create fully dynamic apps. The default Gatsby app is made up of statically rendered pages. On this foundation, you can build what we call "hybrid" sites which adds dynamically rendered sections of pages and if needed, client-only routes. 
+Gatsby can be used to create fully dynamic apps. The default Gatsby app is made up of statically rendered pages. On this foundation, you can build what we call "hybrid" sites which adds dynamically rendered sections of pages and if needed, client-only routes.
 
 ## Statically rendered pages
 

docs/docs/gatsby-starters.md

@@ -80,7 +80,7 @@ Community:
   * Basic components: SiteNavi, SitePost, SitePage
 
 * [gatsby-blog-starter-kit](https://github.com/dschau/gatsby-blog-starter-kit)
-[(demo)](https://dschau.github.io/gatsby-blog-starter-kit/)
+  [(demo)](https://dschau.github.io/gatsby-blog-starter-kit/)
 
   Features:
 

docs/docs/querying-with-graphql.md

@@ -22,7 +22,7 @@ the browser when needed by your components.
 ## Why is GraphQL so cool?
 
 * Eliminate frontend data boilerplate — no need to worry about requesting & waiting for data. Just ask for the data you need with a GraphQL query and it'll show up when you need it
-* Push frontend complexity into queries — many data transformations can be done at *build-time* within your GraphQL queries
+* Push frontend complexity into queries — many data transformations can be done at _build-time_ within your GraphQL queries
 * It's the perfect data querying language for the often complex/nested data dependencies of modern applications
 * Improve performance by removing data bloat — GraphQL is a big part of why Gatsby is so fast as it enables lazy-loading the exact data in the exact form each view needs
 

packages/gatsby-plugin-netlify-cms/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-plugin-netlify-cms",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "A Gatsby plugin which generates the Netlify CMS single page app",
   "main": "index.js",
   "author": "Shawn Erquhart <[email protected]>",

packages/gatsby-plugin-netlify-cms/src/gatsby-node.js

@@ -1,34 +1,70 @@
 const HtmlWebpackPlugin = require(`html-webpack-plugin`)
 const HtmlWebpackIncludeAssetsPlugin = require(`html-webpack-include-assets-plugin`)
+const ExtractTextPlugin = require(`extract-text-webpack-plugin`)
+
+function plugins(stage) {
+  const commonPlugins = [
+    // Output /admin/index.html
+    new HtmlWebpackPlugin({
+      title: `Content Manager`,
+      filename: `admin/index.html`,
+      chunks: [`cms`],
+    }),
+
+    // Include the identity widget script in the html file
+    new HtmlWebpackIncludeAssetsPlugin({
+      assets: [`https://identity.netlify.com/v1/netlify-identity-widget.js`],
+      append: false,
+      publicPath: false,
+    }),
+  ]
 
-exports.modifyWebpackConfig = (
-  { config, stage },
-  { modulePath = `${__dirname}/cms.js` }
-) => {
   switch (stage) {
     case `develop`:
+      return commonPlugins
+    case `build-javascript`:
+      return [...commonPlugins, new ExtractTextPlugin(`cms.css`)]
+    default:
+      return []
+  }
+}
+
+function module(config, stage) {
+  switch (stage) {
     case `build-javascript`:
-      config.merge({
-        entry: {
-          cms: modulePath,
-        },
-        plugins: [
-          new HtmlWebpackPlugin({
-            title: `Content Manager`,
-            filename: `admin/index.html`,
-            chunks: [`cms`],
-          }),
-          new HtmlWebpackIncludeAssetsPlugin({
-            assets: [
-              `https://identity.netlify.com/v1/netlify-identity-widget.js`,
-            ],
-            append: false,
-            publicPath: false,
-          }),
-        ],
+      // Exclude Netlify CMS styles from Gatsby CSS bundle. This relies on
+      // Gatsby using webpack-configurator for webpack config extension, and
+      // also on the target loader key being named "css" in Gatsby's webpack
+      // config.
+      config.loader(`css`, {
+        exclude: [/\/node_modules\/netlify-cms\//],
+      })
+
+      // Exclusively extract Netlify CMS styles to /cms.css (filename configured
+      // above with plugin instantiation).
+      config.loader(`cms-css`, {
+        test: /\.css$/,
+        include: [/\/node_modules\/netlify-cms\//],
+        loader: ExtractTextPlugin.extract([`css`]),
       })
       return config
     default:
       return config
   }
 }
+
+exports.modifyWebpackConfig = (
+  { config, stage },
+  { modulePath = `${__dirname}/cms.js` }
+) => {
+  config.merge({
+    entry: {
+      cms: modulePath,
+    },
+    plugins: plugins(stage),
+  })
+
+  module(config, stage)
+
+  return config
+}

packages/gatsby-remark-images/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-remark-images",
-  "version": "1.5.37",
+  "version": "1.5.39",
   "description": "Processes images in markdown so they can be used in the production build.",
   "main": "index.js",
   "keywords": [

packages/gatsby-remark-images/src/__tests__/index.js

@@ -144,6 +144,5 @@ test(`it leaves non-relative HTML img tags alone`, async () => {
   `.trim()
 
   const nodes = await plugin(createPluginOptions(content, imagePath))
-
-  expect(nodes.length).toBe(0)
+  expect(nodes[0].value).toBe(content)
 })

packages/gatsby-remark-images/src/index.js

@@ -52,6 +52,7 @@ module.exports = (
       }
       return null
     })
+
     if (!imageNode || !imageNode.absolutePath) {
       return resolve()
     }
@@ -141,9 +142,12 @@ module.exports = (
             fileType !== `svg`
           ) {
             const rawHTML = await generateImagesAndUpdateNode(node, resolve)
-            // Replace the image node with an inline HTML node.
-            node.type = `html`
-            node.value = rawHTML
+
+            if (rawHTML) {
+              // Replace the image node with an inline HTML node.
+              node.type = `html`
+              node.value = rawHTML
+            }
             return resolve(node)
           } else {
             // Image isn't relative so there's nothing for us to do.
@@ -197,10 +201,13 @@ module.exports = (
                   formattedImgTag,
                   resolve
                 )
-                // Replace the image string
-                thisImg.replaceWith(rawHTML)
-              } else {
-                return resolve()
+
+                if (rawHTML) {
+                  // Replace the image string
+                  thisImg.replaceWith(rawHTML)
+                } else {
+                  return resolve()
+                }
               }
             }