From 5845915add4c9fcb6cfc0a78fd1cb724a9f28753 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Tue, 29 Nov 2016 19:39:29 +0100 Subject: [PATCH 1/4] Bump zipfile version to 0.5.10 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cc93ed4..8a149fb 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "generic-pool": "~2.4.1", "request": "2.x", "srs": "1.x", - "zipfile": "~0.5.5", + "zipfile": "mapbox/node-zipfile#master", "sqlite3": "2.x || 3.x", "mime": "~1.2.11", "mkdirp": "~0.5.0", From 27f9fc8a3f50d54db15dc888553377f0827d5cd7 Mon Sep 17 00:00:00 2001 From: dgaubert Date: Wed, 30 Nov 2016 10:39:40 +0000 Subject: [PATCH 2/4] Fix assertion --- test/error.test.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/error.test.js b/test/error.test.js index 8fba15f..581a10e 100644 --- a/test/error.test.js +++ b/test/error.test.js @@ -25,7 +25,7 @@ it('correctly handles invalid json', function(done) { }; millstone.resolve(options, function(err, resolved) { - assert.ok(err.message.search("error: 'Unexpected token ]'") != -1); + assert.ok(err.message.search("error: 'Unexpected token ]") != -1); done(); }); }); @@ -61,4 +61,4 @@ it('correctly handles missing shapefile at absolute path', function(done) { assert.ok(err_expected); done(); }); -}); \ No newline at end of file +}); From 5d692ad4c7d3d313f3cc8d20f8797d44d23feea5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Wed, 30 Nov 2016 11:40:29 +0100 Subject: [PATCH 3/4] Add support for Node v6 in CI --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 040834b..0ccbf13 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,7 @@ language: node_js node_js: - "0.10" - "4" + - "6" addons: apt: @@ -17,4 +18,4 @@ install: - npm install --fallback-to-build=false script: - - npm test \ No newline at end of file + - npm test From 0ab672911e173b8ec955e9a3e0609f1495f1f8cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Wed, 14 Dec 2016 11:48:51 +0100 Subject: [PATCH 4/4] Point zipfile to npm registry --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8a149fb..64044e7 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "generic-pool": "~2.4.1", "request": "2.x", "srs": "1.x", - "zipfile": "mapbox/node-zipfile#master", + "zipfile": "0.5.10", "sqlite3": "2.x || 3.x", "mime": "~1.2.11", "mkdirp": "~0.5.0",