Fixed diagnostic build
diff --git a/views/ngXosViews/diagnostic/gulp/build.js b/views/ngXosViews/diagnostic/gulp/build.js
index 8544187..cf2b40e 100644
--- a/views/ngXosViews/diagnostic/gulp/build.js
+++ b/views/ngXosViews/diagnostic/gulp/build.js
@@ -13,7 +13,7 @@
var uglify = require('gulp-uglify');
var templateCache = require('gulp-angular-templatecache');
var runSequence = require('run-sequence');
-var concat = require('gulp-concat');
+var concat = require('gulp-concat-util');
var del = require('del');
var wiredep = require('wiredep');
var angularFilesort = require('gulp-angular-filesort');
@@ -22,10 +22,16 @@
var inject = require('gulp-inject');
var rename = require('gulp-rename');
var replace = require('gulp-replace');
+var postcss = require('gulp-postcss');
+var autoprefixer = require('autoprefixer');
+var mqpacker = require('css-mqpacker');
+var csswring = require('csswring');
-var TEMPLATE_FOOTER = `}]);
-angular.module('xos.serviceTopology').run(function($location){$location.path('/')});
-angular.bootstrap(angular.element('#xosDiagnostic'), ['xos.serviceTopology']);`;
+var TEMPLATE_FOOTER = `
+angular.module('xos.diagnostic').run(function($location){
+ $location.path('/')
+});
+angular.bootstrap(angular.element('#xosDiagnostic'), ['xos.diagnostic']);`;
module.exports = function(options){
@@ -37,15 +43,40 @@
);
});
+ // minify css
+ gulp.task('css', function () {
+ var processors = [
+ autoprefixer({browsers: ['last 1 version']}),
+ mqpacker,
+ csswring
+ ];
+ console.log(options.css);
+ gulp.src([
+ `${options.css}**/*.css`,
+ `!${options.css}dev.css`
+ ])
+ .pipe(postcss(processors))
+ .pipe(gulp.dest(options.tmp + '/css/'));
+ });
+
+ gulp.task('copyCss', ['css'], function(){
+ return gulp.src([`${options.tmp}/css/*.css`])
+ .pipe(concat('xosDiagnostic.css'))
+ .pipe(gulp.dest(options.static + 'css/'))
+ });
+
// compile and minify scripts
gulp.task('scripts', function() {
return gulp.src([
- options.tmp + '**/*.js'
+ options.tmp + '**/*.js',
+ options.tmp + 'templates.js'
])
.pipe(ngAnnotate())
.pipe(angularFilesort())
.pipe(concat('xosDiagnostic.js'))
- .pipe(uglify())
+ .pipe(concat.header('//Autogenerated, do not edit!!!\n'))
+ .pipe(concat.footer(TEMPLATE_FOOTER))
+ // .pipe(uglify())
.pipe(gulp.dest(options.static + 'js/'));
});
@@ -53,9 +84,9 @@
gulp.task('templates', function(){
return gulp.src('./src/templates/*.html')
.pipe(templateCache({
- module: 'xos.serviceTopology',
+ module: 'xos.diagnostic',
root: 'templates/',
- templateFooter: TEMPLATE_FOOTER
+ // templateFooter: TEMPLATE_FOOTER
}))
.pipe(gulp.dest(options.tmp));
});
@@ -72,8 +103,10 @@
inject(
gulp.src([
options.static + 'js/vendor/xosDiagnosticVendor.js',
- options.static + 'js/xosDiagnostic.js'
- ])
+ options.static + 'js/xosDiagnostic.js',
+ options.static + 'css/xosDiagnostic.css'
+ ]),
+ {ignorePath: '/../../../xos/core/xoslib'}
)
)
.pipe(rename('xosDiagnostic.html'))
@@ -112,7 +145,7 @@
'scripts',
'wiredep',
'copyHtml',
- 'cleanTmp'
+ 'copyCss'
);
});
};
\ No newline at end of file