[1.0] Make mediaType optional (#1299)

* Make mediaType optional * Fix tests * more test fixing
gatsbyjs · Jun 29, 2017 · e82dbed · e82dbed
1 parent 9f377dc
commit e82dbed
Show file tree

Hide file tree

Showing 35 changed files with 158 additions and 319 deletions.
diff --git a/docs/docs/node-interface.md b/docs/docs/node-interface.md
@@ -15,14 +15,17 @@ parent: String,
 fields: Object,
 internal: {
   contentDigest: String,
+  // Optional media type (https://en.wikipedia.org/wiki/Media_type) to indicate
+  // to transformer plugins this node has data they can futher process.
   mediaType: String,
   // A globally unique node type choosen by the plugin owner.
   type: String,
   // The plugin which created this node.
   owner: String,
   // Stores which plugins created which fields.
   fieldOwners: Object,
-  // Raw content for this node.
+  // Optional field exposing the raw content for this node
+  // that transformer plugins can take and further process.
   content: String,
 }
 ...other node type specific fields

diff --git a/examples/image-processing/src/pages/index.js b/examples/image-processing/src/pages/index.js
@@ -325,8 +325,8 @@ export const pageQuery = graphql`
     }
     sizes: imageSharp(id: { regex: "/fecolormatrix-kanye-west.jpg/" }) {
       responsiveSizes(
-        duotone: { highlight: "#f00e2e", shadow: "#192550" },
-        toFormat: PNG,
+        duotone: { highlight: "#f00e2e", shadow: "#192550" }
+        toFormat: PNG
       ) {
         base64
         aspectRatio

diff --git a/examples/using-remark/src/pages/index.js b/examples/using-remark/src/pages/index.js
@@ -82,9 +82,9 @@ export const pageQuery = graphql`
       }
     }
     allMarkdownRemark(
-      limit: 2000,
-      sort: { fields: [frontmatter___date], order: DESC },
-      filter: { frontmatter: { draft: { ne: true } } },
+      limit: 2000
+      sort: { fields: [frontmatter___date], order: DESC }
+      filter: { frontmatter: { draft: { ne: true } } }
     ) {
       edges {
         node {

diff --git a/examples/using-remark/src/pages/tags.js b/examples/using-remark/src/pages/tags.js
@@ -38,8 +38,8 @@ export const pageQuery = graphql`
       }
     }
     allMarkdownRemark(
-      limit: 2000,
-      filter: { frontmatter: { draft: { ne: true } } },
+      limit: 2000
+      filter: { frontmatter: { draft: { ne: true } } }
     ) {
       group(field: frontmatter___tags) {
         fieldValue

diff --git a/examples/using-remark/src/templates/template-blog-post.js b/examples/using-remark/src/templates/template-blog-post.js
@@ -136,10 +136,10 @@ export const pageQuery = graphql`
             children {
               ... on ImageSharp {
                 responsiveResolution(
-                  width: 50,
-                  height: 50,
-                  quality: 75,
-                  grayscale: true,
+                  width: 50
+                  height: 50
+                  quality: 75
+                  grayscale: true
                 ) {
                   src
                   srcSet

diff --git a/examples/using-remark/src/templates/template-tag-page.js b/examples/using-remark/src/templates/template-tag-page.js
@@ -34,9 +34,9 @@ export default TagRoute
 export const pageQuery = graphql`
   query TagPage($tag: String) {
     allMarkdownRemark(
-      limit: 1000,
-      sort: { fields: [frontmatter___date], order: DESC },
-      filter: { frontmatter: { tags: { in: [$tag] }, draft: { ne: true } } },
+      limit: 1000
+      sort: { fields: [frontmatter___date], order: DESC }
+      filter: { frontmatter: { tags: { in: [$tag] }, draft: { ne: true } } }
     ) {
       totalCount
       edges {

diff --git a/packages/gatsby-remark-copy-linked-files/src/index.js b/packages/gatsby-remark-copy-linked-files/src/index.js
@@ -3,7 +3,7 @@ const isRelativeUrl = require(`is-relative-url`)
 const fsExtra = require(`fs-extra`)
 const path = require(`path`)
 const _ = require(`lodash`)
-const $ = require('cheerio');
+const $ = require(`cheerio`)
 
 module.exports = ({ files, markdownNode, markdownAST, getNode }) => {
   // Copy linked files to the public directory and modify the AST to point to
@@ -63,14 +63,14 @@ module.exports = ({ files, markdownNode, markdownAST, getNode }) => {
       visitor(image)
     }
   })
-  
+
   // Same as the above except it only works for html img tags
   visit(markdownAST, `html`, node => {
-    if(node.value.startsWith('<img')){
-      let image = Object.assign(node, $.parseHTML(node.value)[0].attribs);
-      image.url = image.src;
-      image.type = 'image';
-      image.position =  node.position;
+    if (node.value.startsWith(`<img`)) {
+      let image = Object.assign(node, $.parseHTML(node.value)[0].attribs)
+      image.url = image.src
+      image.type = `image`
+      image.position = node.position
 
       const imagePath = path.join(getNode(markdownNode.parent).dir, image.url)
       const imageNode = _.find(files, file => {

diff --git a/packages/gatsby-remark-responsive-image/src/index.js b/packages/gatsby-remark-responsive-image/src/index.js
@@ -4,7 +4,7 @@ const isRelativeUrl = require(`is-relative-url`)
 const _ = require(`lodash`)
 const { responsiveSizes } = require(`gatsby-plugin-sharp`)
 const Promise = require(`bluebird`)
-const $ = require('cheerio');
+const $ = require(`cheerio`)
 
 // If the image is relative (not hosted elsewhere)
 // 1. Find the image file
@@ -23,22 +23,23 @@ module.exports = (
   }
 
   const options = _.defaults(pluginOptions, defaults)
-  
+
   // This will only work for markdown syntax image tags
-  const imageNodes = select(markdownAST, 'image');
+  const imageNodes = select(markdownAST, `image`)
 
   // This will also allow the use of html image tags
-  const rawHtmlImageNodes = select(markdownAST, 'html').filter((node) => {
-    return node.value.startsWith('<img');
-  });
+  const rawHtmlImageNodes = select(markdownAST, `html`).filter(node => node.value.startsWith(`<img`))
 
-  for(let node of rawHtmlImageNodes) {
-    let formattedImgTag = Object.assign(node, $.parseHTML(node.value)[0].attribs);
-    formattedImgTag.url = formattedImgTag.src;
-    formattedImgTag.type = 'image';
-    formattedImgTag.position =  node.position;
+  for (let node of rawHtmlImageNodes) {
+    let formattedImgTag = Object.assign(
+      node,
+      $.parseHTML(node.value)[0].attribs
+    )
+    formattedImgTag.url = formattedImgTag.src
+    formattedImgTag.type = `image`
+    formattedImgTag.position = node.position
 
-    imageNodes.push(formattedImgTag);
+    imageNodes.push(formattedImgTag)
   }
 
   return Promise.all(