Fixing dev dependencies

Fixes #775
Fixes #776
pull/843/merge
Jordan Wright 2017-10-02 19:40:56 -05:00
parent e785af5c0a
commit 3972fe5993
2 changed files with 39 additions and 36 deletions

View File

@ -20,26 +20,26 @@ var gulp = require('gulp'),
gulp.task('vendorjs', function () { gulp.task('vendorjs', function () {
// Vendor minifying / concat // Vendor minifying / concat
return gulp.src([ return gulp.src([
vendor_directory + 'jquery.js', vendor_directory + 'jquery.js',
vendor_directory + 'bootstrap.min.js', vendor_directory + 'bootstrap.min.js',
vendor_directory + 'moment.min.js', vendor_directory + 'moment.min.js',
vendor_directory + 'chartist.min.js', vendor_directory + 'chartist.min.js',
vendor_directory + 'papaparse.min.js', vendor_directory + 'papaparse.min.js',
vendor_directory + 'd3.min.js', vendor_directory + 'd3.min.js',
vendor_directory + 'topojson.min.js', vendor_directory + 'topojson.min.js',
vendor_directory + 'datamaps.min.js', vendor_directory + 'datamaps.min.js',
vendor_directory + 'jquery.dataTables.min.js', vendor_directory + 'jquery.dataTables.min.js',
vendor_directory + 'dataTables.bootstrap.js', vendor_directory + 'dataTables.bootstrap.js',
vendor_directory + 'datetime-moment.js', vendor_directory + 'datetime-moment.js',
vendor_directory + 'jquery.ui.widget.js', vendor_directory + 'jquery.ui.widget.js',
vendor_directory + 'jquery.fileupload.js', vendor_directory + 'jquery.fileupload.js',
vendor_directory + 'jquery.iframe-transport.js', vendor_directory + 'jquery.iframe-transport.js',
vendor_directory + 'sweetalert2.min.js', vendor_directory + 'sweetalert2.min.js',
vendor_directory + 'bootstrap-datetime.js', vendor_directory + 'bootstrap-datetime.js',
vendor_directory + 'select2.min.js', vendor_directory + 'select2.min.js',
vendor_directory + 'core.min.js', vendor_directory + 'core.min.js',
vendor_directory + 'highcharts.js' vendor_directory + 'highcharts.js'
]) ])
.pipe(concat('vendor.js')) .pipe(concat('vendor.js'))
.pipe(rename({ .pipe(rename({
suffix: '.min' suffix: '.min'
@ -60,22 +60,24 @@ gulp.task('scripts', function () {
.pipe(gulp.dest(dest_js_directory + 'app/')); .pipe(gulp.dest(dest_js_directory + 'app/'));
}) })
gulp.task('styles', function() { gulp.task('styles', function () {
return gulp.src([ return gulp.src([
css_directory + 'bootstrap.min.css', css_directory + 'bootstrap.min.css',
css_directory + 'main.css', css_directory + 'main.css',
css_directory + 'dashboard.css', css_directory + 'dashboard.css',
css_directory + 'flat-ui.css', css_directory + 'flat-ui.css',
css_directory + 'dataTables.bootstrap.css', css_directory + 'dataTables.bootstrap.css',
css_directory + 'font-awesome.min.css', css_directory + 'font-awesome.min.css',
css_directory + 'chartist.min.css', css_directory + 'chartist.min.css',
css_directory + 'bootstrap-datetime.css', css_directory + 'bootstrap-datetime.css',
css_directory + 'checkbox.css', css_directory + 'checkbox.css',
css_directory + 'sweetalert2.min.css', css_directory + 'sweetalert2.min.css',
css_directory + 'select2.min.css', css_directory + 'select2.min.css',
css_directory + 'select2-bootstrap.min.css', css_directory + 'select2-bootstrap.min.css',
]) ])
.pipe(cleanCSS({ compatibilty: 'ie9' })) .pipe(cleanCSS({
compatibilty: 'ie9'
}))
.pipe(concat('gophish.css')) .pipe(concat('gophish.css'))
.pipe(gulp.dest(dest_css_directory)); .pipe(gulp.dest(dest_css_directory));
}) })

View File

@ -15,6 +15,7 @@
"clean-css": "^3.4.23", "clean-css": "^3.4.23",
"gulp": "^3.9.1", "gulp": "^3.9.1",
"gulp-clean-css": "^2.3.2", "gulp-clean-css": "^2.3.2",
"gulp-cli": "^1.4.0",
"gulp-concat": "^2.6.1", "gulp-concat": "^2.6.1",
"gulp-jshint": "^2.0.4", "gulp-jshint": "^2.0.4",
"gulp-rename": "^1.2.2", "gulp-rename": "^1.2.2",
@ -24,4 +25,4 @@
"jshint": "^2.9.4", "jshint": "^2.9.4",
"jshint-stylish": "^2.2.1" "jshint-stylish": "^2.2.1"
} }
} }