From f405ac470da9eb40294aeb75362e865558f6aab1 Mon Sep 17 00:00:00 2001 From: Lansana Camara Date: Wed, 15 Feb 2017 18:51:18 -0500 Subject: [PATCH 1/2] Add gulp-babel for ES6 to ES5 transpilation --- gulpfile.js | 4 ++++ package.json | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/gulpfile.js b/gulpfile.js index 4a30d5b..070cee0 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -31,7 +31,11 @@ gulp.task('sass', function() { gulp.task('javascript', function() { var concat = require('gulp-concat'); var minify = require('gulp-minify'); + var babel = require('gulp-babel'); return gulp.src(folderAsset + '/dynamic/js/*.js') + .pipe(babel({ + presets: ['es2015'] + })) .pipe(concat('all.js')) .pipe(minify({ ext:{ diff --git a/package.json b/package.json index 98c30d5..250cf37 100644 --- a/package.json +++ b/package.json @@ -1,14 +1,22 @@ { "private": true, "devDependencies": { + "babel-preset-es2015": "^6.22.0", "bootstrap": "^3.3.6", + "child_process": "^1.0.2", "gulp": "^3.9.1", + "gulp-babel": "^6.1.2", "gulp-concat": "^2.6.0", "gulp-ext-replace": "^0.3.0", + "gulp-livereload": "^3.8.1", "gulp-minify": "0.0.13", "gulp-real-favicon": "^0.2.1", "gulp-sass": "^2.3.2", + "gulp-sync": "^0.1.4", + "gulp-util": "^3.0.8", "jquery": "1.9.1 - 2", + "os": "^0.1.1", + "path": "^0.12.7", "run-sequence": "^1.2.2", "underscore": "^1.8.3" } From f10b1eba0c18cc2e500b19eb3fb14d5e6374c427 Mon Sep 17 00:00:00 2001 From: Lansana Camara Date: Wed, 15 Feb 2017 18:54:41 -0500 Subject: [PATCH 2/2] Ignore the .idea directory on all JetBrains IDE's --- .gitignore | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 0f52f66..9acfe1d 100644 --- a/.gitignore +++ b/.gitignore @@ -11,4 +11,7 @@ thumbs.db # Blue Jay Files env.json *.exe -blueprint \ No newline at end of file +blueprint + +# JetBrains IDE metadata +.idea \ No newline at end of file