Merge pull request #300 from CartoDB/audit-deps

Audit dependencies

NEWS

@@ -1,4 +1,11 @@
 2.17.1 (2018-mm-dd)
+    - Upgrade deps:
+        - turbo-carto@0.21.1
+    - Upgrade devel deps:
+        - browserify@16.2.3
+        - qunitz@0.7.7
+        - request@2.88.0
+        - uglify-js@3.4.9
 
 2.17.0 (2018-11-21)
     - Use our current fork of mapnik while testing

dist/torque.uncompressed.js

@@ -1,11 +1,11 @@
 /**
-Torque 2.16.3
+Torque 2.17.1
 Temporal mapping for CARTO
 https://github.com/cartodb/torque
 **/
 
 
-!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var f;"undefined"!=typeof window?f=window:"undefined"!=typeof global?f=global:"undefined"!=typeof self&&(f=self),f.torque=e()}}(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
+(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.torque = f()}})(function(){var define,module,exports;return (function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
 /**
  * Abstract handler for animator steps
  */
@@ -1635,6 +1635,8 @@ function GMapsTorqueLayer(options) {
 
   this.hidden = !this.options.visible;
 
+  this.showLimitErrors = options.showLimitErrors;
+
   this.animator = new torque.Animator(function(time) {
     var k = time | 0;
     if(self.getKey() !== k) {
@@ -6093,7 +6095,7 @@ var CartoDatasource = require('./datasource');
       this._shader = shader;
       this._Map = this._shader.getDefault().getStyle({}, { zoom: 0 });
       var img_names = this._shader.getImageURLs();
-      if (this.layer.showLimitErrors) {
+      if (this.layer && this.layer.showLimitErrors) {
         img_names.push(ERROR_IMG_URL);
       }
 

lib/header.js

@@ -15,9 +15,14 @@ headerString = headerString.replace("{{version}}", packageJSON.version)
 
 ['torque.uncompressed.js'].forEach(function(v){
 	fs.readFile('dist/' + v, 'utf8', function(err, torque) {
-		if(!err){	
-			var torqueString = headerString.replace("{{lib}}", torque);
-			fs.writeFile('dist/' + v, torqueString); 
+		if (err) {
+			return console.error(err);
 		}
+		var torqueString = headerString.replace("{{lib}}", torque);
+		fs.writeFile('dist/' + v, torqueString, function (err) {
+			if (err) {
+				return console.error(err);
+			}
+		});
 	});
 });

package.json

@@ -27,21 +27,21 @@
   "dependencies": {
     "carto": "cartodb/carto#master",
     "d3": "3.5.17",
-    "turbo-carto": "0.19.0",
+    "turbo-carto": "^0.21.1",
     "turf-jenks": "~1.0.1"
   },
   "devDependencies": {
     "@carto/mapnik": "^3.6.2-carto.11",
-    "browserify": "~7.0.0",
+    "browserify": "^16.2.3",
     "canvas": "^1.6.9",
     "leaflet": "1.0.3",
     "node-qunit-phantomjs": "1.6.0",
     "phantomjs-polyfill": "0.0.2",
-    "qunit": "~0.7.5",
+    "qunit": "~0.7.7",
     "qunitjs": "1.x",
-    "request": "~2.53.0",
+    "request": "^2.88.0",
     "sinon": "~1.15.4",
-    "uglify-js": "1.3.3",
+    "uglify-js": "^3.4.9",
     "underscore": "1.8.3"
   },
   "scripts": {

test/acceptance/example.js

@@ -19,4 +19,3 @@ test('reference test with canvas', function() {
 
     equal(imageDiff, 0);
 });
-