Mash everything into one masonstrap.min.js

- woot

gulpfile.js

@@ -9,6 +9,8 @@ const rename = require("gulp-rename");
 const imagemin = require('gulp-imagemin');
 const merge = require('merge-stream');
 const connect = require('gulp-connect');
+const concat = require('gulp-concat')
+const minify = require('gulp-minify');
 
 // Reusable directories
 const src = './src'
@@ -39,19 +41,11 @@ gulp.task('img', () => gulp.src(src + '/img/*').pipe(connect.reload())
 .pipe(gulp.dest(dest + '/img/'))
 );
 
-// Move required js files to build/js
-gulp.task('js', () => {
-  let bootstrap = gulp.src('./node_modules/bootstrap/dist/js/bootstrap.bundle.min.js')
-  .pipe(gulp.dest(dest + '/js/'))
-  
-  let jquery = gulp.src('./node_modules/jquery/dist/jquery.min.js')
-  .pipe(gulp.dest(dest + '/js/'))
-   
-  let masonstrap = gulp.src(src + '/js/*.js')
-  .pipe(gulp.dest(dest + '/js/'))
-
-  return merge(bootstrap, jquery, masonstrap).pipe(connect.reload())  
-});
+// Build masonstrap.min.js
+gulp.task('js', () => gulp.src(['./node_modules/jquery/dist/jquery.min.js', './node_modules/bootstrap/dist/js/bootstrap.bundle.min.js', src + '/js/*.js'])
+    .pipe(concat('masonstrap.js'))
+    .pipe(minify({ext: ".min.js"}))
+    .pipe(gulp.dest(dest + '/js/')));
 
 // Compile, autoprefix, minify scss with sourcemaps
 gulp.task('sass', () => gulp.src(src + '/scss/*.scss').pipe(connect.reload())

package.json

@@ -10,10 +10,13 @@
     "@fortawesome/fontawesome-free-brands": "^5.0.0",
     "@fortawesome/fontawesome-free-regular": "^5.0.0",
     "@fortawesome/fontawesome-free-solid": "^5.0.0",
+    "@fortawesome/fontawesome-free-webfonts": "^1.0.0",
     "autoprefixer": "^7.1.4",
     "bootstrap": "4.0.0-beta.2",
+    "gulp-concat": "^2.6.1",
     "gulp-connect": "^5.0.0",
     "gulp-imagemin": "^3.3.0",
+    "gulp-minify": "^2.1.0",
     "gulp-postcss": "^7.0.0",
     "gulp-rename": "^1.2.2",
     "gulp-sass": "^3.1.0",

src/html/index.html

@@ -77,7 +77,6 @@
   </body>
 
   <!-- load in external js -->
-  <script src="./js/jquery.min.js"></script>
-  <script src="./js/bootstrap.bundle.min.js"></script>
+  <script src="./js/masonstrap.min.js"></script>
 
 </html>
\ No newline at end of file