Changing 6to5 to babel

This commit is contained in:
Jeffrey Morgan 2015-02-16 14:12:26 -08:00
parent bd4656d457
commit 0c3f71b75c
3 changed files with 6 additions and 6 deletions

View File

@ -9,7 +9,7 @@ var less = require('gulp-less');
var livereload = require('gulp-livereload'); var livereload = require('gulp-livereload');
var plumber = require('gulp-plumber'); var plumber = require('gulp-plumber');
var react = require('gulp-react'); var react = require('gulp-react');
var to5 = require('gulp-6to5'); var babel = require('gulp-babel');
var runSequence = require('run-sequence'); var runSequence = require('run-sequence');
var shell = require('gulp-shell'); var shell = require('gulp-shell');
var sourcemaps = require('gulp-sourcemaps'); var sourcemaps = require('gulp-sourcemaps');
@ -35,7 +35,7 @@ gulp.task('js', function () {
})) }))
.pipe(gulpif(options.dev || options.test, sourcemaps.init())) .pipe(gulpif(options.dev || options.test, sourcemaps.init()))
.pipe(react()) .pipe(react())
.pipe(to5({blacklist: ['regenerator']})) .pipe(babel({blacklist: ['regenerator']}))
.pipe(gulpif(options.dev || options.test, sourcemaps.write('.'))) .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(gulp.dest((options.dev || options.test) ? './build' : './dist/osx/' + options.filename + '/Contents/Resources/app/build'))
.pipe(gulpif(options.dev, livereload())); .pipe(gulpif(options.dev, livereload()));

View File

@ -68,13 +68,13 @@
"underscore": "^1.7.0" "underscore": "^1.7.0"
}, },
"devDependencies": { "devDependencies": {
"6to5-jest": "^3.0.0",
"browserify": "^6.2.0", "browserify": "^6.2.0",
"ecstatic": "^0.5.8", "ecstatic": "^0.5.8",
"glob": "^4.0.6", "glob": "^4.0.6",
"gulp": "^3.8.10", "gulp": "^3.8.10",
"gulp-6to5": "^3.0.0", "gulp-babel": "^3.0.0",
"gulp-atom": "0.0.5", "gulp-atom": "0.0.5",
"gulp-babel": "^4.0.0",
"gulp-concat": "^2.3.4", "gulp-concat": "^2.3.4",
"gulp-cssmin": "^0.1.6", "gulp-cssmin": "^0.1.6",
"gulp-download-atom-shell": "0.0.4", "gulp-download-atom-shell": "0.0.4",

View File

@ -3,9 +3,9 @@ var ReactTools = require('react-tools');
module.exports = { module.exports = {
process: function(src, filename) { process: function(src, filename) {
if (filename.indexOf('node_modules') === -1) { 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) { if (filename.indexOf('-test') !== -1) {
res = 'require(\'6to5/polyfill\');' + res; res = 'require(\'babel/polyfill\');' + res;
} }
return res; return res;
} }