Merge branch 'babel'

Author: hipertracker

Brocfile.js

@@ -2,7 +2,8 @@ var rimraf = require('rimraf'),
     mergeTrees = require('broccoli-merge-trees'),
     Funnel = require('broccoli-funnel'),
     compileSass = require('broccoli-sass'),
-    esTranspiler = require('broccoli-6to5-transpiler'),
+    //esTranspiler = require('broccoli-6to5-transpiler'),
+    esTranspiler = require('broccoli-babel-transpiler'),
     fastBrowserify = require('broccoli-fast-browserify'),
     uglifyJavaScript = require('broccoli-uglify-js'),
     gzipFiles = require('broccoli-gzip'),

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-es7",
-  "version": "0.0.11",
+  "version": "0.0.12",
   "description": "Example of using React + Reflux + router + ES6 with experimental ES7 syntax + Jest + Semantic-UI",
   "main": "src/index.js",
   "scripts": {
@@ -27,7 +27,7 @@
     "6to5": "*",
     "6to5-jest": "hipertracker/6to5-jest",
     "broccoli": "^0.13.3",
-    "broccoli-6to5-transpiler": "^0.1.1",
+    "broccoli-babel-transpiler": "^4.0.0",
     "broccoli-cli": "0.0.1",
     "broccoli-env": "0.0.1",
     "broccoli-fast-browserify": "^0.2.3",

src/app/actions/LinksActions.js

@@ -1,4 +1,4 @@
-import * as Reflux from 'reflux'
+import Reflux from 'reflux'
 
 // Each action is like an event channel for one specific event. Actions are called by components.
 // The store is listening to all actions, and the components in turn are listening to the store.

src/app/components/About.js

@@ -1,4 +1,4 @@
-import * as React from 'react'
+import React from 'react'
 import {Segment} from 'react-semantify'
 
 const About = React.createClass({

src/app/components/App.js

@@ -1,5 +1,5 @@
-import * as React from 'react'
-import * as ReactRouter from 'react-router'
+import React from 'react'
+import ReactRouter from 'react-router'
 import {Menu, Segment, Section} from 'react-semantify'
 
 const RouteHandler = ReactRouter.RouteHandler;

src/app/components/Home.js

@@ -1,4 +1,4 @@
-import * as React from 'react'
+import React from 'react'
 import {Segment} from 'react-semantify'
 
 import UsefulLinks from './UsefulLinks'

src/app/components/UsefulLinks.js

@@ -1,5 +1,5 @@
-import * as React from 'react'
-import * as Reflux from 'reflux'
+import React from 'react'
+import Reflux from 'reflux'
 
 import LinksActions from '../actions/LinksActions'
 import LinksStore from '../stores/LinksStore'

src/app/lib/tools.js

@@ -1,5 +1,5 @@
-import * as React from 'react'
-import * as _ from 'lodash'
+import React from 'react'
+import _ from 'lodash'
 
 // mounting a React component to a selector id location
 export function mount(component, location, argv = {}) {

src/app/stores/LinksStore.js

@@ -1,4 +1,4 @@
-import * as Reflux from 'reflux'
+import Reflux from 'reflux'
 
 import LinksActions from '../actions/LinksActions'