From 0c3f71b75cb68859f8dfb096167ba409ef3dc5e3 Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Mon, 16 Feb 2015 14:12:26 -0800 Subject: [PATCH] Changing 6to5 to babel --- gulpfile.js | 4 ++-- package.json | 4 ++-- preprocessor.js | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 7dcbbc3729..af841fc815 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -9,7 +9,7 @@ var less = require('gulp-less'); var livereload = require('gulp-livereload'); var plumber = require('gulp-plumber'); var react = require('gulp-react'); -var to5 = require('gulp-6to5'); +var babel = require('gulp-babel'); var runSequence = require('run-sequence'); var shell = require('gulp-shell'); var sourcemaps = require('gulp-sourcemaps'); @@ -35,7 +35,7 @@ gulp.task('js', function () { })) .pipe(gulpif(options.dev || options.test, sourcemaps.init())) .pipe(react()) - .pipe(to5({blacklist: ['regenerator']})) + .pipe(babel({blacklist: ['regenerator']})) .pipe(gulpif(options.dev || options.test, sourcemaps.write('.'))) .pipe(gulp.dest((options.dev || options.test) ? './build' : './dist/osx/' + options.filename + '/Contents/Resources/app/build')) .pipe(gulpif(options.dev, livereload())); diff --git a/package.json b/package.json index 323bfab539..db0fce0964 100644 --- a/package.json +++ b/package.json @@ -68,13 +68,13 @@ "underscore": "^1.7.0" }, "devDependencies": { - "6to5-jest": "^3.0.0", "browserify": "^6.2.0", "ecstatic": "^0.5.8", "glob": "^4.0.6", "gulp": "^3.8.10", - "gulp-6to5": "^3.0.0", + "gulp-babel": "^3.0.0", "gulp-atom": "0.0.5", + "gulp-babel": "^4.0.0", "gulp-concat": "^2.3.4", "gulp-cssmin": "^0.1.6", "gulp-download-atom-shell": "0.0.4", diff --git a/preprocessor.js b/preprocessor.js index 5e45b168f0..d989ecc0a6 100644 --- a/preprocessor.js +++ b/preprocessor.js @@ -3,9 +3,9 @@ var ReactTools = require('react-tools'); module.exports = { process: function(src, filename) { if (filename.indexOf('node_modules') === -1) { - var res = ReactTools.transform(require('6to5').transform(src).code); + var res = ReactTools.transform(require('babel').transform(src).code); if (filename.indexOf('-test') !== -1) { - res = 'require(\'6to5/polyfill\');' + res; + res = 'require(\'babel/polyfill\');' + res; } return res; }