Merge pull request #942 from notFloran/suppress-github-diff

Better build for the WebUI to avoid big diffs in PR

Merge pull request #942 from notFloran/suppress-github-diff
Better build for the WebUI to avoid big diffs in PR
86fb5efd · Nicolas Hennion · GitHub · f0341db1 · b574de27 · 86fb5efd
11 changed file
--- a/.gitattributes
+++ b/.gitattributes
-glances/outputs/static/public/js/*.js -diff
+glances/outputs/static/public/* -diff linguist-vendored
--- a/glances/outputs/static/css/bootstrap.min.css
+++ b/glances/outputs/static/css/bootstrap.min.css
--- a/glances/outputs/static/gulpfile.js
+++ b/glances/outputs/static/gulpfile.js
@@ -4,6 +4,7 @@ var mainBowerFiles = require('main-bower-files');
 var ngAnnotate = require('gulp-ng-annotate');
 var templateCache = require('gulp-angular-templatecache');
 var del = require('del');
+var rename = require('gulp-rename');

 gulp.task('clean', function() {
  del('./public/*')
@@ -14,6 +15,7 @@ gulp.task('copy', function() {
    .pipe(gulp.dest('./public'));

  gulp.src('./css/*.css')
+    .pipe(rename({suffix: '.min'}))
    .pipe(gulp.dest('./public/css'));

  gulp.src('./images/*.png')
@@ -26,6 +28,7 @@ gulp.task('copy', function() {
 gulp.task('bower', function() {
  return gulp.src(mainBowerFiles())
    .pipe(concat('vendor.js'))
+    .pipe(rename({suffix: '.min'}))
    .pipe(gulp.dest('./public/js'))
 });

@@ -33,12 +36,14 @@ gulp.task('build-js', function() {
  return gulp.src('./js/**/*.js')
    .pipe(ngAnnotate())
    .pipe(concat('main.js'))
+    .pipe(rename({suffix: '.min'}))
    .pipe(gulp.dest('./public/js'))
 });

 gulp.task('template', function () {
  return gulp.src('./html/plugins/*.html')
    .pipe(templateCache('templates.js', {'root': 'plugins/', 'module': 'glancesApp'}))
+    .pipe(rename({suffix: '.min'}))
    .pipe(gulp.dest('./public/js'));
 });


--- a/glances/outputs/static/html/index.html
+++ b/glances/outputs/static/html/index.html
@@ -8,13 +8,13 @@
    <base href="/">

    <link rel="icon" type="image/x-icon" href="favicon.ico" />
-    <link rel="stylesheet" type="text/css" href="css/normalize.css" />
+    <link rel="stylesheet" type="text/css" href="css/normalize.min.css" />
    <link rel="stylesheet" type="text/css" href="css/bootstrap.min.css" />
-    <link rel="stylesheet" type="text/css" href="css/style.css" />
+    <link rel="stylesheet" type="text/css" href="css/style.min.css" />

-    <script type="text/javascript" src="js/vendor.js"></script>
-    <script type="text/javascript" src="js/main.js"></script>
-    <script type="text/javascript" src="js/templates.js"></script>
+    <script type="text/javascript" src="js/vendor.min.js"></script>
+    <script type="text/javascript" src="js/main.min.js"></script>
+    <script type="text/javascript" src="js/templates.min.js"></script>
 </head>

 <body ng-view="" ng-keydown="onKeyDown($event)">

--- a/glances/outputs/static/package.json
+++ b/glances/outputs/static/package.json
@@ -8,6 +8,7 @@
    "gulp-angular-templatecache": "^2.0.0",
    "gulp-concat": "^2.6.0",
    "gulp-ng-annotate": "^2.0.0",
+    "gulp-rename": "^1.2.2",
    "main-bower-files": "^2.13.1"
  },
  "scripts": {

--- a/glances/outputs/static/public/css/normalize.css
+++ b/glances/outputs/static/public/css/normalize.css
--- a/glances/outputs/static/public/css/style.css
+++ b/glances/outputs/static/public/css/style.css
--- a/glances/outputs/static/public/index.html
+++ b/glances/outputs/static/public/index.html
--- a/glances/outputs/static/public/js/main.js
+++ b/glances/outputs/static/public/js/main.js
--- a/glances/outputs/static/public/js/templates.js
+++ b/glances/outputs/static/public/js/templates.js
--- a/glances/outputs/static/public/js/vendor.js
+++ b/glances/outputs/static/public/js/vendor.js