fix v8::Local<T>::GetIsolate deprecation

zawata · zawata · commit 5136a9073794 · 2026-04-21T16:17:49.000-07:00
diff --git a/generate/templates/manual/src/context.cc b/generate/templates/manual/src/context.cc
@@ -28,7 +28,7 @@ namespace nodegit {
     : isolate(isolate)
     , threadPool(10, node::GetCurrentEventLoop(isolate), this)
   {
-    Nan::HandleScope scopoe;
+    Nan::HandleScope scope;
     v8::Local<v8::Object> storage = Nan::New<v8::Object>();
     persistentStorage.Reset(storage);
     contexts[isolate] = this;
@@ -45,9 +45,7 @@ namespace nodegit {
   }
 
   Context *Context::GetCurrentContext() {
-    Nan::HandleScope scope;
-    v8::Local<v8::Context> context = Nan::GetCurrentContext();
-    v8::Isolate *isolate = context->GetIsolate();
+    v8::Isolate *isolate = v8::Isolate::GetCurrent();
     return contexts[isolate];
   }
 
diff --git a/generate/templates/manual/src/thread_pool.cc b/generate/templates/manual/src/thread_pool.cc
@@ -657,9 +657,6 @@ namespace nodegit {
 
   // NOTE this should theoretically never be triggered during a cleanup operation
   void ThreadPoolImpl::RunLoopCallbacks() {
-    Nan::HandleScope scope;
-    v8::Local<v8::Context> context = Nan::GetCurrentContext();
-    node::CallbackScope callbackScope(context->GetIsolate(), Nan::New<v8::Object>(), {0, 0});
 
     std::unique_lock<std::mutex> lock(*jsThreadCallbackMutex);
     // get the next callback to run
@@ -719,10 +716,6 @@ namespace nodegit {
       orchestratorJobCondition.notify_all();
     }
 
-    Nan::HandleScope scope;
-    v8::Local<v8::Context> context = Nan::GetCurrentContext();
-    node::CallbackScope callbackScope(context->GetIsolate(), Nan::New<v8::Object>(), {0, 0});
-
     while (cancelledJobs.size()) {
       std::shared_ptr<Orchestrator::Job> cancelledJob = cancelledJobs.front();
       std::shared_ptr<Orchestrator::AsyncWorkJob> asyncWorkJob = std::static_pointer_cast<Orchestrator::AsyncWorkJob>(cancelledJob);
diff --git a/generate/templates/templates/nodegit.cc b/generate/templates/templates/nodegit.cc
@@ -101,9 +101,7 @@ NAN_MODULE_INIT(init) {
     , Nan::GetFunction(Nan::New<v8::FunctionTemplate>(GetNumberOfTrackedObjects)).ToLocalChecked()
   );
 
-  Nan::HandleScope scope;
-  Local<Context> context = Nan::GetCurrentContext();
-  Isolate *isolate = context->GetIsolate();
+  Isolate *isolate = v8::Isolate::GetCurrent();
   nodegit::Context *nodegitContext = new nodegit::Context(isolate);
 
   Wrapper::InitializeComponent(target, nodegitContext);

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ namespace nodegit {`
`28`	`28`	`: isolate(isolate)`
`29`	`29`	`, threadPool(10, node::GetCurrentEventLoop(isolate), this)`
`30`	`30`	`{`
`31`		`- Nan::HandleScope scopoe;`
	`31`	`+ Nan::HandleScope scope;`
`32`	`32`	`v8::Local<v8::Object> storage = Nan::New<v8::Object>();`
`33`	`33`	`persistentStorage.Reset(storage);`
`34`	`34`	`contexts[isolate] = this;`
`@@ -45,9 +45,7 @@ namespace nodegit {`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`Context *Context::GetCurrentContext() {`
`48`		`- Nan::HandleScope scope;`
`49`		`- v8::Local<v8::Context> context = Nan::GetCurrentContext();`
`50`		`- v8::Isolate *isolate = context->GetIsolate();`
	`48`	`+ v8::Isolate *isolate = v8::Isolate::GetCurrent();`
`51`	`49`	`return contexts[isolate];`
`52`	`50`	`}`
`53`	`51`