From 8e4603d00fcbb5069b04da1368939d885163e2ce Mon Sep 17 00:00:00 2001
From: John Kerl <kerl.john.r@gmail.com>
Date: Thu, 6 Aug 2020 11:10:50 -0400
Subject: [PATCH 01/21] c++ -> C++ in README.md (#897)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 9b5f38ab..a1b3288b 100644
--- a/README.md
+++ b/README.md
@@ -213,7 +213,7 @@ NAN provides a `v8::Script` helpers as the API has changed over the supported ve
 
 ### JSON
 
-The _JSON_ object provides the c++ versions of the methods offered by the `JSON` object in javascript. V8 exposes these methods via the `v8::JSON` object.
+The _JSON_ object provides the C++ versions of the methods offered by the `JSON` object in javascript. V8 exposes these methods via the `v8::JSON` object.
 
  - <a href="doc/json.md#api_nan_json_parse"><b><code>Nan::JSON.Parse</code></b></a>
  - <a href="doc/json.md#api_nan_json_stringify"><b><code>Nan::JSON.Stringify</code></b></a>

From 35f0fab205574b2cbda04e6347c8b2db755e124f Mon Sep 17 00:00:00 2001
From: Momtchil Momtchev <momtchil@momtchev.com>
Date: Sat, 10 Oct 2020 00:44:32 +0200
Subject: [PATCH 02/21] fix gcc 8 function cast warning (#899)

---
 nan.h | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/nan.h b/nan.h
index 648e6e26..6135f735 100644
--- a/nan.h
+++ b/nan.h
@@ -2280,18 +2280,25 @@ inline void AsyncExecute (uv_work_t* req) {
   worker->Execute();
 }
 
-inline void AsyncExecuteComplete (uv_work_t* req) {
+/* uv_after_work_cb has 1 argument before node-v0.9.4 and
+ * 2 arguments since node-v0.9.4
+ * https://github.com/libuv/libuv/commit/92fb84b751e18f032c02609467f44bfe927b80c5
+ */
+inline void AsyncExecuteComplete(uv_work_t *req) {
   AsyncWorker* worker = static_cast<AsyncWorker*>(req->data);
   worker->WorkComplete();
   worker->Destroy();
 }
+inline void AsyncExecuteComplete (uv_work_t* req, int status) {
+  AsyncExecuteComplete(req);
+}
 
 inline void AsyncQueueWorker (AsyncWorker* worker) {
   uv_queue_work(
       GetCurrentEventLoop()
     , &worker->request
     , AsyncExecute
-    , reinterpret_cast<uv_after_work_cb>(AsyncExecuteComplete)
+    , AsyncExecuteComplete
   );
 }
 

From 955d2b86ac30f4849b297bc1412b5a5f66893756 Mon Sep 17 00:00:00 2001
From: Benjamin Byholm <bbyholm@abo.fi>
Date: Tue, 13 Oct 2020 15:40:42 +0300
Subject: [PATCH 03/21] Prepare for 2.14.2

---
 CHANGELOG.md | 6 +++++-
 README.md    | 2 +-
 nan.h        | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 44858c70..93d94964 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # NAN ChangeLog
 
-**Version 2.14.1: current Node 14.0.0, Node 0.12: 0.12.18, Node 0.10: 0.10.48, iojs: 3.3.1**
+**Version 2.14.2: current Node 14.13.1, Node 0.12: 0.12.18, Node 0.10: 0.10.48, iojs: 3.3.1**
+
+### 2.14.2 Oct 13 2020
+
+  - Bugfix: fix gcc 8 function cast warning (#899) 35f0fab205574b2cbda04e6347c8b2db755e124f
 
 ### 2.14.1 Apr 21 2020
 
diff --git a/README.md b/README.md
index a1b3288b..f671ef14 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@ Native Abstractions for Node.js
 
 **A header file filled with macro and utility goodness for making add-on development for Node.js easier across versions 0.8, 0.10, 0.12, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13 and 14.**
 
-***Current version: 2.14.1***
+***Current version: 2.14.2***
 
 *(See [CHANGELOG.md](https://github.com/nodejs/nan/blob/master/CHANGELOG.md) for complete ChangeLog)*
 
diff --git a/nan.h b/nan.h
index 6135f735..59cd9b66 100644
--- a/nan.h
+++ b/nan.h
@@ -13,7 +13,7 @@
  *
  * MIT License <https://github.com/nodejs/nan/blob/master/LICENSE.md>
  *
- * Version 2.14.1: current Node 14.0.0, Node 0.12: 0.12.18, Node 0.10: 0.10.48, iojs: 3.3.1
+ * Version 2.14.2: current Node 14.13.1, Node 0.12: 0.12.18, Node 0.10: 0.10.48, iojs: 3.3.1
  *
  * See https://github.com/nodejs/nan for the latest update to this file
  **********************************************************************************/

From 7c3fc6884666bd19b597ea58a99f51f2f4860c4e Mon Sep 17 00:00:00 2001
From: Benjamin Byholm <bbyholm@abo.fi>
Date: Tue, 13 Oct 2020 15:41:22 +0300
Subject: [PATCH 04/21] 2.14.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c7182c0b..224eaab8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nan",
-  "version": "2.14.1",
+  "version": "2.14.2",
   "description": "Native Abstractions for Node.js: C++ header for Node 0.8 -> 14 compatibility",
   "main": "include_dirs.js",
   "repository": {

From e54794191bc81b77e3816ad6f6f433e74f40c15b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gerhard=20St=C3=B6bich?= <deb2001-github@yahoo.de>
Date: Thu, 10 Jun 2021 15:15:24 +0200
Subject: [PATCH 05/21] tests: adapt for v8 8.9 (#910)

V8 API for ScriptOrigin constructor has changed. Adapt test to compile
with v8 8.9.

Currently only `ScriptOrigin` instances are consumed by NAN therefore
no adaptions in the NAN API are needed to keep build/tests working.
---
 test/cpp/nannew.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/cpp/nannew.cpp b/test/cpp/nannew.cpp
index a489f940..64c85799 100644
--- a/test/cpp/nannew.cpp
+++ b/test/cpp/nannew.cpp
@@ -246,7 +246,12 @@ NAN_METHOD(testScript) {
 
   t.plan(6);
 
+#if defined(V8_MAJOR_VERSION) && (V8_MAJOR_VERSION > 8 ||                      \
+  (V8_MAJOR_VERSION == 8 && defined(V8_MINOR_VERSION) && V8_MINOR_VERSION >= 9))
+  ScriptOrigin origin(New("foo").ToLocalChecked(), 5);
+#else
   ScriptOrigin origin(New("foo").ToLocalChecked(), New(5));
+#endif
 
   t.ok(_( assertType<Script>(New<Script>(
       New("2 + 3").ToLocalChecked()).ToLocalChecked())));

From 65b32af46e9d7fab2e4ff657751205b3865f4920 Mon Sep 17 00:00:00 2001
From: Calvin <clavin@users.noreply.github.com>
Date: Thu, 10 Jun 2021 13:18:28 -0600
Subject: [PATCH 06/21] tests: use utf-16 string to fix alignment (#915)

---
 test/cpp/strings.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/cpp/strings.cpp b/test/cpp/strings.cpp
index 95edeac9..9806886c 100644
--- a/test/cpp/strings.cpp
+++ b/test/cpp/strings.cpp
@@ -26,7 +26,7 @@ NAN_METHOD(EncodeHex) {
 }
 
 NAN_METHOD(EncodeUCS2) {
-  info.GetReturnValue().Set(Encode("h\0e\0l\0l\0o\0", 10, UCS2));
+  info.GetReturnValue().Set(Encode(u"hello", 10, UCS2));
 }
 
 Persistent<v8::FunctionTemplate> returnUtf8String_persistent;

From b5edd5c3c2604c9d5e81a671f946d857e3ad134a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=82=B9=E3=83=8E=E3=83=AB?= <s@sunoru.com>
Date: Sat, 3 Jul 2021 09:14:26 -0400
Subject: [PATCH 07/21] Fix the example. (#916)

---
 examples/async_pi_estimate/addon.cc | 1 -
 examples/async_pi_estimate/sync.cc  | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/examples/async_pi_estimate/addon.cc b/examples/async_pi_estimate/addon.cc
index f36f7ffd..2772b1b5 100644
--- a/examples/async_pi_estimate/addon.cc
+++ b/examples/async_pi_estimate/addon.cc
@@ -11,7 +11,6 @@
 #include "async.h"  // NOLINT(build/include)
 
 using v8::FunctionTemplate;
-using v8::Handle;
 using v8::Object;
 using v8::String;
 using Nan::GetFunction;
diff --git a/examples/async_pi_estimate/sync.cc b/examples/async_pi_estimate/sync.cc
index f27895d0..1ecef9bb 100644
--- a/examples/async_pi_estimate/sync.cc
+++ b/examples/async_pi_estimate/sync.cc
@@ -13,7 +13,7 @@
 // Simple synchronous access to the `Estimate()` function
 NAN_METHOD(CalculateSync) {
   // expect a number as the first argument
-  int points = info[0]->Uint32Value();
+  int points = Nan::To<int>(info[0]).FromJust();
   double est = Estimate(points);
 
   info.GetReturnValue().Set(est);

From 24a211e90c908edc266265b24df7918f5a3c72ba Mon Sep 17 00:00:00 2001
From: Benjamin Byholm <bbyholm@abo.fi>
Date: Sat, 10 Jul 2021 20:00:21 +0300
Subject: [PATCH 08/21] doc/json: fix typo at source

---
 doc/json.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/json.md b/doc/json.md
index d1425978..55beb262 100644
--- a/doc/json.md
+++ b/doc/json.md
@@ -1,6 +1,6 @@
 ## JSON
 
-The _JSON_ object provides the c++ versions of the methods offered by the `JSON` object in javascript. V8 exposes these methods via the `v8::JSON` object.
+The _JSON_ object provides the C++ versions of the methods offered by the `JSON` object in javascript. V8 exposes these methods via the `v8::JSON` object.
 
  - <a href="#api_nan_json_parse"><b><code>Nan::JSON.Parse</code></b></a>
  - <a href="#api_nan_json_stringify"><b><code>Nan::JSON.Stringify</code></b></a>

From d09debf9eeedcb7ca4073e84ffe5fbb455ecb709 Mon Sep 17 00:00:00 2001
From: Benjamin Byholm <bbyholm@abo.fi>
Date: Sat, 10 Jul 2021 20:04:27 +0300
Subject: [PATCH 09/21] add ScriptOrigin

---
 Makefile            |  4 ++-
 README.md           |  3 +-
 doc/script.md       | 24 ++++++++++++--
 nan.h               |  6 ++++
 nan_scriptorigin.h  | 76 +++++++++++++++++++++++++++++++++++++++++++++
 test/cpp/nannew.cpp |  7 +----
 6 files changed, 110 insertions(+), 10 deletions(-)
 create mode 100644 nan_scriptorigin.h

diff --git a/Makefile b/Makefile
index ce1cfdad..4042443f 100644
--- a/Makefile
+++ b/Makefile
@@ -32,6 +32,7 @@ LINT_SOURCES = \
 	nan_persistent_12_inl.h \
 	nan_persistent_pre_12_inl.h \
 	nan_private.h \
+	nan_scriptorigin.h \
 	nan_string_bytes.h \
 	nan_weak.h \
 	test/cpp/accessors.cpp \
@@ -111,5 +112,6 @@ $(ADDONS): nan.h nan_new.h nan_implementation_pre_12_inl.h nan_implementation_12
 		nan_define_own_property_helper.h \
 		nan_json.h nan_maybe_43_inl.h nan_maybe_pre_43_inl.h \
 		nan_persistent_12_inl.h nan_persistent_pre_12_inl.h nan_private.h \
-		nan_weak.h nan_string_bytes.h test/binding.gyp $(SOURCES)
+		nan_weak.h nan_scriptorigin.h nan_string_bytes.h \
+		test/binding.gyp $(SOURCES)
 	cd test/ && ../node_modules/.bin/node-gyp rebuild
diff --git a/README.md b/README.md
index f671ef14..b69ad11f 100644
--- a/README.md
+++ b/README.md
@@ -205,10 +205,11 @@ The `Nan::MaybeLocal` and `Nan::Maybe` types are monads that encapsulate `v8::Lo
 
 ### Script
 
-NAN provides a `v8::Script` helpers as the API has changed over the supported versions of V8.
+NAN provides `v8::Script` helpers as the API has changed over the supported versions of V8.
 
  - <a href="doc/script.md#api_nan_compile_script"><b><code>Nan::CompileScript()</code></b></a>
  - <a href="doc/script.md#api_nan_run_script"><b><code>Nan::RunScript()</code></b></a>
+ - <a href="doc/script.md#api_nan_script_origin"><b><code>Nan::ScriptOrigin</code></b></a>
 
 
 ### JSON
diff --git a/doc/script.md b/doc/script.md
index 213320ad..301c1b3d 100644
--- a/doc/script.md
+++ b/doc/script.md
@@ -1,9 +1,10 @@
 ## Script
 
-NAN provides a `v8::Script` helpers as the API has changed over the supported versions of V8.
+NAN provides `v8::Script` helpers as the API has changed over the supported versions of V8.
 
  - <a href="#api_nan_compile_script"><b><code>Nan::CompileScript()</code></b></a>
  - <a href="#api_nan_run_script"><b><code>Nan::RunScript()</code></b></a>
+ - <a href="#api_nan_script_origin"><b><code>Nan::ScriptOrigin</code></b></a>
 
 
 <a name="api_nan_compile_script"></a>
@@ -34,5 +35,24 @@ Signature:
 
 ```c++
 Nan::MaybeLocal<v8::Value> Nan::RunScript(v8::Local<Nan::UnboundScript> script)
-Nan::MaybeLocal<v8::Value> Nan::RunScript(v8::Local<Nan::BoundScript> script) 
+Nan::MaybeLocal<v8::Value> Nan::RunScript(v8::Local<Nan::BoundScript> script)
+```
+
+<a name="api_nan_script_origin"></a>
+### Nan::ScriptOrigin
+
+A class transparently extending [`v8::ScriptOrigin`](https://v8docs.nodesource.com/node-16.0/db/d84/classv8_1_1_script_origin.html#pub-methods)
+to provide backwards compatibility. Only the listed methods are guaranteed to
+be available on all versions of Node.
+
+Declaration:
+
+```c++
+class Nan::ScriptOrigin : public v8::ScriptOrigin {
+ public:
+  ScriptOrigin(v8::Local<v8::Value> name, v8::Local<v8::Integer> line = v8::Local<v8::Integer>(), v8::Local<v8::Integer> column = v8::Local<v8::Integer>())
+  v8::Local<v8::Value> ResourceName() const;
+  v8::Local<v8::Integer> ResourceLineOffset() const;
+  v8::Local<v8::Integer> ResourceColumnOffset() const;
+}
 ```
diff --git a/nan.h b/nan.h
index 59cd9b66..fe1b244f 100644
--- a/nan.h
+++ b/nan.h
@@ -41,6 +41,8 @@
 #define NODE_12_0_MODULE_VERSION 72
 #define NODE_13_0_MODULE_VERSION 79
 #define NODE_14_0_MODULE_VERSION 83
+#define NODE_15_0_MODULE_VERSION 88
+#define NODE_16_0_MODULE_VERSION 93
 
 #ifdef _MSC_VER
 # define NAN_HAS_CPLUSPLUS_11 (_MSC_VER >= 1800)
@@ -2893,6 +2895,10 @@ MakeMaybe(MaybeMaybe<T> v) {
 
 #include "nan_json.h"  // NOLINT(build/include)
 
+//=== ScriptOrigin =============================================================
+
+#include "nan_scriptorigin.h"  // NOLINT(build/include)
+
 }  // end of namespace Nan
 
 #endif  // NAN_H_
diff --git a/nan_scriptorigin.h b/nan_scriptorigin.h
new file mode 100644
index 00000000..ce79cdf8
--- /dev/null
+++ b/nan_scriptorigin.h
@@ -0,0 +1,76 @@
+/*********************************************************************
+ * NAN - Native Abstractions for Node.js
+ *
+ * Copyright (c) 2021 NAN contributors
+ *
+ * MIT License <https://github.com/nodejs/nan/blob/master/LICENSE.md>
+ ********************************************************************/
+
+#ifndef NAN_SCRIPTORIGIN_H_
+#define NAN_SCRIPTORIGIN_H_
+
+class ScriptOrigin : public v8::ScriptOrigin {
+ public:
+#if defined(V8_MAJOR_VERSION) && (V8_MAJOR_VERSION > 9 ||                      \
+  (V8_MAJOR_VERSION == 9 && (defined(V8_MINOR_VERSION) && (V8_MINOR_VERSION > 0\
+      || (V8_MINOR_VERSION == 0 && defined(V8_BUILD_NUMBER)                    \
+          && V8_BUILD_NUMBER >= 1)))))
+  explicit ScriptOrigin(v8::Local<v8::Value> name) :
+      v8::ScriptOrigin(v8::Isolate::GetCurrent(), name) {}
+
+  ScriptOrigin(v8::Local<v8::Value> name
+             , v8::Local<v8::Integer> line) :
+      v8::ScriptOrigin(v8::Isolate::GetCurrent()
+                   , name
+                   , To<int32_t>(line).FromMaybe(0)) {}
+
+  ScriptOrigin(v8::Local<v8::Value> name
+             , v8::Local<v8::Integer> line
+             , v8::Local<v8::Integer> column) :
+      v8::ScriptOrigin(v8::Isolate::GetCurrent()
+                   , name
+                   , To<int32_t>(line).FromMaybe(0)
+                   , To<int32_t>(column).FromMaybe(0)) {}
+#elif defined(V8_MAJOR_VERSION) && (V8_MAJOR_VERSION > 8 ||                    \
+  (V8_MAJOR_VERSION == 8 && (defined(V8_MINOR_VERSION) && (V8_MINOR_VERSION > 9\
+      || (V8_MINOR_VERSION == 9 && defined(V8_BUILD_NUMBER)                    \
+          && V8_BUILD_NUMBER >= 45)))))
+  explicit ScriptOrigin(v8::Local<v8::Value> name) : v8::ScriptOrigin(name) {}
+
+  ScriptOrigin(v8::Local<v8::Value> name
+             , v8::Local<v8::Integer> line) :
+      v8::ScriptOrigin(name, To<int32_t>(line).FromMaybe(0)) {}
+
+  ScriptOrigin(v8::Local<v8::Value> name
+             , v8::Local<v8::Integer> line
+             , v8::Local<v8::Integer> column) :
+      v8::ScriptOrigin(name
+                   , To<int32_t>(line).FromMaybe(0)
+                   , To<int32_t>(column).FromMaybe(0)) {}
+#else
+  explicit ScriptOrigin(v8::Local<v8::Value> name) : v8::ScriptOrigin(name) {}
+
+  ScriptOrigin(v8::Local<v8::Value> name
+             , v8::Local<v8::Integer> line) : v8::ScriptOrigin(name, line) {}
+
+  ScriptOrigin(v8::Local<v8::Value> name
+             , v8::Local<v8::Integer> line
+             , v8::Local<v8::Integer> column) :
+      v8::ScriptOrigin(name, line, column) {}
+#endif
+
+#if defined(V8_MAJOR_VERSION) && (V8_MAJOR_VERSION > 8 ||                      \
+  (V8_MAJOR_VERSION == 8 && (defined(V8_MINOR_VERSION) && (V8_MINOR_VERSION > 9\
+      || (V8_MINOR_VERSION == 9 && defined(V8_BUILD_NUMBER)                    \
+          && V8_BUILD_NUMBER >= 45)))))
+    v8::Local<v8::Integer> ResourceLineOffset() const {
+      return New(LineOffset());
+    }
+
+    v8::Local<v8::Integer> ResourceColumnOffset() const {
+      return New(ColumnOffset());
+    }
+#endif
+};
+
+#endif  // NAN_SCRIPTORIGIN_H_
diff --git a/test/cpp/nannew.cpp b/test/cpp/nannew.cpp
index 64c85799..e36ce4f8 100644
--- a/test/cpp/nannew.cpp
+++ b/test/cpp/nannew.cpp
@@ -246,12 +246,7 @@ NAN_METHOD(testScript) {
 
   t.plan(6);
 
-#if defined(V8_MAJOR_VERSION) && (V8_MAJOR_VERSION > 8 ||                      \
-  (V8_MAJOR_VERSION == 8 && defined(V8_MINOR_VERSION) && V8_MINOR_VERSION >= 9))
-  ScriptOrigin origin(New("foo").ToLocalChecked(), 5);
-#else
-  ScriptOrigin origin(New("foo").ToLocalChecked(), New(5));
-#endif
+  Nan::ScriptOrigin origin(New("foo").ToLocalChecked(), New(5));
 
   t.ok(_( assertType<Script>(New<Script>(
       New("2 + 3").ToLocalChecked()).ToLocalChecked())));

From 943bbed55d5f82647dbde26f372e04712de8b927 Mon Sep 17 00:00:00 2001
From: Benjamin Byholm <bbyholm@abo.fi>
Date: Sat, 10 Jul 2021 20:40:00 +0300
Subject: [PATCH 10/21] test on 15 and 16

---
 .travis.yml  | 2 ++
 README.md    | 2 +-
 appveyor.yml | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index fb406331..20d5f0c6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,6 +24,8 @@ env:
   - TRAVIS_NODE_VERSION="12"
   - TRAVIS_NODE_VERSION="13"
   - TRAVIS_NODE_VERSION="14"
+  - TRAVIS_NODE_VERSION="15"
+  - TRAVIS_NODE_VERSION="16"
   - 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/README.md b/README.md
index b69ad11f..17c9893c 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ Native Abstractions for Node.js
 
 [![NPM](https://nodei.co/npm/nan.png?downloads=true&downloadRank=true)](https://nodei.co/npm/nan/) [![NPM](https://nodei.co/npm-dl/nan.png?months=6&height=3)](https://nodei.co/npm/nan/)
 
-[![Build Status](https://api.travis-ci.org/nodejs/nan.svg?branch=master)](https://travis-ci.org/nodejs/nan)
+[![Build Status](https://api.travis-ci.com/nodejs/nan.svg?branch=master)](https://travis-ci.com/nodejs/nan)
 [![Build status](https://ci.appveyor.com/api/projects/status/kh73pbm9dsju7fgh)](https://ci.appveyor.com/project/RodVagg/nan)
 
 Thanks to the crazy changes in V8 (and some in Node core), keeping native addons compiling happily across versions, particularly 0.10 to 0.12 to 4.0, is a minor nightmare. The goal of this project is to store all logic necessary to develop native Node.js addons without having to inspect `NODE_MODULE_VERSION` and get yourself into a macro-tangle.
diff --git a/appveyor.yml b/appveyor.yml
index 1f2b26ed..f23d553a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -18,6 +18,8 @@ environment:
     - nodejs_version: "12"
     - nodejs_version: "13"
     - nodejs_version: "14"
+    - nodejs_version: "15"
+    - nodejs_version: "16"
 
 # Install scripts. (runs after repo cloning)
 install:

From c0c0e018975c8acda45528d04ffdf80affcdde19 Mon Sep 17 00:00:00 2001
From: Benjamin Byholm <bbyholm@abo.fi>
Date: Tue, 3 Aug 2021 01:49:03 +0300
Subject: [PATCH 11/21] drop testing of 0.8 on AppVeyor

---
 appveyor.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index f23d553a..bb66fb31 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -4,7 +4,6 @@
 environment:
   matrix:
   # node.js
-    - nodejs_version: "0.8"
     - nodejs_version: "0.10"
     - nodejs_version: "0.12"
     - nodejs_version: "4"
@@ -25,7 +24,6 @@ environment:
 install:
   # Get the latest stable version of Node 0.STABLE.latest
   - ps: Update-NodeJsInstallation (Get-NodeJsLatestBuild $env:nodejs_version)
-  - IF %nodejs_version% EQU 0.8 npm config set strict-ssl false
   - IF %nodejs_version% LSS 4 npm -g install npm@2
   - IF %nodejs_version% EQU 5 npm -g install npm@3
   - set PATH=%APPDATA%\npm;%PATH%

From 1b9c609add6f9497cdf509d3e2f8a91df93d21c3 Mon Sep 17 00:00:00 2001
From: Benjamin Byholm <bbyholm@abo.fi>
Date: Wed, 4 Aug 2021 19:08:10 +0300
Subject: [PATCH 12/21] Prepare for 2.15.0

---
 CHANGELOG.md | 6 +++++-
 README.md    | 4 ++--
 nan.h        | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 93d94964..2838f1a0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # NAN ChangeLog
 
-**Version 2.14.2: current Node 14.13.1, Node 0.12: 0.12.18, Node 0.10: 0.10.48, iojs: 3.3.1**
+**Version 2.15.0: current Node 16.6.1, Node 0.12: 0.12.18, Node 0.10: 0.10.48, iojs: 3.3.1**
+
+### 2.15.0 Aug 4 2021
+
+  - Feature: add ScriptOrigin (#918) d09debf9eeedcb7ca4073e84ffe5fbb455ecb709
 
 ### 2.14.2 Oct 13 2020
 
diff --git a/README.md b/README.md
index 17c9893c..8988a09d 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
 Native Abstractions for Node.js
 ===============================
 
-**A header file filled with macro and utility goodness for making add-on development for Node.js easier across versions 0.8, 0.10, 0.12, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13 and 14.**
+**A header file filled with macro and utility goodness for making add-on development for Node.js easier across versions 0.8, 0.10, 0.12, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 and 16.**
 
-***Current version: 2.14.2***
+***Current version: 2.15.0***
 
 *(See [CHANGELOG.md](https://github.com/nodejs/nan/blob/master/CHANGELOG.md) for complete ChangeLog)*
 
diff --git a/nan.h b/nan.h
index fe1b244f..6c8356c8 100644
--- a/nan.h
+++ b/nan.h
@@ -13,7 +13,7 @@
  *
  * MIT License <https://github.com/nodejs/nan/blob/master/LICENSE.md>
  *
- * Version 2.14.2: current Node 14.13.1, Node 0.12: 0.12.18, Node 0.10: 0.10.48, iojs: 3.3.1
+ * Version 2.15.0: current Node 16.6.1, Node 0.12: 0.12.18, Node 0.10: 0.10.48, iojs: 3.3.1
  *
  * See https://github.com/nodejs/nan for the latest update to this file
  **********************************************************************************/

From 8502c2417b9c1d0ea86c1e0aea6e975d26bf682b Mon Sep 17 00:00:00 2001
From: Benjamin Byholm <bbyholm@abo.fi>
Date: Wed, 4 Aug 2021 19:09:10 +0300
Subject: [PATCH 13/21] 2.15.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 224eaab8..3cb78a11 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nan",
-  "version": "2.14.2",
+  "version": "2.15.0",
   "description": "Native Abstractions for Node.js: C++ header for Node 0.8 -> 14 compatibility",
   "main": "include_dirs.js",
   "repository": {

From f9e63d6924bc562ddea81ba941460da71efcfd24 Mon Sep 17 00:00:00 2001
From: Eddie Monge Jr <eddiemonge@users.noreply.github.com>
Date: Thu, 16 Dec 2021 12:31:22 -0800
Subject: [PATCH 14/21] docs: license format and contributors

The license file differed enough that licensed did not recognize it.

The link to the contributors was also outdated.
---
 LICENSE.md | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/LICENSE.md b/LICENSE.md
index dddd13d5..2d33043d 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,10 +1,6 @@
 The MIT License (MIT)
-=====================
 
-Copyright (c) 2018 NAN contributors
------------------------------------
-
-*NAN contributors listed at <https://github.com/nodejs/nan#contributors>*
+Copyright (c) 2018 [NAN contributors](<https://github.com/nodejs/nan#wg-members--collaborators>)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

From 96ed51a8607462f9601d26a3906a69f304955779 Mon Sep 17 00:00:00 2001
From: Michael Ira Krufky <mkrufky@gmail.com>
Date: Sun, 2 Jan 2022 10:17:25 -0500
Subject: [PATCH 15/21] add node 17 to the test matrix

relates-to: https://github.com/nodejs/nan/issues/924
---
 .travis.yml  | 1 +
 appveyor.yml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 20d5f0c6..ad3d02cd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,6 +26,7 @@ env:
   - TRAVIS_NODE_VERSION="14"
   - TRAVIS_NODE_VERSION="15"
   - TRAVIS_NODE_VERSION="16"
+  - TRAVIS_NODE_VERSION="17"
   - 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
index bb66fb31..e7c88eb3 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -19,6 +19,7 @@ environment:
     - nodejs_version: "14"
     - nodejs_version: "15"
     - nodejs_version: "16"
+    - nodejs_version: "17"
 
 # Install scripts. (runs after repo cloning)
 install:

From 8db8c8f544f2b6ce1b0859ef6ecdd0a3873a9e62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gerhard=20St=C3=B6bich?=
 <18708370+Flarna@users.noreply.github.com>
Date: Mon, 3 Jan 2022 09:37:06 +0100
Subject: [PATCH 16/21] add define NODE_17_0_MODULE_VERSION

---
 nan.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nan.h b/nan.h
index 6c8356c8..ae39e8a2 100644
--- a/nan.h
+++ b/nan.h
@@ -43,6 +43,7 @@
 #define NODE_14_0_MODULE_VERSION 83
 #define NODE_15_0_MODULE_VERSION 88
 #define NODE_16_0_MODULE_VERSION 93
+#define NODE_17_0_MODULE_VERSION 102
 
 #ifdef _MSC_VER
 # define NAN_HAS_CPLUSPLUS_11 (_MSC_VER >= 1800)

From a866bb44bcce1d5e2d62bc38732e978be8ceffe7 Mon Sep 17 00:00:00 2001
From: Christian Clauss <cclauss@me.com>
Date: Fri, 22 Apr 2022 22:05:53 +0200
Subject: [PATCH 17/21] Upgrade node-gyp

Failure to upgrade is causing a ton of pain at is:issue label:"ERR! node-gyp -v <= v5.1.0"
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3cb78a11..bbea318a 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
     "commander": "^2.8.1",
     "glob": "^5.0.14",
     "request": "=2.81.0",
-    "node-gyp": "~3.6.2",
+    "node-gyp": "~8.4.1",
     "readable-stream": "^2.1.4",
     "tap": "~0.7.1",
     "xtend": "~4.0.0"

From 3aaaf1bb45c38944c175812ea3e146771ac9b1ea Mon Sep 17 00:00:00 2001
From: Michael Ira Krufky <mkrufky@gmail.com>
Date: Thu, 21 Apr 2022 20:54:05 -0400
Subject: [PATCH 18/21] fix appveyor build tests when x86 binary is not
 available

As per Feodor Fitsner (Appveyor Support staff):

> There is no x86 build of Node 18.x anymore, so you should [...] change it to:
>
> Update-NodeJsInstallation (Get-NodeJsLatestBuild $env:nodejs_version) x64

See Appveyor ticket: https://help.appveyor.com/discussions/problems/31957-please-install-nodejs-v18-new-builds-are-failing-looks-like-node-18-is-missing

This fixes the following error:
```
Running Install scripts
Update-NodeJsInstallation (Get-NodeJsLatestBuild $env:nodejs_version)
Updating Node.js v18.0.0 (x86)
Uninstalling Node.js v8.17.0 (x86)...
Installing Node.js v18.0.0 (x86)...
Exception calling "DownloadFile" with "2" argument(s): "The remote server returned an error: (404) Not Found."
At C:\Program Files\AppVeyor\BuildAgent\Modules\nodejs-utils\nodejs-utils.psm1:58 char:5
+     (New-Object Net.WebClient).DownloadFile($packageUrl, $packageFile ...
+     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    + CategoryInfo          : NotSpecified: (:) [], MethodInvocationException
    + FullyQualifiedErrorId : WebException

IF %nodejs_version% LSS 4 npm -g install npm@2
IF %nodejs_version% EQU 5 npm -g install npm@3
set PATH=%APPDATA%\npm;%PATH%
npm install
'npm' is not recognized as an internal or external command,
operable program or batch file.
Command exited with code 1
```
---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index e7c88eb3..09e735aa 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -24,7 +24,7 @@ environment:
 # Install scripts. (runs after repo cloning)
 install:
   # Get the latest stable version of Node 0.STABLE.latest
-  - ps: Update-NodeJsInstallation (Get-NodeJsLatestBuild $env:nodejs_version)
+  - ps: Update-NodeJsInstallation (Get-NodeJsLatestBuild $env:nodejs_version) x64
   - IF %nodejs_version% LSS 4 npm -g install npm@2
   - IF %nodejs_version% EQU 5 npm -g install npm@3
   - set PATH=%APPDATA%\npm;%PATH%

From 16fa32231e2ccd89d2804b3f765319128b20c4ac Mon Sep 17 00:00:00 2001
From: Momtchil Momtchev <momtchil@momtchev.com>
Date: Sat, 23 Apr 2022 04:41:11 +0200
Subject: [PATCH 19/21] Add support for Node 18

Add compatibility with Node 18.0.0
---
 .travis.yml       |  1 +
 appveyor.yml      |  1 +
 nan.h             |  6 +++++-
 test/cpp/news.cpp | 12 ++++++++++--
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ad3d02cd..a5f21f67 100644
--- 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
index 09e735aa..9d37ae0c 100644
--- 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
index ae39e8a2..df5496c1 100644
--- 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
index 5b54c0ce..a218167c 100644
--- 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(

From 862939f55504e980eb898a67ccd74f945043bc53 Mon Sep 17 00:00:00 2001
From: Benjamin Byholm <bbyholm@abo.fi>
Date: Wed, 25 May 2022 16:02:09 +0300
Subject: [PATCH 20/21] Prepare for 2.16.0

---
 CHANGELOG.md | 6 +++++-
 README.md    | 4 ++--
 nan.h        | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2838f1a0..d82f56fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # NAN ChangeLog
 
-**Version 2.15.0: current Node 16.6.1, Node 0.12: 0.12.18, Node 0.10: 0.10.48, iojs: 3.3.1**
+**Version 2.16.0: current Node 18.2.0, Node 0.12: 0.12.18, Node 0.10: 0.10.48, iojs: 3.3.1**
+
+### 2.16.0 May 25 2022
+
+  - Feature: Add support for Node 18 (#937) 16fa32231e2ccd89d2804b3f765319128b20c4ac
 
 ### 2.15.0 Aug 4 2021
 
diff --git a/README.md b/README.md
index 8988a09d..0913333f 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
 Native Abstractions for Node.js
 ===============================
 
-**A header file filled with macro and utility goodness for making add-on development for Node.js easier across versions 0.8, 0.10, 0.12, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 and 16.**
+**A header file filled with macro and utility goodness for making add-on development for Node.js easier across versions 0.8, 0.10, 0.12, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17 and 18.**
 
-***Current version: 2.15.0***
+***Current version: 2.16.0***
 
 *(See [CHANGELOG.md](https://github.com/nodejs/nan/blob/master/CHANGELOG.md) for complete ChangeLog)*
 
diff --git a/nan.h b/nan.h
index df5496c1..9e7c59e4 100644
--- a/nan.h
+++ b/nan.h
@@ -13,7 +13,7 @@
  *
  * MIT License <https://github.com/nodejs/nan/blob/master/LICENSE.md>
  *
- * Version 2.15.0: current Node 16.6.1, Node 0.12: 0.12.18, Node 0.10: 0.10.48, iojs: 3.3.1
+ * Version 2.16.0: current Node 18.2.0, Node 0.12: 0.12.18, Node 0.10: 0.10.48, iojs: 3.3.1
  *
  * See https://github.com/nodejs/nan for the latest update to this file
  **********************************************************************************/

From 22c8ac4b6de36a66a1cfef9363d4d7c12db87cd6 Mon Sep 17 00:00:00 2001
From: Benjamin Byholm <bbyholm@abo.fi>
Date: Wed, 25 May 2022 16:02:42 +0300
Subject: [PATCH 21/21] 2.16.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index bbea318a..d7ca99bc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nan",
-  "version": "2.15.0",
+  "version": "2.16.0",
   "description": "Native Abstractions for Node.js: C++ header for Node 0.8 -> 14 compatibility",
   "main": "include_dirs.js",
   "repository": {