Skip to content

/ extension-whitelist

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.

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

Make compatible with Node v12 #15

Merged
merged 1 commit into from May 22, 2019
+24 −23
Merged

Make compatible with Node v12 #15

Changes from all commits
Commits
Show all changes
1 commit
Select commit
81b5805
Make compatible with Node v12
bbondy May 22, 2019
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

Make compatible with Node v12 

Related to brave/brave-core-crx-packager#59

FYI @mihaiplesa
  • Loading branch information
@bbondy
bbondy committed May 22, 2019
commit 81b5805ba1e6c187aa064f4a7b9137b0709b9f6c
39 node_addon/EWParserWrap.cc
View file
Open in desktop
@@ -22,6 +22,7 @@ namespace EWParserWrap {
using v8::Boolean;
using v8::Value;
using v8::Exception;
using v8::NewStringType;

char *deserializedData = nullptr;

@@ -38,7 +39,7 @@ namespace EWParserWrap {

// Prepare constructor template
Local<FunctionTemplate> tpl = FunctionTemplate::New(isolate, New);
tpl->SetClassName(String::NewFromUtf8(isolate, "CEWParser"));
tpl->SetClassName(String::NewFromUtf8(isolate, "CEWParser", NewStringType::kNormal).ToLocalChecked());
tpl->InstanceTemplate()->SetInternalFieldCount(1);

NODE_SET_PROTOTYPE_METHOD(tpl, "addToBlacklist", CEWParserWrap::AddToBlacklist);
@@ -49,9 +50,9 @@ namespace EWParserWrap {
NODE_SET_PROTOTYPE_METHOD(tpl, "deserialize", CEWParserWrap::Deserialize);
NODE_SET_PROTOTYPE_METHOD(tpl, "cleanup", CEWParserWrap::Cleanup);

constructor.Reset(isolate, tpl->GetFunction());
exports->Set(String::NewFromUtf8(isolate, "CEWParser"),
tpl->GetFunction());
constructor.Reset(isolate, tpl->GetFunction(isolate->GetCurrentContext()).ToLocalChecked());
exports->Set(String::NewFromUtf8(isolate, "CEWParser", NewStringType::kNormal).ToLocalChecked(),
tpl->GetFunction(isolate->GetCurrentContext()).ToLocalChecked());
}

void CEWParserWrap::New(const FunctionCallbackInfo<Value>& args) {
@@ -78,17 +79,17 @@ namespace EWParserWrap {
Isolate* isolate = args.GetIsolate();
if (args.Length() != 1) {
isolate->ThrowException(Exception::TypeError(
String::NewFromUtf8(isolate, "Wrong number of arguments")));
String::NewFromUtf8(isolate, "Wrong number of arguments", NewStringType::kNormal).ToLocalChecked()));
return;
}

if (!args[0]->IsString()) {
isolate->ThrowException(Exception::TypeError(
String::NewFromUtf8(isolate, "Wrong arguments")));
String::NewFromUtf8(isolate, "Wrong arguments", NewStringType::kNormal).ToLocalChecked()));
return;
}

String::Utf8Value id(isolate, args[0]->ToString());
String::Utf8Value id(isolate, args[0]->ToString(isolate->GetCurrentContext()).FromMaybe(Local<String>()));
const char * buffer = *id;

CEWParserWrap* obj = ObjectWrap::Unwrap<CEWParserWrap>(args.Holder());
@@ -99,17 +100,17 @@ namespace EWParserWrap {
Isolate* isolate = args.GetIsolate();
if (args.Length() != 1) {
isolate->ThrowException(Exception::TypeError(
String::NewFromUtf8(isolate, "Wrong number of arguments")));
String::NewFromUtf8(isolate, "Wrong number of arguments", NewStringType::kNormal).ToLocalChecked()));
return;
}

if (!args[0]->IsString()) {
isolate->ThrowException(Exception::TypeError(
String::NewFromUtf8(isolate, "Wrong arguments")));
String::NewFromUtf8(isolate, "Wrong arguments", NewStringType::kNormal).ToLocalChecked()));
return;
}

String::Utf8Value id(isolate, args[0]->ToString());
String::Utf8Value id(isolate, args[0]->ToString(isolate->GetCurrentContext()).FromMaybe(Local<String>()));
const char * buffer = *id;

CEWParserWrap* obj = ObjectWrap::Unwrap<CEWParserWrap>(args.Holder());
@@ -120,17 +121,17 @@ namespace EWParserWrap {
Isolate* isolate = args.GetIsolate();
if (args.Length() != 1) {
isolate->ThrowException(Exception::TypeError(
String::NewFromUtf8(isolate, "Wrong number of arguments")));
String::NewFromUtf8(isolate, "Wrong number of arguments", NewStringType::kNormal).ToLocalChecked()));
return;
}

if (!args[0]->IsString()) {
isolate->ThrowException(Exception::TypeError(
String::NewFromUtf8(isolate, "Wrong arguments")));
String::NewFromUtf8(isolate, "Wrong arguments", NewStringType::kNormal).ToLocalChecked()));
return;
}

String::Utf8Value id(isolate, args[0]->ToString());
String::Utf8Value id(isolate, args[0]->ToString(isolate->GetCurrentContext()).FromMaybe(Local<String>()));
const char * bufferID = *id;

CEWParserWrap* obj = ObjectWrap::Unwrap<CEWParserWrap>(args.Holder());
@@ -141,17 +142,17 @@ namespace EWParserWrap {
Isolate* isolate = args.GetIsolate();
if (args.Length() != 1) {
isolate->ThrowException(Exception::TypeError(
String::NewFromUtf8(isolate, "Wrong number of arguments")));
String::NewFromUtf8(isolate, "Wrong number of arguments", NewStringType::kNormal).ToLocalChecked()));
return;
}

if (!args[0]->IsString()) {
isolate->ThrowException(Exception::TypeError(
String::NewFromUtf8(isolate, "Wrong arguments")));
String::NewFromUtf8(isolate, "Wrong arguments", NewStringType::kNormal).ToLocalChecked()));
return;
}

String::Utf8Value id(isolate, args[0]->ToString());
String::Utf8Value id(isolate, args[0]->ToString(isolate->GetCurrentContext()).FromMaybe(Local<String>()));
const char * bufferID = *id;

CEWParserWrap* obj = ObjectWrap::Unwrap<CEWParserWrap>(args.Holder());
@@ -168,15 +169,15 @@ namespace EWParserWrap {
char* data = obj->serialize(&totalSize);
if (nullptr == data) {
isolate->ThrowException(Exception::TypeError(
String::NewFromUtf8(isolate, "Could not serialize")));
String::NewFromUtf8(isolate, "Could not serialize", NewStringType::kNormal).ToLocalChecked()));
return;
}

MaybeLocal<Object> buffer = node::Buffer::New(isolate, totalSize);
Local<Object> localBuffer;
if (!buffer.ToLocal(&localBuffer)) {
isolate->ThrowException(Exception::TypeError(
String::NewFromUtf8(isolate, "Could not convert MaybeLocal to Local")));
String::NewFromUtf8(isolate, "Could not convert MaybeLocal to Local", NewStringType::kNormal).ToLocalChecked()));
return;
}
::memcpy(node::Buffer::Data(localBuffer), data, totalSize);
@@ -190,7 +191,7 @@ namespace EWParserWrap {
Isolate* isolate = args.GetIsolate();
if (args.Length() < 1) {
isolate->ThrowException(Exception::TypeError(
String::NewFromUtf8(isolate, "Wrong number of arguments")));
String::NewFromUtf8(isolate, "Wrong number of arguments", NewStringType::kNormal).ToLocalChecked()));
return;
}

6 package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more.

2 package.json
View file
Open in desktop
@@ -24,7 +24,7 @@
},
"homepage": "https://github.com/brave/extension-whitelist#readme",
"dependencies": {
"hashset-cpp": "^2.1.0",
"hashset-cpp": "^2.1.1",
"node-gyp": "^4.0.0"
},
"devDependencies": {
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.