Moved to babel

data/bundles/buildings.json

@@ -0,0 +1,5 @@
+[{
+  "name": "Winter Fall",
+  "island": "55236b782af3f5a575c6cff9",
+
+}]

gulpfile.js

@@ -9,7 +9,7 @@ gulp.task('start', function() {
     verbose: true,
     ignore: ['public/*', 'node_modules/*'],
     execMap: {
-      js: "DEBUG='game:*' node --harmony --debug"
+      js: "DEBUG='game:*' babel-node --harmony --debug"
     },
     watch: ['*.js', '*.png'],
     events: {

package.json

@@ -27,24 +27,24 @@
   },
   "dependencies": {
     "array-contains": "0.0.1",
-    "co": "^4.5.1",
+    "co": "^4.5.4",
     "co-bcrypt": "^1.0.0",
-    "debug": "^2.1.3",
-    "koa": "~0.18.1",
-    "koa-bodyparser": "^1.4.1",
+    "debug": "^2.2.0",
+    "koa": "~0.21.0",
+    "koa-bodyparser": "^2.0.0",
     "koa-compose": "^2.3.0",
     "koa-compress": "^1.0.8",
-    "koa-cors": "0.0.14",
+    "koa-cors": "0.0.16",
     "koa-error": "^1.1.3",
     "koa-logger": "^1.2.2",
-    "koa-passport": "^1.1.4",
+    "koa-passport": "^1.1.6",
     "koa-response-time": "^1.0.2",
     "koa-router": "^4.2.0",
-    "koa-session": "^2.0.0",
+    "koa-session": "^3.2.0",
     "koa-static": "^1.4.9",
-    "lodash": "^3.5.0",
-    "mongoose": "3.9.7",
-    "mongoose-deep-populate": "^1.0.1",
+    "lodash": "^3.9.3",
+    "mongoose": "4.0.5",
+    "mongoose-deep-populate": "^1.1.0",
     "mongoose-unique-validator": "^0.4.1",
     "oauth2orize": "^1.0.1",
     "passport-http": "^0.2.2",
@@ -54,10 +54,10 @@
     "uid": "0.0.2"
   },
   "devDependencies": {
-    "commander": "^2.7.1",
-    "gulp": "^3.8.11",
-    "gulp-eslint": "^0.9.0",
-    "gulp-load-plugins": "^0.9.0",
-    "gulp-nodemon": "^2.0.2"
+    "commander": "^2.8.1",
+    "gulp": "^3.9.0",
+    "gulp-eslint": "^0.14.0",
+    "gulp-load-plugins": "^1.0.0-rc",
+    "gulp-nodemon": "^2.0.3"
   }
 }

public/gulpfile.js

@@ -1,11 +1,13 @@
 var gulp = require('gulp');
 var $ = require('gulp-load-plugins')();
 var browserSync = require('browser-sync');
+var connect = require('gulp-connect');
 var del = require('del');
 
 var browserify = require('browserify');
 var watchify = require('watchify');
 var source = require('vinyl-source-stream');
+var babelify = require('babelify');
 
 var prettyHrtime = require('pretty-hrtime');
 
@@ -51,8 +53,7 @@ config = {
   },
   browserify: {
     debug: true,
-    extensions: ['.jsx'],
-    transform: ['reactify', { es6: true }]
+    extensions: ['.jsx']
   },
   images: {
     src: paths.assets + '/images/**/*.{png,jpg,gif,ico}',
@@ -62,6 +63,11 @@ config = {
     src: paths.src + '/*.html',
     dest: paths.dist
   },
+  connect: {
+    root: [paths.dist, paths.src],
+    livereload: true,
+    port: 9008
+  },
   browserSync: {
     open: false,
     notify: false,
@@ -134,7 +140,9 @@ gulp.task('browserify-watch', function() {
   args.extensions = config.browserify.extensions;
   bundler = watchify(browserify(config.scripts.src, args));
 
-  bundler.transform(config.browserify.transform);
+  bundler.transform(babelify.configure({
+    stage: 0
+  }));
 
   rebundle = function() {
     bundleLogger.start(config.scripts.outputName);
@@ -145,7 +153,7 @@ gulp.task('browserify-watch', function() {
       .pipe(source(config.scripts.outputName))
       .pipe(gulp.dest(config.scripts.dest))
       .pipe($.notify('Bundled in'))
-      .pipe(browserSync.reload({ stream: true }));
+      .pipe(connect.reload());
   };
 
   bundler.on('update', rebundle);
@@ -177,11 +185,11 @@ gulp.task('markup', function() {
     .pipe(gulp.dest(config.markup.dest));
 });
 
-gulp.task('watch', ['browserSync'], function() {
-  gulp.watch(config.styles.watch, ['styles', browserSync.reload]);
-  gulp.watch(config.images.src, ['images', browserSync.reload]);
-  gulp.watch(config.markup.src, ['markup', browserSync.reload]);
-  gulp.watch(config.fonts.src, ['fonts', browserSync.reload]);
+gulp.task('watch', ['connect'], function() {
+  gulp.watch(config.styles.watch, ['styles', connect.reload]);
+  gulp.watch(config.images.src, ['images', connect.reload]);
+  gulp.watch(config.markup.src, ['markup', connect.reload]);
+  gulp.watch(config.fonts.src, ['fonts', connect.reload]);
 
   gulp.start('browserify-watch');
 });
@@ -190,6 +198,10 @@ gulp.task('browserSync', ['watch:build'], function() {
   browserSync(config.browserSync);
 });
 
+gulp.task('connect', function() {
+  connect.server(config.connect);
+});
+
 gulp.task('watch:build', ['clean'], function() {
   gulp.start(['styles', 'images', 'fonts', 'markup']);
 });

public/package.json

@@ -6,44 +6,45 @@
     "build": "gulp build"
   },
   "devDependencies": {
-    "browser-sync": "^2.4.0",
-    "browserify": "^9.0.3",
-    "del": "^1.1.1",
-    "eslint": "^0.19.0",
-    "eslint-plugin-react": "^2.1.1",
-    "gulp": "^3.8.11",
+    "babelify": "^6.1.2",
+    "browser-sync": "^2.7.12",
+    "browserify": "^10.2.4",
+    "del": "^1.2.0",
+    "eslint": "^0.23.0",
+    "eslint-plugin-react": "^2.5.2",
+    "gulp": "^3.9.0",
     "gulp-connect": "^2.2.0",
     "gulp-debug": "^2.0.1",
-    "gulp-eslint": "^0.9.0",
+    "gulp-eslint": "^0.14.0",
     "gulp-imagemin": "^2.2.1",
-    "gulp-less": "^3.0.2",
-    "gulp-load-plugins": "^0.9.0",
+    "gulp-less": "^3.0.3",
+    "gulp-load-plugins": "^1.0.0-rc",
     "gulp-notify": "^2.2.0",
-    "gulp-sourcemaps": "^1.5.1",
-    "gulp-util": "^3.0.4",
-    "gulp-watch": "^4.2.0",
+    "gulp-sourcemaps": "^1.5.2",
+    "gulp-util": "^3.0.5",
+    "gulp-watch": "^4.2.4",
     "pretty-hrtime": "^1.0.0",
-    "reactify": "^1.1.0",
     "vinyl-source-stream": "^1.1.0",
-    "watchify": "^2.6.2"
+    "watchify": "^3.2.2"
   },
   "dependencies": {
     "array-contains": "0.0.1",
-    "debug": "^2.1.3",
-    "flux": "^2.0.1",
+    "debug": "^2.2.0",
+    "flux": "^2.0.3",
     "is-object-empty": "^1.0.0",
     "keymirror": "^0.1.1",
-    "lodash": "^3.6.0",
+    "lodash": "^3.9.3",
     "make-url": "0.0.1",
     "material-design-fonticons": "^1.0.0",
-    "moment": "^2.9.0",
-    "object-assign": "^2.0.0",
-    "promise": "^6.1.0",
-    "react": "^0.12.2",
-    "react-router": "^0.12.0",
-    "react-tap-event-plugin": "^0.1.6",
+    "moment": "^2.10.3",
+    "node-libs-browser": "^0.5.2",
+    "object-assign": "^3.0.0",
+    "react": "^0.13.3",
+    "react-router": "^0.13.3",
+    "react-tap-event-plugin": "^0.1.7",
     "socket.io-client": "^1.3.5",
-    "store": "^1.3.17"
+    "store": "^1.3.17",
+    "webpack": "^1.9.11"
   },
   "browser": {
     "material-ui": "./material-ui/src/index.js"

public/src/app/actions/app-actions.js

@@ -1 +1 @@
-module.exports = {};
+export default {}

public/src/app/actions/hero-actions.js

@@ -1,38 +1,38 @@
-var AppDispatcher = require('../app-dispatcher');
-var HeroConstants = require('../constants/hero-constants');
+import AppDispatcher from '../app-dispatcher';
+import HeroConstants from '../constants/hero-constants';
 
-module.exports = {
-  receive: function(data) {
+export default {
+  receive(data) {
     AppDispatcher.handleAction({
       actionType: HeroConstants.HERO_RECEIVE,
       data: data
     });
   },
-  updated: function(data) {
+  updated(data) {
     AppDispatcher.handleAction({
       actionType: HeroConstants.HERO_UPDATED,
       data: data
     });
   },
-  thingRemoved: function(id) {
+  thingRemoved(id) {
     AppDispatcher.handleAction({
       actionType: HeroConstants.HERO_THING_REMOVED,
       id: id
     });
   },
-  complectCreated: function(data) {
+  complectCreated(data) {
     AppDispatcher.handleAction({
       actionType: HeroConstants.HERO_COMPLECT_CREATED,
       data: data
     });
   },
-  complectDeleted: function(id) {
+  complectDeleted(id) {
     AppDispatcher.handleAction({
       actionType: HeroConstants.HERO_COMPLECT_DELETED,
       id: id
     });
   },
-  movedOnIsland: function(x, y) {
+  movedOnIsland(x, y) {
     AppDispatcher.handleAction({
       actionType: HeroConstants.HERO_MOVED_ON_ISLAND,
       x: x,

public/src/app/actions/hero-image-actions.js

@@ -1,8 +1,8 @@
-var AppDispatcher = require('../app-dispatcher');
-var HeroImageConstants = require('../constants/hero-image-constants');
+import AppDispatcher from '../app-dispatcher';
+import HeroImageConstants from '../constants/hero-image-constants';
 
-module.exports = {
-  receive: function(data) {
+export default {
+  receive(data) {
     AppDispatcher.handleAction({
       actionType: HeroImageConstants.HERO_IMAGES_RECEIVE,
       data: data

public/src/app/actions/island-actions.js

@@ -1,8 +1,8 @@
-var AppDispatcher = require('../app-dispatcher');
-var IslandConstants = require('../constants/island-constants');
+import AppDispatcher from '../app-dispatcher';
+import IslandConstants from '../constants/island-constants';
 
-module.exports = {
-  receive: function(data) {
+export default {
+  receive(data) {
     AppDispatcher.handleAction({
       actionType: IslandConstants.ISLAND_RECEIVE,
       data: data

public/src/app/actions/skill-actions.js

@@ -1,8 +1,8 @@
-var AppDispatcher = require('../app-dispatcher');
-var SkillConstants = require('../constants/skill-constants');
+import AppDispatcher from '../app-dispatcher';
+import SkillConstants from '../constants/skill-constants';
 
-module.exports = {
-  receive: function(data) {
+export default {
+  receive(data) {
     AppDispatcher.handleAction({
       actionType: SkillConstants.SKILLS_RECEIVE,
       data: data

public/src/app/app-dispatcher.js

@@ -1,15 +1,13 @@
-var assign = require('object-assign');
-var Dispatcher = require('flux').Dispatcher;
+import assign from 'object-assign';
+import { Dispatcher } from 'flux';
 
-var AppDispatcher = assign(new Dispatcher(), {
+export default assign(new Dispatcher(), {
 
-  handleAction: function(action) {
+  handleAction(action) {
     this.dispatch({
       source: 'VIEW_ACTION',
       action: action
     });
   }
 
 });
-
-module.exports = AppDispatcher;

public/src/app/app.js

@@ -1,22 +1,25 @@
-var React = require('react');
-var Router = require('react-router');
-var socket = require('socket.io-client');
+import React from 'react';
+import Router from 'react-router';
+import socket from 'socket.io-client';
 
-var config = require('./config/application');
-var environmentConfig = require('./config/environment');
-var mediator = require('./mediator');
+import config from './config/application';
+import environmentConfig from './config/environment';
+import mediator from './mediator';
 
-var routes = require('./routes');
+import routes from './routes'
 
-var debug = require('debug')('game:application');
+import debugLib from './lib/debug';
 
-var injectTapEventPlugin = require('react-tap-event-plugin');
+const debug = debugLib('application');
 
-var io = socket.connect(environmentConfig[config.environment].api.root, {
+import injectTapEventPlugin from 'react-tap-event-plugin';
+
+const io = socket.connect(environmentConfig[config.environment].api.root, {
   query: 'token=' + mediator.accessToken
 });
 
-require('./config/io')(io);
+import configIo from './config/io';
+configIo(io);
 
 // Needed for React Developer Tools
 window.React = React;
@@ -27,7 +30,7 @@ window.React = React;
 // https://github.com/zilverline/react-tap-event-plugin
 injectTapEventPlugin();
 
-Router.run(routes, function(Handler) {
+Router.run(routes, (Handler) => {
   React.render(React.createElement(Handler), document.body);
 
   debug('game app rendered');

public/src/app/assets/styles/bootstrap.less

@@ -1,5 +1,5 @@
-@import "../../../../material-ui/src/less/scaffolding";
-@import "../../../../material-ui/src/less/components";
+// @import "../../../../material-ui/src/less/scaffolding";
+// @import "../../../../material-ui/src/less/components";
 
 @import (less)"../../../../node_modules/material-design-fonticons/styles/mdfi.css";