Merge pull request #296 from CartoDB/nodejs-10

Support Nodejs 10 LTS

.travis.yml

@@ -1,6 +1,8 @@
 language: node_js
 node_js:
-  - 6.9.2
+  - '6'
+  - '8'
+  - '10'
 before_install:
   - if [ "$CXX" = "g++" ]; then export CXX="g++-4.9" CC="gcc-4.9"; fi
 addons:

NEWS

@@ -1,4 +1,12 @@
-2.16.3
+2.17.0 (2018-mm-dd)
+    - Use our current fork of mapnik while testing
+    - Add support for Node 8 & 10
+    - Support package-lock.json file
+
+v2.16.5
+    -
+
+v2.16.4
     -
 
 2.16.2

package.json

@@ -1,6 +1,6 @@
 {
   "name": "torque.js",
-  "version": "2.16.5",
+  "version": "2.17.0",
   "description": "Temporal mapping for CARTO",
   "repository": {
     "type": "git",
@@ -31,18 +31,18 @@
     "turf-jenks": "~1.0.1"
   },
   "devDependencies": {
+    "@carto/mapnik": "^3.6.2-carto.11",
     "browserify": "~7.0.0",
-    "canvas": "~1.2.1",
+    "canvas": "^1.6.9",
     "leaflet": "1.0.3",
-    "mapnik": "3.5.14",
     "node-qunit-phantomjs": "1.6.0",
     "phantomjs-polyfill": "0.0.2",
     "qunit": "~0.7.5",
     "qunitjs": "1.x",
     "request": "~2.53.0",
+    "sinon": "~1.15.4",
     "uglify-js": "1.3.3",
-    "underscore": "1.8.3",
-    "sinon": "~1.15.4"
+    "underscore": "1.8.3"
   },
   "scripts": {
     "test": "make test-all",

test/support/image.js

@@ -1,4 +1,4 @@
-var mapnik = require('mapnik');
+var mapnik = require('@carto/mapnik');
 
 function compare(buffer, fixtureRelPath) {
     save(__dirname + '/../results/' + fixtureRelPath, buffer);