From 1d358124f08d9a14e38b106296fd1305afa724d6 Mon Sep 17 00:00:00 2001 From: alba-ado <91315153+alba-ado@users.noreply.github.com> Date: Tue, 15 Mar 2022 12:40:29 +0300 Subject: [PATCH 1/4] Make the module "Context Aware" Make the module "Context Aware" for newer versions of Electron and NodeJS --- src/addon.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/addon.cpp b/src/addon.cpp index d158b25f..688e99f9 100644 --- a/src/addon.cpp +++ b/src/addon.cpp @@ -6,4 +6,8 @@ void init_all(v8::Local target) { CardReader::init(target); } +#if NODE_MAJOR_VERSION >= 10 +NAN_MODULE_WORKER_ENABLED(pcsclite, init_all) +#else NODE_MODULE(pcsclite, init_all) +#endif From d726215753b6359ec840d2d5479ee8499563b1f3 Mon Sep 17 00:00:00 2001 From: Daniel Duan <1474548+danielduan@users.noreply.github.com> Date: Fri, 22 Sep 2023 07:24:16 +0000 Subject: [PATCH 2/4] Deprecate support for node < v10 --- src/addon.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/addon.cpp b/src/addon.cpp index 688e99f9..0043b90a 100644 --- a/src/addon.cpp +++ b/src/addon.cpp @@ -6,8 +6,4 @@ void init_all(v8::Local target) { CardReader::init(target); } -#if NODE_MAJOR_VERSION >= 10 NAN_MODULE_WORKER_ENABLED(pcsclite, init_all) -#else -NODE_MODULE(pcsclite, init_all) -#endif From cba2e8a0ecfbfdbd9515e7942fe44f0fbdab7cbd Mon Sep 17 00:00:00 2001 From: Daniel Duan <1474548+danielduan@users.noreply.github.com> Date: Fri, 22 Sep 2023 07:53:28 +0000 Subject: [PATCH 3/4] initialize both modules --- src/addon.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/addon.cpp b/src/addon.cpp index 0043b90a..c1bd54ad 100644 --- a/src/addon.cpp +++ b/src/addon.cpp @@ -6,4 +6,5 @@ void init_all(v8::Local target) { CardReader::init(target); } +NODE_MODULE(pcsclite, init_all) NAN_MODULE_WORKER_ENABLED(pcsclite, init_all) From e34dc37ab981c355103c700a73835da5754ad338 Mon Sep 17 00:00:00 2001 From: Daniel Duan <1474548+danielduan@users.noreply.github.com> Date: Fri, 22 Sep 2023 07:53:50 +0000 Subject: [PATCH 4/4] Update addon.cpp --- src/addon.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/addon.cpp b/src/addon.cpp index c1bd54ad..8b650ca6 100644 --- a/src/addon.cpp +++ b/src/addon.cpp @@ -6,5 +6,5 @@ void init_all(v8::Local target) { CardReader::init(target); } -NODE_MODULE(pcsclite, init_all) -NAN_MODULE_WORKER_ENABLED(pcsclite, init_all) +NODE_MODULE(pcsclite, init_all); +NAN_MODULE_WORKER_ENABLED(pcsclite, init_all);