summaryrefslogtreecommitdiff
path: root/platform/node
diff options
context:
space:
mode:
authorLucas Wojciechowski <lucas@mapbox.com>2015-09-16 17:26:12 -0700
committerMike Morris <michael.patrick.morris@gmail.com>2015-11-04 11:34:35 -0500
commitda569c266b663b815b0fa754be59c78904b92fa6 (patch)
treed17d39da14883baa641f4cc0fa49bc3b88f9db08 /platform/node
parent8e63084c9e77486c9843ce469e0e8b663bfebb03 (diff)
downloadqtlocation-mapboxgl-da569c266b663b815b0fa754be59c78904b92fa6.tar.gz
[node] enable npm to build mapbox-gl-native package from source
This reverts commit 311bf93abe9f815668e8e0a779c87c3eb5c1199d. more explicit require paths in tests
Diffstat (limited to 'platform/node')
-rw-r--r--platform/node/CHANGELOG.md5
-rw-r--r--platform/node/test/js/map.test.js2
-rw-r--r--platform/node/test/render.test.js2
3 files changed, 4 insertions, 5 deletions
diff --git a/platform/node/CHANGELOG.md b/platform/node/CHANGELOG.md
index 8916efd498..d8f71fc292 100644
--- a/platform/node/CHANGELOG.md
+++ b/platform/node/CHANGELOG.md
@@ -14,11 +14,10 @@
render options. ([`a8d9b92`](https://github.com/mapbox/mapbox-gl-native/commit/a8d9b921d71a91d7f8eff82e5a584aaab8b7d1c6), [#1799](https://github.com/mapbox/mapbox-gl-native/pull/1799))
- `map.render` now returns a raw image buffer instead of an object with
`width`, `height` and `pixels` properties. ([#2262](https://github.com/mapbox/mapbox-gl-native/pull/2262))
-- Adds support for rendering v8 styles.
+- Adds support for rendering [mapbox-gl-style-spec](https://github.com/mapbox/mapbox-gl-style-spec) v8 styles.
- No longer loads resources before a render request is made. ([`55d25a8`](https://github.com/mapbox/mapbox-gl-native/commit/55d25a80a77c06ef5e66acc0d8518867b03fe8a4))
-- Adds io.js v3.x support. ([#2261](https://github.com/mapbox/mapbox-gl-native/pull/2261))
+- Adds Node.js v4.x and io.js v3.x support. ([#2261](https://github.com/mapbox/mapbox-gl-native/pull/2261))
- Fixes a bug which prevented raster tiles that `404`'ed from rendering ([#2458](https://github.com/mapbox/mapbox-gl-native/pull/2458))
-- Adds Node.js v4.1.x support.
- Fade transitions are now ignored to prevent half faded labels. ([#942](https://github.com/mapbox/mapbox-gl-native/pull/942))
- Adds option `pitch` ([#2702](https://github.com/mapbox/mapbox-gl-native/pull/2702))
diff --git a/platform/node/test/js/map.test.js b/platform/node/test/js/map.test.js
index dd55df02d5..a87f4aac1a 100644
--- a/platform/node/test/js/map.test.js
+++ b/platform/node/test/js/map.test.js
@@ -1,7 +1,7 @@
'use strict';
var test = require('tape');
-var mbgl = require('../../../..');
+var mbgl = require('../../../../lib/mapbox-gl-native');
var fs = require('fs');
var path = require('path');
var style = require('../fixtures/style.json');
diff --git a/platform/node/test/render.test.js b/platform/node/test/render.test.js
index 5dd0c5ee10..4809019809 100644
--- a/platform/node/test/render.test.js
+++ b/platform/node/test/render.test.js
@@ -1,6 +1,6 @@
'use strict';
-var mbgl = require('../../..');
+var mbgl = require('../../../lib/mapbox-gl-native');
var suite = require('mapbox-gl-test-suite').render;
var request = require('request');