From feeaef70c45ff1b4fa309d3418c3428b8e767f1b Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Mon, 9 Aug 2021 11:28:06 +0200 Subject: [PATCH 1/2] chore(deps): bump mongodb-connection-string-url to 2.0.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is only a major bump because the release dropped out-of-the-box Node.js 10.x support, which we don’t care about here. --- .../service-provider-core/package-lock.json | 29 +++++++++++++++---- packages/service-provider-core/package.json | 2 +- .../service-provider-server/package-lock.json | 21 ++++++++++---- packages/service-provider-server/package.json | 2 +- 4 files changed, 42 insertions(+), 12 deletions(-) diff --git a/packages/service-provider-core/package-lock.json b/packages/service-provider-core/package-lock.json index ca165c9715..f95994db02 100644 --- a/packages/service-provider-core/package-lock.json +++ b/packages/service-provider-core/package-lock.json @@ -298,12 +298,31 @@ } }, "mongodb-connection-string-url": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-1.1.2.tgz", - "integrity": "sha512-mp5lv4guWuykOpkwNNqQ0tKKytuJUjL/aC/bu/DqoJVWL5NSh4j/u+gJ+EiOdweLujHyq6JZZqcTVipHhL5xRg==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-2.0.0.tgz", + "integrity": "sha512-M0I1vyLoq5+HQTuPSJWbt+hIXsMCfE8sS1fS5mvP9R2DOMoi2ZD32yWqgBIITyu0dFu4qtS50erxKjvUeBiyog==", "requires": { - "@types/whatwg-url": "^8.0.0", - "whatwg-url": "^8.4.0" + "@types/whatwg-url": "^8.2.1", + "whatwg-url": "^9.1.0" + }, + "dependencies": { + "tr46": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz", + "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==", + "requires": { + "punycode": "^2.1.1" + } + }, + "whatwg-url": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-9.1.0.tgz", + "integrity": "sha512-CQ0UcrPHyomtlOCot1TL77WyMIm/bCwrJ2D6AOKGwEczU9EpyoqAokfqrf/MioU9kHcMsmJZcg1egXix2KYEsA==", + "requires": { + "tr46": "^2.1.0", + "webidl-conversions": "^6.1.0" + } + } } }, "nan": { diff --git a/packages/service-provider-core/package.json b/packages/service-provider-core/package.json index 98f316fd70..e88c4ad9ac 100644 --- a/packages/service-provider-core/package.json +++ b/packages/service-provider-core/package.json @@ -35,7 +35,7 @@ "bson": "^4.4.1", "mongodb": "^4.1.0", "mongodb-build-info": "^1.2.0", - "mongodb-connection-string-url": "^1.1.2" + "mongodb-connection-string-url": "^2.0.0" }, "optionalDependencies": { "mongodb-client-encryption": "^1.2.6" diff --git a/packages/service-provider-server/package-lock.json b/packages/service-provider-server/package-lock.json index 8c6cbf82a3..408506e86b 100644 --- a/packages/service-provider-server/package-lock.json +++ b/packages/service-provider-server/package-lock.json @@ -328,12 +328,23 @@ } }, "mongodb-connection-string-url": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-1.1.2.tgz", - "integrity": "sha512-mp5lv4guWuykOpkwNNqQ0tKKytuJUjL/aC/bu/DqoJVWL5NSh4j/u+gJ+EiOdweLujHyq6JZZqcTVipHhL5xRg==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-2.0.0.tgz", + "integrity": "sha512-M0I1vyLoq5+HQTuPSJWbt+hIXsMCfE8sS1fS5mvP9R2DOMoi2ZD32yWqgBIITyu0dFu4qtS50erxKjvUeBiyog==", "requires": { - "@types/whatwg-url": "^8.0.0", - "whatwg-url": "^8.4.0" + "@types/whatwg-url": "^8.2.1", + "whatwg-url": "^9.1.0" + }, + "dependencies": { + "whatwg-url": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-9.1.0.tgz", + "integrity": "sha512-CQ0UcrPHyomtlOCot1TL77WyMIm/bCwrJ2D6AOKGwEczU9EpyoqAokfqrf/MioU9kHcMsmJZcg1egXix2KYEsA==", + "requires": { + "tr46": "^2.1.0", + "webidl-conversions": "^6.1.0" + } + } } }, "nan": { diff --git a/packages/service-provider-server/package.json b/packages/service-provider-server/package.json index b37de66bee..ba95947425 100644 --- a/packages/service-provider-server/package.json +++ b/packages/service-provider-server/package.json @@ -44,7 +44,7 @@ "@types/sinon-chai": "^3.2.3", "mongodb": "^4.1.0", "saslprep": "mongodb-js/saslprep#v1.0.4", - "mongodb-connection-string-url": "^1.1.2" + "mongodb-connection-string-url": "^2.0.0" }, "optionalDependencies": { "mongodb-client-encryption": "^1.2.6", From 36873f9bde1cc850cb42835d35b2aaccd693f9ff Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Mon, 9 Aug 2021 13:04:48 +0200 Subject: [PATCH 2/2] fixup: try polyfilling TextEncoder on the global object --- .../service-provider-core/src/textencoder-polyfill.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/service-provider-core/src/textencoder-polyfill.ts b/packages/service-provider-core/src/textencoder-polyfill.ts index 9f34ff2b25..d5d4a98ee5 100644 --- a/packages/service-provider-core/src/textencoder-polyfill.ts +++ b/packages/service-provider-core/src/textencoder-polyfill.ts @@ -3,10 +3,12 @@ // so we need to (crudely) polyfill that as well in order to use that // pure-JS implementation. if ( - typeof require('util').TextDecoder !== 'function' || - typeof require('util').TextEncoder !== 'function' + // eslint-disable-next-line @typescript-eslint/ban-ts-comment + // @ts-ignore + typeof TextDecoder !== 'function' || typeof TextEncoder !== 'function' ) { - Object.assign(require('util'), textEncodingPolyfill()); + // eslint-disable-next-line no-new-func + Object.assign(Function('return this')(), textEncodingPolyfill()); } // Basic encoder/decoder polyfill for java-shell environment (see above)