Skip to content

Commit

Permalink
Fixes for Node 12.
Browse files Browse the repository at this point in the history
Resolves #409. There are still warnings that should be resolved. Especially, `MakeCallback`, which will break domain support.
  • Loading branch information
kjvalencik committed May 30, 2019
1 parent ac15216 commit 5d877ac
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 8 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ matrix:

env:
matrix:
- TRAVIS_NODE_VERSION="12"
- TRAVIS_NODE_VERSION="10"
- TRAVIS_NODE_VERSION="8"
- TRAVIS_NODE_VERSION="6"
Expand Down
7 changes: 3 additions & 4 deletions crates/neon-runtime/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion crates/neon-runtime/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
"dependencies": {
"bindings": "1.2.1",
"node-gyp": "^3.5.0",
"nan": "^2.10.0"
"nan": "^2.14.0"
}
}
10 changes: 7 additions & 3 deletions crates/neon-runtime/src/neon.cc
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,11 @@ extern "C" bool Neon_String_New(v8::Local<v8::String> *out, v8::Isolate *isolate
}

extern "C" int32_t Neon_String_Utf8Length(v8::Local<v8::String> str) {
return str->Utf8Length();
#if NODE_MODULE_VERSION >= NODE_11_0_MODULE_VERSION
return str->Utf8Length(v8::Isolate::GetCurrent());
#else
return str->Utf8Length();
#endif
}

extern "C" size_t Neon_String_Data(char *out, size_t len, v8::Local<v8::Value> str) {
Expand Down Expand Up @@ -338,7 +342,7 @@ extern "C" void *Neon_Class_GetAllocateKernel(v8::Local<v8::External> wrapper) {
}

extern "C" bool Neon_Class_Constructor(v8::Local<v8::Function> *out, v8::Local<v8::FunctionTemplate> ft) {
v8::MaybeLocal<v8::Function> maybe = ft->GetFunction();
v8::MaybeLocal<v8::Function> maybe = Nan::GetFunction(ft);
return maybe.ToLocal(out);
}

Expand Down Expand Up @@ -394,7 +398,7 @@ extern "C" bool Neon_Class_AddMethod(v8::Isolate *isolate, void *metadata_pointe

extern "C" bool Neon_Class_MetadataToConstructor(v8::Local<v8::Function> *out, v8::Isolate *isolate, void *metadata) {
v8::Local<v8::FunctionTemplate> ft = static_cast<neon::ClassMetadata *>(metadata)->GetTemplate(isolate);
v8::MaybeLocal<v8::Function> maybe = ft->GetFunction();
v8::MaybeLocal<v8::Function> maybe = Nan::GetFunction(ft);
return maybe.ToLocal(out);
}

Expand Down

0 comments on commit 5d877ac

Please sign in to comment.