From 91732dd2083ad0b195787174cd31a0b922b8f256 Mon Sep 17 00:00:00 2001 From: ptaylor Date: Mon, 5 Aug 2019 13:22:05 -0700 Subject: [PATCH] updates for node 12 --- examples/addon/package.json | 2 +- examples/deps/package.json | 2 +- include/addon-tools.hpp | 2 +- include/event-emitter.hpp | 2 +- package.json | 2 +- test/package.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/addon/package.json b/examples/addon/package.json index 0d3dd95..14f835c 100644 --- a/examples/addon/package.json +++ b/examples/addon/package.json @@ -4,6 +4,6 @@ "private": true, "main": "index.js", "dependencies": { - "addon-tools-raub": "https://github.com/node-3d/addon-tools-raub.git" + "addon-tools-raub": "1.0.0" } } diff --git a/examples/deps/package.json b/examples/deps/package.json index 0d3dd95..14f835c 100644 --- a/examples/deps/package.json +++ b/examples/deps/package.json @@ -4,6 +4,6 @@ "private": true, "main": "index.js", "dependencies": { - "addon-tools-raub": "https://github.com/node-3d/addon-tools-raub.git" + "addon-tools-raub": "1.0.0" } } diff --git a/include/addon-tools.hpp b/include/addon-tools.hpp index 09c4820..de5e78d 100644 --- a/include/addon-tools.hpp +++ b/include/addon-tools.hpp @@ -276,7 +276,7 @@ inline void *getData(V8_VAR_OBJ obj) { if (obj->IsArrayBufferView()) { pixels = getArrayData(obj); - } else if (obj->Has(JS_STR("data"))) { + } else if (obj->Has(Nan::GetCurrentContext(), JS_STR("data")).ToChecked()) { V8_VAR_VAL data = Nan::Get(obj, JS_STR("data")).ToLocalChecked(); if ( ! data->IsNullOrUndefined() ) { pixels = node::Buffer::Data(data); diff --git a/include/event-emitter.hpp b/include/event-emitter.hpp index e5a2f1a..d1ad9ef 100644 --- a/include/event-emitter.hpp +++ b/include/event-emitter.hpp @@ -212,7 +212,7 @@ private: REQ_OBJ_ARG(0, event); - if ( ! event->Has(JS_STR("type")) ) { + if ( ! event->Has(Nan::GetCurrentContext(), JS_STR("type")).ToChecked() ) { return Nan::ThrowError("Event must have the `type` property."); } diff --git a/package.json b/package.json index 8cb8da4..1934887 100644 --- a/package.json +++ b/package.json @@ -34,6 +34,6 @@ "url": "https://github.com/node-3d/addon-tools-raub.git" }, "dependencies": { - "nan": "2.12.1" + "nan": "2.14.0" } } diff --git a/test/package.json b/test/package.json index 29068a2..0f2580a 100644 --- a/test/package.json +++ b/test/package.json @@ -8,7 +8,7 @@ "start": "mocha" }, "dependencies": { - "addon-tools-raub": "https://github.com/node-3d/addon-tools-raub.git", + "addon-tools-raub": "1.0.0", "chai": "^4.2.0", "mocha": "^5.2.0", "sinon": "^7.1.1"