add io.js v3.x support

mapbox · Sep 9, 2015 · 3d48147 · 3d48147
1 parent 627623e
commit 3d48147
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -59,7 +59,7 @@ matrix:
         apt:
           packages: [ 'lib32stdc++6' ]
     - os: linux
-      env: FLAVOR=node CXX=clang++-3.5 BUILDTYPE=Release NODE_VERSION=iojs-v2
+      env: FLAVOR=node CXX=clang++-3.5 BUILDTYPE=Release NODE_VERSION=iojs-v3
       addons:
         apt:
           sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.5' ]
@@ -79,7 +79,7 @@ matrix:
     - os: osx
       osx_image: xcode6.4
       compiler: clang
-      env: FLAVOR=node NODE_VERSION=iojs-v2
+      env: FLAVOR=node NODE_VERSION=iojs-v3
     - os: osx
       osx_image: xcode6.4
       compiler: clang

diff --git a/platform/node/CHANGELOG.md b/platform/node/CHANGELOG.md
@@ -9,6 +9,7 @@
   render options.
 - Adds support for rendering v8 styles.
 - No longer load resources before a render request is made.
+- Adds io.js v3.x support.
 
 # 1.1.3
 

diff --git a/platform/node/src/node_file_source.cpp b/platform/node/src/node_file_source.cpp
@@ -75,7 +75,7 @@ void NodeFileSource::processAdd(const mbgl::Resource& resource) {
         queue->ref();
     }
 
-    auto requestHandle = Nan::New<v8::Object>(NodeRequest::Create(this, resource));
+    v8::Local<v8::Object> requestHandle = NodeRequest::Create(this, resource)->ToObject();
     pending.emplace(resource, requestHandle);
 
     v8::Local<v8::Value> argv[] = { requestHandle };

diff --git a/platform/node/src/node_mapbox_gl_native.cpp b/platform/node/src/node_mapbox_gl_native.cpp
@@ -59,7 +59,7 @@ NAN_MODULE_INIT(RegisterModule) {
     Nan::SetPrototype(target,
         Nan::Get(EventEmitter, Nan::New("prototype").ToLocalChecked()).ToLocalChecked());
 
-    mbgl::Log::setObserver(std::make_unique<node_mbgl::NodeLogObserver>(Nan::New(target)));
+    mbgl::Log::setObserver(std::make_unique<node_mbgl::NodeLogObserver>(target->ToObject()));
 }
 
 NODE_MODULE(mapbox_gl_native, RegisterModule)