diff --git a/.travis.yml b/.travis.yml index f4f6c0a..4369a0b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ env: - secure: "gve1nkeKkwFEG1VAT3i+JwYyAdF0gKXwKx0uxbkBTsmm2M+0MDusohQdFLoEIkSIFktXBIDefoa7iGpLKRfG2VsZLpwJgnvnD0HqbnuR+k+W+bu7BHt4CAaR6GTllsDCjyq9zNyhUThzSnf2WNIpOEF5kHspZlbGfawURuUJH/U=" - secure: "jqVpmWxxBVXu2X8+XJMpKH0cooc2EKz9xKL2znBfYdNafJORSXcFAVbjCX5mZmVDcgIMwDtm2+gIG4P73hzJ2e3S+y2Z9ROJGyXHa3AxUTvXHQsxqzH8coHHqB8vTvfr0t2O5aKfpvpICpSea39r0hzNoMv6Ie5SwBdqj1YY9K0=" matrix: + - NODE_VERSION="v12" - NODE_VERSION="v11" - NODE_VERSION="v10" - NODE_VERSION="v9" diff --git a/fsevents.cc b/fsevents.cc index 6fd6bc0..c5031fe 100644 --- a/fsevents.cc +++ b/fsevents.cc @@ -40,7 +40,7 @@ namespace fse { // Common CFArrayRef paths; std::vector events; - static void Initialize(v8::Handle exports); + static void Initialize(v8::Local exports); // methods.cc - exposed static NAN_METHOD(New); @@ -73,19 +73,16 @@ FSEvents::~FSEvents() { #include "src/constants.cc" #include "src/methods.cc" -void FSEvents::Initialize(v8::Handle exports) { +void FSEvents::Initialize(v8::Local exports) { + v8::Isolate* isolate = exports->GetIsolate(); + v8::Local context = isolate->GetCurrentContext(); v8::Local tpl = Nan::New(FSEvents::New); tpl->SetClassName(Nan::New("FSEvents").ToLocalChecked()); tpl->InstanceTemplate()->SetInternalFieldCount(1); - tpl->PrototypeTemplate()->Set( - Nan::New("start").ToLocalChecked(), - Nan::New(FSEvents::Start)); - tpl->PrototypeTemplate()->Set( - Nan::New("stop").ToLocalChecked(), - Nan::New(FSEvents::Stop)); - exports->Set(Nan::New("Constants").ToLocalChecked(), Constants()); - exports->Set(Nan::New("FSEvents").ToLocalChecked(), - tpl->GetFunction()); + Nan::SetPrototypeTemplate(tpl, "start", Nan::New(FSEvents::Start)); + Nan::SetPrototypeTemplate(tpl, "stop", Nan::New(FSEvents::Stop)); + Nan::Set(exports, Nan::New("Constants").ToLocalChecked(), Constants()); + Nan::Set(exports, Nan::New("FSEvents").ToLocalChecked(), tpl->GetFunction(context).ToLocalChecked()); } NODE_MODULE(fse, FSEvents::Initialize) diff --git a/package.json b/package.json index afd46a1..b5bc3e5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fsevents", - "version": "1.2.8", + "version": "1.2.9", "description": "Native Access to Mac OS-X FSEvents", "main": "fsevents.js", "dependencies": { diff --git a/src/constants.cc b/src/constants.cc index fbd61ee..caccfad 100644 --- a/src/constants.cc +++ b/src/constants.cc @@ -86,25 +86,25 @@ static v8::Local Constants() { v8::Local object = Nan::New(); - object->Set(Nan::New("kFSEventStreamEventFlagNone").ToLocalChecked(), Nan::New(kFSEventStreamEventFlagNone)); - object->Set(Nan::New("kFSEventStreamEventFlagMustScanSubDirs").ToLocalChecked(), Nan::New(kFSEventStreamEventFlagMustScanSubDirs)); - object->Set(Nan::New("kFSEventStreamEventFlagUserDropped").ToLocalChecked(), Nan::New(kFSEventStreamEventFlagUserDropped)); - object->Set(Nan::New("kFSEventStreamEventFlagKernelDropped").ToLocalChecked(), Nan::New(kFSEventStreamEventFlagKernelDropped)); - object->Set(Nan::New("kFSEventStreamEventFlagEventIdsWrapped").ToLocalChecked(), Nan::New(kFSEventStreamEventFlagEventIdsWrapped)); - object->Set(Nan::New("kFSEventStreamEventFlagHistoryDone").ToLocalChecked(), Nan::New(kFSEventStreamEventFlagHistoryDone)); - object->Set(Nan::New("kFSEventStreamEventFlagRootChanged").ToLocalChecked(), Nan::New(kFSEventStreamEventFlagRootChanged)); - object->Set(Nan::New("kFSEventStreamEventFlagMount").ToLocalChecked(), Nan::New(kFSEventStreamEventFlagMount)); - object->Set(Nan::New("kFSEventStreamEventFlagUnmount").ToLocalChecked(), Nan::New(kFSEventStreamEventFlagUnmount)); - object->Set(Nan::New("kFSEventStreamEventFlagItemCreated").ToLocalChecked(), Nan::New(kFSEventStreamEventFlagItemCreated)); - object->Set(Nan::New("kFSEventStreamEventFlagItemRemoved").ToLocalChecked(), Nan::New(kFSEventStreamEventFlagItemRemoved)); - object->Set(Nan::New("kFSEventStreamEventFlagItemInodeMetaMod").ToLocalChecked(), Nan::New(kFSEventStreamEventFlagItemInodeMetaMod)); - object->Set(Nan::New("kFSEventStreamEventFlagItemRenamed").ToLocalChecked(), Nan::New(kFSEventStreamEventFlagItemRenamed)); - object->Set(Nan::New("kFSEventStreamEventFlagItemModified").ToLocalChecked(), Nan::New(kFSEventStreamEventFlagItemModified)); - object->Set(Nan::New("kFSEventStreamEventFlagItemFinderInfoMod").ToLocalChecked(), Nan::New(kFSEventStreamEventFlagItemFinderInfoMod)); - object->Set(Nan::New("kFSEventStreamEventFlagItemChangeOwner").ToLocalChecked(), Nan::New(kFSEventStreamEventFlagItemChangeOwner)); - object->Set(Nan::New("kFSEventStreamEventFlagItemXattrMod").ToLocalChecked(), Nan::New(kFSEventStreamEventFlagItemXattrMod)); - object->Set(Nan::New("kFSEventStreamEventFlagItemIsFile").ToLocalChecked(), Nan::New(kFSEventStreamEventFlagItemIsFile)); - object->Set(Nan::New("kFSEventStreamEventFlagItemIsDir").ToLocalChecked(), Nan::New(kFSEventStreamEventFlagItemIsDir)); - object->Set(Nan::New("kFSEventStreamEventFlagItemIsSymlink").ToLocalChecked(), Nan::New(kFSEventStreamEventFlagItemIsSymlink)); + Nan::Set(object, Nan::New("kFSEventStreamEventFlagNone").ToLocalChecked(), Nan::New(kFSEventStreamEventFlagNone)); + Nan::Set(object, Nan::New("kFSEventStreamEventFlagMustScanSubDirs").ToLocalChecked(), Nan::New(kFSEventStreamEventFlagMustScanSubDirs)); + Nan::Set(object, Nan::New("kFSEventStreamEventFlagUserDropped").ToLocalChecked(), Nan::New(kFSEventStreamEventFlagUserDropped)); + Nan::Set(object, Nan::New("kFSEventStreamEventFlagKernelDropped").ToLocalChecked(), Nan::New(kFSEventStreamEventFlagKernelDropped)); + Nan::Set(object, Nan::New("kFSEventStreamEventFlagEventIdsWrapped").ToLocalChecked(), Nan::New(kFSEventStreamEventFlagEventIdsWrapped)); + Nan::Set(object, Nan::New("kFSEventStreamEventFlagHistoryDone").ToLocalChecked(), Nan::New(kFSEventStreamEventFlagHistoryDone)); + Nan::Set(object, Nan::New("kFSEventStreamEventFlagRootChanged").ToLocalChecked(), Nan::New(kFSEventStreamEventFlagRootChanged)); + Nan::Set(object, Nan::New("kFSEventStreamEventFlagMount").ToLocalChecked(), Nan::New(kFSEventStreamEventFlagMount)); + Nan::Set(object, Nan::New("kFSEventStreamEventFlagUnmount").ToLocalChecked(), Nan::New(kFSEventStreamEventFlagUnmount)); + Nan::Set(object, Nan::New("kFSEventStreamEventFlagItemCreated").ToLocalChecked(), Nan::New(kFSEventStreamEventFlagItemCreated)); + Nan::Set(object, Nan::New("kFSEventStreamEventFlagItemRemoved").ToLocalChecked(), Nan::New(kFSEventStreamEventFlagItemRemoved)); + Nan::Set(object, Nan::New("kFSEventStreamEventFlagItemInodeMetaMod").ToLocalChecked(), Nan::New(kFSEventStreamEventFlagItemInodeMetaMod)); + Nan::Set(object, Nan::New("kFSEventStreamEventFlagItemRenamed").ToLocalChecked(), Nan::New(kFSEventStreamEventFlagItemRenamed)); + Nan::Set(object, Nan::New("kFSEventStreamEventFlagItemModified").ToLocalChecked(), Nan::New(kFSEventStreamEventFlagItemModified)); + Nan::Set(object, Nan::New("kFSEventStreamEventFlagItemFinderInfoMod").ToLocalChecked(), Nan::New(kFSEventStreamEventFlagItemFinderInfoMod)); + Nan::Set(object, Nan::New("kFSEventStreamEventFlagItemChangeOwner").ToLocalChecked(), Nan::New(kFSEventStreamEventFlagItemChangeOwner)); + Nan::Set(object, Nan::New("kFSEventStreamEventFlagItemXattrMod").ToLocalChecked(), Nan::New(kFSEventStreamEventFlagItemXattrMod)); + Nan::Set(object, Nan::New("kFSEventStreamEventFlagItemIsFile").ToLocalChecked(), Nan::New(kFSEventStreamEventFlagItemIsFile)); + Nan::Set(object, Nan::New("kFSEventStreamEventFlagItemIsDir").ToLocalChecked(), Nan::New(kFSEventStreamEventFlagItemIsDir)); + Nan::Set(object, Nan::New("kFSEventStreamEventFlagItemIsSymlink").ToLocalChecked(), Nan::New(kFSEventStreamEventFlagItemIsSymlink)); return object; }