README.md

@@ -1,5 +1,5 @@
 <p align="center">
-  <a href="https://gatsbyjs.com">
+  <a href="https://www.gatsbyjs.com">
     <img alt="Gatsby" src="https://www.gatsbyjs.com/Gatsby-Monogram.svg" width="60" />
   </a>
 </p>
@@ -41,17 +41,17 @@
 </p>
 
 <h3 align="center">
-  <a href="https://gatsbyjs.com/docs/">Quickstart</a>
+  <a href="https://www.gatsbyjs.com/docs/">Quickstart</a>
   <span> · </span>
-  <a href="https://gatsbyjs.com/tutorial/">Tutorial</a>
+  <a href="https://www.gatsbyjs.com/tutorial/">Tutorial</a>
   <span> · </span>
-  <a href="https://gatsbyjs.com/plugins/">Plugins</a>
+  <a href="https://www.gatsbyjs.com/plugins/">Plugins</a>
   <span> · </span>
-  <a href="https://gatsbyjs.com/starters/">Starters</a>
+  <a href="https://www.gatsbyjs.com/starters/">Starters</a>
   <span> · </span>
-  <a href="https://gatsbyjs.com/showcase/">Showcase</a>
+  <a href="https://www.gatsbyjs.com/showcase/">Showcase</a>
   <span> · </span>
-  <a href="https://gatsbyjs.com/contributing/how-to-contribute/">Contribute</a>
+  <a href="https://www.gatsbyjs.com/contributing/how-to-contribute/">Contribute</a>
   <span> · </span>
   Support: <a href="https://twitter.com/AskGatsbyJS">Twitter</a>
   <span> & </span>
@@ -80,7 +80,7 @@ Gatsby is a modern web framework for blazing fast websites.
   site on a CDN for a fraction of the cost of a server-rendered site. Many Gatsby sites can be
   hosted entirely free on services like GitHub Pages and Netlify.
 
-[**Learn how to use Gatsby for your next project.**](https://gatsbyjs.com/docs/)
+[**Learn how to use Gatsby for your next project.**](https://www.gatsbyjs.com/docs/)
 
 ## What’s In This Document
 
@@ -124,36 +124,36 @@ You can get a new Gatsby site up and running on your local dev environment in 5
 
    Your site is now running at `http://localhost:8000`. Open the `my-blazing-fast-site` directory in your code editor of choice and edit `src/pages/index.js`. Save your changes, and the browser will update in real time!
 
-At this point, you’ve got a fully functional Gatsby website. For additional information on how you can customize your Gatsby site, see our [plugins](https://gatsbyjs.com/plugins/) and [the official tutorial](https://gatsbyjs.com/tutorial/).
+At this point, you’ve got a fully functional Gatsby website. For additional information on how you can customize your Gatsby site, see our [plugins](https://gatsbyjs.com/plugins/) and [the official tutorial](https://www.gatsbyjs.com/tutorial/).
 
 ## 🎓 Learning Gatsby
 
-Full documentation for Gatsby lives [on the website](https://gatsbyjs.com/).
+Full documentation for Gatsby lives [on the website](https://www.gatsbyjs.com/).
 
-- **For most developers, we recommend starting with our [in-depth tutorial for creating a site with Gatsby](https://gatsbyjs.com/tutorial/).** It starts with zero assumptions about your level of ability and walks through every step of the process.
+- **For most developers, we recommend starting with our [in-depth tutorial for creating a site with Gatsby](https://www.gatsbyjs.com/tutorial/).** It starts with zero assumptions about your level of ability and walks through every step of the process.
 
-- **To dive straight into code samples head [to our documentation](https://gatsbyjs.com/docs/).** In particular, check out the “<i>Guides</i>”, “<i>API Reference</i>”, and “<i>Advanced Tutorials</i>” sections in the sidebar.
+- **To dive straight into code samples head [to our documentation](https://www.gatsbyjs.com/docs/).** In particular, check out the “<i>Guides</i>”, “<i>API Reference</i>”, and “<i>Advanced Tutorials</i>” sections in the sidebar.
 
-We welcome suggestions for improving our docs. See the [“how to contribute”](https://gatsbyjs.com/contributing/how-to-contribute/) documentation for more details.
+We welcome suggestions for improving our docs. See the [“how to contribute”](https://www.gatsbyjs.com/contributing/how-to-contribute/) documentation for more details.
 
-**Start Learning Gatsby: [Follow the Tutorial](https://gatsbyjs.com/tutorial/) · [Read the Docs](https://gatsbyjs.com/docs/)**
+**Start Learning Gatsby: [Follow the Tutorial](https://www.gatsbyjs.com/tutorial/) · [Read the Docs](https://www.gatsbyjs.com/docs/)**
 
 ## 💼 Migration Guides
 
 Already have a Gatsby site? These handy guides will help you add the improvements of Gatsby v2 to your site without starting from scratch!
 
-- [Migrate a Gatsby site from v1 to v2](https://gatsbyjs.com/docs/migrating-from-v1-to-v2/)
-- Still on v0? Start here: [Migrate a Gatsby site from v0 to v1](https://gatsbyjs.com/docs/migrating-from-v0-to-v1/)
+- [Migrate a Gatsby site from v1 to v2](https://www.gatsbyjs.com/docs/migrating-from-v1-to-v2/)
+- Still on v0? Start here: [Migrate a Gatsby site from v0 to v1](https://www.gatsbyjs.com/docs/migrating-from-v0-to-v1/)
 
 ## ❗ Code of Conduct
 
-Gatsby is dedicated to building a welcoming, diverse, safe community. We expect everyone participating in the Gatsby community to abide by our [**Code of Conduct**](https://gatsbyjs.com/contributing/code-of-conduct/). Please read it. Please follow it. In the Gatsby community, we work hard to build each other up and create amazing things together. 💪💜
+Gatsby is dedicated to building a welcoming, diverse, safe community. We expect everyone participating in the Gatsby community to abide by our [**Code of Conduct**](https://www.gatsbyjs.com/contributing/code-of-conduct/). Please read it. Please follow it. In the Gatsby community, we work hard to build each other up and create amazing things together. 💪💜
 
 ## 🤝 How to Contribute
 
 Whether you're helping us fix bugs, improve the docs, or spread the word, we'd love to have you as part of the Gatsby community! :muscle::purple_heart:
 
-Check out our [**Contributing Guide**](https://gatsbyjs.com/contributing/how-to-contribute/) for ideas on contributing and setup steps for getting our repositories up and running on your local machine.
+Check out our [**Contributing Guide**](https://www.gatsbyjs.com/contributing/how-to-contribute/) for ideas on contributing and setup steps for getting our repositories up and running on your local machine.
 
 ### A note on how this repository is organized
 
@@ -169,4 +169,4 @@ Licensed under the [MIT License](./LICENSE).
 
 ## 💜 Thanks
 
-Thanks to our many contributors and to [Netlify](https://www.netlify.com/) for hosting [gatsbyjs.com](https://gatsbyjs.com) and our example sites.
+Thanks to our many contributors and to [Netlify](https://www.netlify.com/) for hosting [GatsbyJs](https://www.gatsbyjs.com) and our example sites.

benchmarks/gabe-csv-markdown/gatsby-node.js

@@ -1,52 +1,49 @@
 const path = require(`path`)
-const { createFilePath } = require(`gatsby-source-filesystem`)
+
+const blogPost = path.resolve(`./src/templates/blog-post.js`)
 
 exports.createPages = async ({ graphql, actions }) => {
   const { createPage } = actions
-  const blogPost = path.resolve(`./src/templates/blog-post.js`)
 
-  const result = await graphql(
-    `
-      {
-        allMarkdownRemark(sort: null) {
-          edges {
-            node {
-              id
-              frontmatter {
-                slug
-                title
-              }
-            }
+  const result = await graphql(`
+    query {
+      allMarkdownRemark {
+        nodes {
+          id
+          frontmatter {
+            slug
+            title # used in prev/next
           }
         }
       }
-    `
-  )
+    }
+  `)
 
   if (result.errors) {
     throw result.errors
   }
 
-  // Create blog posts pages.
-  const posts = result.data.allMarkdownRemark.edges
+  const posts = result.data.allMarkdownRemark.nodes
 
-  posts.forEach((post, index) => {
+  posts.forEach(({ id, frontmatter: { slug } }, index) => {
     const previous = index === posts.length - 1 ? null : posts[index + 1].node
     const next = index === 0 ? null : posts[index - 1].node
 
     createPage({
-      path: post.node.frontmatter.slug,
+      path: slug,
       component: blogPost,
       context: {
-        slug: post.node.frontmatter.slug,
-        id: post.node.id,
+        id,
+        slug,
         previous,
         next,
       },
     })
   })
 }
 
+// Not sure if there is a better way than to create a proxy node for markdown to pick up
+// I certainly can't get remark to to pick up csv nodes :(
 exports.onCreateNode = ({ node, actions }) => {
   const { createNode } = actions
 
@@ -58,7 +55,7 @@ exports.onCreateNode = ({ node, actions }) => {
         type: `MarkdownProxy`,
         mediaType: "text/markdown",
         content: node.articleContent,
-        contentDigest: String(Math.random()),
+        contentDigest: node.articleContent,
       },
     })
   }

benchmarks/gabe-csv-markdown/gen.js

@@ -30,13 +30,15 @@ title: "${title.replace(/"/g, '\\"')}"
 description: "${desc.replace(/"/g, '\\"')}"
 slug: '${slug}'
 date: ${date}
-tags: [${tags}]
 ---
 
 # ${title}
 
 > ${desc}
-${faker.lorem.paragraphs(2)}
+
+${faker.lorem.paragraphs()}
+
+${faker.lorem.paragraphs()}
   `
 
   // Note: you can only escape double quotes (by doubling them, not by backslash)

benchmarks/gabe-csv-markdown/src/pages/index.js

@@ -8,31 +8,30 @@ class BlogIndex extends React.Component {
   render() {
     const { data } = this.props
     const siteTitle = data.site.siteMetadata.title
-    const posts = data.allMarkdownRemark.edges
+    const posts = data.allMarkdownRemark.nodes
 
     return (
       <Layout location={this.props.location} title={siteTitle}>
         <Bio />
-        {posts.map(({ node }) => {
-          const title = node.frontmatter.title || node.frontmatter.slug
+        {posts.map(({ frontmatter: { title, slug, date, description } }) => {
           return (
-            <article key={node.frontmatter.slug}>
+            <article key={slug}>
               <header>
                 <h3
                   style={{
-                    marginBottom: '5px',
+                    marginBottom: "5px",
                   }}
                 >
-                  <Link style={{ boxShadow: `none` }} to={'/' + node.frontmatter.slug}>
+                  <Link style={{ boxShadow: `none` }} to={"/" + slug}>
                     {title}
                   </Link>
                 </h3>
-                <small>{node.frontmatter.date}</small>
+                <small>{date}</small>
               </header>
               <section>
                 <p
                   dangerouslySetInnerHTML={{
-                    __html: node.frontmatter.description || node.excerpt,
+                    __html: description,
                   }}
                 />
               </section>
@@ -53,16 +52,16 @@ export const pageQuery = graphql`
         title
       }
     }
-    allMarkdownRemark(limit: 100) {
-      edges {
-        node {
-          excerpt
-          frontmatter {
-            slug
-            date(formatString: "MMMM DD, YYYY")
-            title
-            description
-          }
+    allMarkdownRemark(
+      limit: 100
+      sort: { fields: frontmatter___date, order: DESC }
+    ) {
+      nodes {
+        frontmatter {
+          title
+          slug
+          date(formatString: "MMMM DD, YYYY")
+          description
         }
       }
     }

benchmarks/gabe-csv-markdown/src/templates/blog-post.js

@@ -6,37 +6,22 @@ import Layout from "../components/layout"
 
 class BlogPostTemplate extends React.Component {
   render() {
-    const post = this.props.data.markdownRemark
+    const {
+      html,
+      frontmatter: { title, date },
+    } = this.props.data.markdownRemark
     const siteTitle = this.props.data.site.siteMetadata.title
     const { previous, next } = this.props.pageContext
 
     return (
       <Layout location={this.props.location} title={siteTitle}>
         <article>
           <header>
-            <h1
-              style={{
-                marginTop: '5px',
-                marginBottom: 0,
-              }}
-            >
-              {post.frontmatter.title}
-            </h1>
-            <p
-              style={{
-                display: `block`,
-                marginBottom: '5px',
-              }}
-            >
-              {post.frontmatter.date}
-            </p>
+            <h1 style={{ marginTop: "5px", marginBottom: 0 }}>{title}</h1>
+            <p style={{ display: `block`, marginBottom: "5px" }}>{date}</p>
           </header>
-          <section dangerouslySetInnerHTML={{ __html: post.html }} />
-          <hr
-            style={{
-              marginBottom: '5px',
-            }}
-          />
+          <section dangerouslySetInnerHTML={{ __html: html }} />
+          <hr style={{ marginBottom: "5px" }} />
           <footer>
             <Bio />
           </footer>
@@ -54,14 +39,14 @@ class BlogPostTemplate extends React.Component {
           >
             <li>
               {previous && (
-                <Link to={'/' + previous.frontmatter.slug} rel="prev">
+                <Link to={"/" + previous.frontmatter.slug} rel="prev">
                   ← {previous.frontmatter.title}
                 </Link>
               )}
             </li>
             <li>
               {next && (
-                <Link to={'/' + next.frontmatter.slug} rel="next">
+                <Link to={"/" + next.frontmatter.slug} rel="next">
                   {next.frontmatter.title} →
                 </Link>
               )}
@@ -83,14 +68,10 @@ export const pageQuery = graphql`
       }
     }
     markdownRemark(id: { eq: $id }) {
-      id
-      excerpt(pruneLength: 160)
       html
       frontmatter {
-        slug
         title
         date(formatString: "MMMM DD, YYYY")
-        description
       }
     }
   }