From f1e7a17698980cf3b9f051df4f16470ea62f5342 Mon Sep 17 00:00:00 2001
From: Mark Friedrich <exodus4d@users.noreply.github.com>
Date: Sat, 7 Mar 2020 17:16:43 +0100
Subject: [PATCH] - Upgraded NPM dependencies

---
 gulpfile.js  | 21 ++++++++++++---------
 package.json | 12 ++++++------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/gulpfile.js b/gulpfile.js
index 6df592b6..d002f29b 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -10,6 +10,7 @@ let filter              = require('gulp-filter');
 let gulpif              = require('gulp-if');
 let jshint              = require('gulp-jshint');
 let sourcemaps          = require('gulp-sourcemaps');
+let zlib                = require('zlib');
 let gzip                = require('gulp-gzip');
 let brotli              = require('gulp-brotli');
 let uglifyjs            = require('uglify-es');
@@ -185,9 +186,11 @@ let gZipOptions = {
 
 let brotliOptions = {
     extension: 'br',                    // use "custom" ext: .br
-    mode: 1,                            // compression mode for UTF-8 formatted text
-    quality: 11,                        // quality [1 worst - 11 best]
-    skipLarger: true                    // use orig. files in case of *.br size > orig. size
+    skipLarger: true,                   // use orig. files in case of *.br size > orig. size
+    params: {
+        [zlib.constants.BROTLI_PARAM_MODE]: zlib.constants.BROTLI_MODE_TEXT,        // compression mode for UTF-8 formatted text
+        [zlib.constants.BROTLI_PARAM_QUALITY]: zlib.constants.BROTLI_MAX_QUALITY    // quality [1 worst - 11 best]
+    }
 };
 
 let compassOptions = {
@@ -580,7 +583,7 @@ gulp.task('task:diffJS', () => {
  * get assets filter options e.g. for gZip or Brotli assets
  * @param compression
  * @param fileExt
- * @returns {{srcModules: *[], fileFilter}}
+ * @returns {{fileFilter, srcModules: string[]}}
  */
 let getAssetFilterOptions = (compression, fileExt) => {
     return {
@@ -593,10 +596,10 @@ let getAssetFilterOptions = (compression, fileExt) => {
 };
 
 /**
- * build gZip or Brotli assets
+ * build gZip assets
  * @param config
  * @param taskName
- * @returns {JQuery.PromiseBase<never, never, never, never, never, never, never, never, never, never, never, never>}
+ * @returns {*}
  */
 let gzipAssets = (config, taskName) => {
     return gulp.src(config.srcModules, {base: 'public', since: gulp.lastRun(taskName)})
@@ -616,17 +619,17 @@ let gzipAssets = (config, taskName) => {
 };
 
 /**
- * build Brotli or Brotli assets
+ * build Brotli assets
  * @param config
  * @param taskName
- * @returns {JQuery.PromiseBase<never, never, never, never, never, never, never, never, never, never, never, never>}
+ * @returns {*}
  */
 let brotliAssets = (config, taskName) => {
     return gulp.src(config.srcModules, {base: 'public', since: gulp.lastRun(taskName)})
         .pipe(config.fileFilter)
         .pipe(debug({title: 'Brotli asses dest: ', showFiles: false}))
         .pipe(bytediff.start())
-        .pipe(brotli.compress(brotliOptions))
+        .pipe(brotli(brotliOptions))
         .pipe(bytediff.stop(data => {
             trackFile(data, {brotliFile: 'fileName', brotli: 'endSize'});
             if(fileExtension(data.fileName) ===  brotliOptions.extension){
diff --git a/package.json b/package.json
index dd35e00b..b6fae107 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
   "name": "pathfinder-eve",
-  "version": "1.2.4",
+  "version": "2.0.0",
   "engines": {
-    "node": "6.x"
+    "node": "12.x"
   },
   "description": "Pathfinder is a system mapping tool for EVE ONLINE",
   "main": "index.php",
@@ -11,9 +11,9 @@
     "ansi-colors": "^4.1.1",
     "fancy-log": "^1.3.3",
     "file-extension": "^4.0.5",
-    "flat": "^4.1.0",
+    "flat": "^5.0.0",
     "gulp": "^4.0.2",
-    "gulp-brotli": "^1.2.2",
+    "gulp-brotli": "^2.0.2",
     "gulp-bytediff": "1.0.x",
     "gulp-clean-css": "^4.2.0",
     "gulp-compass": "2.1.x",
@@ -26,10 +26,10 @@
     "gulp-requirejs-optimize": "1.3.x",
     "gulp-sourcemaps": "^2.6.5",
     "gulp-uglify": "^3.0.2",
-    "jshint": "^2.10.3",
+    "jshint": "^2.11.0",
     "jshint-stylish": "^2.x.x",
     "lodash.padend": "4.6.x",
-    "node-notifier": "^5.4.0",
+    "node-notifier": "^6.0.0",
     "pretty-bytes": "^5.3.0",
     "promised-del": "1.0.x",
     "slash": "^3.0.0",