Merge branch '1.0' of github.com:gatsbyjs/gatsby into 1.0

.babelrc

@@ -1,4 +1,13 @@
 {
+  "sourceMaps": true,
+  // "env": {
+  //   "development": {
+  //     "sourceMaps": "inline"
+  //   },
+  //   "production": {
+  //     "sourceMaps": false
+  //   }
+  // },
   "presets": [
     [
       "env",
@@ -17,4 +26,4 @@
     "transform-async-to-generator",
     "transform-flow-strip-types"
   ]
-}
+}

examples/gatsbygram/gatsby-node.js

@@ -25,7 +25,7 @@ exports.createPages = ({ graphql, boundActionCreators }) => {
     graphql(
       `
       {
-        allPosts(limit: 1000) {
+        allPostsJson(limit: 1000) {
           edges {
             node {
               id
@@ -45,7 +45,7 @@ exports.createPages = ({ graphql, boundActionCreators }) => {
       // Instagram post. Since the scrapped Instagram data
       // already includes an ID field, we just use that for
       // each page's path.
-      _.each(result.data.allPosts.edges, edge => {
+      _.each(result.data.allPostsJson.edges, edge => {
         // Gatsby uses Redux to manage its internal state.
         // Plugins and sites can use functions like "upsertPage"
         // to interact with Gatsby.

examples/gatsbygram/src/components/post-detail.js

@@ -19,7 +19,7 @@ class PostDetail extends React.Component {
       text,
       avatar,
     } = this.props.post
-    const { big } = image.children[0]
+    const { big } = image.childImageSharp
 
     const UserBar = () => (
       <div

examples/gatsbygram/src/components/post.js

@@ -17,7 +17,7 @@ class Post extends React.Component {
 
   render() {
     const { image, likes, id } = this.props.post
-    const { small } = image.children[0]
+    const { small } = image.childImageSharp
     return (
       <Link
         to={`/${id}/`}

examples/gatsbygram/src/pages/index.js

@@ -52,7 +52,7 @@ class Index extends React.Component {
 
   render() {
     console.log(this.props)
-    this.context.setEdges(this.props.data.allPosts.edges)
+    this.context.setEdges(this.props.data.allPostsJson.edges)
     return (
       <div
         css={{
@@ -122,17 +122,17 @@ class Index extends React.Component {
                 fontWeight: `normal`,
               }}
             >
-              {this.props.data.allPosts.edges[0].node.username}
+              {this.props.data.allPostsJson.edges[0].node.username}
             </h3>
             <p>
-              <strong>{this.props.data.allPosts.edges.length}</strong> posts
+              <strong>{this.props.data.allPostsJson.edges.length}</strong> posts
               <strong css={{ marginLeft: rhythm(1) }}>192k</strong> followers
             </p>
           </div>
         </div>
         {/* posts */}
         {chunk(
-          this.props.data.allPosts.edges.slice(0, this.state.postsToShow),
+          this.props.data.allPostsJson.edges.slice(0, this.state.postsToShow),
           3
         ).map(chunk => {
           return (
@@ -152,7 +152,7 @@ class Index extends React.Component {
                 <Post
                   key={edge.node.id}
                   post={edge.node}
-                  edges={this.props.data.allPosts.edges}
+                  edges={this.props.data.allPostsJson.edges}
                   location={this.props.location}
                   onClick={post => this.setState({ activePost: post })}
                 />
@@ -211,25 +211,23 @@ export default Index
 
 export const pageQuery = `
 query allImages {
-  user: allPosts(limit: 1) { edges { node { avatar, username }}}
-  allPosts {
+  user: allPostsJson(limit: 1) { edges { node { avatar, username }}}
+  allPostsJson {
     edges {
       node {
         likes
         id
         text
         weeksAgo: time(difference: "weeks")
         image {
-          children {
-            ... on ImageSharp {
-              small: responsiveSizes(maxWidth: 292, maxHeight: 292) {
-                src
-                srcSet
-              }
-              big: responsiveSizes(maxWidth: 640, maxHeight: 640) {
-                src
-                srcSet
-              }
+          childImageSharp {
+            small: responsiveSizes(maxWidth: 292, maxHeight: 292) {
+              src
+              srcSet
+            }
+            big: responsiveSizes(maxWidth: 640, maxHeight: 640) {
+              src
+              srcSet
             }
           }
         }

examples/gatsbygram/src/templates/post-page.js

@@ -6,7 +6,7 @@ class PostTemplate extends React.Component {
     return (
       // PostDetail is used for this detail page and
       // also in the modal.
-      <PostDetail post={this.props.data.posts} />
+      <PostDetail post={this.props.data.postsJson} />
     )
   }
 }
@@ -20,9 +20,9 @@ export default PostTemplate
 // All GraphQL queries in Gatsby are run at build-time and
 // loaded as plain JSON files so have minimal client cost.
 export const pageQuery = `
-  query PostPage($id: String!) {
+  query PostPageJson($id: String!) {
     # Select the post which equals this id.
-    posts(id: { eq: $id }) {
+    postsJson(id: { eq: $id }) {
       # Specify the fields from the post we need.
       username
       avatar
@@ -36,17 +36,15 @@ export const pageQuery = `
       # for the client.
       weeksAgo: time(difference: "weeks")
       image {
-        children {
-          ... on ImageSharp {
-            # Here we query for *multiple* image thumbnails to be
-            # created. So with no effort on our part, 100s of
-            # thumbnails are created. This makes iterating on
-            # designs effortless as we simply change the args
-            # for the query and we get new thumbnails.
-            big: responsiveSizes(maxWidth: 640) {
-              src
-              srcSet
-            }
+        childImageSharp {
+          # Here we query for *multiple* image thumbnails to be
+          # created. So with no effort on our part, 100s of
+          # thumbnails are created. This makes iterating on
+          # designs effortless as we simply change the args
+          # for the query and we get new thumbnails.
+          big: responsiveSizes(maxWidth: 640) {
+            src
+            srcSet
           }
         }
       }

packages/gatsby-dev-cli/.gitignore

@@ -1 +1,30 @@
-/index.js
+# Logs
+logs
+*.log
+
+# Runtime data
+pids
+*.pid
+*.seed
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (http://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directory
+# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
+node_modules
+
+decls
+dist

packages/gatsby-dev-cli/.npmignore

@@ -1,34 +1,2 @@
-# Logs
-logs
-*.log
-
-# Runtime data
-pids
-*.pid
-*.seed
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
-coverage
-
-# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# node-waf configuration
-.lock-wscript
-
-# Compiled binary addons (http://nodejs.org/api/addons.html)
-build/Release
-
-# Dependency directory
-# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
-node_modules
-*.un~
-yarn.lock
 src
 flow-typed
-coverage
-decls
-examples

packages/gatsby-dev-cli/package.json

@@ -15,16 +15,16 @@
     "babel-cli": "^6.24.1"
   },
   "bin": {
-    "gatsby-dev": "./bin/gatsby-dev"
+    "gatsby-dev": "dist/index.js"
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "build": "babel src --out-dir .",
-    "watch": "babel -w src --out-dir ."
+    "build": "babel src --out-dir dist --presets es2015",
+    "watch": "babel -w src --out-dir dist --presets es2015"
   },
   "keywords": [
     "gatsby"
   ],
   "author": "Kyle Mathews <[email protected]>",
   "license": "MIT"
-}
+}