Add support for Node 18

Add compatibility with Node 18.0.0
nodejs · Apr 23, 2022 · 16fa322 · 16fa322
1 parent 3aaaf1b
commit 16fa322
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -27,6 +27,7 @@ env:
   - TRAVIS_NODE_VERSION="15"
   - TRAVIS_NODE_VERSION="16"
   - TRAVIS_NODE_VERSION="17"
+  - TRAVIS_NODE_VERSION="18"
   - TRAVIS_NODE_VERSION="lts/*" ELECTRON_VERSION="2.0.18"
   - TRAVIS_NODE_VERSION="lts/*" ELECTRON_VERSION="3.1.13"
   - TRAVIS_NODE_VERSION="lts/*" ELECTRON_VERSION="4.2.12"

diff --git a/appveyor.yml b/appveyor.yml
@@ -20,6 +20,7 @@ environment:
     - nodejs_version: "15"
     - nodejs_version: "16"
     - nodejs_version: "17"
+    - nodejs_version: "18"
 
 # Install scripts. (runs after repo cloning)
 install:

diff --git a/nan.h b/nan.h
@@ -44,6 +44,7 @@
 #define NODE_15_0_MODULE_VERSION 88
 #define NODE_16_0_MODULE_VERSION 93
 #define NODE_17_0_MODULE_VERSION 102
+#define NODE_18_0_MODULE_VERSION 108
 
 #ifdef _MSC_VER
 # define NAN_HAS_CPLUSPLUS_11 (_MSC_VER >= 1800)
@@ -2549,7 +2550,10 @@ inline void SetAccessor(
     , obj
     , settings
     , attribute
-    , signature);
+#if (NODE_MODULE_VERSION < NODE_18_0_MODULE_VERSION)
+    , signature
+#endif
+  );
 }
 
 inline bool SetAccessor(

diff --git a/test/cpp/news.cpp b/test/cpp/news.cpp
@@ -114,7 +114,11 @@ NAN_METHOD(NewScript) {
 }
 
 NAN_METHOD(NewScript2) {
-  v8::ScriptOrigin origin(New<v8::String>("x").ToLocalChecked());
+  v8::ScriptOrigin origin(
+#if NODE_MODULE_VERSION >= NODE_18_0_MODULE_VERSION
+    info.GetIsolate(),
+#endif
+    New<v8::String>("x").ToLocalChecked());
   v8::Local<UnboundScript> script =
       New<UnboundScript>(
           New("2+4").ToLocalChecked()
@@ -131,7 +135,11 @@ NAN_METHOD(CompileScript) {
 }
 
 NAN_METHOD(CompileScript2) {
-  v8::ScriptOrigin origin(New<v8::String>("x").ToLocalChecked());
+  v8::ScriptOrigin origin(
+#if NODE_MODULE_VERSION >= NODE_18_0_MODULE_VERSION
+    info.GetIsolate(),
+#endif
+    New<v8::String>("x").ToLocalChecked());
   v8::Local<BoundScript> script =
       CompileScript(New("2+4").ToLocalChecked(), origin).ToLocalChecked();
   info.GetReturnValue().Set(