From 5b679a682eaf35bc019e6a1377b1c29af4b7fc9b Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Thu, 5 Aug 2021 14:13:16 +0200 Subject: [PATCH 1/2] feat: bump driver to 4.1.0/mongosh to 1.0.4 VSCODE-270 --- .github/workflows/test-and-build.yaml | 2 - package-lock.json | 191 +++++++++----------------- package.json | 8 +- scripts/no-npm-list-fail.js | 16 --- 4 files changed, 71 insertions(+), 146 deletions(-) delete mode 100644 scripts/no-npm-list-fail.js diff --git a/.github/workflows/test-and-build.yaml b/.github/workflows/test-and-build.yaml index 3211491fe..d21684ffe 100644 --- a/.github/workflows/test-and-build.yaml +++ b/.github/workflows/test-and-build.yaml @@ -75,8 +75,6 @@ jobs: npx json -I -f package-lock.json -e "this.version='${RELEASE_VERSION}'" - name: Build .vsix - env: - NODE_OPTIONS: "--require ./scripts/no-npm-list-fail.js" run: npx vsce package --githubBranch main shell: bash diff --git a/package-lock.json b/package-lock.json index 343bbcdaf..e2a60f4f9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -27,10 +27,10 @@ "debug": "^4.3.2", "dotenv": "^8.2.0", "micromatch": "^4.0.4", - "mongodb": "addaleax/node-mongodb-native#71d4c39e5c858f49d10e840df626eca4da653e28", + "mongodb": "^4.1.0", "mongodb-cloud-info": "^1.1.2", - "mongodb-connection-model": "^21.5.3", - "mongodb-data-service": "^21.5.3", + "mongodb-connection-model": "^21.5.4", + "mongodb-data-service": "^21.5.4", "mongodb-js-errors": "^0.5.0", "mongodb-ns": "^2.2.0", "mongodb-schema": "^9.0.0", @@ -1522,22 +1522,6 @@ "mongodb-client-encryption": "^1.2.6" } }, - "node_modules/@mongosh/service-provider-core/node_modules/mongodb": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-4.1.0.tgz", - "integrity": "sha512-Gx9U9MsFWgJ3E0v4oHAdWvYTGBznNYPCkhmD/3i/kPTY/URnPfHD5/6VoKUFrdgQTK3icFiM9976hVbqCRBO9Q==", - "dependencies": { - "bson": "^4.4.0", - "denque": "^1.5.0", - "mongodb-connection-string-url": "^1.0.1" - }, - "engines": { - "node": ">=12.9.0" - }, - "optionalDependencies": { - "saslprep": "^1.0.0" - } - }, "node_modules/@mongosh/service-provider-server": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/@mongosh/service-provider-server/-/service-provider-server-1.0.4.tgz", @@ -1561,22 +1545,6 @@ "resolve-mongodb-srv": "^1.1.0" } }, - "node_modules/@mongosh/service-provider-server/node_modules/mongodb": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-4.1.0.tgz", - "integrity": "sha512-Gx9U9MsFWgJ3E0v4oHAdWvYTGBznNYPCkhmD/3i/kPTY/URnPfHD5/6VoKUFrdgQTK3icFiM9976hVbqCRBO9Q==", - "dependencies": { - "bson": "^4.4.0", - "denque": "^1.5.0", - "mongodb-connection-string-url": "^1.0.1" - }, - "engines": { - "node": ">=12.9.0" - }, - "optionalDependencies": { - "saslprep": "^1.0.0" - } - }, "node_modules/@mongosh/shell-api": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/@mongosh/shell-api/-/shell-api-1.0.4.tgz", @@ -9949,9 +9917,9 @@ "optional": true }, "node_modules/hadron-ipc": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/hadron-ipc/-/hadron-ipc-2.3.0.tgz", - "integrity": "sha512-5T+AkWN5Fg5Gps/BGqPP4WGKWcyMWl3oXmrdOmUldQoYo4FLFrcFgja4jslBUilFG94v0yUwX+13AfkEbYkBpw==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/hadron-ipc/-/hadron-ipc-2.3.1.tgz", + "integrity": "sha512-mVGNtMsoLULAnpA3JHXRBaMEnq3zOQT1f2Nu7qmGlM8EoWVQMaHigSmpP2H+YJlKVv5Y2P7oe8hrcs3oNipESA==", "dependencies": { "debug": "^4.1.1", "is-electron-renderer": "^2.0.0", @@ -15907,13 +15875,13 @@ } }, "node_modules/mongodb": { - "version": "4.0.0-beta.6", - "resolved": "git+ssh://git@github.com/addaleax/node-mongodb-native.git#71d4c39e5c858f49d10e840df626eca4da653e28", - "license": "Apache-2.0", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-4.1.0.tgz", + "integrity": "sha512-Gx9U9MsFWgJ3E0v4oHAdWvYTGBznNYPCkhmD/3i/kPTY/URnPfHD5/6VoKUFrdgQTK3icFiM9976hVbqCRBO9Q==", "dependencies": { "bson": "^4.4.0", "denque": "^1.5.0", - "mongodb-connection-string-url": "^1.0.0" + "mongodb-connection-string-url": "^1.0.1" }, "engines": { "node": ">=12.9.0" @@ -16208,9 +16176,9 @@ } }, "node_modules/mongodb-connection-model": { - "version": "21.5.3", - "resolved": "https://registry.npmjs.org/mongodb-connection-model/-/mongodb-connection-model-21.5.3.tgz", - "integrity": "sha512-VCqgBNzJjWbWUdotJqvSyzWOjn5Ob1Z2kS9hXL4g9x/xlGZb778LwMEqg2vc5FAQIVTfRzrZBneElmAjHjHLvA==", + "version": "21.5.4", + "resolved": "https://registry.npmjs.org/mongodb-connection-model/-/mongodb-connection-model-21.5.4.tgz", + "integrity": "sha512-X6tk81IStBSe0omu7kN5ao5qUzv6Gk7h6wMSorOf1fuaFDk3e3KDNdYkJ9LAesTcmCslAaY2DqlGwVNAELWPag==", "dependencies": { "@mongodb-js/ssh-tunnel": "^1.2.0", "ampersand-model": "^8.0.0", @@ -16222,7 +16190,7 @@ "raf": "^3.4.1", "resolve-mongodb-srv": "^1.1.0", "ssh2": "^0.8.7", - "storage-mixin": "^4.5.0" + "storage-mixin": "^4.5.1" }, "peerDependencies": { "mongodb": "4.x" @@ -16261,18 +16229,18 @@ } }, "node_modules/mongodb-data-service": { - "version": "21.5.3", - "resolved": "https://registry.npmjs.org/mongodb-data-service/-/mongodb-data-service-21.5.3.tgz", - "integrity": "sha512-XiyQYh4DW9+OlO7MZhDsjG4vQ/HyJQBa4zTwgomJnMDUBOz2Nb2zp5yaS9cwPK5QB+7b7FbYHN5YK6rJhrl1Lw==", + "version": "21.5.4", + "resolved": "https://registry.npmjs.org/mongodb-data-service/-/mongodb-data-service-21.5.4.tgz", + "integrity": "sha512-W0frBajZJbTNBscUX+1hmUWfpjTgGDJy7s4wL09psnNdw7K+maoWKakCL5HrNmLVGsGIIwklYmTz5D4P3iPZdw==", "dependencies": { "async": "^3.2.0", "debug": "^4.2.0", "lodash": "^4.17.20", "mongodb-build-info": "^1.1.1", - "mongodb-index-model": "^3.3.1", + "mongodb-index-model": "^3.3.2", "mongodb-js-errors": "^0.5.0", "mongodb-ns": "^2.2.0", - "mongodb-security": "^1.2.0", + "mongodb-security": "^1.2.1", "mongodb-url": "^3.0.3" }, "engines": { @@ -16390,9 +16358,9 @@ } }, "node_modules/mongodb-index-model": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/mongodb-index-model/-/mongodb-index-model-3.3.1.tgz", - "integrity": "sha512-rpJyVJL44PrQ+5EjQk2ARPRipA/EyjnT+toHhV5o2eEd08WRiVW9Y9qt6MSqA/9XBWTIzpvTH8ZGqwiw65yQeQ==", + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/mongodb-index-model/-/mongodb-index-model-3.3.2.tgz", + "integrity": "sha512-0/dxalooEGpDe1AUx0sra1hfyQ0T0/gRlChiUMANcLGxcx8+vmC+4VIu1YszbfOa5benIoRIu1TtakFYdLQH3g==", "dependencies": { "ampersand-collection": "^1.6.1", "ampersand-model": "^6.0.2", @@ -16497,9 +16465,9 @@ } }, "node_modules/mongodb-index-model/node_modules/async": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/async/-/async-3.2.0.tgz", - "integrity": "sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw==" + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.1.tgz", + "integrity": "sha512-XdD5lRO/87udXCMC9meWdYiR+Nq6ZjUfXidViUZGu2F1MO4T3XwZ1et0hb2++BgLfhyJwy44BGB/yx80ABx8hg==" }, "node_modules/mongodb-index-model/node_modules/lodash.assign": { "version": "3.2.0", @@ -16751,9 +16719,9 @@ } }, "node_modules/mongodb-security": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/mongodb-security/-/mongodb-security-1.2.0.tgz", - "integrity": "sha512-G+y37UlWnLUZ21vwa5SlcevNgEppg+Q8NaY5CKQGmJPOef/+QMVzPh/u2ixQyOs35rcbw4Git4OA6isw7eQRrg==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/mongodb-security/-/mongodb-security-1.2.1.tgz", + "integrity": "sha512-Jkc7xX7sq4O42r9qybtNeR/RjvYJIF62QI97zBccAcxz4IOuEtJ7rIImzmd6Idechx0l0LiRmjI4rjV84utn6w==", "dependencies": { "debug": "^4.1.1", "lodash.every": "^4.6.0", @@ -21243,16 +21211,16 @@ } }, "node_modules/storage-mixin": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/storage-mixin/-/storage-mixin-4.5.0.tgz", - "integrity": "sha512-KisJTw89kWSNmbTD0PTIldSuyHajJkel78qUmz8b1lCpH7F/b9IZm8cx8C4syGFe8GdIHAkgAMde1r1nu08Sdg==", + "version": "4.5.1", + "resolved": "https://registry.npmjs.org/storage-mixin/-/storage-mixin-4.5.1.tgz", + "integrity": "sha512-7Muq1+on0jNad2QPRo18+UNARtS1P6WGpKp8r+9rfLon6wLFBcFW9FFwlh9xcNV4+B33I7XhEP08K+FRfYNFnA==", "dependencies": { "ampersand-model": "^8.0.1", "ampersand-rest-collection": "^6.0.0", "ampersand-sync": "^5.1.0", "async": "^3.1.0", "debug": "^4.1.1", - "hadron-ipc": "^2.3.0", + "hadron-ipc": "^2.3.1", "keytar": "^5.0.0", "localforage": "^1.7.3", "lodash": "^4.17.15", @@ -21262,9 +21230,9 @@ } }, "node_modules/storage-mixin/node_modules/async": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/async/-/async-3.2.0.tgz", - "integrity": "sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw==" + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.1.tgz", + "integrity": "sha512-XdD5lRO/87udXCMC9meWdYiR+Nq6ZjUfXidViUZGu2F1MO4T3XwZ1et0hb2++BgLfhyJwy44BGB/yx80ABx8hg==" }, "node_modules/storage-mixin/node_modules/uuid": { "version": "3.4.0", @@ -25536,19 +25504,6 @@ "mongodb-build-info": "^1.2.0", "mongodb-client-encryption": "^1.2.6", "mongodb-connection-string-url": "^1.0.0" - }, - "dependencies": { - "mongodb": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-4.1.0.tgz", - "integrity": "sha512-Gx9U9MsFWgJ3E0v4oHAdWvYTGBznNYPCkhmD/3i/kPTY/URnPfHD5/6VoKUFrdgQTK3icFiM9976hVbqCRBO9Q==", - "requires": { - "bson": "^4.4.0", - "denque": "^1.5.0", - "mongodb-connection-string-url": "^1.0.1", - "saslprep": "^1.0.0" - } - } } }, "@mongosh/service-provider-server": { @@ -25567,19 +25522,6 @@ "os-dns-native": "^1.0.3", "resolve-mongodb-srv": "^1.1.0", "saslprep": "github:mongodb-js/saslprep#v1.0.4" - }, - "dependencies": { - "mongodb": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-4.1.0.tgz", - "integrity": "sha512-Gx9U9MsFWgJ3E0v4oHAdWvYTGBznNYPCkhmD/3i/kPTY/URnPfHD5/6VoKUFrdgQTK3icFiM9976hVbqCRBO9Q==", - "requires": { - "bson": "^4.4.0", - "denque": "^1.5.0", - "mongodb-connection-string-url": "^1.0.1", - "saslprep": "^1.0.0" - } - } } }, "@mongosh/shell-api": { @@ -32644,9 +32586,9 @@ "optional": true }, "hadron-ipc": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/hadron-ipc/-/hadron-ipc-2.3.0.tgz", - "integrity": "sha512-5T+AkWN5Fg5Gps/BGqPP4WGKWcyMWl3oXmrdOmUldQoYo4FLFrcFgja4jslBUilFG94v0yUwX+13AfkEbYkBpw==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/hadron-ipc/-/hadron-ipc-2.3.1.tgz", + "integrity": "sha512-mVGNtMsoLULAnpA3JHXRBaMEnq3zOQT1f2Nu7qmGlM8EoWVQMaHigSmpP2H+YJlKVv5Y2P7oe8hrcs3oNipESA==", "requires": { "debug": "^4.1.1", "is-electron-renderer": "^2.0.0", @@ -37717,12 +37659,13 @@ "optional": true }, "mongodb": { - "version": "git+ssh://git@github.com/addaleax/node-mongodb-native.git#71d4c39e5c858f49d10e840df626eca4da653e28", - "from": "mongodb@addaleax/node-mongodb-native#71d4c39e5c858f49d10e840df626eca4da653e28", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-4.1.0.tgz", + "integrity": "sha512-Gx9U9MsFWgJ3E0v4oHAdWvYTGBznNYPCkhmD/3i/kPTY/URnPfHD5/6VoKUFrdgQTK3icFiM9976hVbqCRBO9Q==", "requires": { "bson": "^4.4.0", "denque": "^1.5.0", - "mongodb-connection-string-url": "^1.0.0", + "mongodb-connection-string-url": "^1.0.1", "saslprep": "^1.0.0" } }, @@ -37961,9 +37904,9 @@ } }, "mongodb-connection-model": { - "version": "21.5.3", - "resolved": "https://registry.npmjs.org/mongodb-connection-model/-/mongodb-connection-model-21.5.3.tgz", - "integrity": "sha512-VCqgBNzJjWbWUdotJqvSyzWOjn5Ob1Z2kS9hXL4g9x/xlGZb778LwMEqg2vc5FAQIVTfRzrZBneElmAjHjHLvA==", + "version": "21.5.4", + "resolved": "https://registry.npmjs.org/mongodb-connection-model/-/mongodb-connection-model-21.5.4.tgz", + "integrity": "sha512-X6tk81IStBSe0omu7kN5ao5qUzv6Gk7h6wMSorOf1fuaFDk3e3KDNdYkJ9LAesTcmCslAaY2DqlGwVNAELWPag==", "requires": { "@mongodb-js/ssh-tunnel": "^1.2.0", "ampersand-model": "^8.0.0", @@ -37975,7 +37918,7 @@ "raf": "^3.4.1", "resolve-mongodb-srv": "^1.1.0", "ssh2": "^0.8.7", - "storage-mixin": "^4.5.0" + "storage-mixin": "^4.5.1" } }, "mongodb-connection-string-url": { @@ -38008,18 +37951,18 @@ } }, "mongodb-data-service": { - "version": "21.5.3", - "resolved": "https://registry.npmjs.org/mongodb-data-service/-/mongodb-data-service-21.5.3.tgz", - "integrity": "sha512-XiyQYh4DW9+OlO7MZhDsjG4vQ/HyJQBa4zTwgomJnMDUBOz2Nb2zp5yaS9cwPK5QB+7b7FbYHN5YK6rJhrl1Lw==", + "version": "21.5.4", + "resolved": "https://registry.npmjs.org/mongodb-data-service/-/mongodb-data-service-21.5.4.tgz", + "integrity": "sha512-W0frBajZJbTNBscUX+1hmUWfpjTgGDJy7s4wL09psnNdw7K+maoWKakCL5HrNmLVGsGIIwklYmTz5D4P3iPZdw==", "requires": { "async": "^3.2.0", "debug": "^4.2.0", "lodash": "^4.17.20", "mongodb-build-info": "^1.1.1", - "mongodb-index-model": "^3.3.1", + "mongodb-index-model": "^3.3.2", "mongodb-js-errors": "^0.5.0", "mongodb-ns": "^2.2.0", - "mongodb-security": "^1.2.0", + "mongodb-security": "^1.2.1", "mongodb-url": "^3.0.3" }, "dependencies": { @@ -38121,9 +38064,9 @@ } }, "mongodb-index-model": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/mongodb-index-model/-/mongodb-index-model-3.3.1.tgz", - "integrity": "sha512-rpJyVJL44PrQ+5EjQk2ARPRipA/EyjnT+toHhV5o2eEd08WRiVW9Y9qt6MSqA/9XBWTIzpvTH8ZGqwiw65yQeQ==", + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/mongodb-index-model/-/mongodb-index-model-3.3.2.tgz", + "integrity": "sha512-0/dxalooEGpDe1AUx0sra1hfyQ0T0/gRlChiUMANcLGxcx8+vmC+4VIu1YszbfOa5benIoRIu1TtakFYdLQH3g==", "requires": { "ampersand-collection": "^1.6.1", "ampersand-model": "^6.0.2", @@ -38228,9 +38171,9 @@ } }, "async": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/async/-/async-3.2.0.tgz", - "integrity": "sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw==" + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.1.tgz", + "integrity": "sha512-XdD5lRO/87udXCMC9meWdYiR+Nq6ZjUfXidViUZGu2F1MO4T3XwZ1et0hb2++BgLfhyJwy44BGB/yx80ABx8hg==" }, "lodash.assign": { "version": "3.2.0", @@ -38418,9 +38361,9 @@ } }, "mongodb-security": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/mongodb-security/-/mongodb-security-1.2.0.tgz", - "integrity": "sha512-G+y37UlWnLUZ21vwa5SlcevNgEppg+Q8NaY5CKQGmJPOef/+QMVzPh/u2ixQyOs35rcbw4Git4OA6isw7eQRrg==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/mongodb-security/-/mongodb-security-1.2.1.tgz", + "integrity": "sha512-Jkc7xX7sq4O42r9qybtNeR/RjvYJIF62QI97zBccAcxz4IOuEtJ7rIImzmd6Idechx0l0LiRmjI4rjV84utn6w==", "requires": { "debug": "^4.1.1", "lodash.every": "^4.6.0", @@ -42130,16 +42073,16 @@ "dev": true }, "storage-mixin": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/storage-mixin/-/storage-mixin-4.5.0.tgz", - "integrity": "sha512-KisJTw89kWSNmbTD0PTIldSuyHajJkel78qUmz8b1lCpH7F/b9IZm8cx8C4syGFe8GdIHAkgAMde1r1nu08Sdg==", + "version": "4.5.1", + "resolved": "https://registry.npmjs.org/storage-mixin/-/storage-mixin-4.5.1.tgz", + "integrity": "sha512-7Muq1+on0jNad2QPRo18+UNARtS1P6WGpKp8r+9rfLon6wLFBcFW9FFwlh9xcNV4+B33I7XhEP08K+FRfYNFnA==", "requires": { "ampersand-model": "^8.0.1", "ampersand-rest-collection": "^6.0.0", "ampersand-sync": "^5.1.0", "async": "^3.1.0", "debug": "^4.1.1", - "hadron-ipc": "^2.3.0", + "hadron-ipc": "^2.3.1", "keytar": "^5.0.0", "localforage": "^1.7.3", "lodash": "^4.17.15", @@ -42149,9 +42092,9 @@ }, "dependencies": { "async": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/async/-/async-3.2.0.tgz", - "integrity": "sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw==" + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.1.tgz", + "integrity": "sha512-XdD5lRO/87udXCMC9meWdYiR+Nq6ZjUfXidViUZGu2F1MO4T3XwZ1et0hb2++BgLfhyJwy44BGB/yx80ABx8hg==" }, "uuid": { "version": "3.4.0", diff --git a/package.json b/package.json index a6f5ea06f..1b255fdd0 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "vscode:prepublish": "npm run clean && npm run compile:keyfile && npm run compile:resources && webpack --mode production", "check": "npm run lint && npm run check-dependencies", "check-dependencies": "depcheck --ignores='vscode,keytar,@types/jest,mocha-junit-reporter,mocha-multi,pre-commit,webpack-cli,vscode-languageserver-textdocument,@babel/core'", - "package": "npm list --production --parseable --depth=99999 --loglevel=info || true && cross-env NODE_OPTIONS=\"--require ./scripts/no-npm-list-fail.js\" vsce package --githubBranch main", + "package": "npm list --production --parseable --depth=99999 --loglevel=info || true && vsce package --githubBranch main", "local-install": "npm run package && code --install-extension ./mongodb-vscode-*.vsix", "check-vsix-size": "ts-node ./scripts/check-vsix-size.ts", "release-draft": "node ./scripts/release-draft.js" @@ -879,10 +879,10 @@ "debug": "^4.3.2", "dotenv": "^8.2.0", "micromatch": "^4.0.4", - "mongodb": "addaleax/node-mongodb-native#71d4c39e5c858f49d10e840df626eca4da653e28", + "mongodb": "^4.1.0", "mongodb-cloud-info": "^1.1.2", - "mongodb-connection-model": "^21.5.3", - "mongodb-data-service": "^21.5.3", + "mongodb-connection-model": "^21.5.4", + "mongodb-data-service": "^21.5.4", "mongodb-js-errors": "^0.5.0", "mongodb-ns": "^2.2.0", "mongodb-schema": "^9.0.0", diff --git a/scripts/no-npm-list-fail.js b/scripts/no-npm-list-fail.js deleted file mode 100644 index 4c2923e58..000000000 --- a/scripts/no-npm-list-fail.js +++ /dev/null @@ -1,16 +0,0 @@ -'use strict'; -// Monkey-patch child_process so that the `npm list` command run by -// `vsce package` does not fail because of `mongodb` being a 4.x prerelease -// rather than a "proper" version number. -const child_process = require('child_process'); -const origExec = child_process.exec; -child_process.exec = (cmd, options, cb) => { - if (cmd === 'npm list --production --parseable --depth=99999 --loglevel=error') { - origExec(cmd, options, (err, stdout, stderr) => { - cb(null, stdout, stderr); - }); - } else { - origExec(cmd, options, cb); - } -}; - From 3dfe1cfbd764fdfc2e5d99924cfb92e1b2666c1f Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Tue, 10 Aug 2021 14:45:05 +0200 Subject: [PATCH 2/2] fixup: partial revert --- .github/workflows/test-and-build.yaml | 2 ++ scripts/no-npm-list-fail.js | 16 ++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 scripts/no-npm-list-fail.js diff --git a/.github/workflows/test-and-build.yaml b/.github/workflows/test-and-build.yaml index d21684ffe..3211491fe 100644 --- a/.github/workflows/test-and-build.yaml +++ b/.github/workflows/test-and-build.yaml @@ -75,6 +75,8 @@ jobs: npx json -I -f package-lock.json -e "this.version='${RELEASE_VERSION}'" - name: Build .vsix + env: + NODE_OPTIONS: "--require ./scripts/no-npm-list-fail.js" run: npx vsce package --githubBranch main shell: bash diff --git a/scripts/no-npm-list-fail.js b/scripts/no-npm-list-fail.js new file mode 100644 index 000000000..4c2923e58 --- /dev/null +++ b/scripts/no-npm-list-fail.js @@ -0,0 +1,16 @@ +'use strict'; +// Monkey-patch child_process so that the `npm list` command run by +// `vsce package` does not fail because of `mongodb` being a 4.x prerelease +// rather than a "proper" version number. +const child_process = require('child_process'); +const origExec = child_process.exec; +child_process.exec = (cmd, options, cb) => { + if (cmd === 'npm list --production --parseable --depth=99999 --loglevel=error') { + origExec(cmd, options, (err, stdout, stderr) => { + cb(null, stdout, stderr); + }); + } else { + origExec(cmd, options, cb); + } +}; +