Skip to content

Commit 16fa322

Browse files
authored
Add support for Node 18
Add compatibility with Node 18.0.0
1 parent 3aaaf1b commit 16fa322

File tree

4 files changed

+17
-3
lines changed

4 files changed

+17
-3
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ env:
2727
- TRAVIS_NODE_VERSION="15"
2828
- TRAVIS_NODE_VERSION="16"
2929
- TRAVIS_NODE_VERSION="17"
30+
- TRAVIS_NODE_VERSION="18"
3031
- TRAVIS_NODE_VERSION="lts/*" ELECTRON_VERSION="2.0.18"
3132
- TRAVIS_NODE_VERSION="lts/*" ELECTRON_VERSION="3.1.13"
3233
- TRAVIS_NODE_VERSION="lts/*" ELECTRON_VERSION="4.2.12"

appveyor.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ environment:
2020
- nodejs_version: "15"
2121
- nodejs_version: "16"
2222
- nodejs_version: "17"
23+
- nodejs_version: "18"
2324

2425
# Install scripts. (runs after repo cloning)
2526
install:

nan.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
#define NODE_15_0_MODULE_VERSION 88
4545
#define NODE_16_0_MODULE_VERSION 93
4646
#define NODE_17_0_MODULE_VERSION 102
47+
#define NODE_18_0_MODULE_VERSION 108
4748

4849
#ifdef _MSC_VER
4950
# define NAN_HAS_CPLUSPLUS_11 (_MSC_VER >= 1800)
@@ -2549,7 +2550,10 @@ inline void SetAccessor(
25492550
, obj
25502551
, settings
25512552
, attribute
2552-
, signature);
2553+
#if (NODE_MODULE_VERSION < NODE_18_0_MODULE_VERSION)
2554+
, signature
2555+
#endif
2556+
);
25532557
}
25542558

25552559
inline bool SetAccessor(

test/cpp/news.cpp

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,11 @@ NAN_METHOD(NewScript) {
114114
}
115115

116116
NAN_METHOD(NewScript2) {
117-
v8::ScriptOrigin origin(New<v8::String>("x").ToLocalChecked());
117+
v8::ScriptOrigin origin(
118+
#if NODE_MODULE_VERSION >= NODE_18_0_MODULE_VERSION
119+
info.GetIsolate(),
120+
#endif
121+
New<v8::String>("x").ToLocalChecked());
118122
v8::Local<UnboundScript> script =
119123
New<UnboundScript>(
120124
New("2+4").ToLocalChecked()
@@ -131,7 +135,11 @@ NAN_METHOD(CompileScript) {
131135
}
132136

133137
NAN_METHOD(CompileScript2) {
134-
v8::ScriptOrigin origin(New<v8::String>("x").ToLocalChecked());
138+
v8::ScriptOrigin origin(
139+
#if NODE_MODULE_VERSION >= NODE_18_0_MODULE_VERSION
140+
info.GetIsolate(),
141+
#endif
142+
New<v8::String>("x").ToLocalChecked());
135143
v8::Local<BoundScript> script =
136144
CompileScript(New("2+4").ToLocalChecked(), origin).ToLocalChecked();
137145
info.GetReturnValue().Set(

0 commit comments

Comments
 (0)