From 82c00c97f40558a22e6cf0f4f0d21b60626728e4 Mon Sep 17 00:00:00 2001 From: Enrico Fasoli Date: Tue, 31 Mar 2015 19:59:23 +0200 Subject: [PATCH] completed the build system --- .gitignore | 1 + divshot.json | 4 ++++ gulpfile.js | 17 ++++++++++++++--- index.html | 19 ------------------- src/index.html | 19 +++++++++++++++++++ 5 files changed, 38 insertions(+), 22 deletions(-) create mode 100644 divshot.json delete mode 100644 index.html create mode 100644 src/index.html diff --git a/.gitignore b/.gitignore index 0619f88..1542f83 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ bower_components/ +.divshot-cache/ node_modules/ test/ dist/ diff --git a/divshot.json b/divshot.json new file mode 100644 index 0000000..3e7650f --- /dev/null +++ b/divshot.json @@ -0,0 +1,4 @@ +{ + "name": "pert", + "root": "dist" +} diff --git a/gulpfile.js b/gulpfile.js index a422bcc..c4dbd89 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -6,7 +6,9 @@ var uglify = require('gulp-uglify') var clean = require('gulp-clean') gulp.task('css',function(){ - return gulp.src('src/*.css') + cssFiles = ["src/*.css","bower_components/vis/dist/vis.min.css", + "bower_components/bootstrap/dist/css/bootstrap.css"] + return gulp.src(cssFiles) .pipe(minifyCSS()) .pipe(gulp.dest('dist/')) }) @@ -16,7 +18,16 @@ gulp.task('html',function(){ .pipe(minifyHTML({ quotes: true })) .pipe(gulp.dest('dist/')) }) - +gulp.task('js',function(){ + jsFiles = ["src/*.js", + "bower_components/jquery/dist/jquery.js", + "bower_components/angular/angular.js", + "bower_components/angular-ui-router/release/angular-ui-router.js", + "bower_components/vis/dist/vis.min.js"] + return gulp.src(jsFiles).pipe(uglify({ mangle: false })) + .pipe(gulp.dest('dist/')) + +}) gulp.task('coffee',function(){ return gulp.src('src/*.coffee') .pipe(coffee({ bare: true })) @@ -33,4 +44,4 @@ gulp.task('watch',function(){ gulp.watch('src/*.css',['css']) gulp.watch('src/*.html',['html']) }) -gulp.task('default',['html','css','coffee']) +gulp.task('default',['html','css','js','coffee']) diff --git a/index.html b/index.html deleted file mode 100644 index 0ae444a..0000000 --- a/index.html +++ /dev/null @@ -1,19 +0,0 @@ - - - - Pert - - - - - - - - - - - - -
- - diff --git a/src/index.html b/src/index.html new file mode 100644 index 0000000..aa4e615 --- /dev/null +++ b/src/index.html @@ -0,0 +1,19 @@ + + + + Pert + + + + + + + + + + + + +
+ +