Skip to content

Implement support for Node 12 #1696

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
implausible merged 13 commits into from
Jul 15, 2019
Merged

Implement support for Node 12 #1696

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c7d9e10
:arrow_up: Make templates compatible with Node 12
tiggerite Jul 10, 2019
59bad99
:arrow_up: GetPropertyNames also needs to be changed for Node 12
tiggerite Jul 10, 2019
eb2df37
:art: Extra space for Utf8Strings to line up better
tiggerite Jul 10, 2019
8e723ef
:arrow_up: BooleanValue also needs changing for Node 12
tiggerite Jul 10, 2019
77b615a
:arrow_up: Minor amends for a few manual templates
tiggerite Jul 10, 2019
a470a67
:arrow_up: Nan::Call requires ToLocalChecked
tiggerite Jul 10, 2019
a10a616
:art: Final spacing amends for manual str_array_converter
tiggerite Jul 10, 2019
4db1670
:white_check_mark: Start building for Node 12
tiggerite Jul 12, 2019
9bc65c6
:arrow_up: Update versions of nan and node-pre-gyp
tiggerite Jul 12, 2019
658936e
:recycle: Remove last depreciated warnings so everything is now clean
tiggerite Jul 12, 2019
a0f0c60
:art: Minor spacing for parameters in Nan::Set
tiggerite Jul 12, 2019
0455882
:recycle: Missed one Callback->Call without async_resource
tiggerite Jul 12, 2019
e82db05
:bug: Needs the reference to callback, not the pointer
tiggerite Jul 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
⬆️ Minor amends for a few manual templates
  • Loading branch information
@tiggerite
tiggerite committed Jul 10, 2019
commit 77b615a6ebd0f910a816b76142eabea830dc9a2e
2 changes: 1 addition & 1 deletion generate/templates/manual/src/filter_registry.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ NAN_METHOD(GitFilterRegistry::GitFilterRegister) {
baton->error_code = GIT_OK;
baton->filter_priority = Nan::To<int>(info[2]).FromJust();

Nan::New(GitFilterRegistry::persistentHandle)->Set(Nan::To<v8::Object>(Nan::To<v8::String>(info[0]).ToLocalChecked(), info[1]).ToLocalChecked());
Nan::New(GitFilterRegistry::persistentHandle)->Set(Nan::To<v8::String>(info[0]).ToLocalChecked(), Nan::To<v8::Object>(info[1]).ToLocalChecked());

Nan::Callback *callback = new Nan::Callback(Local<Function>::Cast(info[3]));
RegisterWorker *worker = new RegisterWorker(baton, callback);
Expand Down
2 changes: 1 addition & 1 deletion generate/templates/manual/src/git_buf_converter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ using namespace node;

git_buf *GitBufConverter::Convert(Local<v8::Value> val) {
if (val->IsString() || val->IsStringObject()) {
v8::String::Utf8Value param1(Nan::To<v8::String>(val).ToLocalChecked());
Nan::Utf8String param1(Nan::To<v8::String>(val).ToLocalChecked());
std::string v8String = std::string(*param1);

const size_t size = sizeof(git_buf);
Expand Down
2 changes: 1 addition & 1 deletion generate/templates/manual/src/nodegit_wrapper.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ NAN_METHOD(NodeGitWrapper<Traits>::JSNewFunction) {
instance = new cppClass(static_cast<cType *>(
Local<External>::Cast(info[0])->Value()),
Nan::To<bool>(info[1]).FromJust(),
info.Length() >= 3 && !Nan::To<v8::Object>(info[2].IsEmpty() && info[2]->IsObject() ? info[2]).ToLocalChecked() : Local<v8::Object>()
info.Length() >= 3 && !info[2].IsEmpty() && info[2]->IsObject() ? Nan::To<v8::Object>(info[2]).ToLocalChecked() : Local<v8::Object>()
);
}

Expand Down
2 changes: 1 addition & 1 deletion generate/templates/partials/field_accessors.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@

wrapper->{{ field.name }}.Reset({{ field.name }});

wrapper->raw->{{ field.name }} = {% if not field.cType | isPointer %}*{% endif %}{% if field.cppClassName == 'GitStrarray' %}StrArrayConverter::Convert(Nan::To<v8::Object>({{ field.name }}).ToLocalChecked())){% else %}Nan::ObjectWrap::Unwrap<{{ field.cppClassName }}>(Nan::To<v8::Object>({{ field.name }}).ToLocalChecked())->GetValue(){% endif %};
wrapper->raw->{{ field.name }} = {% if not field.cType | isPointer %}*{% endif %}{% if field.cppClassName == 'GitStrarray' %}StrArrayConverter::Convert(Nan::To<v8::Object>({{ field.name }}).ToLocalChecked()){% else %}Nan::ObjectWrap::Unwrap<{{ field.cppClassName }}>(Nan::To<v8::Object>({{ field.name }}).ToLocalChecked())->GetValue(){% endif %};

{% elsif field.isCallbackFunction %}
Nan::Callback *callback = NULL;
Expand Down