diff --git a/package-lock.json b/package-lock.json index 0fa038ee97d..41f5daf94c5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -66,7 +66,7 @@ }, "optionalDependencies": { "@aws-sdk/credential-providers": "^3.186.0", - "saslprep": "^1.0.3" + "@mongodb-js/saslprep": "^1.1.0" } }, "node_modules/@ampproject/remapping": { @@ -1932,6 +1932,15 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/@mongodb-js/saslprep": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.1.0.tgz", + "integrity": "sha512-Xfijy7HvfzzqiOAhAepF4SGN5e9leLkMvg/OPOF97XemjfVCYN/oWa75wnkc6mltMSTwY+XlbhWgUOJmkFspSw==", + "optional": true, + "dependencies": { + "sparse-bitfield": "^3.0.3" + } + }, "node_modules/@mongodb-js/zstd": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@mongodb-js/zstd/-/zstd-1.1.0.tgz", @@ -8229,18 +8238,6 @@ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", "dev": true }, - "node_modules/saslprep": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/saslprep/-/saslprep-1.0.3.tgz", - "integrity": "sha512-/MY/PEMbk2SuY5sScONwhUDsV2p77Znkb/q3nSVstq/yQzYJOH/Azh29p9oJLsl3LnQwSvZDKagDGBsBwSooag==", - "optional": true, - "dependencies": { - "sparse-bitfield": "^3.0.3" - }, - "engines": { - "node": ">=6" - } - }, "node_modules/semver": { "version": "7.5.0", "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz", diff --git a/package.json b/package.json index b0f3a67ca48..1b6f801975d 100644 --- a/package.json +++ b/package.json @@ -87,7 +87,7 @@ "homepage": "https://github.com/mongodb/node-mongodb-native", "optionalDependencies": { "@aws-sdk/credential-providers": "^3.186.0", - "saslprep": "^1.0.3" + "@mongodb-js/saslprep": "^1.1.0" }, "scripts": { "build:evergreen": "node .evergreen/generate_evergreen_tasks.js", diff --git a/src/deps.ts b/src/deps.ts index 0ec001f58dd..52c359bbaf1 100644 --- a/src/deps.ts +++ b/src/deps.ts @@ -133,13 +133,14 @@ try { } catch {} // eslint-disable-line } catch {} // eslint-disable-line -export let saslprep: typeof import('saslprep') | { kModuleError: MongoMissingDependencyError } = - makeErrorModule( - new MongoMissingDependencyError( - 'Optional module `saslprep` not found.' + - ' Please install it to enable Stringprep Profile for User Names and Passwords' - ) - ); +export let saslprep: + | typeof import('@mongodb-js/saslprep') + | { kModuleError: MongoMissingDependencyError } = makeErrorModule( + new MongoMissingDependencyError( + 'Optional module `@mongodb-js/saslprep` not found.' + + ' Please install it to enable Stringprep Profile for User Names and Passwords' + ) +); try { // Ensure you always wrap an optional require in the try block NODE-3199