WIP: Updating dependencies to fix vulnerabilities

.gitignore

@@ -68,6 +68,10 @@ Thumbs.db
 /*.local.bat
 /CMakeSettings.json
 
+# Jetbrains related files #
+###########################
+.idea/
+
 # stxxl related files #
 #######################
 .stxxl

.travis.yml

@@ -54,7 +54,6 @@ matrix:
         - nvm use $NODE
         - npm --version
         - npm ci --ignore-scripts
-        - npm link --ignore-scripts
       script:
         - ./scripts/check_taginfo.py taginfo.json profiles/car.lua
         - ${MASON} install clang-format 3.8.1

features/step_definitions/data.js

@@ -295,7 +295,7 @@ module.exports = function () {
         this.reprocess(callback);
     });
 
-    this.Given(/^osrm\-routed is stopped$/, (callback) => {
+    this.Given(/^osrm-routed is stopped$/, (callback) => {
         this.OSRMLoader.shutdown(callback);
     });
 

features/step_definitions/options.js

@@ -21,23 +21,23 @@ module.exports = function () {
         });
     };
 
-    this.When(/^I run "osrm\-routed\s?(.*?)"$/, { timeout: this.TIMEOUT }, (options, callback) => {
+    this.When(/^I run "osrm-routed\s?(.*?)"$/, { timeout: this.TIMEOUT }, (options, callback) => {
         this.runAndSafeOutput('osrm-routed', options, callback);
     });
 
-    this.When(/^I run "osrm\-(extract|contract|partition|customize)\s?(.*?)"$/, (binary, options, callback) => {
+    this.When(/^I run "osrm-(extract|contract|partition|customize)\s?(.*?)"$/, (binary, options, callback) => {
         const stamp = this.processedCacheFile + '.stamp_' + binary;
         this.runAndSafeOutput('osrm-' + binary, options, (err) => {
             if (err) return callback(err);
             fs.writeFile(stamp, 'ok', callback);
         });
     });
 
-    this.When(/^I try to run "(osrm\-[a-z]+)\s?(.*?)"$/, (binary, options, callback) => {
+    this.When(/^I try to run "(osrm-[a-z]+)\s?(.*?)"$/, (binary, options, callback) => {
         this.runAndSafeOutput(binary, options, () => { callback(); });
     });
 
-    this.When(/^I run "osrm\-datastore\s?(.*?)"(?: with input "([^"]*)")?$/, (options, input, callback) => {
+    this.When(/^I run "osrm-datastore\s?(.*?)"(?: with input "([^"]*)")?$/, (options, input, callback) => {
         let child = this.runAndSafeOutput('osrm-datastore', options, callback);
         if (input !== undefined)
             child.stdin.write(input);
@@ -55,13 +55,13 @@ module.exports = function () {
     this.Then(/^stdout should( not)? contain "(.*?)"$/, (not, str) => {
         const contains = this.stdout.indexOf(str) > -1;
         assert.ok(typeof not === 'undefined' ? contains : !contains,
-                  'stdout ' + (typeof not === 'undefined' ? 'does not contain' : 'contains') + ' "' + str + '"');
+            'stdout ' + (typeof not === 'undefined' ? 'does not contain' : 'contains') + ' "' + str + '"');
     });
 
     this.Then(/^stderr should( not)? contain "(.*?)"$/, (not, str) => {
         const contains = this.stderr.indexOf(str) > -1;
         assert.ok(typeof not === 'undefined' ? contains : !contains,
-                 'stderr ' + (typeof not === 'undefined' ? 'does not contain' : 'contains') + ' "' + str + '"');
+            'stderr ' + (typeof not === 'undefined' ? 'does not contain' : 'contains') + ' "' + str + '"');
     });
 
     this.Then(/^stdout should contain \/(.*)\/$/, (regexStr) => {

features/step_definitions/routability.js

@@ -69,7 +69,7 @@ module.exports = function () {
                                 outputRow[direction] = result[direction].status ?
                                     'x' : '';
                                 break;
-                            case /^[\d\.]+ s/.test(want):
+                            case /^[\d.]+ s/.test(want):
                                 // the result here can come back as a non-number value like
                                 // `diff`, but we only want to apply the unit when it comes
                                 // back as a number, for tableDiff's literal comparison

features/support/cache.js

@@ -29,7 +29,7 @@ module.exports = function() {
 
             // setup cache for feature data
             // if OSRM_PROFILE is set to force a specific profile, then
-             // include the profile name in the hash of the profile file
+            // include the profile name in the hash of the profile file
             hash.hashOfFile(uri, this.OSRM_PROFILE, (err, hash) => {
                 if (err) return callback(err);
 
@@ -45,10 +45,10 @@ module.exports = function() {
                 this.featureProcessedCacheDirectories[uri] = featureProcessedCacheDirectory;
 
                 d3.queue(1)
-                  .defer(mkdirp, featureProcessedCacheDirectory)
-                  .defer(this.cleanupFeatureCache.bind(this), featureCacheDirectory, hash)
-                  .defer(this.cleanupProcessedFeatureCache.bind(this), featureProcessedCacheDirectory, this.osrmHash)
-                  .awaitAll(callback);
+                    .defer(mkdirp, featureProcessedCacheDirectory)
+                    .defer(this.cleanupFeatureCache.bind(this), featureCacheDirectory, hash)
+                    .defer(this.cleanupProcessedFeatureCache.bind(this), featureProcessedCacheDirectory, this.osrmHash)
+                    .awaitAll(callback);
             });
         }
 
@@ -87,7 +87,7 @@ module.exports = function() {
         fs.readdir(parentPath, (err, files) => {
             let q = d3.queue();
             files.filter(name => { return name !== featureHash;})
-                 .map((f) => { q.defer(rimraf, path.join(parentPath, f)); });
+                .map((f) => { q.defer(rimraf, path.join(parentPath, f)); });
             q.awaitAll(callback);
         });
     };
@@ -145,7 +145,7 @@ module.exports = function() {
 
     // converts the scenario titles in file prefixes
     this.getScenarioID = (scenario) => {
-        let name = scenario.getName().toLowerCase().replace(/[\/\-'=,\(\):\*#]/g, '')
+        let name = scenario.getName().toLowerCase().replace(/[/\-'=,():*#]/g, '')
             .replace(/\s/g, '_').replace(/__/g, '_').replace(/\.\./g, '.')
             .substring(0, 64);
         return util.format('%d_%s', scenario.getLine(), name);

features/support/data_classes.js

@@ -17,12 +17,12 @@ module.exports = {
                 return true;
 
             var matchPercent = want.match(/(.*)\s+~(.+)%$/),
-                matchAbs = want.match(/(.*)\s+\+\-(.+)$/),
+                matchAbs = want.match(/(.*)\s+\+-(.+)$/),
                 matchRe = want.match(/^\/(.*)\/$/),
                 // we use this for matching before/after bearing
-                matchBearingListAbs = want.match(/^((\d+)->(\d+))(,(\d+)->(\d+))*\s+\+\-(.+)$/),
-                matchIntersectionListAbs = want.match(/^(((((true|false):\d+)\s{0,1})+,{0,1})+;{0,1})+\s+\+\-(.+)$/),
-                matchRangeNumbers = want.match(/\d+\+\-\d+/);
+                matchBearingListAbs = want.match(/^((\d+)->(\d+))(,(\d+)->(\d+))*\s+\+-(.+)$/),
+                matchIntersectionListAbs = want.match(/^(((((true|false):\d+)\s{0,1})+,{0,1})+;{0,1})+\s+\+-(.+)$/),
+                matchRangeNumbers = want.match(/\d+\+-\d+/);
 
             function inRange(margin, got, want) {
                 var fromR = parseFloat(want) - margin,
@@ -31,12 +31,12 @@ module.exports = {
             }
             function parseIntersectionString(str) {
                 return str.split(';')
-                          .map((turn_intersections) => turn_intersections
-                                                       .split(',')
-                                                       .map((intersection) => intersection
-                                                                               .split(' ')
-                                                                               .map((entry_bearing_pair) => entry_bearing_pair
-                                                                                                            .split(':'))));
+                    .map((turn_intersections) => turn_intersections
+                        .split(',')
+                        .map((intersection) => intersection
+                            .split(' ')
+                            .map((entry_bearing_pair) => entry_bearing_pair
+                                .split(':'))));
             }
 
             if (got === want) {

features/support/shared_steps.js

@@ -115,7 +115,7 @@ module.exports = function () {
 
                         if (headers.has('weight')) {
                             if (row.weight.length) {
-                                if (!row.weight.match(/[\d\.]+/))
+                                if (!row.weight.match(/[\d.]+/))
                                     return cb(new Error('*** Weight must be specified as a numeric value. (ex: 8)'));
                                 got.weight = instructions ? util.format('%d', weight) : '';
                             } else {
@@ -151,7 +151,7 @@ module.exports = function () {
                         if (headers.has('locations')){
                             got.locations = (locations || '').trim();
                         }
-/*
+                        /*
                         if (headers.has('approaches')){
                             got.approaches = (approaches || '').trim();
                         }*/