diff --git a/gulpfile.js b/gulpfile.js index 5d2c110..11f0415 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -31,9 +31,7 @@ var destination = { } var source = { - pillar: '../pillar/', - bootstrap: 'node_modules/bootstrap/', - popper: 'node_modules/popper.js/' + pillar: '../pillar/' } @@ -71,6 +69,9 @@ gulp.task('templates', function() { }); +/* Tutti gets built by Pillar. See gulpfile.js in pillar.*/ + + /* Individual Uglified Scripts */ gulp.task('scripts', function() { gulp.src('src/scripts/*.js') @@ -86,44 +87,6 @@ gulp.task('scripts', function() { }); -/* Collection of scripts in src/scripts/tutti/ to merge into tutti.min.js */ -/* Since it's always loaded, it's only for functions that we want site-wide */ -gulp.task('scripts_concat_tutti', function() { - gulp.src('src/scripts/tutti/**/*.js') - .pipe(gulpif(enabled.failCheck, plumber())) - .pipe(gulpif(enabled.maps, sourcemaps.init())) - .pipe(concat("tutti.min.js")) - .pipe(gulpif(enabled.uglify, uglify())) - .pipe(gulpif(enabled.maps, sourcemaps.write("."))) - .pipe(gulpif(enabled.chmod, chmod(644))) - .pipe(gulp.dest(destination.js)) - .pipe(gulpif(argv.livereload, livereload())); -}); - - -// Combine all needed Bootstrap JavaScript into a single file. -gulp.task('scripts_concat_bootstrap', function() { - - toUglify = [ - source.popper + 'dist/umd/popper.min.js', - source.bootstrap + 'js/dist/index.js', - source.bootstrap + 'js/dist/util.js', - source.bootstrap + 'js/dist/tooltip.js', - source.bootstrap + 'js/dist/dropdown.js', - ]; - - gulp.src(toUglify) - .pipe(gulpif(enabled.failCheck, plumber())) - .pipe(gulpif(enabled.maps, sourcemaps.init())) - .pipe(concat("bootstrap.min.js")) - .pipe(gulpif(enabled.uglify, uglify())) - .pipe(gulpif(enabled.maps, sourcemaps.write("."))) - .pipe(gulpif(enabled.chmod, chmod(644))) - .pipe(gulp.dest(destination.js)) - .pipe(gulpif(argv.livereload, livereload())); -}); - - // While developing, run 'gulp watch' gulp.task('watch',function() { // Only listen for live reloads if ran with --livereload @@ -133,12 +96,11 @@ gulp.task('watch',function() { gulp.watch('src/styles/**/*.sass',['styles']); gulp.watch(source.pillar + 'src/styles/**/*.sass',['styles']); - - gulp.watch('src/templates/**/*.pug',['templates']); gulp.watch('src/scripts/*.js',['scripts']); - gulp.watch('src/scripts/tutti/**/*.js',['scripts_concat_tutti']); + gulp.watch('src/templates/**/*.pug',['templates']); }); + // Erases all generated files in output directories. gulp.task('cleanup', function() { var paths = []; @@ -157,4 +119,4 @@ gulp.task('cleanup', function() { var tasks = []; if (enabled.cleanup) tasks.push('cleanup'); -gulp.task('default', tasks.concat(['styles', 'templates', 'scripts', 'scripts_concat_tutti', 'scripts_concat_bootstrap'])); +gulp.task('default', tasks.concat(['styles', 'templates', 'scripts'])); diff --git a/package.json b/package.json index 1894f5d..f032c2e 100644 --- a/package.json +++ b/package.json @@ -22,10 +22,5 @@ "gulp-sourcemaps": "~2.6.4", "gulp-uglify-es": "^1.0.4", "minimist": "^1.2.0" - }, - "dependencies": { - "bootstrap": "^4.1.3", - "jquery": "^3.3.1", - "popper.js": "^1.14.4" } }