Merge pull request #923 from notFloran/webui-remove-uglify

[WebUI] Remove uglify of js files
nicolargo · Sep 18, 2016 · bea5e56 · bea5e56
2 parents ac1a24d + 5191b73
commit bea5e56
Show file tree

Hide file tree

Showing 6 changed files with 50,863 additions and 15 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+glances/outputs/static/public/js/*.js -diff
diff --git a/glances/outputs/static/bower.json b/glances/outputs/static/bower.json
@@ -1,5 +1,5 @@
 {
-  "name": "Glances",
+  "name": "glances",
   "private": true,
   "dependencies": {
     "angular": "^1.5.8",

diff --git a/glances/outputs/static/gulpfile.js b/glances/outputs/static/gulpfile.js
@@ -1,5 +1,4 @@
 var gulp = require('gulp');
-var uglify = require('gulp-uglify');
 var concat = require('gulp-concat');
 var mainBowerFiles = require('main-bower-files');
 var ngAnnotate = require('gulp-ng-annotate');
@@ -27,15 +26,13 @@ gulp.task('copy', function() {
 gulp.task('bower', function() {
   return gulp.src(mainBowerFiles())
     .pipe(concat('vendor.js'))
-    .pipe(uglify())
     .pipe(gulp.dest('./public/js'))
 });
 
 gulp.task('build-js', function() {
   return gulp.src('./js/**/*.js')
     .pipe(ngAnnotate())
     .pipe(concat('main.js'))
-    .pipe(uglify())
     .pipe(gulp.dest('./public/js'))
 });
 
@@ -53,4 +50,4 @@ gulp.task('watch', function () {
 });
 
 gulp.task('build', ['clean', 'bower', 'build-js', 'template', 'copy']);
-gulp.task('default', ['build']);
+gulp.task('default', ['build']);
diff --git a/glances/outputs/static/package.json b/glances/outputs/static/package.json
@@ -8,7 +8,6 @@
     "gulp-angular-templatecache": "^2.0.0",
     "gulp-concat": "^2.6.0",
     "gulp-ng-annotate": "^2.0.0",
-    "gulp-uglify": "^1.5.4",
     "main-bower-files": "^2.13.1"
   },
   "scripts": {