Merge pull request #541 from osano/gulp4

upgrade gulp & made package changes to reflect Osano as repo owner

Author: arlogilbert

.gitignore

@@ -1,7 +1,6 @@
 node_modules/
 .idea
 .vscode
-.code-workspace
+*.code-workspace
 .DS_Store
-build-verify/
-build/
+build-verify/

.travis.yml

@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-- '4.1'
+- 'lts/*'
 install:
 - npm install
 - npm install -g gulp

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "cookieconsent",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "homepage": "http://cookieconsent.osano.com/",
   "authors": ["Osano"],
   "description": "Osano cookie consent plugin",

build/cookieconsent.min.css

@@ -1,21 +1,19 @@
-var gulp = require('gulp');
-var concat = require('gulp-concat');
-var rename = require('gulp-rename');
-var minifyJS = require('gulp-uglify');
-var minifyCSS = require('gulp-minify-css');
-var deleteDirs = require('del');
-var runSequence = require('run-sequence');
-var autoprefixer = require('gulp-autoprefixer');
-var bump = require('gulp-bump');
-var yargs = require('yargs');
-var diff = require('gulp-diff');
+const gulp = require('gulp');
+const concat = require('gulp-concat');
+const minifyJS = require('gulp-terser');
+const minifyCSS = require('gulp-clean-css');
+const deleteDirs = require('del');
+const autoprefixer = require('gulp-autoprefixer');
+const bump = require('gulp-bump');
+const yargs = require('yargs');
+const diff = require('gulp-diff-4');
 
 
-var buildFolder = './build';
-var jsBuildFiles = [
+let buildFolder = './build';
+const jsBuildFiles = [
   './src/cookieconsent.js'
 ];
-var cssBuildFiles = [
+const cssBuildFiles = [
   // defined explicitly so they are combined in order
   './src/styles/animation.css',
   './src/styles/base.css',
@@ -46,38 +44,33 @@ gulp.task('minify:css', function () {
     .pipe(gulp.dest(buildFolder));          // save under a new name
 });
 
-gulp.task('bump', function(callback) {
+gulp.task('bump', function() {
   return gulp.src(['./bower.json', './package.json'])
              .pipe(bump({'version': yargs.argv.tag}))
              .pipe(gulp.dest('./'))
 });
 
-gulp.task('build', function(callback) {
-  return runSequence('cleanup:begin', 'minify:js', 'minify:css', callback);
-});
+gulp.task('build', gulp.series('cleanup:begin', 'minify:js', 'minify:css'));
 
-gulp.task('verify', function(callback) {
+gulp.task('verify', function() {
   buildFolder = "./build-verify";
-  return runSequence('cleanup:begin', 'minify:js', 'minify:css', 'verify:diff', callback);
+  return new Promise(gulp.series('cleanup:begin', 'minify:js', 'minify:css', 'verify:diff'));
 });
 
-gulp.task('verify:diff', function(callback) {
+gulp.task('verify:diff', function() {
   return gulp.src('./build/*')
              .pipe(diff('./build-verify'))
              .pipe(diff.reporter({ fail: true }));
 });
 
-gulp.task('build:release', function(callback) {
+gulp.task('build:release', function() {
   if (yargs.argv.tag===undefined) {
     throw "A version number (e.g. 3.0.1) is required to build a release of cookieconsent"
   }
 
-  return runSequence('build', 'bump', callback)
+  return new Promise(gulp.series('build', 'bump'));
 });
 
 gulp.task('watch', function() {
   gulp.watch(cssBuildFiles.concat(jsBuildFiles), ['build']);
-});
-
-function _minify(opts) {
-}
+});