Moved diagnostic server script to allow sass
diff --git a/views/ngXosViews/diagnostic/gulp/build.js b/views/ngXosViews/diagnostic/gulp/build.js
index cf2b40e..00b3e78 100644
--- a/views/ngXosViews/diagnostic/gulp/build.js
+++ b/views/ngXosViews/diagnostic/gulp/build.js
@@ -26,12 +26,7 @@
var autoprefixer = require('autoprefixer');
var mqpacker = require('css-mqpacker');
var csswring = require('csswring');
-
-var TEMPLATE_FOOTER = `
-angular.module('xos.diagnostic').run(function($location){
- $location.path('/')
-});
-angular.bootstrap(angular.element('#xosDiagnostic'), ['xos.diagnostic']);`;
+var sass = require('gulp-sass');
module.exports = function(options){
@@ -75,7 +70,7 @@
.pipe(angularFilesort())
.pipe(concat('xosDiagnostic.js'))
.pipe(concat.header('//Autogenerated, do not edit!!!\n'))
- .pipe(concat.footer(TEMPLATE_FOOTER))
+ // .pipe(concat.footer(TEMPLATE_FOOTER))
// .pipe(uglify())
.pipe(gulp.dest(options.static + 'js/'));
});
@@ -97,7 +92,7 @@
// remove dev dependencies from html
.pipe(replace(/<!-- bower:css -->(\n.*)*\n<!-- endbower --><!-- endcss -->/, ''))
.pipe(replace(/<!-- bower:js -->(\n.*)*\n<!-- endbower --><!-- endjs -->/, ''))
- .pipe(replace(/ng-app=".*"\s/, ''))
+ // .pipe(replace(/ng-app=".*"\s/, ''))
// injecting minified files
.pipe(
inject(
diff --git a/views/ngXosViews/diagnostic/gulp/server.js b/views/ngXosViews/diagnostic/gulp/server.js
index 7605294..194bd45 100644
--- a/views/ngXosViews/diagnostic/gulp/server.js
+++ b/views/ngXosViews/diagnostic/gulp/server.js
@@ -9,6 +9,7 @@
var wiredep = require('wiredep').stream;
var httpProxy = require('http-proxy');
var del = require('del');
+var sass = require('gulp-sass');
const environment = process.env.NODE_ENV;
@@ -78,8 +79,24 @@
gulp.watch(options.src + '**/*.html', function(){
browserSync.reload();
});
+ gulp.watch(options.css + '**/*.css', function(){
+ browserSync.reload();
+ });
+ gulp.watch(`${options.sass}/**/*.scss`, ['sass'], function(){
+ browserSync.reload();
+ });
});
+ gulp.task('sass', function () {
+ return gulp.src(`${options.sass}/**/*.scss`)
+ .pipe(sass().on('error', sass.logError))
+ .pipe(gulp.dest(options.css));
+ });
+
+ // gulp.task('sass:watch', function () {
+ // gulp.watch('./sass/**/*.scss', ['sass']);
+ // });
+
// transpile js with sourceMaps
gulp.task('babel', function(){
return gulp.src(options.scripts + '**/*.js')
@@ -137,6 +154,7 @@
gulp.task('serve', function() {
runSequence(
+ 'sass',
'bower',
'injectScript',
'injectCss',