Skip to content

Commit 3e2eff9

Browse files
committed
chore(deps): replace argon2 w/@node-rs/argon2
1 parent 48ddad8 commit 3e2eff9

File tree

6 files changed

+185
-448
lines changed

6 files changed

+185
-448
lines changed

ci/build/build-standalone-release.sh

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
set -euo pipefail
33

44
# This is due to an upstream issue with RHEL7/CentOS 7 comptability with node-argon2
5+
# TODO@jsjoeio see if we can remove
56
# See: https://github.com/cdr/code-server/pull/3422#pullrequestreview-677765057
67
export npm_config_build_from_source=true
78

ci/build/npm-postinstall.sh

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ detect_arch() {
1919

2020
ARCH="${NPM_CONFIG_ARCH:-$(detect_arch)}"
2121
# This is due to an upstream issue with RHEL7/CentOS 7 comptability with node-argon2
22+
# TODO@jsjoeio see if we can remove
2223
# See: https://github.com/cdr/code-server/pull/3422#pullrequestreview-677765057
2324
export npm_config_build_from_source=true
2425

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
},
8282
"dependencies": {
8383
"@coder/logger": "1.1.16",
84-
"argon2": "^0.28.0",
84+
"@node-rs/argon2": "^1.0.3",
8585
"compression": "^1.7.4",
8686
"cookie-parser": "^1.4.5",
8787
"env-paths": "^2.2.0",

test/package.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
"license": "MIT",
33
"#": "We must put jest in a sub-directory otherwise VS Code somehow picks up the types and generates conflicts with mocha.",
44
"devDependencies": {
5+
"@node-rs/argon2": "^1.0.3",
56
"@playwright/test": "^1.16.3",
67
"@types/jest": "^27.0.2",
78
"@types/jsdom": "^16.2.13",
89
"@types/node-fetch": "^2.5.8",
910
"@types/supertest": "^2.0.11",
1011
"@types/wtfnode": "^0.7.0",
11-
"argon2": "^0.28.0",
1212
"jest": "^27.3.1",
1313
"jest-fetch-mock": "^3.0.3",
1414
"jsdom": "^16.4.0",
@@ -20,7 +20,6 @@
2020
},
2121
"resolutions": {
2222
"ansi-regex": "^5.0.1",
23-
"argon2/@mapbox/node-pre-gyp/tar": "^6.1.9",
2423
"set-value": "^4.0.1",
2524
"tmpl": "^1.0.5",
2625
"path-parse": "^1.0.7",

0 commit comments

Comments
 (0)