Skip to content

Commit b574de2

Browse files
author
Floran Brutel
committed
Better build for the webui to avoid big diffs in PR
1 parent f0341db commit b574de2

File tree

11 files changed

+17
-11
lines changed

11 files changed

+17
-11
lines changed

‎.gitattributes

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
glances/outputs/static/public/js/*.js -diff
1+
glances/outputs/static/public/* -diff linguist-vendored

‎glances/outputs/static/css/bootstrap.min.css ‎glances/outputs/static/css/bootstrap.css

File renamed without changes.

‎glances/outputs/static/gulpfile.js

+5
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ var mainBowerFiles = require('main-bower-files');
44
var ngAnnotate = require('gulp-ng-annotate');
55
var templateCache = require('gulp-angular-templatecache');
66
var del = require('del');
7+
var rename = require('gulp-rename');
78

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

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

1921
gulp.src('./images/*.png')
@@ -26,19 +28,22 @@ gulp.task('copy', function() {
2628
gulp.task('bower', function() {
2729
return gulp.src(mainBowerFiles())
2830
.pipe(concat('vendor.js'))
31+
.pipe(rename({suffix: '.min'}))
2932
.pipe(gulp.dest('./public/js'))
3033
});
3134

3235
gulp.task('build-js', function() {
3336
return gulp.src('./js/**/*.js')
3437
.pipe(ngAnnotate())
3538
.pipe(concat('main.js'))
39+
.pipe(rename({suffix: '.min'}))
3640
.pipe(gulp.dest('./public/js'))
3741
});
3842

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

‎glances/outputs/static/html/index.html

+5-5
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
<base href="/">
99

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

15-
<script type="text/javascript" src="js/vendor.js"></script>
16-
<script type="text/javascript" src="js/main.js"></script>
17-
<script type="text/javascript" src="js/templates.js"></script>
15+
<script type="text/javascript" src="js/vendor.min.js"></script>
16+
<script type="text/javascript" src="js/main.min.js"></script>
17+
<script type="text/javascript" src="js/templates.min.js"></script>
1818
</head>
1919

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

‎glances/outputs/static/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"gulp-angular-templatecache": "^2.0.0",
99
"gulp-concat": "^2.6.0",
1010
"gulp-ng-annotate": "^2.0.0",
11+
"gulp-rename": "^1.2.2",
1112
"main-bower-files": "^2.13.1"
1213
},
1314
"scripts": {

‎glances/outputs/static/public/css/normalize.css ‎glances/outputs/static/public/css/normalize.min.css

File renamed without changes.

‎glances/outputs/static/public/css/style.css ‎glances/outputs/static/public/css/style.min.css

File renamed without changes.

‎glances/outputs/static/public/index.html

+5-5
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
<base href="/">
99

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

15-
<script type="text/javascript" src="js/vendor.js"></script>
16-
<script type="text/javascript" src="js/main.js"></script>
17-
<script type="text/javascript" src="js/templates.js"></script>
15+
<script type="text/javascript" src="js/vendor.min.js"></script>
16+
<script type="text/javascript" src="js/main.min.js"></script>
17+
<script type="text/javascript" src="js/templates.min.js"></script>
1818
</head>
1919

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

‎glances/outputs/static/public/js/main.js ‎glances/outputs/static/public/js/main.min.js

File renamed without changes.

‎glances/outputs/static/public/js/templates.js ‎glances/outputs/static/public/js/templates.min.js

File renamed without changes.

‎glances/outputs/static/public/js/vendor.js ‎glances/outputs/static/public/js/vendor.min.js

File renamed without changes.

0 commit comments

Comments
 (0)