Merge pull request #122 from ZeGentzy/fixes

Fix builds with newer node.

Author: rafeca

.travis.yml

@@ -32,3 +32,4 @@ env:
   matrix:
     - NODE_VERSION=8.9.3
     - NODE_VERSION=10
+    - NODE_VERSION=12

appveyor.yml

@@ -4,7 +4,6 @@ environment:
     - nodejs_version: '10'
       SPELLCHECKER_PREFER_HUNSPELL: true
     - nodejs_version: '8'
-    - nodejs_version: '6'
 
 install:
   - ps: Install-Product node $env:nodejs_version

package-lock.json

@@ -20,6 +20,6 @@
   },
   "dependencies": {
     "any-promise": "^1.3.0",
-    "nan": "^2.10.0"
+    "nan": "^2.14.0"
   }
 }

package.json

@@ -71,7 +71,11 @@ class Spellchecker : public Nan::ObjectWrap {
     }
 
     std::vector<uint16_t> text(string->Length() + 1);
-    string->Write(reinterpret_cast<uint16_t *>(text.data()));
+    string->Write(
+#if V8_MAJOR_VERSION > 6
+        info.GetIsolate(),
+#endif
+        reinterpret_cast<uint16_t *>(text.data()));
 
     Spellchecker* that = Nan::ObjectWrap::Unwrap<Spellchecker>(info.Holder());
     std::vector<MisspelledRange> misspelled_ranges = that->impl->CheckSpelling(text.data(), text.size());
@@ -102,7 +106,11 @@ class Spellchecker : public Nan::ObjectWrap {
     Nan::Callback *callback = new Nan::Callback(info[1].As<Function>());
 
     std::vector<uint16_t> corpus(string->Length() + 1);
-    string->Write(reinterpret_cast<uint16_t *>(corpus.data()));
+    string->Write(
+#if V8_MAJOR_VERSION > 6
+        info.GetIsolate(),
+#endif
+        reinterpret_cast<uint16_t *>(corpus.data()));
 
     Spellchecker* that = Nan::ObjectWrap::Unwrap<Spellchecker>(info.Holder());
 
@@ -207,7 +215,9 @@ class Spellchecker : public Nan::ObjectWrap {
     Nan::SetPrototypeMethod(tpl, "add", Spellchecker::Add);
     Nan::SetPrototypeMethod(tpl, "remove", Spellchecker::Remove);
 
-    exports->Set(Nan::New("Spellchecker").ToLocalChecked(), tpl->GetFunction());
+    Isolate* isolate = exports->GetIsolate();
+    Local<Context> context = isolate->GetCurrentContext();
+    exports->Set(Nan::New("Spellchecker").ToLocalChecked(), tpl->GetFunction(context).ToLocalChecked());
   }
 };