Merge pull request xoseperez#1219 from mcspr/update-package-lock

NPM maintenance
nixkj · Sep 25, 2018 · a50c335 · a50c335
2 parents a3fc8f9 + 0aed95c
commit a50c335
Show file tree

Hide file tree

Showing 6 changed files with 1,245 additions and 1,529 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,10 +8,10 @@ cache:
   - "~/.npm"
   - "~/.platformio"
   - "$TRAVIS_BUILD_DIR/code/.piolibdeps"
-  - "$TRAVIS_BUILD_DIR/code/espurna/node_modules"
 install:
 - pip install -U platformio
-- cd code ; npm install --only=dev ; cd ..
+- npm install -g npm@latest
+- cd code ; npm ci ; cd ..
 env:
   global:
   - BUILDER_TOTAL_THREADS=4

diff --git a/code/gulpfile.js b/code/gulpfile.js
@@ -31,7 +31,6 @@ const runSequence = require('run-sequence');
 const through = require('through2');
 
 const htmlmin = require('gulp-htmlmin');
-const uglify = require('gulp-uglify');
 const inline = require('gulp-inline');
 const inlineImages = require('gulp-css-base64');
 const favicon = require('gulp-base64-favicon');

diff --git a/code/html/vendor/images/sort_asc_disabled.png b/code/html/vendor/images/sort_asc_disabled.png
diff --git a/code/html/vendor/images/sort_desc_disabled.png b/code/html/vendor/images/sort_desc_disabled.png