Fix node 12

vweevers · May 31, 2019 · 16c0004 · 16c0004
1 parent 818ddb2
commit 16c0004
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 11 deletions.
diff --git a/index.js b/index.js
@@ -2,7 +2,7 @@
 
 var resolve = require('path').resolve
 var isWindows = process.platform === 'win32'
-var info = isWindows ? require('bindings')('VersionInfo') : null
+var info = isWindows ? require('bindings')('VersionInfo').getInfo : null
 
 module.exports = function (file) {
   if (typeof file !== 'string') {

diff --git a/src/VersionInfo.cc b/src/VersionInfo.cc
@@ -6,7 +6,7 @@
 using namespace std;
 using namespace utf8util;
 
-void CreateObject(const Nan::FunctionCallbackInfo<v8::Value>& info) {
+NAN_METHOD(getInfo) {
   if (!info[0]->IsString()) {
     return Nan::ThrowError("win-version-info requires a string filename");
   }
@@ -36,9 +36,8 @@ void CreateObject(const Nan::FunctionCallbackInfo<v8::Value>& info) {
   info.GetReturnValue().Set(metadata);
 }
 
-void Init(v8::Local<v8::Object> exports, v8::Local<v8::Object> module) {
-  module->Set(Nan::New("exports").ToLocalChecked(),
-      Nan::New<v8::FunctionTemplate>(CreateObject)->GetFunction());
+NAN_MODULE_INIT(Init) {
+  NAN_EXPORT(target, getInfo);
 }
 
 NODE_MODULE(VersionInfo, Init)
diff --git a/src/showver.cc b/src/showver.cc
@@ -133,7 +133,8 @@ void ReadFixedFileInfo(VS_FIXEDFILEINFO* pValue, v8::Local<v8::Object> &metadata
 	std::string version = v.str();
 
 	if (version != "0.0.0.0") {
-		metadata->Set(
+		Nan::Set(
+      metadata,
 			Nan::New("FileVersion").ToLocalChecked(),
 			Nan::New(version).ToLocalChecked()
 		);
@@ -150,10 +151,7 @@ void SetUTF16Pair(wchar_t *key, wchar_t *value, v8::Local<v8::Object> &metadata)
 	if (isVersionKey(utf8Key) && isEmptyVersion(utf8Val)) return;
 
 	v8::Local<v8::String> k = Nan::New(utf8Key).ToLocalChecked();
-
-	if (!metadata->Has(k)) {
-		metadata->Set(k, Nan::New(utf8Val).ToLocalChecked());
-	}
+  Nan::Set(metadata, k, Nan::New(utf8Val).ToLocalChecked());
 }
 
 void ReadFileInfo(void* pVer, DWORD size, v8::Local<v8::Object> &metadata) {

diff --git a/test/basic-test.js b/test/basic-test.js
@@ -121,7 +121,7 @@ if (process.platform !== 'win32') {
   })
 
   test('binding throws on non-string', function (t) {
-    var info = require('bindings')('VersionInfo')
+    var info = require('bindings')('VersionInfo').getInfo
 
     t.plan(1)