From 1b55a8578692a0fa79426b1559a1f7588ccbeb6c Mon Sep 17 00:00:00 2001
From: yannliao <trembleliao@gmail.com>
Date: Thu, 4 Aug 2016 21:38:37 +0800
Subject: [PATCH 1/2] remove deprecated dependencies

---
 Gulpfile.js  | 28 ++++++++++++++++++++++------
 package.json | 31 +++++++++++++++++--------------
 2 files changed, 39 insertions(+), 20 deletions(-)
 mode change 100755 => 100644 package.json

diff --git a/Gulpfile.js b/Gulpfile.js
index c796822..a872690 100755
--- a/Gulpfile.js
+++ b/Gulpfile.js
@@ -1,13 +1,29 @@
 var gulp       = require('gulp'),
-    browserify = require('gulp-browserify');
+    browserify = require('browserify'),
+    source     = require('vinyl-source-stream'),
+    buffer     = require('vinyl-buffer'),
+    sourcemaps = require('gulp-sourcemaps');
 
 gulp.task('scripts', function () {
 
-    gulp.src(['app/main.js'])
-        .pipe(browserify({
-            debug: true,
-            transform: [ 'reactify' ]
-        }))
+    // gulp.src(['app/main.js'])
+    //     .pipe(browserify({
+    //         debug: true,
+    //         transform: [ 'reactify' ]
+    //     }))
+    //     .pipe(gulp.dest('./public/'));
+
+
+    var bundler = browserify({
+        entries: ['app/main.js'],
+        debug: true,
+        transform: [ "babelify" ]
+    });
+    return bundler.bundle()
+        .pipe(source('bundle.js'))
+        .pipe(buffer())
+        .pipe(sourcemaps.init({ loadMaps: true }))
+        .pipe(sourcemaps.write('./'))
         .pipe(gulp.dest('./public/'));
 
 });
diff --git a/package.json b/package.json
old mode 100755
new mode 100644
index 6094d3d..c4b7bbe
--- a/package.json
+++ b/package.json
@@ -2,21 +2,24 @@
   "name": "node-authentication",
   "main": "server.js",
   "dependencies": {
-    "body-parser": "~1.0.0",
-    "cookie-parser": "~1.0.0",
-    "ejs": "~0.8.5",
-    "express": "~4.0.0",
-    "griddle-react": "^0.1.19",
-    "path": "*",
-    "react": "~0.12.0"
+    "body-parser": "^1.0.2",
+    "cookie-parser": "^1.0.1",
+    "ejs": "^0.8.8",
+    "express": "^4.0.0",
+    "griddle-react": "^0.1.20",
+    "path": "^0.12.7",
+    "react": "^0.12.2"
   },
   "devDependencies": {
-    "browserify": "~3.20.0",
-    "gulp": "~3.8.9",
-    "gulp-browserify": "~0.5.0",
-    "gulp-concat": "~2.4.1",
-    "node-jsx": "~0.2.0",
-    "react-tools": "^0.12.0",
-    "reactify": "0.15.2"
+    "babel-preset-es2015": "^6.9.0",
+    "babel-preset-react": "^6.11.1",
+    "babel-register": "^6.11.6",
+    "babelify": "^7.3.0",
+    "browserify": "^13.1.0",
+    "gulp": "^3.9.1",
+    "gulp-concat": "^2.6.0",
+    "gulp-sourcemaps": "^1.6.0",
+    "vinyl-buffer": "^1.0.0",
+    "vinyl-source-stream": "^1.1.0"
   }
 }

From 476854cf7bae74055599d0468189c88051fd7b20 Mon Sep 17 00:00:00 2001
From: yannliao <trembleliao@gmail.com>
Date: Thu, 4 Aug 2016 21:39:11 +0800
Subject: [PATCH 2/2] replace node-jsx with babel

---
 app/components/ReactApp.js | 3 +--
 server.js                  | 7 ++++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/components/ReactApp.js b/app/components/ReactApp.js
index 372539f..1c94224 100755
--- a/app/components/ReactApp.js
+++ b/app/components/ReactApp.js
@@ -1,4 +1,3 @@
-/** @jsx React.DOM */
 
 var React = require('react/addons');
 
@@ -30,4 +29,4 @@ var ReactApp = React.createClass({
   });
 
 /* Module.exports instead of normal dom mounting */
-module.exports = ReactApp;
\ No newline at end of file
+module.exports = ReactApp;
diff --git a/server.js b/server.js
index 3012ddd..c4c4e51 100755
--- a/server.js
+++ b/server.js
@@ -7,7 +7,12 @@ port = 4444,
 bodyParser = require('body-parser');
 
 // Make sure to include the JSX transpiler
-require('node-jsx').install();
+// require('node-jsx').install();
+require('babel-register')({
+   presets: [ 'es2015', 'react' ],
+   extensions: ['.es6', '.es', '.jsx', '.js']
+});
+
 
 // Include static assets. Not advised for production
 app.use(express.static(path.join(__dirname, 'public')));