diff --git a/package.json b/package.json index 162481307e6..8108c239d1b 100644 --- a/package.json +++ b/package.json @@ -155,7 +155,7 @@ "underscore": "1.9.0", "uuid": "3.3.2", "websocket": "1.0.28", - "zkgroup": "https://github.com/signalapp/signal-zkgroup-node.git#2d7db946cc88492b65cc66e9aa9de0c9e664fd8d", + "zkgroup": "https://github.com/signalapp/signal-zkgroup-node.git#7ecf70be85e5a485ec870c1723b1c6247b9d549e", "zod": "1.11.13" }, "devDependencies": { diff --git a/ts/util/lint/exceptions.json b/ts/util/lint/exceptions.json index 224cd98c1f2..bb61326ff49 100644 --- a/ts/util/lint/exceptions.json +++ b/ts/util/lint/exceptions.json @@ -3250,38 +3250,6 @@ "reasonCategory": "falseMatch", "updated": "2020-02-21T14:09:28.005Z" }, - { - "rule": "jQuery-load(", - "path": "node_modules/ffi-napi/node_modules/debug/src/browser.js", - "line": "function load() {", - "lineNumber": 160, - "reasonCategory": "falseMatch", - "updated": "2020-02-21T22:10:39.074Z" - }, - { - "rule": "jQuery-load(", - "path": "node_modules/ffi-napi/node_modules/debug/src/browser.js", - "line": "exports.enable(load());", - "lineNumber": 178, - "reasonCategory": "falseMatch", - "updated": "2020-02-21T22:10:39.074Z" - }, - { - "rule": "jQuery-load(", - "path": "node_modules/ffi-napi/node_modules/debug/src/node.js", - "line": "function load() {", - "lineNumber": 162, - "reasonCategory": "falseMatch", - "updated": "2020-02-21T22:10:39.074Z" - }, - { - "rule": "jQuery-load(", - "path": "node_modules/ffi-napi/node_modules/debug/src/node.js", - "line": "exports.enable(load());", - "lineNumber": 186, - "reasonCategory": "falseMatch", - "updated": "2020-02-21T22:10:39.074Z" - }, { "rule": "jQuery-load(", "path": "node_modules/file-entry-cache/cache.js", @@ -14886,38 +14854,6 @@ "reasonCategory": "falseMatch", "updated": "2020-04-30T22:35:27.860Z" }, - { - "rule": "jQuery-load(", - "path": "node_modules/ref-napi/node_modules/debug/src/browser.js", - "line": "function load() {", - "lineNumber": 160, - "reasonCategory": "falseMatch", - "updated": "2020-02-21T22:10:39.074Z" - }, - { - "rule": "jQuery-load(", - "path": "node_modules/ref-napi/node_modules/debug/src/browser.js", - "line": "exports.enable(load());", - "lineNumber": 178, - "reasonCategory": "falseMatch", - "updated": "2020-02-21T22:10:39.074Z" - }, - { - "rule": "jQuery-load(", - "path": "node_modules/ref-napi/node_modules/debug/src/node.js", - "line": "function load() {", - "lineNumber": 162, - "reasonCategory": "falseMatch", - "updated": "2020-02-21T22:10:39.074Z" - }, - { - "rule": "jQuery-load(", - "path": "node_modules/ref-napi/node_modules/debug/src/node.js", - "line": "exports.enable(load());", - "lineNumber": 186, - "reasonCategory": "falseMatch", - "updated": "2020-02-21T22:10:39.074Z" - }, { "rule": "jQuery-load(", "path": "node_modules/ref-struct-di/node_modules/debug/src/browser.js", @@ -15693,38 +15629,6 @@ "reasonCategory": "falseMatch", "updated": "2018-09-19T21:59:32.770Z" }, - { - "rule": "jQuery-load(", - "path": "node_modules/zkgroup/node_modules/debug/src/browser.js", - "line": "function load() {", - "lineNumber": 160, - "reasonCategory": "falseMatch", - "updated": "2020-04-13T23:38:26.065Z" - }, - { - "rule": "jQuery-load(", - "path": "node_modules/zkgroup/node_modules/debug/src/browser.js", - "line": "exports.enable(load());", - "lineNumber": 178, - "reasonCategory": "falseMatch", - "updated": "2020-04-13T23:38:26.065Z" - }, - { - "rule": "jQuery-load(", - "path": "node_modules/zkgroup/node_modules/debug/src/node.js", - "line": "function load() {", - "lineNumber": 162, - "reasonCategory": "falseMatch", - "updated": "2020-04-13T23:38:26.065Z" - }, - { - "rule": "jQuery-load(", - "path": "node_modules/zkgroup/node_modules/debug/src/node.js", - "line": "exports.enable(load());", - "lineNumber": 186, - "reasonCategory": "falseMatch", - "updated": "2020-04-13T23:38:26.065Z" - }, { "rule": "jQuery-$(", "path": "sticker-creator/util/i18n.tsx", @@ -16848,5 +16752,37 @@ "reasonCategory": "usageTrusted", "updated": "2021-01-08T15:46:32.143Z", "reasonDetail": "Doesn't manipulate the DOM. This is just a function." + }, + { + "rule": "jQuery-load(", + "path": "node_modules/ref-array-napi/node_modules/ref-napi/node_modules/debug/src/browser.js", + "line": "function load() {", + "lineNumber": 160, + "reasonCategory": "falseMatch", + "updated": "2021-04-02T18:54:41.261Z" + }, + { + "rule": "jQuery-load(", + "path": "node_modules/ref-array-napi/node_modules/ref-napi/node_modules/debug/src/browser.js", + "line": "exports.enable(load());", + "lineNumber": 178, + "reasonCategory": "falseMatch", + "updated": "2021-04-02T18:54:41.261Z" + }, + { + "rule": "jQuery-load(", + "path": "node_modules/ref-array-napi/node_modules/ref-napi/node_modules/debug/src/node.js", + "line": "function load() {", + "lineNumber": 162, + "reasonCategory": "falseMatch", + "updated": "2021-04-02T18:54:41.261Z" + }, + { + "rule": "jQuery-load(", + "path": "node_modules/ref-array-napi/node_modules/ref-napi/node_modules/debug/src/node.js", + "line": "exports.enable(load());", + "lineNumber": 186, + "reasonCategory": "falseMatch", + "updated": "2021-04-02T18:54:41.261Z" } -] \ No newline at end of file +] diff --git a/yarn.lock b/yarn.lock index 33bf38dcfe6..8c88e6cdcd1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7537,16 +7537,16 @@ fd-slicer@~1.1.0: dependencies: pend "~1.2.0" -ffi-napi@2.4.5: - version "2.4.5" - resolved "https://registry.yarnpkg.com/ffi-napi/-/ffi-napi-2.4.5.tgz#12e807f238f8c68fc094fc46c1ce5193c2ab64f8" - integrity sha512-24Et/c5/sRvZvpOZ9nvkK0Be1S8A1Vkt6aJSKGaohOGb5FwV4+EmecaTtNhN4TCLJDjYC8z/k4X8W1SC5IK/fw== +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: - bindings "^1.3.0" - debug "^3.1.0" + debug "^4.1.1" get-uv-event-loop-napi-h "^1.0.5" - node-addon-api "1.5.0" - ref-napi "^1.4.0" + 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" figgy-pudding@^3.5.1: @@ -8125,7 +8125,7 @@ get-stream@^5.1.0: dependencies: pump "^3.0.0" -get-symbol-from-current-process-h@^1.0.1: +get-symbol-from-current-process-h@^1.0.1, get-symbol-from-current-process-h@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/get-symbol-from-current-process-h/-/get-symbol-from-current-process-h-1.0.2.tgz#510af52eaef873f7028854c3377f47f7bb200265" integrity sha512-syloC6fsCt62ELLrr1VKBM1ggOpMdetX9hTrdW77UQdcApPHLmf7CI7OKcN1c9kYuNxKcDe4iJ4FY9sX3aw2xw== @@ -11513,16 +11513,6 @@ node-abi@^2.7.0: dependencies: semver "^5.4.1" -node-addon-api@1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.5.0.tgz#55be6b3da36e746f4b1f2af16c2adf67647d1ff8" - integrity sha512-YsL/8dpBWxCFj3wAVAa/ceN4TlT8lACK8EgpuN0q/4ecflWHDuKpodb+tt7Rx22r/6FJ2f+IT25XSsXnZGwYgA== - -node-addon-api@^1.6.2: - version "1.7.1" - resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.1.tgz#cf813cd69bb8d9100f6bdca6755fc268f54ac492" - integrity sha512-2+DuKodWvwRTrCfKOeR24KIc5unKjOh8mz17NCzVnHWfjAdDqbfbjqh7gUT+BkXBRQM52+xCHciKWonJ3CbJMQ== - node-addon-api@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-2.0.0.tgz#f9afb8d777a91525244b01775ea0ddbe1125483b" @@ -11570,6 +11560,11 @@ node-forge@0.7.5: resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.5.tgz#6c152c345ce11c52f465c2abd957e8639cd674df" integrity sha512-MmbQJ2MTESTjt3Gi/3yG1wGpIMhUfcIypUCGtTizFR9IiccFwxSpfp0vtIZlkFclEqERemxfnSdZEMR9VqqEFQ== +node-gyp-build@^4.2.1: + version "4.2.3" + resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.2.3.tgz#ce6277f853835f718829efb47db20f3e4d9c4739" + integrity sha512-MN6ZpzmfNCRM+3t57PTJHgHyw/h4OWnZ6mR8P5j/uZtqQr46RRuDE/P+g3n0YR/AiYXeWixZZzaip77gdICfRg== + node-gyp@5.0.3: version "5.0.3" resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-5.0.3.tgz#80d64c23790244991b6d44532f0a351bedd3dd45" @@ -14099,25 +14094,26 @@ redux@^3.6.0: loose-envify "^1.1.0" symbol-observable "^1.0.3" -ref-array-napi@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/ref-array-napi/-/ref-array-napi-1.2.0.tgz#7ec96b0e648cec2164101cf55f62cb217b325f2e" - integrity sha512-EkqS2iyJsrPAGu4Cv5bGAItuDEsE9ZXPoICU0dYB7qqLgksIhmMS4HaBRyJVsrTwb6Da/PNAZgBy6T6gN/HbkQ== +ref-array-napi@1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/ref-array-napi/-/ref-array-napi-1.2.1.tgz#c5e8d08a4b2223d01042ee43e504971cc1f2bf30" + integrity sha512-jQp2WWSucmxkqVfoNfm7yDlDeGu3liAbzqfwjNybL80ooLOCnCZpAK2woDInY+lxNOK/VlIVSqeDEYb4gVPuNQ== dependencies: array-index "1" debug "2" ref-napi "^1.4.2" -ref-napi@1.4.2: - version "1.4.2" - resolved "https://registry.yarnpkg.com/ref-napi/-/ref-napi-1.4.2.tgz#28ee242de131cd4fbbdd7d935086996d3cb9abc8" - integrity sha512-6AkdfqTLmP9oHQ6/aTnuIoPlVble6LHZ2wWqC1Sh/LWhnXHoT2L3CvyF72rJQ9w76XR5v9rIX6UQUwsry1vfBg== +ref-napi@3.0.2, "ref-napi@^2.0.1 || ^3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/ref-napi/-/ref-napi-3.0.2.tgz#fe71c2a09df654baa66649d783c6e5ab182c19cb" + integrity sha512-5YE0XrvWteoTr5DR2sEqxefL06aml7c6qS7hGv3u27do4HlGQphwvB+zD1NYep9utMKScvwOZsSs9EPYdGBVsg== dependencies: - bindings "^1.3.0" - debug "^3.1.0" - node-addon-api "^1.6.2" + debug "^4.1.1" + get-symbol-from-current-process-h "^1.0.2" + node-addon-api "^2.0.0" + node-gyp-build "^4.2.1" -ref-napi@^1.4.0, ref-napi@^1.4.2: +ref-napi@^1.4.2: version "1.4.3" resolved "https://registry.yarnpkg.com/ref-napi/-/ref-napi-1.4.3.tgz#c9495a4670a18655b3d45472284cc1fdac03e314" integrity sha512-yE98eVwjpeGSbHjahn+hNlheGgKdV3gCW1rSj7HZL4ITzBhRb0HlUapWamRcAjZebPr3yuhvxeKFmso8NbRv5g== @@ -17760,13 +17756,13 @@ zip-stream@^1.2.0: lodash "^4.8.0" readable-stream "^2.0.0" -"zkgroup@https://github.com/signalapp/signal-zkgroup-node.git#2d7db946cc88492b65cc66e9aa9de0c9e664fd8d": - version "0.7.1" - resolved "https://github.com/signalapp/signal-zkgroup-node.git#2d7db946cc88492b65cc66e9aa9de0c9e664fd8d" +"zkgroup@https://github.com/signalapp/signal-zkgroup-node.git#7ecf70be85e5a485ec870c1723b1c6247b9d549e": + version "0.7.2" + resolved "https://github.com/signalapp/signal-zkgroup-node.git#7ecf70be85e5a485ec870c1723b1c6247b9d549e" dependencies: - ffi-napi "2.4.5" - ref-array-napi "1.2.0" - ref-napi "1.4.2" + ffi-napi "4.0.3" + ref-array-napi "1.2.1" + ref-napi "3.0.2" zod@1.11.13: version "1.11.13"