Merge pull request #127 from mapbox/latest-nan

Upgrade to [email protected] - refs #125

binding.gyp

@@ -112,4 +112,4 @@
       }
     }
   ]
-}
+}

package.json

@@ -18,7 +18,7 @@
   "license": "ISC",
   "dependencies": {
     "mason-js-sdk": "~0.1.4",
-    "nan": "~2.5.1",
+    "nan": "~2.10.0",
     "node-pre-gyp": "~0.10.0"
   },
   "bundledDependencies": [

src/module_utils.hpp

@@ -19,9 +19,9 @@ namespace utils {
 * context
 *
 */
-inline void CallbackError(std::string message,
-                          v8::Local<v8::Function> callback) {
+inline void CallbackError(std::string message, v8::Local<v8::Function> func) {
+    Nan::Callback cb(func);
     v8::Local<v8::Value> argv[1] = {Nan::Error(message.c_str())};
-    Nan::MakeCallback(Nan::GetCurrentContext()->Global(), callback, 1, argv);
+    Nan::Call(cb, 1, argv);
 }
 } // namespace utils

src/object_async/hello_async.cpp

@@ -151,12 +151,14 @@ struct AsyncHelloWorker : Nan::AsyncWorker // NOLINT to disable cppcoreguideline
 {
 
     using Base = Nan::AsyncWorker;
-    // Make this class noncopyable
+    // We explicitly delete the copy constructor and assignment operator below (even though Nan::Asyncworker)
+    // already does this in the base class. This allows us to have the `const std::string* name`
+    // pointer member without the silly g++ warning of "error: ‘struct object_async::AsyncHelloWorker’ has pointer data members [-Werror=effc++]"
     AsyncHelloWorker(AsyncHelloWorker const&) = delete;
     AsyncHelloWorker& operator=(AsyncHelloWorker const&) = delete;
     AsyncHelloWorker(bool louder, const std::string* name,
                      Nan::Callback* cb)
-        : Base(cb), louder_{louder}, name_{name} {}
+        : Base(cb, "skel:object-async-worker"), louder_{louder}, name_{name} {}
 
     // The Execute() function is getting called when the worker starts to run.
     // - You only have access to member variables stored in this worker.
@@ -184,7 +186,7 @@ struct AsyncHelloWorker : Nan::AsyncWorker // NOLINT to disable cppcoreguideline
             Nan::Null(), Nan::New<v8::String>(result_).ToLocalChecked()};
 
         // Static cast done here to avoid 'cppcoreguidelines-pro-bounds-array-to-pointer-decay' warning with clang-tidy
-        callback->Call(argc, static_cast<v8::Local<v8::Value>*>(argv));
+        callback->Call(argc, static_cast<v8::Local<v8::Value>*>(argv), async_resource);
     }
 
     std::string result_{};
@@ -297,4 +299,4 @@ void HelloObjectAsync::Init(v8::Local<v8::Object> target) {
                              // after this code block ends.
     Nan::Set(target, whoami, fn);
 }
-} // namespace object_async
+} // namespace object_async

src/standalone_async/hello_async.cpp

@@ -73,7 +73,7 @@ struct AsyncHelloWorker : Nan::AsyncWorker {
     using Base = Nan::AsyncWorker;
 
     AsyncHelloWorker(bool louder, Nan::Callback* cb)
-        : Base(cb), louder_{louder} {}
+        : Base(cb, "skel:standalone-async-worker"), louder_{louder} {}
 
     // The Execute() function is getting called when the worker starts to run.
     // - You only have access to member variables stored in this worker.
@@ -101,9 +101,8 @@ struct AsyncHelloWorker : Nan::AsyncWorker {
         const auto argc = 2u;
         v8::Local<v8::Value> argv[argc] = {
             Nan::Null(), Nan::New<v8::String>(result_).ToLocalChecked()};
-
         // Static cast done here to avoid 'cppcoreguidelines-pro-bounds-array-to-pointer-decay' warning with clang-tidy
-        callback->Call(argc, static_cast<v8::Local<v8::Value>*>(argv));
+        callback->Call(argc, static_cast<v8::Local<v8::Value>*>(argv), async_resource);
     }
 
     std::string result_{};