From 6bbb46d4bfa1a06d5ad88e2354b91f5259aa2044 Mon Sep 17 00:00:00 2001 From: Tobias Reich Date: Thu, 29 Jan 2015 23:54:25 +0100 Subject: [PATCH] Updated deps and added 6to5 --- src/gulpfile.js | 18 +++++++++++------- src/package.json | 3 ++- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/gulpfile.js b/src/gulpfile.js index 2b41502..694f9d0 100644 --- a/src/gulpfile.js +++ b/src/gulpfile.js @@ -15,7 +15,6 @@ var catchError = function(err) { paths.view = { js: [ - 'bower_components/jQuery/dist/jquery.min.js', '../src/scripts/_gup.js', '../src/scripts/view/main.js' ], @@ -23,6 +22,7 @@ paths.view = { '../src/scripts/build.coffee' ], scripts: [ + 'bower_components/jQuery/dist/jquery.min.js', '../dist/_view--javascript.js', '../dist/_view--coffee.js' ] @@ -32,6 +32,8 @@ gulp.task('view--js', function() { var stream = gulp.src(paths.view.js) + .pipe(plugins['6to5']()) + .on('error', catchError) .pipe(plugins.concat('_view--javascript.js', {newLine: "\n"})) .pipe(gulp.dest('../dist/')); @@ -69,18 +71,18 @@ gulp.task('view--scripts', ['view--js', 'view--coffee'], function() { paths.main = { js: [ - 'bower_components/jQuery/dist/jquery.min.js', - 'bower_components/js-md5/js/md5.min.js', - 'bower_components/mousetrap/mousetrap.min.js', - 'bower_components/mousetrap/plugins/global-bind/mousetrap-global-bind.min.js', - 'bower_components/basicContext/dist/basicContext.min.js', - 'bower_components/basicModal/dist/basicModal.min.js', '../src/scripts/*.js' ], coffee: [ '../src/scripts/*.coffee' ], scripts: [ + 'bower_components/jQuery/dist/jquery.min.js', + 'bower_components/js-md5/js/md5.min.js', + 'bower_components/mousetrap/mousetrap.min.js', + 'bower_components/mousetrap/plugins/global-bind/mousetrap-global-bind.min.js', + 'bower_components/basicContext/dist/basicContext.min.js', + 'bower_components/basicModal/dist/basicModal.min.js', '../dist/_main--javascript.js', '../dist/_main--coffee.js' ], @@ -98,6 +100,8 @@ gulp.task('main--js', function() { var stream = gulp.src(paths.main.js) + .pipe(plugins['6to5']()) + .on('error', catchError) .pipe(plugins.concat('_main--javascript.js', {newLine: "\n"})) .pipe(gulp.dest('../dist/')); diff --git a/src/package.json b/src/package.json index 73d3cea..774efd8 100644 --- a/src/package.json +++ b/src/package.json @@ -11,11 +11,12 @@ }, "devDependencies": { "gulp": "^3.8.10", + "gulp-6to5": "^3.0.0", "gulp-autoprefixer": "2.1.0", "gulp-coffee": "^2.2.0", "gulp-concat": "^2.4.3", "gulp-load-plugins": "^0.8.0", - "gulp-minify-css": "^0.4.2", + "gulp-minify-css": "^0.4.3", "gulp-rimraf": "^0.1.1", "gulp-sass": "^1.3.2", "gulp-uglify": "^1.1.0"