Merge pull request #19 from JBartscher/feature/restructure_headings

Change heading-structure of "Sonar project Quality"- and "Sonar Server Vision"-widgets.

Author: Joshua Sprey

.gitignore

@@ -3,3 +3,4 @@
 /build/
 /components/
 .tmp/
+.idea/

dist/adf-widget-sonar.js

@@ -1,106 +1,112 @@
-var gulp = require('gulp');
-var connect = require('gulp-connect');
-var wiredep = require('wiredep').stream;
-var $ = require('gulp-load-plugins')();
-var del = require('del');
-var jsReporter = require('jshint-stylish');
-var annotateAdfPlugin = require('ng-annotate-adf-plugin');
-var pkg = require('./package.json');
+'use strict';
+
+const gulp = require('gulp');
+const connect = require('gulp-connect');
+const wiredep = require('wiredep').stream;
+const $ = require('gulp-load-plugins')();
+const del = require('del');
+const jsReporter = require('jshint-stylish');
+const annotateAdfPlugin = require('ng-annotate-adf-plugin');
+const pkg = require('./package.json');
 
 var annotateOptions = {
   plugin: [
     annotateAdfPlugin
   ]
 };
 
-var templateOptions = {
+const templateOptions = {
   root: '{widgetsPath}/sonar/src',
   module: 'adf.widget.sonar'
 };
 
 /** lint **/
 
-gulp.task('csslint', function(){
+gulp.task('csslint', (done) => {
   gulp.src('src/**/*.css')
-      .pipe($.csslint())
-      .pipe($.csslint.reporter());
+    .pipe($.csslint())
+    .pipe($.csslint.reporter());
+  done();
 });
 
-gulp.task('jslint', function(){
+gulp.task('jslint', (done) => {
   gulp.src('src/**/*.js')
-      .pipe($.jshint())
-      .pipe($.jshint.reporter(jsReporter));
+    .pipe($.jshint())
+    .pipe($.jshint.reporter(jsReporter));
+  done();
 });
 
-gulp.task('lint', ['csslint', 'jslint']);
+gulp.task('lint', gulp.series('csslint', 'jslint'));
 
 /** serve **/
 
-gulp.task('templates', function(){
+gulp.task('templates', () => {
   return gulp.src('src/**/*.html')
-             .pipe($.angularTemplatecache('templates.tpl.js', templateOptions))
-             .pipe(gulp.dest('.tmp/dist'));
+    .pipe($.angularTemplatecache('templates.tpl.js', templateOptions))
+    .pipe(gulp.dest('.tmp/dist'));
 });
 
-gulp.task('sample', ['templates'], function(){
-  var files = gulp.src(['src/**/*.js', 'src/**/*.css', 'src/**/*.less', '.tmp/dist/*.js'])
-                  .pipe($.if('*.js', $.angularFilesort()));
+gulp.task('sample', gulp.series('templates', function (done) {
+  const files = gulp.src(['src/**/*.js', 'src/**/*.css', 'src/**/*.less', '.tmp/dist/*.js'])
+    .pipe($.if('*.js', $.angularFilesort()));
 
   gulp.src('sample/index.html')
-      .pipe(wiredep({
-        directory: './components/',
-        bowerJson: require('./bower.json'),
-        devDependencies: true,
-        dependencies: true
-      }))
-      .pipe($.inject(files))
-      .pipe(gulp.dest('.tmp/dist'))
-      .pipe(connect.reload());
-});
-
-gulp.task('watch', function(){
-  gulp.watch(['src/**'], ['sample']);
+    .pipe(wiredep({
+      directory: './components/',
+      bowerJson: require('./bower.json'),
+      devDependencies: true,
+      dependencies: true
+    }))
+    .pipe($.inject(files))
+    .pipe(gulp.dest('.tmp/dist'));
+  //.pipe(connect.reload());
+  done();
+}));
+
+gulp.task('watch', (done) => {
+  gulp.watch(['src/**'], gulp.series('sample'));
+  done();
 });
 
-gulp.task('serve', ['watch', 'sample'], function(){
+gulp.task('serve', gulp.series('sample', 'watch', function () {
   connect.server({
     root: ['.tmp/dist', '.'],
     livereload: true,
     port: 9002
   });
-});
+}));
 
 /** build **/
 
-gulp.task('css', function(){
-  gulp.src(['src/**/*.css', 'src/**/*.less'])
-      .pipe($.if('*.less', $.less()))
-      .pipe($.concat(pkg.name + '.css'))
-      .pipe(gulp.dest('dist'))
-      .pipe($.rename(pkg.name + '.min.css'))
-      .pipe($.minifyCss())
-      .pipe(gulp.dest('dist'));
+gulp.task('css', function () {
+  return gulp.src(['src/**/*.css', 'src/**/*.less'])
+    .pipe($.if('*.less', $.less()))
+    .pipe($.concat(pkg.name + '.css'))
+    .pipe(gulp.dest('dist'))
+    .pipe($.rename(pkg.name + '.min.css'))
+    .pipe($.minifyCss())
+    .pipe(gulp.dest('dist'));
 });
 
-gulp.task('js', function() {
-  gulp.src(['src/**/*.js', 'src/**/*.html'])
-      .pipe($.if('*.html', $.minifyHtml()))
-      .pipe($.if('*.html', $.angularTemplatecache(pkg.name + '.tpl.js', templateOptions)))
-      .pipe($.angularFilesort())
-      .pipe($.if('*.js', $.replace(/'use strict';/g, '')))
-      .pipe($.concat(pkg.name + '.js'))
-      .pipe($.headerfooter('(function(window, undefined) {\'use strict\';\n', '})(window);'))
-      .pipe($.ngAnnotate(annotateOptions))
-      .pipe(gulp.dest('dist'))
-      .pipe($.rename(pkg.name + '.min.js'))
-      .pipe($.uglify())
-      .pipe(gulp.dest('dist'));
+gulp.task('js', function () {
+  return gulp.src(['src/**/*.js', 'src/**/*.html'])
+    .pipe($.if('*.html', $.minifyHtml()))
+    .pipe($.if('*.html', $.angularTemplatecache(pkg.name + '.tpl.js', templateOptions)))
+    .pipe($.angularFilesort())
+    .pipe($.if('*.js', $.replace(/'use strict';/g, '')))
+    .pipe($.concat(pkg.name + '.js'))
+    .pipe($.headerfooter('(function(window, undefined) {\'use strict\';\n', '})(window);'))
+    .pipe($.ngAnnotate(annotateOptions))
+    .pipe(gulp.dest('dist'))
+    .pipe($.rename(pkg.name + '.min.js'))
+    .pipe($.uglify())
+    .pipe(gulp.dest('dist'));
 });
 
 /** clean **/
 
-gulp.task('clean', function(cb){
+gulp.task('clean', function (cb) {
   del(['dist', '.tmp'], cb);
 });
 
-gulp.task('default', ['css', 'js']);
+gulp.task('default', gulp.series('css', 'js'));