Skip to content

Fix build on Node.js >= 12#89

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

Open
jazzzz wants to merge 1 commit into
base:master
Choose a base branch
from
Open

Fix build on Node.js >= 12 #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion lib/index.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
var binary = require('node-pre-gyp');
var binary = require('@mapbox/node-pre-gyp');
var path = require('path');
var binding_path = binary.find(path.resolve(path.join(__dirname,'../package.json')));
var zipfile = require(binding_path);
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,8 +20,8 @@
"BSD"
],
"dependencies": {
"nan": "~2.10.0",
"node-pre-gyp": "~0.10.2"
"nan": "~2.18.0",
"@mapbox/node-pre-gyp": "~1.0.11"
},
"devDependencies": {
"@mapbox/cloudfriend": "^1.9.1",
Expand Down
14 changes: 7 additions & 7 deletions src/node_zipfile.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ extern "C" {
#include <fstream>
#include <stdexcept>

#define TOSTR(obj) (*String::Utf8Value((obj)->ToString()))
#define TOSTR(obj) (*Nan::Utf8String(obj))

using namespace v8;

Expand All@@ -42,7 +42,7 @@ void ZipFile::Initialize(Local<Object> target) {
Nan::SetAccessor(lcons->InstanceTemplate(), Nan::New("count").ToLocalChecked(), get_prop);
Nan::SetAccessor(lcons->InstanceTemplate(), Nan::New("names").ToLocalChecked(), get_prop);

target->Set(Nan::New("ZipFile").ToLocalChecked(),lcons->GetFunction());
Nan::Set(target, Nan::New("ZipFile").ToLocalChecked(), Nan::GetFunction(lcons).ToLocalChecked());
constructor.Reset(lcons);
}

Expand DownExpand Up@@ -109,7 +109,7 @@ void ZipFile::get_prop(v8::Local<v8::String> property, const Nan::PropertyCallba
unsigned num = zf->names_.size();
Local<Array> a = Nan::New<Array>(num);
for (unsigned i = 0; i < num; ++i) {
a->Set(i, Nan::New(zf->names_[i].c_str()).ToLocalChecked());
Nan::Set(a, i, Nan::New(zf->names_[i].c_str()).ToLocalChecked());
}
args.GetReturnValue().Set(a);
} else {
Expand DownExpand Up@@ -487,13 +487,13 @@ extern "C" {
ZipFile::Initialize(target);

// node-zipfile version
target->Set(Nan::New("version").ToLocalChecked(), Nan::New("0.5.8").ToLocalChecked());
Nan::Set(target, Nan::New("version").ToLocalChecked(), Nan::New("0.5.8").ToLocalChecked());

// versions of deps
Local<Object> versions = Nan::New<Object>();
versions->Set(Nan::New("node").ToLocalChecked(), Nan::New(NODE_VERSION+1).ToLocalChecked());
versions->Set(Nan::New("v8").ToLocalChecked(), Nan::New(V8::GetVersion()).ToLocalChecked());
target->Set(Nan::New("versions").ToLocalChecked(), versions);
Nan::Set(versions, Nan::New("node").ToLocalChecked(), Nan::New(NODE_VERSION+1).ToLocalChecked());
Nan::Set(versions, Nan::New("v8").ToLocalChecked(), Nan::New(V8::GetVersion()).ToLocalChecked());
Nan::Set(target, Nan::New("versions").ToLocalChecked(), versions);
}
#define MAKE_MODULE(_modname) NODE_MODULE( _modname, init)
MAKE_MODULE(MODULE_NAME)
Expand Down