Skip to content

Commit 50b562c

Browse files
authored
Merge pull request #53 from peakon/node12
Node 12 compatibility
2 parents 61cd06d + 1c10b8e commit 50b562c

File tree

2 files changed

+17
-7
lines changed

2 files changed

+17
-7
lines changed

appveyor.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,16 @@ environment:
1616
nodejs_arch: "x86"
1717
- nodejs_version: "2"
1818
nodejs_arch: "x64"
19+
- nodejs_version: "4"
20+
nodejs_arch: "x64"
21+
- nodejs_version: "6"
22+
nodejs_arch: "x64"
23+
- nodejs_version: "8"
24+
nodejs_arch: "x64"
25+
- nodejs_version: "10"
26+
nodejs_arch: "x64"
27+
- nodejs_version: "12"
28+
nodejs_arch: "x64"
1929
install:
2030
- ps: Install-Product node $env:nodejs_version $env:nodejs_arch
2131
- npm install --msvs_version=2013

src/cld.cc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,22 @@ namespace NodeCld {
1111

1212
NAN_METHOD(Detect) {
1313
v8::Local<v8::Object> results = Nan::New<v8::Object>();
14-
v8::String::Utf8Value text(info[0]->ToString());
14+
v8::String::Utf8Value text(v8::Isolate::GetCurrent(), Nan::To<v8::String>(info[0]).ToLocalChecked());
1515

1616
char *bytes = *text;
1717
int numBytes = text.length();
18-
bool isPlainText = info[1]->ToBoolean()->Value();
18+
bool isPlainText = Nan::To<bool>(info[1]).FromJust();
1919

2020
CLD2::CLDHints hints;
2121
hints.tld_hint = 0;
2222
hints.content_language_hint = 0;
2323
hints.language_hint = CLD2::UNKNOWN_LANGUAGE;
2424
hints.encoding_hint = CLD2::UNKNOWN_ENCODING;
2525

26-
v8::String::Utf8Value languageHint(info[2]->ToString());
27-
v8::String::Utf8Value encodingHint(info[3]->ToString());
28-
v8::String::Utf8Value tldHint(info[4]->ToString());
29-
v8::String::Utf8Value httpHint(info[5]->ToString());
26+
v8::String::Utf8Value languageHint(v8::Isolate::GetCurrent(), Nan::To<v8::String>(info[2]).ToLocalChecked());
27+
v8::String::Utf8Value encodingHint(v8::Isolate::GetCurrent(), Nan::To<v8::String>(info[3]).ToLocalChecked());
28+
v8::String::Utf8Value tldHint(v8::Isolate::GetCurrent(), Nan::To<v8::String>(info[4]).ToLocalChecked());
29+
v8::String::Utf8Value httpHint(v8::Isolate::GetCurrent(), Nan::To<v8::String>(info[5]).ToLocalChecked());
3030

3131
if (tldHint.length() > 0) {
3232
hints.tld_hint = *tldHint;
@@ -121,7 +121,7 @@ namespace NodeCld {
121121
info.GetReturnValue().Set(results);
122122
}
123123

124-
extern "C" void init (v8::Handle<v8::Object> target) {
124+
extern "C" void init (v8::Local<v8::Object> target) {
125125
// set detected languages
126126
v8::Local<v8::Array> detected = Nan::New<v8::Array>();
127127
vector<NodeCldDetected>* rawDetected = Constants::getInstance().getDetected();

0 commit comments

Comments
 (0)