Fix compatibility to Node.js 13 (#121)

gengjiawen · web-flow · commit 8c093b82905b · 2019-10-30T10:14:14.000+08:00
diff --git a/.travis.yml b/.travis.yml
@@ -3,6 +3,7 @@ node_js:
   - "8"
   - "10"
   - "12"
+  - "13"
 cache:
   npm
 before_install:
diff --git a/1_hello_world/nan/hello.cc b/1_hello_world/nan/hello.cc
@@ -6,7 +6,8 @@ void Method(const Nan::FunctionCallbackInfo<v8::Value>& info) {
 
 void Init(v8::Local<v8::Object> exports) {
   v8::Local<v8::Context> context = exports->CreationContext();
-  exports->Set(Nan::New("hello").ToLocalChecked(),
+  exports->Set(context,
+               Nan::New("hello").ToLocalChecked(),
                Nan::New<v8::FunctionTemplate>(Method)
                    ->GetFunction(context)
                    .ToLocalChecked());
diff --git a/2_function_arguments/nan/addon.cc b/2_function_arguments/nan/addon.cc
@@ -22,7 +22,8 @@ void Add(const Nan::FunctionCallbackInfo<v8::Value>& info) {
 
 void Init(v8::Local<v8::Object> exports) {
   v8::Local<v8::Context> context = exports->CreationContext();
-  exports->Set(Nan::New("add").ToLocalChecked(),
+  exports->Set(context,
+               Nan::New("add").ToLocalChecked(),
                Nan::New<v8::FunctionTemplate>(Add)
                    ->GetFunction(context)
                    .ToLocalChecked());
diff --git a/4_object_factory/nan/addon.cc b/4_object_factory/nan/addon.cc
@@ -3,15 +3,17 @@
 void CreateObject(const Nan::FunctionCallbackInfo<v8::Value>& info) {
   v8::Local<v8::Context> context = info.GetIsolate()->GetCurrentContext();
   v8::Local<v8::Object> obj = Nan::New<v8::Object>();
-  obj->Set(Nan::New("msg").ToLocalChecked(),
+  obj->Set(context,
+           Nan::New("msg").ToLocalChecked(),
            info[0]->ToString(context).ToLocalChecked());
 
   info.GetReturnValue().Set(obj);
 }
 
 void Init(v8::Local<v8::Object> exports, v8::Local<v8::Object> module) {
   v8::Local<v8::Context> context = exports->CreationContext();
-  module->Set(Nan::New("exports").ToLocalChecked(),
+  module->Set(context,
+              Nan::New("exports").ToLocalChecked(),
               Nan::New<v8::FunctionTemplate>(CreateObject)
                   ->GetFunction(context)
                   .ToLocalChecked());
diff --git a/6_object_wrap/nan/myobject.cc b/6_object_wrap/nan/myobject.cc
@@ -21,7 +21,8 @@ void MyObject::Init(v8::Local<v8::Object> exports) {
   Nan::SetPrototypeMethod(tpl, "multiply", Multiply);
 
   constructor.Reset(tpl->GetFunction(context).ToLocalChecked());
-  exports->Set(Nan::New("MyObject").ToLocalChecked(),
+  exports->Set(context,
+               Nan::New("MyObject").ToLocalChecked(),
                tpl->GetFunction(context).ToLocalChecked());
 }
 
diff --git a/7_factory_wrap/nan/addon.cc b/7_factory_wrap/nan/addon.cc
@@ -12,7 +12,8 @@ void InitAll(v8::Local<v8::Object> exports, v8::Local<v8::Object> module) {
 
   MyObject::Init();
 
-  module->Set(Nan::New("exports").ToLocalChecked(),
+  module->Set(context,
+              Nan::New("exports").ToLocalChecked(),
               Nan::New<v8::FunctionTemplate>(CreateObject)
                   ->GetFunction(context)
                   .ToLocalChecked());
diff --git a/8_passing_wrapped/nan/addon.cc b/8_passing_wrapped/nan/addon.cc
@@ -23,12 +23,14 @@ void InitAll(v8::Local<v8::Object> exports) {
 
   MyObject::Init();
 
-  exports->Set(Nan::New("createObject").ToLocalChecked(),
+  exports->Set(context,
+               Nan::New("createObject").ToLocalChecked(),
                Nan::New<v8::FunctionTemplate>(CreateObject)
                    ->GetFunction(context)
                    .ToLocalChecked());
 
-  exports->Set(Nan::New("add").ToLocalChecked(),
+  exports->Set(context,
+               Nan::New("add").ToLocalChecked(),
                Nan::New<v8::FunctionTemplate>(Add)
                    ->GetFunction(context)
                    .ToLocalChecked());

-Original file line number
+Diff line change
   - "8"
   - "10"
   - "12"
 +  - "13"
 cache:
   npm
 before_install:
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,8 @@ void MyObject::Init(v8::Local<v8::Object> exports) {`
`21`	`21`	`Nan::SetPrototypeMethod(tpl, "multiply", Multiply);`
`22`	`22`
`23`	`23`	`constructor.Reset(tpl->GetFunction(context).ToLocalChecked());`
`24`		`- exports->Set(Nan::New("MyObject").ToLocalChecked(),`
	`24`	`+ exports->Set(context,`
	`25`	`+ Nan::New("MyObject").ToLocalChecked(),`
`25`	`26`	`tpl->GetFunction(context).ToLocalChecked());`
`26`	`27`	`}`
`27`	`28`