Merge pull request #573 from branch 'dependency-updates'

Author: olets

gulpfile.js/lib/task-defaults.js

@@ -20,7 +20,7 @@ module.exports = {
       exclude: /node_modules/
     },
     babel: {
-      presets: [["es2015", { "modules": false }], 'stage-1']
+      presets: [["env", { "modules": false }], 'stage-1']
     },
     development: {},
     production: {

gulpfile.js/tasks/rev/rev-assets.js

@@ -1,6 +1,6 @@
 var gulp        = require('gulp')
 var rev         = require('gulp-rev')
-var revNapkin   = require('gulp-rev-napkin');
+var revdel      = require('gulp-rev-delete-original')
 var projectPath = require('../../lib/projectPath')
 
 // 1) Add md5 hashes to assets referenced by CSS and JS files
@@ -11,7 +11,7 @@ gulp.task('rev-assets', function() {
   return gulp.src([projectPath(PATH_CONFIG.dest,'**/*'), ignoreThese])
     .pipe(rev())
     .pipe(gulp.dest(PATH_CONFIG.dest))
-    .pipe(revNapkin({ verbose: false, force: true }))
+    .pipe(revdel())
     .pipe(rev.manifest(projectPath(PATH_CONFIG.dest, 'rev-manifest.json'), {merge: true}))
     .pipe(gulp.dest(''))
 })

gulpfile.js/tasks/rev/rev-css.js

@@ -1,6 +1,6 @@
 var gulp        = require('gulp')
 var rev         = require('gulp-rev')
-var revNapkin   = require('gulp-rev-napkin')
+var revdel      = require('gulp-rev-delete-original')
 var projectPath = require('../../lib/projectPath')
 
 // 3) Rev and compress CSS and JS files (this is done after assets, so that if a
@@ -9,7 +9,7 @@ gulp.task('rev-css', function(){
   return gulp.src(projectPath(PATH_CONFIG.dest,'**/*.css'))
     .pipe(rev())
     .pipe(gulp.dest(PATH_CONFIG.dest))
-    .pipe(revNapkin({verbose: false, force: true}))
+    .pipe(revdel())
     .pipe(rev.manifest(projectPath(PATH_CONFIG.dest, 'rev-manifest.json'), {merge: true}))
     .pipe(gulp.dest(''))
 })

gulpfile.js/tasks/rev/rev-update-references.js

@@ -1,12 +1,12 @@
 var gulp        = require('gulp')
-var revReplace  = require('gulp-rev-replace')
+var revRewrite  = require('gulp-rev-rewrite')
 var projectPath = require('../../lib/projectPath')
 
 // 2) Update asset references with reved filenames in compiled css + js
 gulp.task('rev-update-references', function(){
   var manifest = gulp.src(projectPath(PATH_CONFIG.dest, "rev-manifest.json"))
 
   return gulp.src(projectPath(PATH_CONFIG.dest,'**/**.{css,js}'))
-    .pipe(revReplace({manifest: manifest}))
+    .pipe(revRewrite({manifest: manifest}))
     .pipe(gulp.dest(PATH_CONFIG.dest))
 })

gulpfile.js/tasks/rev/update-html.js

@@ -1,13 +1,13 @@
 if(!TASK_CONFIG.html) return false
 
 var gulp        = require('gulp')
-var revReplace  = require('gulp-rev-replace')
+var revRewrite  = require('gulp-rev-rewrite')
 var projectPath = require('../../lib/projectPath')
 
 // 4) Update asset references in HTML
 gulp.task('update-html', function(){
   var manifest = gulp.src(projectPath(PATH_CONFIG.dest, "rev-manifest.json"))
   return gulp.src(projectPath(PATH_CONFIG.dest, PATH_CONFIG.html.dest, '**/*.html'))
-    .pipe(revReplace({ manifest: manifest }))
+    .pipe(revRewrite({ manifest: manifest }))
     .pipe(gulp.dest(projectPath(PATH_CONFIG.dest, PATH_CONFIG.html.dest)))
 })

gulpfile.js/tasks/watch.js

@@ -1,5 +1,4 @@
 var gulp        = require('gulp')
-var watch       = require('gulp-watch')
 var path        = require('path')
 var projectPath = require('../lib/projectPath')
 
@@ -32,7 +31,7 @@ var watchTask = function() {
     if(taskConfig) {
       var srcPath = projectPath(PATH_CONFIG.src, taskPath.src)
       var globPattern = '**/*' + (taskConfig.extensions ? '.{' + taskConfig.extensions.join(',') + '}' : '')
-      watch(path.join(srcPath, globPattern), watchConfig, function() {
+      gulp.watch(path.join(srcPath, globPattern), watchConfig, function() {
        require('./' + taskName)()
       })
     }

package.json

@@ -24,51 +24,50 @@
     "dev:test": "mocha ./gulpfile.js/**/*.test.js"
   },
   "dependencies": {
-    "ansi-colors": "^1.0.1",
-    "babel-core": "^6.25.0",
+    "ansi-colors": "^3.2.4",
+    "babel-core": "^6.26.3",
     "babel-loader": "^7.1.1",
-    "babel-preset-es2015": "^6.24.1",
+    "babel-preset-env": "^1.7.0",
     "babel-preset-stage-1": "^6.24.1",
-    "browser-sync": "^2.18.8",
-    "del": "2.2.2",
-    "es6-promise": "^4.1.1",
-    "fancy-log": "^1.3.2",
+    "browser-sync": "^2.26.3",
+    "del": "4.0.0",
+    "es6-promise": "^4.2.6",
+    "fancy-log": "^1.3.3",
     "gulp": "3.9.1",
-    "gulp-autoprefixer": "3.1.1",
-    "gulp-changed": "^2.0.0",
-    "gulp-cssnano": "2.1.2",
-    "gulp-data": "1.2.1",
+    "gulp-autoprefixer": "6.0.0",
+    "gulp-changed": "^3.2.0",
+    "gulp-cssnano": "2.1.3",
+    "gulp-data": "1.3.1",
     "gulp-gh-pages": "0.5.4",
-    "gulp-htmlmin": "3.0.0",
+    "gulp-htmlmin": "5.0.1",
     "gulp-if": "2.0.2",
-    "gulp-notify": "^3.0.0",
-    "gulp-nunjucks-render": "^2.2.1",
-    "gulp-rename": "1.2.2",
-    "gulp-replace": "^0.5.4",
-    "gulp-rev": "7.1.2",
-    "gulp-rev-napkin": "0.1.0",
-    "gulp-rev-replace": "0.4.3",
-    "gulp-sass": "^3.1.0",
-    "gulp-sequence": "0.4.6",
-    "gulp-sizereport": "1.2.0",
-    "gulp-sourcemaps": "^2.6.0",
-    "gulp-svgstore": "6.1.0",
-    "gulp-watch": "4.3.11",
-    "lodash": "^4.17.4",
+    "gulp-notify": "^3.2.0",
+    "gulp-nunjucks-render": "^2.2.2",
+    "gulp-rename": "1.4.0",
+    "gulp-replace": "^1.0.0",
+    "gulp-rev": "9.0.0",
+    "gulp-rev-delete-original": "^0.2.3",
+    "gulp-rev-rewrite": "^1.1.4",
+    "gulp-sass": "^4.0.2",
+    "gulp-sequence": "1.0.0",
+    "gulp-sizereport": "1.2.1",
+    "gulp-sourcemaps": "^2.6.5",
+    "gulp-svgstore": "7.0.1",
+    "lodash": "^4.17.11",
     "merge-stream": "^1.0.1",
     "minimist": "^1.2.0",
     "node-fs-extra": "^0.8.2",
-    "node-sass-glob-importer": "^5.0.0-alpha.5",
+    "node-sass-glob-importer": "^5.3.0",
     "open": "0.0.5",
-    "plugin-error": "^0.1.2",
+    "plugin-error": "^1.0.1",
     "pretty-hrtime": "1.0.3",
-    "require-dir": "0.3.2",
+    "require-dir": "1.2.0",
     "webpack": "^3.4.1",
     "webpack-dev-middleware": "^1.12.0",
     "webpack-hot-middleware": "^2.18.2"
   },
   "devDependencies": {
     "chai": "^3.5.0",
-    "mocha": "3.2.0"
+    "mocha": "^6.0.2"
   }
 }