Merge pull request #58 from LansanaCamara/ignore-idea-files

Ignore idea files
blue-jay · Feb 16, 2017 · e65ca2b · e65ca2b
2 parents 7f0ca66 + 06e1ef0
commit e65ca2b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -12,4 +12,7 @@ thumbs.db
 env.json
 *.exe
 *.exe~
-blueprint
+blueprint
+
+# JetBrains IDE metadata
+.idea
diff --git a/gulpfile.js b/gulpfile.js
@@ -41,7 +41,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
@@ -1,9 +1,11 @@
 {
   "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",