Merge pull request nodegit#1951 from zawata/fix/WinElectronCrash

ianhattendorf · web-flow · commit 2cc0e389a0aa · 2022-11-04T08:52:16.000-07:00
Fix intermittent crash on Electron 18+
diff --git a/generate/templates/manual/src/convenient_hunk.cc b/generate/templates/manual/src/convenient_hunk.cc
@@ -39,7 +39,7 @@ void ConvenientHunk::InitializeComponent(Local<v8::Object> target, nodegit::Cont
   Local<External> nodegitExternal = Nan::New<External>(nodegitContext);
   Local<FunctionTemplate> tpl = Nan::New<FunctionTemplate>(JSNewFunction, nodegitExternal);
 
-  tpl->InstanceTemplate()->SetInternalFieldCount(1);
+  tpl->InstanceTemplate()->SetInternalFieldCount(2);
   tpl->SetClassName(Nan::New("ConvenientHunk").ToLocalChecked());
 
   Nan::SetPrototypeMethod(tpl, "size", Size, nodegitExternal);
diff --git a/generate/templates/manual/src/convenient_patch.cc b/generate/templates/manual/src/convenient_patch.cc
@@ -136,7 +136,7 @@ void ConvenientPatch::InitializeComponent(Local<v8::Object> target, nodegit::Con
   Local<External> nodegitExternal = Nan::New<External>(nodegitContext);
   Local<FunctionTemplate> tpl = Nan::New<FunctionTemplate>(JSNewFunction, nodegitExternal);
 
-  tpl->InstanceTemplate()->SetInternalFieldCount(1);
+  tpl->InstanceTemplate()->SetInternalFieldCount(2);
   tpl->SetClassName(Nan::New("ConvenientPatch").ToLocalChecked());
 
   Nan::SetPrototypeMethod(tpl, "hunks", Hunks, nodegitExternal);
diff --git a/generate/templates/manual/src/promise_completion.cc b/generate/templates/manual/src/promise_completion.cc
@@ -6,7 +6,7 @@ void PromiseCompletion::InitializeComponent(nodegit::Context *nodegitContext) {
   Nan::HandleScope scope;
   v8::Local<v8::Value> nodegitExternal = Nan::New<v8::External>(nodegitContext);
   v8::Local<v8::FunctionTemplate> newTemplate = Nan::New<v8::FunctionTemplate>(New, nodegitExternal);
-  newTemplate->InstanceTemplate()->SetInternalFieldCount(1);
+  newTemplate->InstanceTemplate()->SetInternalFieldCount(2);
 
   nodegitContext->SaveToPersistent(
     "PromiseCompletion::Template",
diff --git a/generate/templates/manual/src/wrapper.cc b/generate/templates/manual/src/wrapper.cc
@@ -22,7 +22,7 @@ void Wrapper::InitializeComponent(Local<v8::Object> target, nodegit::Context *no
   Local<External> nodegitExternal = Nan::New<External>(nodegitContext);
   Local<FunctionTemplate> tpl = Nan::New<FunctionTemplate>(JSNewFunction, nodegitExternal);
 
-  tpl->InstanceTemplate()->SetInternalFieldCount(1);
+  tpl->InstanceTemplate()->SetInternalFieldCount(2);
   tpl->SetClassName(Nan::New("Wrapper").ToLocalChecked());
 
   Nan::SetPrototypeMethod(tpl, "toBuffer", ToBuffer, nodegitExternal);
diff --git a/generate/templates/templates/binding.gyp b/generate/templates/templates/binding.gyp
@@ -81,7 +81,7 @@
       "include_dirs": [
         "vendor/libv8-convert",
         "vendor/libssh2/include",
-        "<!(node -e \"require('nan')\")"
+        "<!(node -e \"require('@axosoft/nan')\")"
       ],
 
       "cflags": [
diff --git a/generate/templates/templates/class_content.cc b/generate/templates/templates/class_content.cc
@@ -48,7 +48,7 @@ using namespace node;
     v8::Local<v8::External> nodegitExternal = Nan::New<v8::External>(nodegitContext);
     v8::Local<FunctionTemplate> tpl = Nan::New<FunctionTemplate>(JSNewFunction, nodegitExternal);
 
-    tpl->InstanceTemplate()->SetInternalFieldCount(1);
+    tpl->InstanceTemplate()->SetInternalFieldCount(2);
     tpl->SetClassName(Nan::New("{{ jsClassName }}").ToLocalChecked());
 
     {% each functions as function %}
diff --git a/generate/templates/templates/struct_content.cc b/generate/templates/templates/struct_content.cc
@@ -89,7 +89,7 @@ using namespace std;
     Local<External> nodegitExternal = Nan::New<External>(nodegitContext);
     Local<FunctionTemplate> tpl = Nan::New<FunctionTemplate>(JSNewFunction, nodegitExternal);
 
-    tpl->InstanceTemplate()->SetInternalFieldCount(1);
+    tpl->InstanceTemplate()->SetInternalFieldCount(2);
     tpl->SetClassName(Nan::New("{{ jsClassName }}").ToLocalChecked());
 
     {% each fields as field %}
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -38,12 +38,12 @@
     "node": ">= 12.19.0 < 13 || >= 14.10.0"
   },
   "dependencies": {
+    "@axosoft/nan": "^2.18.0-gk.1",
     "@mapbox/node-pre-gyp": "^1.0.8",
     "fs-extra": "^7.0.0",
     "got": "^10.7.0",
     "json5": "^2.1.0",
     "lodash": "^4.17.14",
-    "nan": "^2.15.0",
     "node-gyp": "^8.4.1",
     "ramda": "^0.25.0",
     "tar-fs": "^2.1.1"
