From 366663355e10f667c43eb0ac368723c8c27b43e6 Mon Sep 17 00:00:00 2001 From: Ariel Gentile Date: Sun, 13 Aug 2023 09:35:23 -0300 Subject: [PATCH] fix(js): use patched ffi-napi and ref-napi for nodejs Signed-off-by: Ariel Gentile --- .../javascript/anoncreds-nodejs/package.json | 4 +- wrappers/javascript/package.json | 3 -- wrappers/javascript/yarn.lock | 44 +++++++++---------- 3 files changed, 24 insertions(+), 27 deletions(-) diff --git a/wrappers/javascript/anoncreds-nodejs/package.json b/wrappers/javascript/anoncreds-nodejs/package.json index 300daba7..c64c2d32 100644 --- a/wrappers/javascript/anoncreds-nodejs/package.json +++ b/wrappers/javascript/anoncreds-nodejs/package.json @@ -28,10 +28,10 @@ "dependencies": { "@hyperledger/anoncreds-shared": "0.1.0", "@mapbox/node-pre-gyp": "^1.0.10", - "ffi-napi": "4.0.3", + "@2060.io/ffi-napi": "4.0.4", + "@2060.io/ref-napi": "3.0.4", "node-cache": "5.1.2", "ref-array-di": "1.2.2", - "ref-napi": "3.0.3", "ref-struct-di": "1.1.1" }, "devDependencies": { diff --git a/wrappers/javascript/package.json b/wrappers/javascript/package.json index 1797662a..6db8c5a8 100644 --- a/wrappers/javascript/package.json +++ b/wrappers/javascript/package.json @@ -55,9 +55,6 @@ "tsconfig-paths": "4.1.0", "typescript": "4.5.5" }, - "resolutions": { - "ref-napi": "npm:@2060.io/ref-napi" - }, "engines": { "node": ">= 18" } diff --git a/wrappers/javascript/yarn.lock b/wrappers/javascript/yarn.lock index f44ee07c..b522596f 100644 --- a/wrappers/javascript/yarn.lock +++ b/wrappers/javascript/yarn.lock @@ -2,6 +2,28 @@ # yarn lockfile v1 +"@2060.io/ffi-napi@4.0.4": + version "4.0.4" + resolved "https://registry.yarnpkg.com/@2060.io/ffi-napi/-/ffi-napi-4.0.4.tgz#1c504d3d77d529f535687351b33c66a98438a24f" + integrity sha512-iwXzS+/J9o3EhDFjSdn8MIV7Vvf7qX7hO5IuLWQ5XnIjVkLHx54DDC4vSfqweZ1HE6/nznfLg+iFdmmE/2ofgw== + dependencies: + "@2060.io/ref-napi" "3.0.4" + debug "^4.1.1" + get-uv-event-loop-napi-h "^1.0.5" + node-addon-api "^3.0.0" + node-gyp-build "^4.2.1" + ref-struct-di "^1.1.0" + +"@2060.io/ref-napi@3.0.4": + version "3.0.4" + resolved "https://registry.yarnpkg.com/@2060.io/ref-napi/-/ref-napi-3.0.4.tgz#6a78093b36e8f4ffeb750f706433869382e73eb1" + integrity sha512-Aqf699E+DKs2xANx8bSkuzXyG9gcZ2iFkAk1kUTA8KbV5BSPQtIcBJexzohSRi9QWDhP4X54NLm7xwGA0UNCdQ== + dependencies: + debug "^4.1.1" + get-symbol-from-current-process-h "^1.0.2" + node-addon-api "^3.0.0" + node-gyp-build "^4.2.1" + "@aashutoshrathi/word-wrap@^1.2.3": version "1.2.6" resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf" @@ -4930,18 +4952,6 @@ fb-watchman@^2.0.0: dependencies: bser "2.1.1" -ffi-napi@4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/ffi-napi/-/ffi-napi-4.0.3.tgz#27a8d42a8ea938457154895c59761fbf1a10f441" - integrity sha512-PMdLCIvDY9mS32RxZ0XGb95sonPRal8aqRhLbeEtWKZTe2A87qRFG9HjOhvG8EX2UmQw5XNRMIOT+1MYlWmdeg== - dependencies: - debug "^4.1.1" - get-uv-event-loop-napi-h "^1.0.5" - node-addon-api "^3.0.0" - node-gyp-build "^4.2.1" - ref-napi "^2.0.1 || ^3.0.2" - ref-struct-di "^1.1.0" - figures@3.2.0, figures@^3.0.0: version "3.2.0" resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af" @@ -8929,16 +8939,6 @@ ref-array-di@1.2.2: array-index "^1.0.0" debug "^3.1.0" -ref-napi@3.0.3, "ref-napi@^2.0.1 || ^3.0.2", "ref-napi@npm:@2060.io/ref-napi": - version "3.0.4" - resolved "https://registry.yarnpkg.com/@2060.io/ref-napi/-/ref-napi-3.0.4.tgz#6a78093b36e8f4ffeb750f706433869382e73eb1" - integrity sha512-Aqf699E+DKs2xANx8bSkuzXyG9gcZ2iFkAk1kUTA8KbV5BSPQtIcBJexzohSRi9QWDhP4X54NLm7xwGA0UNCdQ== - dependencies: - debug "^4.1.1" - get-symbol-from-current-process-h "^1.0.2" - node-addon-api "^3.0.0" - node-gyp-build "^4.2.1" - ref-struct-di@1.1.1, ref-struct-di@^1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/ref-struct-di/-/ref-struct-di-1.1.1.tgz#5827b1d3b32372058f177547093db1fe1602dc10"