add concat

sean-codes · Nov 18, 2017 · 5e9f69e · 5e9f69e
1 parent a38a6af
commit 5e9f69e
Show file tree

Hide file tree

Showing 3 changed files with 79 additions and 21 deletions.
diff --git a/gulpfile.js b/gulpfile.js
@@ -5,6 +5,7 @@ const autoprefixer = require('gulp-autoprefixer')
 const uglify = require('gulp-uglify')
 const rename = require('gulp-rename')
 const cleancss = require('gulp-clean-css')
+const concat = require('gulp-concat')
 
 gulp.task('default', ['js', 'scss', 'minify-js', 'minify-css'])
 gulp.task('watch', function(){
@@ -26,8 +27,11 @@ gulp.task('minify-js', function(){
 })
 
 gulp.task('js', function(){
+   console.log('Babeling...')
    gulp.src('src/*.js')
+      .pipe(concat('scripts.js'))
       .pipe(babel({ presets: ['env'] }))
+      .on('error', (error) => { console.log('JavaScript Error: ', error.loc); this.emit('end') })
       .pipe(gulp.dest('dist'))
 });
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -36,5 +36,8 @@
     "gulp-sass": "^3.1.0",
     "gulp-uglify": "^3.0.0",
     "gulp-watch": "^4.3.11"
+  },
+  "dependencies": {
+    "gulp-concat": "^2.6.1"
   }
 }