summaryrefslogtreecommitdiff
path: root/web-ui
diff options
context:
space:
mode:
authorBruno Wagner <bwagner@riseup.net>2016-06-26 08:13:46 +0200
committerBruno Wagner <bwagner@riseup.net>2016-06-26 08:17:24 +0200
commit47544aa067fb0119147e0e302a7f08e215f0e88f (patch)
treed25ced3bbc5c14b5d45a5ab22ff22fd4e23e3ed2 /web-ui
parentb4add4e3481ef5a3d53f8af0739bc3b8048d32bf (diff)
Updated minifiers and packaging accordingly
Diffstat (limited to 'web-ui')
-rw-r--r--web-ui/app/images/favicon.png (renamed from web-ui/app/images/Favicon.png)bin592 -> 592 bytes
-rw-r--r--web-ui/config/imagemin.js22
-rw-r--r--web-ui/package.json6
3 files changed, 11 insertions, 17 deletions
diff --git a/web-ui/app/images/Favicon.png b/web-ui/app/images/favicon.png
index e14841c7..e14841c7 100644
--- a/web-ui/app/images/Favicon.png
+++ b/web-ui/app/images/favicon.png
Binary files differ
diff --git a/web-ui/config/imagemin.js b/web-ui/config/imagemin.js
index 7d0be6df..2b2c87e0 100644
--- a/web-ui/config/imagemin.js
+++ b/web-ui/config/imagemin.js
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 2014 ThoughtWorks, Inc.
- *
+ * Copyright (c) 2016 ThoughtWorks, Inc.
+ *
* Pixelated is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
@@ -15,17 +15,11 @@
* along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
*/
-var Imagemin = require('imagemin');
-
-var imagemin = new Imagemin()
- .src('app/images/*.{gif,jpg,png,svg}')
- .dest('dist/images')
- .use(Imagemin.jpegtran({ progressive: true }));
-
-imagemin.run(function (err, files) {
- if (err) {
- throw err;
- }
+const imagemin = require('imagemin');
- console.log(files[0]);
+imagemin(['app/images/*.{gif,jpg,png,svg}'],
+ 'dist/images'
+).then(files => {
+ console.log('Images list:')
+ files.map(function(file) { console.log(file.path); });
});
diff --git a/web-ui/package.json b/web-ui/package.json
index 652e7b0e..b13459af 100644
--- a/web-ui/package.json
+++ b/web-ui/package.json
@@ -7,9 +7,9 @@
"devDependencies": {
"bower": "1.7.2",
"handlebars": "2.0.0",
- "html-minifier": "1.3.0",
- "imagemin": "4.0.0",
- "jshint": "2.9.1-rc2",
+ "html-minifier": "2.1.6",
+ "imagemin": "5.2.1",
+ "jshint": "2.9.2",
"karma": "0.13.19",
"karma-chrome-launcher": "0.2.2",
"karma-firefox-launcher": "0.1.7",