Major Patch: ES6-Babel-6-Full-Dependencies-Upgrade

.babelrc

@@ -1,3 +1,3 @@
 {
-  "stage": 0
+  "presets": ["es2015", "stage-0", "react"]
 }

.eslintrc

@@ -1,15 +1,33 @@
 {
+  "ecmaFeatures": {
+    "jsx": true,
+    "modules": true
+  },
+  "env": {
+    "browser": true,
+    "node": true
+  },
+  "parser": "babel-eslint",
   "extends": "eslint-config-airbnb",
   "rules": {
+    "no-loop-func": 0,
+    "quotes": [2, "single"],
+    "strict": [2, "never"],
+    "react/jsx-uses-react": 2,
+    "react/jsx-uses-vars": 2,
+    "react/react-in-jsx-scope": 2,
     "indent": [2, 2, {"SwitchCase": 1}],
     "no-console": [0],
     "func-names": [0],
     "semi": [2, "never"],
     "no-extra-semi": [2],
     "space-before-function-paren": [2, "always"],
-    "no-else-return": [0],
+    "no-else-return": [0]
   },
   "globals": {
-    "__PREFIX_LINKS__": true,
+    "__PREFIX_LINKS__": true
   },
+  "plugins": [
+    "react"
+  ]
 }

.gitignore

@@ -24,9 +24,12 @@ build/Release
 
 # Dependency directory
 # https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
-node_modules
+node_modules/
 examples/biz-website/public/
 examples/blog/public/
 *.un~
-dist
+dist/
 bin/published.js
+
+# JetBrains IntelliJ IDEA-based project configuration directory
+.idea/

.jshintrc

@@ -0,0 +1,6 @@
+{
+  "node": true,
+  "browser": true,
+  "esnext": true,
+  "newcap": false
+}

bin/build.js

@@ -0,0 +1,27 @@
+import program from 'commander'
+import path from 'path'
+
+const packageJson = require('../package.json')
+
+// Use compiled version of code when installed globally, otherwise use babel script version.
+const build = require(('./published.js') ? ('../dist/utils/build') : ('../lib/utils/build'))
+
+program
+  .version(packageJson.version)
+	.option('--prefix-links', 'Build site with links prefixed (set prefix in your config).')
+	.parse(process.argv)
+
+let relativeDirectory = program.args[0]
+if (!(typeof relativeDirectory !== 'undefined' && relativeDirectory !== null)) { relativeDirectory = '.' }
+const directory = path.resolve(relativeDirectory)
+
+program.directory = directory
+program.relativeDirectory = relativeDirectory
+
+build(program, function (err) {
+  if ((typeof err !== 'undefined' && err !== null)) {
+    throw err
+  } else {
+    return console.log('Done')
+  }
+})

bin/cli.js

@@ -1,4 +1,3 @@
 #!/usr/bin/env node
 
-require('coffee-script/register')
 require('./index')

bin/develop.js

@@ -0,0 +1,22 @@
+import program from 'commander'
+import path from 'path'
+
+import packageJson from '../package.json'
+
+// Use compiled version of code when installed globally, otherwise use babel script version.
+const develop = require(('./published.js') ? ('../dist/utils/develop') : ('../lib/utils/develop'))
+
+program
+  .version(packageJson.version)
+  .option('-h, --host <url>', 'Set host. Defaults to 0.0.0.0', '0.0.0.0')
+  .option('-p, --port <port>', 'Set port. Defaults to 8000', '8000')
+  .parse(process.argv)
+
+let relativeDirectory = program.args[0]
+if (!(typeof relativeDirectory !== 'undefined' && relativeDirectory !== null)) { relativeDirectory = '.' }
+const directory = path.resolve(relativeDirectory)
+
+program.directory = directory
+program.relativeDirectory = relativeDirectory
+
+develop(program)

bin/gatsby-build.js

@@ -1,5 +1,4 @@
 #!/usr/bin/env node
 
-require('babel/register')
-require('coffee-script/register')
+require('babel-register')
 require('./build')

bin/gatsby-develop.js

@@ -1,5 +1,4 @@
 #!/usr/bin/env node
-require('babel/register')
 
-require('coffee-script/register')
+require('babel-register')
 require('./develop')

bin/gatsby-new.js

@@ -1,5 +1,4 @@
 #!/usr/bin/env node
 
-require('coffee-script/register')
-require('babel/register')
+require('babel-register')
 require('./new')

bin/index.coffee → bin/index.js

@@ -1,7 +1,6 @@
-program = require 'commander'
-path = require 'path'
+const program = require('commander')
 
-packageJson = require '../package.json'
+const packageJson = require('../package.json')
 
 program
   .version(packageJson.version)

bin/new.js

@@ -0,0 +1,23 @@
+const program = require('commander')
+const loggy = require('loggy')
+
+const packageJson = require('../package.json')
+
+// Use compiled version of code when installed globally, otherwise use babelscript version.
+const initStarter = require(('./published.js') ? ('../dist/utils/init-starter') : ('../lib/utils/init-starter'))
+
+program
+  .version(packageJson.version)
+  .parse(process.argv)
+
+const rootPath = program.args[0]
+const starter = ((program.args.length === 1) ? ('gh:gatsbyjs/gatsby-starter-default') : (program.args[1]))
+
+initStarter(starter, {
+  rootPath,
+  logger: loggy,
+}, function (error) {
+  if (error) {
+    return loggy.error(error)
+  }
+})

lib/isomorphic/HTML.jsx → lib/isomorphic/HTML.js

@@ -1,4 +1,6 @@
-import React, {PropTypes} from 'react'
+'use strict'
+
+import React, { PropTypes } from 'react'
 import Typography from 'typography'
 
 const TypographyStyle = new Typography().TypographyStyle
@@ -10,14 +12,14 @@ module.exports = React.createClass({
     favicon: PropTypes.string,
   },
 
-  getDefaultProps: function () {
+  getDefaultProps () {
     return {
       title: 'Default title',
       body: '',
     }
   },
 
-  render: function () {
+  render () {
     return (
     <html lang="en">
     <head>
@@ -27,12 +29,12 @@ module.exports = React.createClass({
       <title>
         {this.props.title}
       </title>
-      <link rel="shortcut icon" href={this.props.favicon} />
+      <link rel="shortcut icon" href={ this.props.favicon } />
       <TypographyStyle/>
-      <style dangerouslySetInnerHTML={{ __html: `body {color: rgb(66,66,66)} h1,h2,h3,h4,h5,h6 {color: rgb(44,44,44)}a {color: rgb(42,93,173)text-decoration: none}a:hover{text-decoration: underline}`}} />
+      <style dangerouslySetInnerHTML={{ __html: `body {color: rgb(66,66,66)} h1,h2,h3,h4,h5,h6 {color: rgb(44,44,44)}a {color: rgb(42,93,173)text-decoration: none}a:hover{text-decoration: underline}` }} />
     </head>
     <body className="landing-page">
-      <div id="react-mount" dangerouslySetInnerHTML={{__html: this.props.body}} />
+      <div id="react-mount" dangerouslySetInnerHTML={{ __html: this.props.body }} />
       <script src="/bundle.js" />
     </body>
     </html>