Merge pull request #21 from addyosmani/babel-update

Moving to new babelify

Author: addyosmani

gulp-tasks/scripts.js

@@ -22,7 +22,6 @@ var eslint = require('gulp-eslint');
 var path = require('path');
 var glob = require('glob');
 var browserify = require('browserify');
-var babelify = require('babelify');
 var gutil = require('gulp-util');
 var source = require('vinyl-source-stream');
 var uglify = require('gulp-uglify');
@@ -45,7 +44,7 @@ function compileES6Bundles(browserifyBundles, cb) {
     var browserifyBundle = browserify({
       entries: [bundle.srcPath]
     })
-    .transform(babelify);
+    .transform('babelify', {presets: ['es2015']});
 
     return browserifyBundle.bundle()
       .on('log', gutil.log.bind(gutil, 'Browserify Log'))

package.json

@@ -7,7 +7,8 @@
     "node": ">=0.10.0"
   },
   "devDependencies": {
-    "babelify": "^6.3.0",
+    "babel-preset-es2015": "^6.0.15",
+    "babelify": "^7.2.0",
     "browserify": "^11.2.0",
     "del": "^2.0.2",
     "express": "^4.13.3",

src/scripts/controller/ApplicationController.js

@@ -25,16 +25,16 @@ export default class ApplicationController extends Controller {
   constructor() {
     super();
 
-    this.navDrawer = new NavDrawerView();
+    var navDrawer = new NavDrawerView();
 
-    this.sideNavToggleButton = document.querySelector('.js-toggle-menu');
-    this.sideNavToggleButton.addEventListener('click', () => {
-      this.navDrawer.toggle();
+    var sideNavToggleButton = document.querySelector('.js-toggle-menu');
+    sideNavToggleButton.addEventListener('click', () => {
+      navDrawer.toggle();
     });
 
     // TODO: Find more elegant solution to this and handling anchors in the
     // web app for dynamically loaded content
-    var anchorElements = this.navDrawer.sideNavContent.querySelectorAll('a');
+    var anchorElements = navDrawer.sideNavContent.querySelectorAll('a');
     for (var i = 0; i < anchorElements.length; i++) {
       if (!anchorElements[i].href) {
         continue;
@@ -43,7 +43,7 @@ export default class ApplicationController extends Controller {
       anchorElements[i].addEventListener('click', (clickEvent) => {
         clickEvent.preventDefault();
 
-        this.navDrawer.close();
+        navDrawer.close();
 
         var router = RouterSingleton.getRouter();
         router.goToPath(clickEvent.target.href);

src/scripts/controller/StaticPageController.js

@@ -23,11 +23,11 @@ export default class StaticPageController extends Controller {
   constructor() {
     super();
 
-    this.navDrawer = new NavDrawerView();
+    var navDrawer = new NavDrawerView();
 
-    this.sideNavToggleButton = document.querySelector('.js-toggle-menu');
-    this.sideNavToggleButton.addEventListener('click', () => {
-      this.navDrawer.toggle();
+    var sideNavToggleButton = document.querySelector('.js-toggle-menu');
+    sideNavToggleButton.addEventListener('click', () => {
+      navDrawer.toggle();
     });
   }
 }