From a2f246bc55d3888928e5f18bbaa9af8d4d7804c3 Mon Sep 17 00:00:00 2001 From: gagik Date: Tue, 10 Dec 2024 12:05:53 +0100 Subject: [PATCH 01/27] WIP: individual publishing of packages --- .github/workflows/bump-packages.yml | 57 +++++ lerna.json | 8 +- package-lock.json | 200 +++++++++--------- package.json | 3 +- packages/arg-parser/package.json | 6 +- packages/async-rewriter2/package.json | 2 +- packages/autocomplete/package.json | 4 +- packages/browser-repl/package.json | 14 +- packages/browser-runtime-core/package.json | 10 +- .../browser-runtime-electron/package.json | 10 +- packages/build/package.json | 2 +- packages/build/src/npm-packages/bump.ts | 50 ----- packages/build/src/npm-packages/constants.ts | 1 - packages/build/src/npm-packages/index.ts | 1 - packages/build/src/npm-packages/publish.ts | 7 +- packages/build/src/release.ts | 8 +- packages/cli-repl/package.json | 30 +-- packages/connectivity-tests/package.json | 4 +- packages/e2e-tests/package.json | 6 +- packages/editor/package.json | 12 +- packages/errors/package.json | 2 +- packages/history/package.json | 2 +- packages/i18n/package.json | 4 +- packages/java-shell/package.json | 2 +- .../js-multiline-to-singleline/package.json | 2 +- packages/logging/package.json | 2 +- packages/mongosh/package.json | 4 +- .../node-runtime-worker-thread/package.json | 2 +- packages/service-provider-core/package.json | 2 +- .../service-provider-node-driver/package.json | 8 +- packages/shell-api/package.json | 12 +- packages/shell-evaluator/package.json | 10 +- packages/snippet-manager/package.json | 2 +- packages/types/package.json | 2 +- scripts/docker/package.json | 2 +- 35 files changed, 242 insertions(+), 251 deletions(-) create mode 100644 .github/workflows/bump-packages.yml delete mode 100644 packages/build/src/npm-packages/bump.ts diff --git a/.github/workflows/bump-packages.yml b/.github/workflows/bump-packages.yml new file mode 100644 index 000000000..a98adf2ef --- /dev/null +++ b/.github/workflows/bump-packages.yml @@ -0,0 +1,57 @@ +name: Bump packages +on: + workflow_dispatch: + push: + branches: + - main + +jobs: + update_generated_files: + name: Bump packages + runs-on: ubuntu-latest + steps: + - name: Create Github App Token + uses: mongodb-js/devtools-shared/actions/setup-bot-token@main + id: app-token + with: + app-id: ${{ vars.DEVTOOLS_BOT_APP_ID }} + private-key: ${{ secrets.DEVTOOLS_BOT_PRIVATE_KEY }} + + - uses: actions/checkout@v4 + with: + # don't checkout a detatched HEAD + ref: ${{ github.head_ref }} + + - uses: actions/setup-node@v4 + with: + node-version: 20.16.0 + cache: "npm" + + - name: Install npm@10.2.4 + run: | + npm install -g npm@10.2.4 + + - name: Install Dependencies + run: | + npm -v + npm ci + + - name: Bump packages + env: + LAST_BUMP_COMMIT_MESSAGE: "chore(release): bump package versions" + SKIP_BUMP_PACKAGES: "mongodb-compass" + run: | + npm run bump-packages + git add . + git commit --no-allow-empty -m "$LAST_BUMP_COMMIT_MESSAGE" || true + + - name: Create Pull Request + uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # 7.0.5 + with: + token: ${{ steps.app-token.outputs.token }} + commit-message: "chore(release): bump package versions" + branch: ci/bump-packages + title: "chore(release): bump package versions" + labels: no-title-validation + body: | + - Bump package versions diff --git a/lerna.json b/lerna.json index b6f109ce4..b919701ef 100644 --- a/lerna.json +++ b/lerna.json @@ -1,8 +1,4 @@ { - "packages": [ - "configs/*", - "packages/*", - "scripts/docker" - ], - "version": "0.0.0-dev.0" + "packages": ["configs/*", "packages/*", "scripts/docker"], + "version": "independent" } diff --git a/package-lock.json b/package-lock.json index 95c4d8780..e9de2a75f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -28930,11 +28930,11 @@ }, "packages/arg-parser": { "name": "@mongosh/arg-parser", - "version": "0.0.0-dev.0", + "version": "2.3.6", "license": "Apache-2.0", "dependencies": { - "@mongosh/errors": "0.0.0-dev.0", - "@mongosh/i18n": "0.0.0-dev.0", + "@mongosh/errors": "2.3.6", + "@mongosh/i18n": "2.3.6", "mongodb-connection-string-url": "^3.0.1" }, "devDependencies": { @@ -28978,7 +28978,7 @@ }, "packages/async-rewriter2": { "name": "@mongosh/async-rewriter2", - "version": "0.0.0-dev.0", + "version": "2.3.6", "license": "Apache-2.0", "dependencies": { "@babel/core": "^7.22.8", @@ -29005,11 +29005,11 @@ }, "packages/autocomplete": { "name": "@mongosh/autocomplete", - "version": "0.0.0-dev.0", + "version": "2.3.6", "license": "Apache-2.0", "dependencies": { "@mongodb-js/mongodb-constants": "^0.10.1", - "@mongosh/shell-api": "0.0.0-dev.0", + "@mongosh/shell-api": "2.3.6", "semver": "^7.5.4" }, "devDependencies": { @@ -29027,15 +29027,15 @@ }, "packages/browser-repl": { "name": "@mongosh/browser-repl", - "version": "0.0.0-dev.0", + "version": "2.3.6", "license": "Apache-2.0", "dependencies": { - "@mongosh/browser-runtime-core": "0.0.0-dev.0", - "@mongosh/errors": "0.0.0-dev.0", - "@mongosh/history": "0.0.0-dev.0", - "@mongosh/i18n": "0.0.0-dev.0", - "@mongosh/node-runtime-worker-thread": "0.0.0-dev.0", - "@mongosh/service-provider-core": "0.0.0-dev.0", + "@mongosh/browser-runtime-core": "2.3.6", + "@mongosh/errors": "2.3.6", + "@mongosh/history": "2.3.6", + "@mongosh/i18n": "2.3.6", + "@mongosh/node-runtime-worker-thread": "2.3.6", + "@mongosh/service-provider-core": "2.3.6", "numeral": "^2.0.6", "text-table": "^0.2.0" }, @@ -29214,20 +29214,20 @@ }, "packages/browser-runtime-core": { "name": "@mongosh/browser-runtime-core", - "version": "0.0.0-dev.0", + "version": "2.3.6", "license": "Apache-2.0", "dependencies": { - "@mongosh/autocomplete": "0.0.0-dev.0", - "@mongosh/service-provider-core": "0.0.0-dev.0", - "@mongosh/shell-api": "0.0.0-dev.0", - "@mongosh/shell-evaluator": "0.0.0-dev.0" + "@mongosh/autocomplete": "2.3.6", + "@mongosh/service-provider-core": "2.3.6", + "@mongosh/shell-api": "2.3.6", + "@mongosh/shell-evaluator": "2.3.6" }, "devDependencies": { "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", - "@mongosh/types": "0.0.0-dev.0", - "bson": "^6.10.1", + "@mongosh/types": "2.3.6", + "bson": "^6.10.0", "depcheck": "^1.4.7", "eslint": "^7.25.0", "prettier": "^2.8.8", @@ -29239,18 +29239,18 @@ }, "packages/browser-runtime-electron": { "name": "@mongosh/browser-runtime-electron", - "version": "0.0.0-dev.0", + "version": "2.3.6", "license": "Apache-2.0", "dependencies": { - "@mongosh/browser-runtime-core": "0.0.0-dev.0", - "@mongosh/service-provider-core": "0.0.0-dev.0", - "@mongosh/types": "0.0.0-dev.0" + "@mongosh/browser-runtime-core": "2.3.6", + "@mongosh/service-provider-core": "2.3.6", + "@mongosh/types": "2.3.6" }, "devDependencies": { "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", - "@mongosh/service-provider-node-driver": "0.0.0-dev.0", + "@mongosh/service-provider-node-driver": "2.3.6", "@types/sinon": "^7.5.1", "@types/sinon-chai": "^3.2.4", "depcheck": "^1.4.7", @@ -29269,7 +29269,7 @@ }, "packages/build": { "name": "@mongosh/build", - "version": "0.0.0-dev.0", + "version": "2.3.6", "license": "Apache-2.0", "dependencies": { "@mongodb-js/devtools-github-repo": "^1.0.1", @@ -29394,24 +29394,24 @@ }, "packages/cli-repl": { "name": "@mongosh/cli-repl", - "version": "0.0.0-dev.0", + "version": "2.3.6", "license": "Apache-2.0", "dependencies": { "@mongodb-js/devtools-proxy-support": "^0.4.2", - "@mongosh/arg-parser": "0.0.0-dev.0", - "@mongosh/autocomplete": "0.0.0-dev.0", - "@mongosh/editor": "0.0.0-dev.0", - "@mongosh/errors": "0.0.0-dev.0", - "@mongosh/history": "0.0.0-dev.0", - "@mongosh/i18n": "0.0.0-dev.0", - "@mongosh/js-multiline-to-singleline": "0.0.0-dev.0", - "@mongosh/logging": "0.0.0-dev.0", - "@mongosh/service-provider-core": "0.0.0-dev.0", - "@mongosh/service-provider-node-driver": "0.0.0-dev.0", - "@mongosh/shell-api": "0.0.0-dev.0", - "@mongosh/shell-evaluator": "0.0.0-dev.0", - "@mongosh/snippet-manager": "0.0.0-dev.0", - "@mongosh/types": "0.0.0-dev.0", + "@mongosh/arg-parser": "2.3.6", + "@mongosh/autocomplete": "2.3.6", + "@mongosh/editor": "2.3.6", + "@mongosh/errors": "2.3.6", + "@mongosh/history": "2.3.6", + "@mongosh/i18n": "2.3.6", + "@mongosh/js-multiline-to-singleline": "2.3.6", + "@mongosh/logging": "2.3.6", + "@mongosh/service-provider-core": "2.3.6", + "@mongosh/service-provider-node-driver": "2.3.6", + "@mongosh/shell-api": "2.3.6", + "@mongosh/shell-evaluator": "2.3.6", + "@mongosh/snippet-manager": "2.3.6", + "@mongosh/types": "2.3.6", "@segment/analytics-node": "^1.3.0", "ansi-escape-sequences": "^5.1.2", "askcharacter": "^2.0.4", @@ -29478,20 +29478,20 @@ }, "packages/connectivity-tests": { "name": "@mongosh/connectivity-tests", - "version": "0.0.0-dev.0", + "version": "2.3.6", "license": "Apache-2.0", "devDependencies": { - "mongosh": "0.0.0-dev.0" + "mongosh": "2.3.6" } }, "packages/e2e-tests": { "name": "@mongosh/e2e-tests", - "version": "0.0.0-dev.0", + "version": "2.3.6", "license": "Apache-2.0", "dependencies": { "@mongodb-js/oidc-plugin": "^1.1.5", - "@mongosh/cli-repl": "0.0.0-dev.0", - "@mongosh/service-provider-core": "0.0.0-dev.0", + "@mongosh/cli-repl": "2.3.6", + "@mongosh/service-provider-core": "2.3.6", "strip-ansi": "^6.0.0" }, "devDependencies": { @@ -29601,14 +29601,14 @@ }, "packages/editor": { "name": "@mongosh/editor", - "version": "0.0.0-dev.0", + "version": "2.3.6", "license": "Apache-2.0", "dependencies": { - "@mongosh/js-multiline-to-singleline": "0.0.0-dev.0", - "@mongosh/service-provider-core": "0.0.0-dev.0", - "@mongosh/shell-api": "0.0.0-dev.0", - "@mongosh/shell-evaluator": "0.0.0-dev.0", - "@mongosh/types": "0.0.0-dev.0", + "@mongosh/js-multiline-to-singleline": "2.3.6", + "@mongosh/service-provider-core": "2.3.6", + "@mongosh/shell-api": "2.3.6", + "@mongosh/shell-evaluator": "2.3.6", + "@mongosh/types": "2.3.6", "js-beautify": "^1.15.1" }, "devDependencies": { @@ -29626,7 +29626,7 @@ }, "packages/errors": { "name": "@mongosh/errors", - "version": "0.0.0-dev.0", + "version": "2.3.6", "license": "Apache-2.0", "devDependencies": { "@mongodb-js/eslint-config-mongosh": "^1.0.0", @@ -29645,7 +29645,7 @@ }, "packages/history": { "name": "@mongosh/history", - "version": "0.0.0-dev.0", + "version": "2.3.6", "license": "Apache-2.0", "dependencies": { "mongodb-connection-string-url": "^3.0.1", @@ -29666,10 +29666,10 @@ }, "packages/i18n": { "name": "@mongosh/i18n", - "version": "0.0.0-dev.0", + "version": "2.3.6", "license": "Apache-2.0", "dependencies": { - "@mongosh/errors": "0.0.0-dev.0" + "@mongosh/errors": "2.3.6" }, "devDependencies": { "@mongodb-js/eslint-config-mongosh": "^1.0.0", @@ -29685,7 +29685,7 @@ }, "packages/java-shell": { "name": "@mongosh/java-shell", - "version": "0.0.0-dev.0", + "version": "2.3.6", "license": "SSPL", "devDependencies": { "@mongodb-js/tsconfig-mongosh": "^1.0.0", @@ -29748,7 +29748,7 @@ }, "packages/js-multiline-to-singleline": { "name": "@mongosh/js-multiline-to-singleline", - "version": "0.0.0-dev.0", + "version": "2.3.6", "license": "Apache-2.0", "dependencies": { "@babel/core": "^7.16.12", @@ -29769,13 +29769,13 @@ }, "packages/logging": { "name": "@mongosh/logging", - "version": "0.0.0-dev.0", + "version": "2.3.6", "license": "Apache-2.0", "dependencies": { - "@mongodb-js/devtools-connect": "^3.3.4", - "@mongosh/errors": "0.0.0-dev.0", - "@mongosh/history": "0.0.0-dev.0", - "@mongosh/types": "0.0.0-dev.0", + "@mongodb-js/devtools-connect": "^3.3.3", + "@mongosh/errors": "2.3.6", + "@mongosh/history": "2.3.6", + "@mongosh/types": "2.3.6", "mongodb-log-writer": "^1.4.2", "mongodb-redact": "^1.1.2" }, @@ -29816,10 +29816,10 @@ } }, "packages/mongosh": { - "version": "0.0.0-dev.0", + "version": "2.3.6", "license": "Apache-2.0", "dependencies": { - "@mongosh/cli-repl": "0.0.0-dev.0" + "@mongosh/cli-repl": "2.3.6" }, "bin": { "mongosh": "bin/mongosh.js" @@ -29830,7 +29830,7 @@ }, "packages/node-runtime-worker-thread": { "name": "@mongosh/node-runtime-worker-thread", - "version": "0.0.0-dev.0", + "version": "2.3.6", "license": "Apache-2.0", "dependencies": { "interruptor": "^1.0.1", @@ -29841,12 +29841,12 @@ "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", - "@mongosh/browser-runtime-core": "0.0.0-dev.0", - "@mongosh/browser-runtime-electron": "0.0.0-dev.0", - "@mongosh/service-provider-core": "0.0.0-dev.0", - "@mongosh/service-provider-node-driver": "0.0.0-dev.0", - "@mongosh/types": "0.0.0-dev.0", - "bson": "^6.10.1", + "@mongosh/browser-runtime-core": "2.3.6", + "@mongosh/browser-runtime-electron": "2.3.6", + "@mongosh/service-provider-core": "2.3.6", + "@mongosh/service-provider-node-driver": "2.3.6", + "@mongosh/types": "2.3.6", + "bson": "^6.10.0", "depcheck": "^1.4.7", "eslint": "^7.25.0", "mocha": "^10.2.0", @@ -29860,13 +29860,13 @@ }, "packages/service-provider-core": { "name": "@mongosh/service-provider-core", - "version": "0.0.0-dev.0", + "version": "2.3.6", "license": "Apache-2.0", "dependencies": { "@aws-sdk/credential-providers": "^3.525.0", - "@mongosh/errors": "0.0.0-dev.0", - "bson": "^6.10.1", - "mongodb": "^6.12.0", + "@mongosh/errors": "2.3.6", + "bson": "^6.10.0", + "mongodb": "^6.11.0", "mongodb-build-info": "^1.7.2", "mongodb-connection-string-url": "^3.0.1" }, @@ -29887,14 +29887,14 @@ }, "packages/service-provider-node-driver": { "name": "@mongosh/service-provider-node-driver", - "version": "0.0.0-dev.0", + "version": "2.3.6", "license": "Apache-2.0", "dependencies": { "@mongodb-js/devtools-connect": "^3.3.4", "@mongodb-js/oidc-plugin": "^1.1.5", - "@mongosh/errors": "0.0.0-dev.0", - "@mongosh/service-provider-core": "0.0.0-dev.0", - "@mongosh/types": "0.0.0-dev.0", + "@mongosh/errors": "2.3.6", + "@mongosh/service-provider-core": "2.3.6", + "@mongosh/types": "2.3.6", "aws4": "^1.12.0", "mongodb": "^6.12.0", "mongodb-connection-string-url": "^3.0.1", @@ -29943,22 +29943,22 @@ }, "packages/shell-api": { "name": "@mongosh/shell-api", - "version": "0.0.0-dev.0", + "version": "2.3.6", "license": "Apache-2.0", "dependencies": { - "@mongosh/arg-parser": "0.0.0-dev.0", - "@mongosh/errors": "0.0.0-dev.0", - "@mongosh/history": "0.0.0-dev.0", - "@mongosh/i18n": "0.0.0-dev.0", - "@mongosh/service-provider-core": "0.0.0-dev.0", + "@mongosh/arg-parser": "2.3.6", + "@mongosh/errors": "2.3.6", + "@mongosh/history": "2.3.6", + "@mongosh/i18n": "2.3.6", + "@mongosh/service-provider-core": "2.3.6", "mongodb-redact": "^1.1.2" }, "devDependencies": { "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", - "@mongosh/types": "0.0.0-dev.0", - "bson": "^6.10.1", + "@mongosh/types": "2.3.6", + "bson": "^6.10.0", "depcheck": "^1.4.7", "eslint": "^7.25.0", "mongodb": "^6.12.0", @@ -29971,18 +29971,18 @@ }, "packages/shell-evaluator": { "name": "@mongosh/shell-evaluator", - "version": "0.0.0-dev.0", + "version": "2.3.6", "license": "Apache-2.0", "dependencies": { - "@mongosh/async-rewriter2": "0.0.0-dev.0", - "@mongosh/history": "0.0.0-dev.0", - "@mongosh/shell-api": "0.0.0-dev.0" + "@mongosh/async-rewriter2": "2.3.6", + "@mongosh/history": "2.3.6", + "@mongosh/shell-api": "2.3.6" }, "devDependencies": { "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", - "@mongosh/types": "0.0.0-dev.0", + "@mongosh/types": "2.3.6", "@types/sinon-chai": "^3.2.4", "depcheck": "^1.4.7", "eslint": "^7.25.0", @@ -29994,14 +29994,14 @@ }, "packages/snippet-manager": { "name": "@mongosh/snippet-manager", - "version": "0.0.0-dev.0", + "version": "2.3.6", "license": "Apache-2.0", "dependencies": { "@mongodb-js/devtools-proxy-support": "^0.4.2", - "@mongosh/errors": "0.0.0-dev.0", - "@mongosh/shell-api": "0.0.0-dev.0", - "@mongosh/types": "0.0.0-dev.0", - "bson": "^6.10.1", + "@mongosh/errors": "2.3.6", + "@mongosh/shell-api": "2.3.6", + "@mongosh/types": "2.3.6", + "bson": "^6.10.0", "cross-spawn": "^7.0.5", "escape-string-regexp": "^4.0.0", "joi": "^17.4.0", @@ -30034,7 +30034,7 @@ }, "packages/types": { "name": "@mongosh/types", - "version": "0.0.0-dev.0", + "version": "2.3.6", "license": "Apache-2.0", "dependencies": { "@mongodb-js/devtools-connect": "^3.3.4" @@ -30078,7 +30078,7 @@ }, "scripts/docker": { "name": "@mongosh/docker-build-scripts", - "version": "0.0.0-dev.0", + "version": "2.3.6", "license": "Apache-2.0", "dependencies": { "mongodb-crypt-library-version": "^1.0.5" diff --git a/package.json b/package.json index ce7a963a5..5a6f0929c 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,8 @@ "reformat": "npm run reformat --workspaces --if-present", "prepare": "husky", "precommit": "precommit", - "preinstall": "node scripts/sort-workspaces.js" + "preinstall": "node scripts/sort-workspaces.js", + "bump-packages": "bump-monorepo-packages" }, "config": { "unsafe-perm": true diff --git a/packages/arg-parser/package.json b/packages/arg-parser/package.json index c784148e7..cd5495786 100644 --- a/packages/arg-parser/package.json +++ b/packages/arg-parser/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/arg-parser", - "version": "0.0.0-dev.0", + "version": "2.3.6", "description": "MongoDB Shell CLI Argument List Parser Package", "main": "./lib/index.js", "repository": { @@ -35,8 +35,8 @@ "unitTestsOnly": true }, "dependencies": { - "@mongosh/errors": "0.0.0-dev.0", - "@mongosh/i18n": "0.0.0-dev.0", + "@mongosh/errors": "2.3.6", + "@mongosh/i18n": "2.3.6", "mongodb-connection-string-url": "^3.0.1" }, "devDependencies": { diff --git a/packages/async-rewriter2/package.json b/packages/async-rewriter2/package.json index 0d2e5be0e..e61a9b5bc 100644 --- a/packages/async-rewriter2/package.json +++ b/packages/async-rewriter2/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/async-rewriter2", - "version": "0.0.0-dev.0", + "version": "2.3.6", "description": "MongoDB Shell Async Rewriter Package", "main": "./lib/index.js", "scripts": { diff --git a/packages/autocomplete/package.json b/packages/autocomplete/package.json index b3d2e4b97..2583fe2e6 100644 --- a/packages/autocomplete/package.json +++ b/packages/autocomplete/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/autocomplete", - "version": "0.0.0-dev.0", + "version": "2.3.6", "description": "MongoDB Shell Autocomplete Package", "homepage": "https://github.com/mongodb-js/mongosh", "license": "Apache-2.0", @@ -44,7 +44,7 @@ }, "dependencies": { "@mongodb-js/mongodb-constants": "^0.10.1", - "@mongosh/shell-api": "0.0.0-dev.0", + "@mongosh/shell-api": "2.3.6", "semver": "^7.5.4" } } diff --git a/packages/browser-repl/package.json b/packages/browser-repl/package.json index b4dfeeed0..1f1c30845 100644 --- a/packages/browser-repl/package.json +++ b/packages/browser-repl/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/browser-repl", - "version": "0.0.0-dev.0", + "version": "2.3.6", "description": "Browser presentation component for Mongo Shell", "engines": { "node": ">=14.15.1" @@ -56,12 +56,12 @@ ] }, "dependencies": { - "@mongosh/browser-runtime-core": "0.0.0-dev.0", - "@mongosh/errors": "0.0.0-dev.0", - "@mongosh/history": "0.0.0-dev.0", - "@mongosh/i18n": "0.0.0-dev.0", - "@mongosh/node-runtime-worker-thread": "0.0.0-dev.0", - "@mongosh/service-provider-core": "0.0.0-dev.0", + "@mongosh/browser-runtime-core": "2.3.6", + "@mongosh/errors": "2.3.6", + "@mongosh/history": "2.3.6", + "@mongosh/i18n": "2.3.6", + "@mongosh/node-runtime-worker-thread": "2.3.6", + "@mongosh/service-provider-core": "2.3.6", "numeral": "^2.0.6", "text-table": "^0.2.0" }, diff --git a/packages/browser-runtime-core/package.json b/packages/browser-runtime-core/package.json index 723871e73..e105485ed 100644 --- a/packages/browser-runtime-core/package.json +++ b/packages/browser-runtime-core/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/browser-runtime-core", - "version": "0.0.0-dev.0", + "version": "2.3.6", "description": "Mongosh browser runtime core", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -49,9 +49,9 @@ "rimraf": "^3.0.2" }, "dependencies": { - "@mongosh/autocomplete": "0.0.0-dev.0", - "@mongosh/service-provider-core": "0.0.0-dev.0", - "@mongosh/shell-api": "0.0.0-dev.0", - "@mongosh/shell-evaluator": "0.0.0-dev.0" + "@mongosh/autocomplete": "2.3.6", + "@mongosh/service-provider-core": "2.3.6", + "@mongosh/shell-api": "2.3.6", + "@mongosh/shell-evaluator": "2.3.6" } } diff --git a/packages/browser-runtime-electron/package.json b/packages/browser-runtime-electron/package.json index 70946b7d0..3a7024874 100644 --- a/packages/browser-runtime-electron/package.json +++ b/packages/browser-runtime-electron/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/browser-runtime-electron", - "version": "0.0.0-dev.0", + "version": "2.3.6", "description": "Mongosh browser runtime electron", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -41,7 +41,7 @@ "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", - "@mongosh/service-provider-node-driver": "0.0.0-dev.0", + "@mongosh/service-provider-node-driver": "2.3.6", "@types/sinon": "^7.5.1", "@types/sinon-chai": "^3.2.4", "depcheck": "^1.4.7", @@ -50,8 +50,8 @@ "rimraf": "^3.0.2" }, "dependencies": { - "@mongosh/browser-runtime-core": "0.0.0-dev.0", - "@mongosh/service-provider-core": "0.0.0-dev.0", - "@mongosh/types": "0.0.0-dev.0" + "@mongosh/browser-runtime-core": "2.3.6", + "@mongosh/service-provider-core": "2.3.6", + "@mongosh/types": "2.3.6" } } diff --git a/packages/build/package.json b/packages/build/package.json index a4963c70c..f3424962e 100644 --- a/packages/build/package.json +++ b/packages/build/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/build", - "version": "0.0.0-dev.0", + "version": "2.3.6", "private": true, "description": "MongoDB Shell Build Tools", "main": "lib/index.js", diff --git a/packages/build/src/npm-packages/bump.ts b/packages/build/src/npm-packages/bump.ts deleted file mode 100644 index 4cf52c26f..000000000 --- a/packages/build/src/npm-packages/bump.ts +++ /dev/null @@ -1,50 +0,0 @@ -import { promises as fs } from 'fs'; -import path from 'path'; -import { PLACEHOLDER_VERSION } from './constants'; -import { getPackagesInTopologicalOrder } from '@mongodb-js/monorepo-tools'; - -export async function bumpNpmPackages(version: string): Promise { - if (!version || version === PLACEHOLDER_VERSION) { - console.info( - 'mongosh: Not bumping package version, keeping at placeholder' - ); - return; - } - - console.info(`mongosh: Bumping package versions to ${version}`); - const monorepoRootPath = path.resolve(__dirname, '..', '..', '..', '..'); - const packages = await getPackagesInTopologicalOrder(monorepoRootPath); - - const workspaceNames = packages.map((p) => p.name); - - const locations = [monorepoRootPath, ...packages.map((p) => p.location)]; - - for (const location of locations) { - const packageJsonPath = path.join(location, 'package.json'); - const packageJson = JSON.parse(await fs.readFile(packageJsonPath, 'utf8')); - - packageJson.version = version; - for (const grouping of [ - 'dependencies', - 'devDependencies', - 'optionalDependencies', - 'peerDependencies', - ]) { - if (!packageJson[grouping]) { - continue; - } - - for (const name of Object.keys(packageJson[grouping])) { - if (!workspaceNames.includes(name)) { - continue; - } - packageJson[grouping][name] = version; - } - } - - await fs.writeFile( - packageJsonPath, - JSON.stringify(packageJson, null, 2) + '\n' - ); - } -} diff --git a/packages/build/src/npm-packages/constants.ts b/packages/build/src/npm-packages/constants.ts index 26a5f4348..5d0c6f8d3 100644 --- a/packages/build/src/npm-packages/constants.ts +++ b/packages/build/src/npm-packages/constants.ts @@ -1,6 +1,5 @@ import path from 'path'; -export const PLACEHOLDER_VERSION = '0.0.0-dev.0'; export const PROJECT_ROOT = path.resolve(__dirname, '..', '..', '..', '..'); export const LERNA_BIN = path.resolve( PROJECT_ROOT, diff --git a/packages/build/src/npm-packages/index.ts b/packages/build/src/npm-packages/index.ts index 350977521..4d4931001 100644 --- a/packages/build/src/npm-packages/index.ts +++ b/packages/build/src/npm-packages/index.ts @@ -1,2 +1 @@ -export { bumpNpmPackages } from './bump'; export { publishNpmPackages } from './publish'; diff --git a/packages/build/src/npm-packages/publish.ts b/packages/build/src/npm-packages/publish.ts index 2741a0039..ebf73b782 100644 --- a/packages/build/src/npm-packages/publish.ts +++ b/packages/build/src/npm-packages/publish.ts @@ -1,5 +1,5 @@ import path from 'path'; -import { LERNA_BIN, PLACEHOLDER_VERSION, PROJECT_ROOT } from './constants'; +import { LERNA_BIN, PROJECT_ROOT } from './constants'; import type { LernaPackageDescription } from './list'; import { listNpmPackages as listNpmPackagesFn } from './list'; import { spawnSync } from '../helpers/spawn-sync'; @@ -20,10 +20,6 @@ export function publishNpmPackages( ); } - if (versions[0] === PLACEHOLDER_VERSION) { - throw new Error('Refusing to publish packages with placeholder version'); - } - // Lerna requires a clean repository for a publish from-package (--force-publish does not have any effect here) // we use git update-index --assume-unchanged on files we know have been bumped markBumpedFilesAsAssumeUnchangedFn(packages, true); @@ -38,7 +34,6 @@ export function publishNpmPackages( '--no-push', '--exact', '--no-git-tag-version', - '--force-publish', '--yes', '--no-verify-access', ], diff --git a/packages/build/src/release.ts b/packages/build/src/release.ts index 06c47d8a4..2777990c8 100644 --- a/packages/build/src/release.ts +++ b/packages/build/src/release.ts @@ -14,7 +14,7 @@ import { } from './evergreen'; import { GithubRepo } from '@mongodb-js/devtools-github-repo'; import { publishToHomebrew } from './homebrew'; -import { bumpNpmPackages, publishNpmPackages } from './npm-packages'; +import { publishNpmPackages } from './npm-packages'; import { runPackage } from './packaging'; import { runDraft } from './run-draft'; import { runPublish } from './run-publish'; @@ -54,12 +54,6 @@ export async function release( redactConfig(config) ); - if (command === 'bump') { - // updates the version of internal packages to reflect the tagged one - await bumpNpmPackages(config.version); - return; - } - const octokit = new Octokit({ auth: config.githubToken, }); diff --git a/packages/cli-repl/package.json b/packages/cli-repl/package.json index 43c735443..0e16d14fc 100644 --- a/packages/cli-repl/package.json +++ b/packages/cli-repl/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/cli-repl", - "version": "0.0.0-dev.0", + "version": "2.3.6", "description": "MongoDB Shell CLI REPL Package", "homepage": "https://github.com/mongodb-js/mongosh", "author": "Compass Team ", @@ -63,20 +63,20 @@ }, "dependencies": { "@mongodb-js/devtools-proxy-support": "^0.4.2", - "@mongosh/arg-parser": "0.0.0-dev.0", - "@mongosh/autocomplete": "0.0.0-dev.0", - "@mongosh/editor": "0.0.0-dev.0", - "@mongosh/errors": "0.0.0-dev.0", - "@mongosh/history": "0.0.0-dev.0", - "@mongosh/i18n": "0.0.0-dev.0", - "@mongosh/js-multiline-to-singleline": "0.0.0-dev.0", - "@mongosh/logging": "0.0.0-dev.0", - "@mongosh/service-provider-core": "0.0.0-dev.0", - "@mongosh/service-provider-node-driver": "0.0.0-dev.0", - "@mongosh/shell-api": "0.0.0-dev.0", - "@mongosh/shell-evaluator": "0.0.0-dev.0", - "@mongosh/snippet-manager": "0.0.0-dev.0", - "@mongosh/types": "0.0.0-dev.0", + "@mongosh/arg-parser": "2.3.6", + "@mongosh/autocomplete": "2.3.6", + "@mongosh/editor": "2.3.6", + "@mongosh/errors": "2.3.6", + "@mongosh/history": "2.3.6", + "@mongosh/i18n": "2.3.6", + "@mongosh/js-multiline-to-singleline": "2.3.6", + "@mongosh/logging": "2.3.6", + "@mongosh/service-provider-core": "2.3.6", + "@mongosh/service-provider-node-driver": "2.3.6", + "@mongosh/shell-api": "2.3.6", + "@mongosh/shell-evaluator": "2.3.6", + "@mongosh/snippet-manager": "2.3.6", + "@mongosh/types": "2.3.6", "@segment/analytics-node": "^1.3.0", "ansi-escape-sequences": "^5.1.2", "askcharacter": "^2.0.4", diff --git a/packages/connectivity-tests/package.json b/packages/connectivity-tests/package.json index 4ef44a9b2..fabc82e00 100644 --- a/packages/connectivity-tests/package.json +++ b/packages/connectivity-tests/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/connectivity-tests", - "version": "0.0.0-dev.0", + "version": "2.3.6", "private": true, "license": "Apache-2.0", "scripts": { @@ -11,7 +11,7 @@ "test-ci-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test-ci" }, "devDependencies": { - "mongosh": "0.0.0-dev.0" + "mongosh": "2.3.6" }, "mongosh": { "unitTestsOnly": true, diff --git a/packages/e2e-tests/package.json b/packages/e2e-tests/package.json index 326647057..535b371a8 100644 --- a/packages/e2e-tests/package.json +++ b/packages/e2e-tests/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/e2e-tests", - "version": "0.0.0-dev.0", + "version": "2.3.6", "private": true, "description": "MongoDB Shell E2E Tests Package", "homepage": "https://github.com/mongodb-js/mongosh", @@ -27,8 +27,8 @@ "node": ">=16.15.0" }, "dependencies": { - "@mongosh/cli-repl": "0.0.0-dev.0", - "@mongosh/service-provider-core": "0.0.0-dev.0", + "@mongosh/cli-repl": "2.3.6", + "@mongosh/service-provider-core": "2.3.6", "@mongodb-js/oidc-plugin": "^1.1.5", "strip-ansi": "^6.0.0" }, diff --git a/packages/editor/package.json b/packages/editor/package.json index 57e07395a..566691fc5 100644 --- a/packages/editor/package.json +++ b/packages/editor/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/editor", - "version": "0.0.0-dev.0", + "version": "2.3.6", "description": "MongoDB Shell External Editor", "main": "./lib/index.js", "repository": { @@ -35,11 +35,11 @@ "unitTestsOnly": true }, "dependencies": { - "@mongosh/js-multiline-to-singleline": "0.0.0-dev.0", - "@mongosh/service-provider-core": "0.0.0-dev.0", - "@mongosh/shell-api": "0.0.0-dev.0", - "@mongosh/shell-evaluator": "0.0.0-dev.0", - "@mongosh/types": "0.0.0-dev.0", + "@mongosh/js-multiline-to-singleline": "2.3.6", + "@mongosh/service-provider-core": "2.3.6", + "@mongosh/shell-api": "2.3.6", + "@mongosh/shell-evaluator": "2.3.6", + "@mongosh/types": "2.3.6", "js-beautify": "^1.15.1" }, "devDependencies": { diff --git a/packages/errors/package.json b/packages/errors/package.json index 4736c169b..154f2ba94 100644 --- a/packages/errors/package.json +++ b/packages/errors/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/errors", - "version": "0.0.0-dev.0", + "version": "2.3.6", "description": "MongoDB Shell Errors Package", "homepage": "https://github.com/mongodb-js/mongosh", "license": "Apache-2.0", diff --git a/packages/history/package.json b/packages/history/package.json index 21df6a136..1ba741e06 100644 --- a/packages/history/package.json +++ b/packages/history/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/history", - "version": "0.0.0-dev.0", + "version": "2.3.6", "description": "MongoDB Shell History Package", "main": "./lib/index.js", "repository": { diff --git a/packages/i18n/package.json b/packages/i18n/package.json index e717cf762..c73b24847 100644 --- a/packages/i18n/package.json +++ b/packages/i18n/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/i18n", - "version": "0.0.0-dev.0", + "version": "2.3.6", "description": "MongoDB Shell i18n Project", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -36,7 +36,7 @@ "unitTestsOnly": true }, "dependencies": { - "@mongosh/errors": "0.0.0-dev.0" + "@mongosh/errors": "2.3.6" }, "devDependencies": { "@mongodb-js/eslint-config-mongosh": "^1.0.0", diff --git a/packages/java-shell/package.json b/packages/java-shell/package.json index f541d15ef..b7e57a6fc 100644 --- a/packages/java-shell/package.json +++ b/packages/java-shell/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/java-shell", - "version": "0.0.0-dev.0", + "version": "2.3.6", "private": true, "description": "Java application that uses mongosh-shell-api node module and MongoDB java driver to run mongo shell on JVM", "config": { diff --git a/packages/js-multiline-to-singleline/package.json b/packages/js-multiline-to-singleline/package.json index 06b21592a..88b451a24 100644 --- a/packages/js-multiline-to-singleline/package.json +++ b/packages/js-multiline-to-singleline/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/js-multiline-to-singleline", - "version": "0.0.0-dev.0", + "version": "2.3.6", "description": "Make multiline JS into a single line", "main": "./lib/index.js", "repository": { diff --git a/packages/logging/package.json b/packages/logging/package.json index bcaf18607..51f824413 100644 --- a/packages/logging/package.json +++ b/packages/logging/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/logging", - "version": "0.0.0-dev.0", + "version": "2.3.6", "description": "MongoDB Shell Logging Utilities Package", "homepage": "https://github.com/mongodb-js/mongosh", "license": "Apache-2.0", diff --git a/packages/mongosh/package.json b/packages/mongosh/package.json index dc77b76af..5b1c34b98 100644 --- a/packages/mongosh/package.json +++ b/packages/mongosh/package.json @@ -1,6 +1,6 @@ { "name": "mongosh", - "version": "0.0.0-dev.0", + "version": "2.3.6", "description": "MongoDB Shell CLI REPL", "keywords": [ "mongosh", @@ -39,6 +39,6 @@ "variants": [] }, "dependencies": { - "@mongosh/cli-repl": "0.0.0-dev.0" + "@mongosh/cli-repl": "2.3.6" } } diff --git a/packages/node-runtime-worker-thread/package.json b/packages/node-runtime-worker-thread/package.json index 211205f6b..3a6076910 100644 --- a/packages/node-runtime-worker-thread/package.json +++ b/packages/node-runtime-worker-thread/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/node-runtime-worker-thread", - "version": "0.0.0-dev.0", + "version": "2.3.6", "description": "MongoDB shell runtime that lives in a worker thread", "homepage": "https://github.com/mongodb-js/mongosh", "license": "Apache-2.0", diff --git a/packages/service-provider-core/package.json b/packages/service-provider-core/package.json index 94847a855..2797fd253 100644 --- a/packages/service-provider-core/package.json +++ b/packages/service-provider-core/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/service-provider-core", - "version": "0.0.0-dev.0", + "version": "2.3.6", "description": "MongoDB Shell Core Service Provider Package", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/service-provider-node-driver/package.json b/packages/service-provider-node-driver/package.json index 4f9d72106..78031b739 100644 --- a/packages/service-provider-node-driver/package.json +++ b/packages/service-provider-node-driver/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/service-provider-node-driver", - "version": "0.0.0-dev.0", + "version": "2.3.6", "description": "MongoDB Shell Server Service Provider Package", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -49,9 +49,9 @@ "dependencies": { "@mongodb-js/devtools-connect": "^3.3.4", "@mongodb-js/oidc-plugin": "^1.1.5", - "@mongosh/errors": "0.0.0-dev.0", - "@mongosh/service-provider-core": "0.0.0-dev.0", - "@mongosh/types": "0.0.0-dev.0", + "@mongosh/errors": "2.3.6", + "@mongosh/service-provider-core": "2.3.6", + "@mongosh/types": "2.3.6", "aws4": "^1.12.0", "mongodb": "^6.12.0", "mongodb-connection-string-url": "^3.0.1", diff --git a/packages/shell-api/package.json b/packages/shell-api/package.json index 429920d6d..19b72efa4 100644 --- a/packages/shell-api/package.json +++ b/packages/shell-api/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/shell-api", - "version": "0.0.0-dev.0", + "version": "2.3.6", "description": "MongoDB Shell API Classes Package", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -40,11 +40,11 @@ "build" ], "dependencies": { - "@mongosh/arg-parser": "0.0.0-dev.0", - "@mongosh/errors": "0.0.0-dev.0", - "@mongosh/history": "0.0.0-dev.0", - "@mongosh/i18n": "0.0.0-dev.0", - "@mongosh/service-provider-core": "0.0.0-dev.0", + "@mongosh/arg-parser": "2.3.6", + "@mongosh/errors": "2.3.6", + "@mongosh/history": "2.3.6", + "@mongosh/i18n": "2.3.6", + "@mongosh/service-provider-core": "2.3.6", "mongodb-redact": "^1.1.2" }, "devDependencies": { diff --git a/packages/shell-evaluator/package.json b/packages/shell-evaluator/package.json index 7952764ee..1896d9d9c 100644 --- a/packages/shell-evaluator/package.json +++ b/packages/shell-evaluator/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/shell-evaluator", - "version": "0.0.0-dev.0", + "version": "2.3.6", "description": "MongoDB Top Level API Package", "main": "./lib/index.js", "scripts": { @@ -38,15 +38,15 @@ "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", - "@mongosh/types": "0.0.0-dev.0", + "@mongosh/types": "2.3.6", "@types/sinon-chai": "^3.2.4", "depcheck": "^1.4.7", "eslint": "^7.25.0", "prettier": "^2.8.8" }, "dependencies": { - "@mongosh/async-rewriter2": "0.0.0-dev.0", - "@mongosh/history": "0.0.0-dev.0", - "@mongosh/shell-api": "0.0.0-dev.0" + "@mongosh/async-rewriter2": "2.3.6", + "@mongosh/history": "2.3.6", + "@mongosh/shell-api": "2.3.6" } } diff --git a/packages/snippet-manager/package.json b/packages/snippet-manager/package.json index 5684fbe12..5c5c5f4be 100644 --- a/packages/snippet-manager/package.json +++ b/packages/snippet-manager/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/snippet-manager", - "version": "0.0.0-dev.0", + "version": "2.3.6", "description": "MongoDB Shell Snippet Manager", "main": "./lib/index.js", "repository": { diff --git a/packages/types/package.json b/packages/types/package.json index 7c7e7d755..51d93c8dd 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/types", - "version": "0.0.0-dev.0", + "version": "2.3.6", "description": "Types for mongosh internals", "author": "Anna Henningsen ", "homepage": "https://github.com/mongodb-js/mongosh/tree/main/packages/types#readme", diff --git a/scripts/docker/package.json b/scripts/docker/package.json index 9560b97a8..54bd1c29d 100644 --- a/scripts/docker/package.json +++ b/scripts/docker/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/docker-build-scripts", - "version": "0.0.0-dev.0", + "version": "2.3.6", "private": true, "description": "MongoDB Shell Build Docker Images", "config": { From 417e1f49deb30cee1d1abf8395045a246bc24518 Mon Sep 17 00:00:00 2001 From: gagik Date: Wed, 18 Dec 2024 13:09:00 +0100 Subject: [PATCH 02/27] use 2.3.7 --- THIRD_PARTY_NOTICES.md | 303 ++++++++++++------ packages/browser-runtime-core/package.json | 2 +- .../build/src/npm-packages/publish.spec.ts | 4 +- packages/logging/package.json | 6 +- .../node-runtime-worker-thread/package.json | 10 +- packages/service-provider-core/package.json | 2 +- packages/shell-api/package.json | 2 +- packages/snippet-manager/package.json | 6 +- 8 files changed, 218 insertions(+), 117 deletions(-) diff --git a/THIRD_PARTY_NOTICES.md b/THIRD_PARTY_NOTICES.md index 0f38a7259..1b5bbf59a 100644 --- a/THIRD_PARTY_NOTICES.md +++ b/THIRD_PARTY_NOTICES.md @@ -20347,30 +20347,54 @@ License tags: Unlicense License files: * LICENSE: - This is free and unencumbered software released into the public domain. - - Anyone is free to copy, modify, publish, use, compile, sell, or - distribute this software, either in source code form or as a compiled - binary, for any purpose, commercial or non-commercial, and by any - means. - - In jurisdictions that recognize copyright laws, the author or authors - of this software dedicate any and all copyright interest in the - software to the public domain. We make this dedication for the benefit - of the public at large and to the detriment of our heirs and - successors. We intend this dedication to be an overt act of - relinquishment in perpetuity of all present and future rights to this - software under copyright law. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR - OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - OTHER DEALINGS IN THE SOFTWARE. - - For more information, please refer to + This is free and unencumbered software released into the public domain. + + + + Anyone is free to copy, modify, publish, use, compile, sell, or + + distribute this software, either in source code form or as a compiled + + binary, for any purpose, commercial or non-commercial, and by any + + means. + + + + In jurisdictions that recognize copyright laws, the author or authors + + of this software dedicate any and all copyright interest in the + + software to the public domain. We make this dedication for the benefit + + of the public at large and to the detriment of our heirs and + + successors. We intend this dedication to be an overt act of + + relinquishment in perpetuity of all present and future rights to this + + software under copyright law. + + + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + + IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR + + OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + + ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + + OTHER DEALINGS IN THE SOFTWARE. + + + + For more information, please refer to + @@ -21432,13 +21456,20 @@ License tags: MIT License files: * LICENSE: - The MIT License (MIT) - Copyright (c) 2015 Dmitry Ivanov - - Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - + The MIT License (MIT) + + Copyright (c) 2015 Dmitry Ivanov + + + + Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + + + + The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -21712,24 +21743,42 @@ License tags: MIT License files: * LICENSE: - Copyright Brian White. All rights reserved. - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to - deal in the Software without restriction, including without limitation the - rights to use, copy, modify, merge, publish, distribute, sublicense, and/or - sell copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + Copyright Brian White. All rights reserved. + + + + Permission is hereby granted, free of charge, to any person obtaining a copy + + of this software and associated documentation files (the "Software"), to + + deal in the Software without restriction, including without limitation the + + rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + + sell copies of the Software, and to permit persons to whom the Software is + + furnished to do so, subject to the following conditions: + + + + The above copyright notice and this permission notice shall be included in + + all copies or substantial portions of the Software. + + + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + IN THE SOFTWARE. @@ -31209,36 +31258,62 @@ License tags: 0BSD License files: * CopyrightNotice.txt: - /*! ***************************************************************************** - Copyright (c) Microsoft Corporation. - - Permission to use, copy, modify, and/or distribute this software for any - purpose with or without fee is hereby granted. - - THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH - REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, - INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM - LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR - OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - PERFORMANCE OF THIS SOFTWARE. - ***************************************************************************** */ - + /*! ***************************************************************************** + + Copyright (c) Microsoft Corporation. + + + + Permission to use, copy, modify, and/or distribute this software for any + + purpose with or without fee is hereby granted. + + + + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH + + REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + + AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, + + INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM + + LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR + + OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + + PERFORMANCE OF THIS SOFTWARE. + + ***************************************************************************** */ + + + * LICENSE.txt: - Copyright (c) Microsoft Corporation. - - Permission to use, copy, modify, and/or distribute this software for any - purpose with or without fee is hereby granted. - - THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH - REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, - INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM - LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR - OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + Copyright (c) Microsoft Corporation. + + + + Permission to use, copy, modify, and/or distribute this software for any + + purpose with or without fee is hereby granted. + + + + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH + + REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + + AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, + + INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM + + LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR + + OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + PERFORMANCE OF THIS SOFTWARE. @@ -31249,36 +31324,62 @@ License tags: 0BSD License files: * CopyrightNotice.txt: - /****************************************************************************** - Copyright (c) Microsoft Corporation. - - Permission to use, copy, modify, and/or distribute this software for any - purpose with or without fee is hereby granted. - - THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH - REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, - INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM - LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR - OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - PERFORMANCE OF THIS SOFTWARE. - ***************************************************************************** */ - + /****************************************************************************** + + Copyright (c) Microsoft Corporation. + + + + Permission to use, copy, modify, and/or distribute this software for any + + purpose with or without fee is hereby granted. + + + + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH + + REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + + AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, + + INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM + + LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR + + OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + + PERFORMANCE OF THIS SOFTWARE. + + ***************************************************************************** */ + + + * LICENSE.txt: - Copyright (c) Microsoft Corporation. - - Permission to use, copy, modify, and/or distribute this software for any - purpose with or without fee is hereby granted. - - THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH - REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, - INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM - LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR - OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + Copyright (c) Microsoft Corporation. + + + + Permission to use, copy, modify, and/or distribute this software for any + + purpose with or without fee is hereby granted. + + + + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH + + REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + + AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, + + INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM + + LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR + + OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + PERFORMANCE OF THIS SOFTWARE. diff --git a/packages/browser-runtime-core/package.json b/packages/browser-runtime-core/package.json index e105485ed..95362521a 100644 --- a/packages/browser-runtime-core/package.json +++ b/packages/browser-runtime-core/package.json @@ -41,7 +41,7 @@ "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", - "@mongosh/types": "0.0.0-dev.0", + "@mongosh/types": "2.3.7", "bson": "^6.10.1", "depcheck": "^1.4.7", "eslint": "^7.25.0", diff --git a/packages/build/src/npm-packages/publish.spec.ts b/packages/build/src/npm-packages/publish.spec.ts index b1440f902..fc4666566 100644 --- a/packages/build/src/npm-packages/publish.spec.ts +++ b/packages/build/src/npm-packages/publish.spec.ts @@ -37,8 +37,8 @@ describe('npm-packages publishNpmPackages', function () { it('fails if packages have placeholder versions', function () { listNpmPackages.returns([ - { name: 'packageA', version: '0.0.0-dev.0' }, - { name: 'packageB', version: '0.0.0-dev.0' }, + { name: 'packageA', version: '2.3.7' }, + { name: 'packageB', version: '2.3.7' }, ]); try { publishNpmPackages( diff --git a/packages/logging/package.json b/packages/logging/package.json index 51f824413..11bb75e72 100644 --- a/packages/logging/package.json +++ b/packages/logging/package.json @@ -18,9 +18,9 @@ }, "dependencies": { "@mongodb-js/devtools-connect": "^3.3.4", - "@mongosh/errors": "0.0.0-dev.0", - "@mongosh/history": "0.0.0-dev.0", - "@mongosh/types": "0.0.0-dev.0", + "@mongosh/errors": "2.3.7", + "@mongosh/history": "2.3.7", + "@mongosh/types": "2.3.7", "mongodb-log-writer": "^1.4.2", "mongodb-redact": "^1.1.2" }, diff --git a/packages/node-runtime-worker-thread/package.json b/packages/node-runtime-worker-thread/package.json index 3a6076910..68cb41d0d 100644 --- a/packages/node-runtime-worker-thread/package.json +++ b/packages/node-runtime-worker-thread/package.json @@ -37,11 +37,11 @@ "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", - "@mongosh/browser-runtime-core": "0.0.0-dev.0", - "@mongosh/browser-runtime-electron": "0.0.0-dev.0", - "@mongosh/service-provider-core": "0.0.0-dev.0", - "@mongosh/service-provider-node-driver": "0.0.0-dev.0", - "@mongosh/types": "0.0.0-dev.0", + "@mongosh/browser-runtime-core": "2.3.7", + "@mongosh/browser-runtime-electron": "2.3.7", + "@mongosh/service-provider-core": "2.3.7", + "@mongosh/service-provider-node-driver": "2.3.7", + "@mongosh/types": "2.3.7", "bson": "^6.10.1", "depcheck": "^1.4.7", "eslint": "^7.25.0", diff --git a/packages/service-provider-core/package.json b/packages/service-provider-core/package.json index 2797fd253..b9450a076 100644 --- a/packages/service-provider-core/package.json +++ b/packages/service-provider-core/package.json @@ -44,7 +44,7 @@ }, "dependencies": { "@aws-sdk/credential-providers": "^3.525.0", - "@mongosh/errors": "0.0.0-dev.0", + "@mongosh/errors": "2.3.7", "bson": "^6.10.1", "mongodb": "^6.12.0", "mongodb-build-info": "^1.7.2", diff --git a/packages/shell-api/package.json b/packages/shell-api/package.json index 19b72efa4..060f3df6d 100644 --- a/packages/shell-api/package.json +++ b/packages/shell-api/package.json @@ -51,7 +51,7 @@ "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", - "@mongosh/types": "0.0.0-dev.0", + "@mongosh/types": "2.3.7", "bson": "^6.10.1", "depcheck": "^1.4.7", "eslint": "^7.25.0", diff --git a/packages/snippet-manager/package.json b/packages/snippet-manager/package.json index 5c5c5f4be..ff56c6085 100644 --- a/packages/snippet-manager/package.json +++ b/packages/snippet-manager/package.json @@ -36,9 +36,9 @@ }, "dependencies": { "@mongodb-js/devtools-proxy-support": "^0.4.2", - "@mongosh/errors": "0.0.0-dev.0", - "@mongosh/shell-api": "0.0.0-dev.0", - "@mongosh/types": "0.0.0-dev.0", + "@mongosh/errors": "2.3.7", + "@mongosh/shell-api": "2.3.7", + "@mongosh/types": "2.3.7", "bson": "^6.10.1", "cross-spawn": "^7.0.5", "escape-string-regexp": "^4.0.0", From 447e8d1942d0ac0129390ff9a19f163a97c0bfb0 Mon Sep 17 00:00:00 2001 From: gagik Date: Wed, 18 Dec 2024 13:18:09 +0100 Subject: [PATCH 03/27] update package-lock.json and packages --- package-lock.json | 527 ++++++++++++++++++++++++++++++++++++---------- package.json | 12 +- 2 files changed, 421 insertions(+), 118 deletions(-) diff --git a/package-lock.json b/package-lock.json index e9de2a75f..494ba87c9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5659,6 +5659,30 @@ "dev": true, "license": "Apache-2.0" }, + "node_modules/@mongodb-js/devtools-connect": { + "version": "3.3.4", + "resolved": "https://registry.npmjs.org/@mongodb-js/devtools-connect/-/devtools-connect-3.3.4.tgz", + "integrity": "sha512-zD1uu/e2+/SbkSjzdxCg8PSVJkRY+/z1h75F1kZ2UPuy41PmLe9f7Lh8zC1rlR+uFUUcUc503QknfmvinnPSOg==", + "license": "Apache-2.0", + "dependencies": { + "@mongodb-js/devtools-proxy-support": "^0.4.2", + "@mongodb-js/oidc-http-server-pages": "1.1.3", + "lodash.merge": "^4.6.2", + "mongodb-connection-string-url": "^3.0.0", + "socks": "^2.7.3" + }, + "optionalDependencies": { + "kerberos": "^2.1.0", + "mongodb-client-encryption": "^6.1.0", + "os-dns-native": "^1.2.0", + "resolve-mongodb-srv": "^1.1.1" + }, + "peerDependencies": { + "@mongodb-js/oidc-plugin": "^1.1.0", + "mongodb": "^6.9.0", + "mongodb-log-writer": "^1.4.2" + } + }, "node_modules/@mongodb-js/devtools-github-repo": { "version": "1.2.0", "license": "Apache-2.0", @@ -28951,31 +28975,6 @@ "node": ">=14.15.1" } }, - "packages/arg-parser/node_modules/@mongodb-js/devtools-connect": { - "version": "3.3.4", - "resolved": "https://registry.npmjs.org/@mongodb-js/devtools-connect/-/devtools-connect-3.3.4.tgz", - "integrity": "sha512-zD1uu/e2+/SbkSjzdxCg8PSVJkRY+/z1h75F1kZ2UPuy41PmLe9f7Lh8zC1rlR+uFUUcUc503QknfmvinnPSOg==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "@mongodb-js/devtools-proxy-support": "^0.4.2", - "@mongodb-js/oidc-http-server-pages": "1.1.3", - "lodash.merge": "^4.6.2", - "mongodb-connection-string-url": "^3.0.0", - "socks": "^2.7.3" - }, - "optionalDependencies": { - "kerberos": "^2.1.0", - "mongodb-client-encryption": "^6.1.0", - "os-dns-native": "^1.2.0", - "resolve-mongodb-srv": "^1.1.1" - }, - "peerDependencies": { - "@mongodb-js/oidc-plugin": "^1.1.0", - "mongodb": "^6.9.0", - "mongodb-log-writer": "^1.4.2" - } - }, "packages/async-rewriter2": { "name": "@mongosh/async-rewriter2", "version": "2.3.6", @@ -29226,8 +29225,8 @@ "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", - "@mongosh/types": "2.3.6", - "bson": "^6.10.0", + "@mongosh/types": "2.3.7", + "bson": "^6.10.1", "depcheck": "^1.4.7", "eslint": "^7.25.0", "prettier": "^2.8.8", @@ -29237,6 +29236,19 @@ "node": ">=14.15.1" } }, + "packages/browser-runtime-core/node_modules/@mongosh/types": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/@mongosh/types/-/types-2.3.7.tgz", + "integrity": "sha512-0rOQM9CtsGcpkBmQOjdSbZw/idWNuBl38+Fk7H74goEey7ojE/PZvKtcAwSaODsJIrDhCqWx+1w+TdspVokeAg==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@mongodb-js/devtools-connect": "^3.3.4" + }, + "engines": { + "node": ">=14.15.1" + } + }, "packages/browser-runtime-electron": { "name": "@mongosh/browser-runtime-electron", "version": "2.3.6", @@ -29772,10 +29784,10 @@ "version": "2.3.6", "license": "Apache-2.0", "dependencies": { - "@mongodb-js/devtools-connect": "^3.3.3", - "@mongosh/errors": "2.3.6", - "@mongosh/history": "2.3.6", - "@mongosh/types": "2.3.6", + "@mongodb-js/devtools-connect": "^3.3.4", + "@mongosh/errors": "2.3.7", + "@mongosh/history": "2.3.7", + "@mongosh/types": "2.3.7", "mongodb-log-writer": "^1.4.2", "mongodb-redact": "^1.1.2" }, @@ -29791,28 +29803,38 @@ "node": ">=14.15.1" } }, - "packages/logging/node_modules/@mongodb-js/devtools-connect": { - "version": "3.3.4", - "resolved": "https://registry.npmjs.org/@mongodb-js/devtools-connect/-/devtools-connect-3.3.4.tgz", - "integrity": "sha512-zD1uu/e2+/SbkSjzdxCg8PSVJkRY+/z1h75F1kZ2UPuy41PmLe9f7Lh8zC1rlR+uFUUcUc503QknfmvinnPSOg==", + "packages/logging/node_modules/@mongosh/errors": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/@mongosh/errors/-/errors-2.3.7.tgz", + "integrity": "sha512-WQ7vyeypDYnQIVieNJDF+GhItt46oR9bL2ossWJ9PrTxX57gwV8y1k1YKdhmrWOAVejp5ZDNPWKPyAM5/Ri0Kw==", + "license": "Apache-2.0", + "engines": { + "node": ">=14.15.1" + } + }, + "packages/logging/node_modules/@mongosh/history": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/@mongosh/history/-/history-2.3.7.tgz", + "integrity": "sha512-4EEyPZuFTHEAPUvn6ga4+xcz2NKrl5fJIU37T9eyWJb4BfpDxG+CrrLGRRMqfS+LHar7Xen/oEWWKOMvrt1x8g==", "license": "Apache-2.0", "dependencies": { - "@mongodb-js/devtools-proxy-support": "^0.4.2", - "@mongodb-js/oidc-http-server-pages": "1.1.3", - "lodash.merge": "^4.6.2", - "mongodb-connection-string-url": "^3.0.0", - "socks": "^2.7.3" + "mongodb-connection-string-url": "^3.0.1", + "mongodb-redact": "^1.1.2" }, - "optionalDependencies": { - "kerberos": "^2.1.0", - "mongodb-client-encryption": "^6.1.0", - "os-dns-native": "^1.2.0", - "resolve-mongodb-srv": "^1.1.1" + "engines": { + "node": ">=14.15.1" + } + }, + "packages/logging/node_modules/@mongosh/types": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/@mongosh/types/-/types-2.3.7.tgz", + "integrity": "sha512-0rOQM9CtsGcpkBmQOjdSbZw/idWNuBl38+Fk7H74goEey7ojE/PZvKtcAwSaODsJIrDhCqWx+1w+TdspVokeAg==", + "license": "Apache-2.0", + "dependencies": { + "@mongodb-js/devtools-connect": "^3.3.4" }, - "peerDependencies": { - "@mongodb-js/oidc-plugin": "^1.1.0", - "mongodb": "^6.9.0", - "mongodb-log-writer": "^1.4.2" + "engines": { + "node": ">=14.15.1" } }, "packages/mongosh": { @@ -29841,12 +29863,12 @@ "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", - "@mongosh/browser-runtime-core": "2.3.6", - "@mongosh/browser-runtime-electron": "2.3.6", - "@mongosh/service-provider-core": "2.3.6", - "@mongosh/service-provider-node-driver": "2.3.6", - "@mongosh/types": "2.3.6", - "bson": "^6.10.0", + "@mongosh/browser-runtime-core": "2.3.7", + "@mongosh/browser-runtime-electron": "2.3.7", + "@mongosh/service-provider-core": "2.3.7", + "@mongosh/service-provider-node-driver": "2.3.7", + "@mongosh/types": "2.3.7", + "bson": "^6.10.1", "depcheck": "^1.4.7", "eslint": "^7.25.0", "mocha": "^10.2.0", @@ -29858,15 +29880,225 @@ "node": ">=14.15.1" } }, + "packages/node-runtime-worker-thread/node_modules/@mongosh/arg-parser": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/@mongosh/arg-parser/-/arg-parser-2.3.7.tgz", + "integrity": "sha512-cChpbvlSjaHAtO2nAgrJpWBhvL8BPZhjS0PWxlYlHIGdLSHKCjOA62QsAKTP57HIcs4lirhrvV3DqP9FZnKftg==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@mongosh/errors": "2.3.7", + "@mongosh/i18n": "2.3.7", + "mongodb-connection-string-url": "^3.0.1" + }, + "engines": { + "node": ">=14.15.1" + } + }, + "packages/node-runtime-worker-thread/node_modules/@mongosh/async-rewriter2": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/@mongosh/async-rewriter2/-/async-rewriter2-2.3.7.tgz", + "integrity": "sha512-847ZzSbvoz0iveZt23AWD6iJQ7qm6CZdHOASVBvmKTyixf3rMt/y+L/xvOuZvz5kEU7eCaFa99eyW6SN4DBNog==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@babel/core": "^7.22.8", + "@babel/plugin-transform-destructuring": "^7.22.5", + "@babel/plugin-transform-parameters": "^7.22.5", + "@babel/plugin-transform-shorthand-properties": "^7.22.5", + "@babel/types": "^7.22.5" + }, + "bin": { + "async-rewrite": "bin/async-rewrite.js" + }, + "engines": { + "node": ">=14.15.1" + } + }, + "packages/node-runtime-worker-thread/node_modules/@mongosh/autocomplete": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/@mongosh/autocomplete/-/autocomplete-2.3.7.tgz", + "integrity": "sha512-+LSbyX5ej4gD3uVL0hvgX66f/1V6BM1ccwEvIHQWePaIuprvThSE1mPwt8dl6Dz8PoqB/wzMp1nbUVE51pUoJA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@mongodb-js/mongodb-constants": "^0.10.1", + "@mongosh/shell-api": "2.3.7", + "semver": "^7.5.4" + }, + "engines": { + "node": ">=14.15.1" + } + }, + "packages/node-runtime-worker-thread/node_modules/@mongosh/browser-runtime-core": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/@mongosh/browser-runtime-core/-/browser-runtime-core-2.3.7.tgz", + "integrity": "sha512-L3HEGKqmZ8IPjcTTmUHu3oN1D1wv1MBWS1MhwkcAhprqOfLOu9vloLfX/uWV5+w8MqarWZZDQEzWkWrZ40y49A==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@mongosh/autocomplete": "2.3.7", + "@mongosh/service-provider-core": "2.3.7", + "@mongosh/shell-api": "2.3.7", + "@mongosh/shell-evaluator": "2.3.7" + }, + "engines": { + "node": ">=14.15.1" + } + }, + "packages/node-runtime-worker-thread/node_modules/@mongosh/browser-runtime-electron": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/@mongosh/browser-runtime-electron/-/browser-runtime-electron-2.3.7.tgz", + "integrity": "sha512-y3RHWClFo1xqG3zZIohfAb/DKkTpc3irKrDy+MPs0NqeOgqrGhRq8tPZB8nN9SOK19DWfjTmfWUKBpdOL3Ou+g==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@mongosh/browser-runtime-core": "2.3.7", + "@mongosh/service-provider-core": "2.3.7", + "@mongosh/types": "2.3.7" + }, + "engines": { + "node": ">=14.15.1" + } + }, + "packages/node-runtime-worker-thread/node_modules/@mongosh/errors": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/@mongosh/errors/-/errors-2.3.7.tgz", + "integrity": "sha512-WQ7vyeypDYnQIVieNJDF+GhItt46oR9bL2ossWJ9PrTxX57gwV8y1k1YKdhmrWOAVejp5ZDNPWKPyAM5/Ri0Kw==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=14.15.1" + } + }, + "packages/node-runtime-worker-thread/node_modules/@mongosh/history": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/@mongosh/history/-/history-2.3.7.tgz", + "integrity": "sha512-4EEyPZuFTHEAPUvn6ga4+xcz2NKrl5fJIU37T9eyWJb4BfpDxG+CrrLGRRMqfS+LHar7Xen/oEWWKOMvrt1x8g==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "mongodb-connection-string-url": "^3.0.1", + "mongodb-redact": "^1.1.2" + }, + "engines": { + "node": ">=14.15.1" + } + }, + "packages/node-runtime-worker-thread/node_modules/@mongosh/i18n": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/@mongosh/i18n/-/i18n-2.3.7.tgz", + "integrity": "sha512-xH5ZK29jb4pf3cBOFpomz3Zq2PnZLTgBRiteqGLucTrGM1YZ7Nr81fFMEa8il0wTK2taQ8yuCvhGC0liiM+8sw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@mongosh/errors": "2.3.7" + }, + "engines": { + "node": ">=14.15.1" + } + }, + "packages/node-runtime-worker-thread/node_modules/@mongosh/service-provider-core": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/@mongosh/service-provider-core/-/service-provider-core-2.3.7.tgz", + "integrity": "sha512-y6gQv3Pi6vSR0O1pIpBNDJv84oY+QKKUJAIjDRwGAmgRP6CuMXr25J6R57iLxVzsdhxPxZml1RXvvncM8gRGkA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/credential-providers": "^3.525.0", + "@mongosh/errors": "2.3.7", + "bson": "^6.10.1", + "mongodb": "^6.12.0", + "mongodb-build-info": "^1.7.2", + "mongodb-connection-string-url": "^3.0.1" + }, + "engines": { + "node": ">=14.15.1" + }, + "optionalDependencies": { + "mongodb-client-encryption": "^6.1.0" + } + }, + "packages/node-runtime-worker-thread/node_modules/@mongosh/service-provider-node-driver": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/@mongosh/service-provider-node-driver/-/service-provider-node-driver-2.3.7.tgz", + "integrity": "sha512-qxWwuwFcmI2cQxaBClof886vw2W0TNYNC0ewnjTtWo8EF01uGB9krATKp1rn5A+FX62z6dI1J0L0oYLpmlu68w==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@mongodb-js/devtools-connect": "^3.3.4", + "@mongodb-js/oidc-plugin": "^1.1.5", + "@mongosh/errors": "2.3.7", + "@mongosh/service-provider-core": "2.3.7", + "@mongosh/types": "2.3.7", + "aws4": "^1.12.0", + "mongodb": "^6.12.0", + "mongodb-connection-string-url": "^3.0.1", + "socks": "^2.8.3" + }, + "engines": { + "node": ">=14.15.1" + }, + "optionalDependencies": { + "kerberos": "2.1.0", + "mongodb-client-encryption": "^6.1.0" + } + }, + "packages/node-runtime-worker-thread/node_modules/@mongosh/shell-api": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/@mongosh/shell-api/-/shell-api-2.3.7.tgz", + "integrity": "sha512-3aWHB74dUPrPGVQgOsfJUykx/sy4CbUXoZTUZA8VZt6i0aRZFuJ0bbEFmtZ7hM4cmacNVlqe+ry/6rxC7KL/hA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@mongosh/arg-parser": "2.3.7", + "@mongosh/errors": "2.3.7", + "@mongosh/history": "2.3.7", + "@mongosh/i18n": "2.3.7", + "@mongosh/service-provider-core": "2.3.7", + "mongodb-redact": "^1.1.2" + }, + "engines": { + "node": ">=14.15.1" + } + }, + "packages/node-runtime-worker-thread/node_modules/@mongosh/shell-evaluator": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/@mongosh/shell-evaluator/-/shell-evaluator-2.3.7.tgz", + "integrity": "sha512-pdG+ILkFiejOySti3QMte3vTHOQhLrjag8Gfm4DjnH2oK8z4Yw5lr4BfWS5u5JaSvtmmOIEW1mRp2UJbSiKjDA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@mongosh/async-rewriter2": "2.3.7", + "@mongosh/history": "2.3.7", + "@mongosh/shell-api": "2.3.7" + }, + "engines": { + "node": ">=14.15.1" + } + }, + "packages/node-runtime-worker-thread/node_modules/@mongosh/types": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/@mongosh/types/-/types-2.3.7.tgz", + "integrity": "sha512-0rOQM9CtsGcpkBmQOjdSbZw/idWNuBl38+Fk7H74goEey7ojE/PZvKtcAwSaODsJIrDhCqWx+1w+TdspVokeAg==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@mongodb-js/devtools-connect": "^3.3.4" + }, + "engines": { + "node": ">=14.15.1" + } + }, "packages/service-provider-core": { "name": "@mongosh/service-provider-core", "version": "2.3.6", "license": "Apache-2.0", "dependencies": { "@aws-sdk/credential-providers": "^3.525.0", - "@mongosh/errors": "2.3.6", - "bson": "^6.10.0", - "mongodb": "^6.11.0", + "@mongosh/errors": "2.3.7", + "bson": "^6.10.1", + "mongodb": "^6.12.0", "mongodb-build-info": "^1.7.2", "mongodb-connection-string-url": "^3.0.1" }, @@ -29885,6 +30117,15 @@ "mongodb-client-encryption": "^6.1.0" } }, + "packages/service-provider-core/node_modules/@mongosh/errors": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/@mongosh/errors/-/errors-2.3.7.tgz", + "integrity": "sha512-WQ7vyeypDYnQIVieNJDF+GhItt46oR9bL2ossWJ9PrTxX57gwV8y1k1YKdhmrWOAVejp5ZDNPWKPyAM5/Ri0Kw==", + "license": "Apache-2.0", + "engines": { + "node": ">=14.15.1" + } + }, "packages/service-provider-node-driver": { "name": "@mongosh/service-provider-node-driver", "version": "2.3.6", @@ -29917,30 +30158,6 @@ "mongodb-client-encryption": "^6.1.0" } }, - "packages/service-provider-node-driver/node_modules/@mongodb-js/devtools-connect": { - "version": "3.3.4", - "resolved": "https://registry.npmjs.org/@mongodb-js/devtools-connect/-/devtools-connect-3.3.4.tgz", - "integrity": "sha512-zD1uu/e2+/SbkSjzdxCg8PSVJkRY+/z1h75F1kZ2UPuy41PmLe9f7Lh8zC1rlR+uFUUcUc503QknfmvinnPSOg==", - "license": "Apache-2.0", - "dependencies": { - "@mongodb-js/devtools-proxy-support": "^0.4.2", - "@mongodb-js/oidc-http-server-pages": "1.1.3", - "lodash.merge": "^4.6.2", - "mongodb-connection-string-url": "^3.0.0", - "socks": "^2.7.3" - }, - "optionalDependencies": { - "kerberos": "^2.1.0", - "mongodb-client-encryption": "^6.1.0", - "os-dns-native": "^1.2.0", - "resolve-mongodb-srv": "^1.1.1" - }, - "peerDependencies": { - "@mongodb-js/oidc-plugin": "^1.1.0", - "mongodb": "^6.9.0", - "mongodb-log-writer": "^1.4.2" - } - }, "packages/shell-api": { "name": "@mongosh/shell-api", "version": "2.3.6", @@ -29957,8 +30174,8 @@ "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", - "@mongosh/types": "2.3.6", - "bson": "^6.10.0", + "@mongosh/types": "2.3.7", + "bson": "^6.10.1", "depcheck": "^1.4.7", "eslint": "^7.25.0", "mongodb": "^6.12.0", @@ -29969,6 +30186,19 @@ "node": ">=14.15.1" } }, + "packages/shell-api/node_modules/@mongosh/types": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/@mongosh/types/-/types-2.3.7.tgz", + "integrity": "sha512-0rOQM9CtsGcpkBmQOjdSbZw/idWNuBl38+Fk7H74goEey7ojE/PZvKtcAwSaODsJIrDhCqWx+1w+TdspVokeAg==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@mongodb-js/devtools-connect": "^3.3.4" + }, + "engines": { + "node": ">=14.15.1" + } + }, "packages/shell-evaluator": { "name": "@mongosh/shell-evaluator", "version": "2.3.6", @@ -29998,10 +30228,10 @@ "license": "Apache-2.0", "dependencies": { "@mongodb-js/devtools-proxy-support": "^0.4.2", - "@mongosh/errors": "2.3.6", - "@mongosh/shell-api": "2.3.6", - "@mongosh/types": "2.3.6", - "bson": "^6.10.0", + "@mongosh/errors": "2.3.7", + "@mongosh/shell-api": "2.3.7", + "@mongosh/types": "2.3.7", + "bson": "^6.10.1", "cross-spawn": "^7.0.5", "escape-string-regexp": "^4.0.0", "joi": "^17.4.0", @@ -30022,6 +30252,103 @@ "node": ">=14.15.1" } }, + "packages/snippet-manager/node_modules/@mongosh/arg-parser": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/@mongosh/arg-parser/-/arg-parser-2.3.7.tgz", + "integrity": "sha512-cChpbvlSjaHAtO2nAgrJpWBhvL8BPZhjS0PWxlYlHIGdLSHKCjOA62QsAKTP57HIcs4lirhrvV3DqP9FZnKftg==", + "license": "Apache-2.0", + "dependencies": { + "@mongosh/errors": "2.3.7", + "@mongosh/i18n": "2.3.7", + "mongodb-connection-string-url": "^3.0.1" + }, + "engines": { + "node": ">=14.15.1" + } + }, + "packages/snippet-manager/node_modules/@mongosh/errors": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/@mongosh/errors/-/errors-2.3.7.tgz", + "integrity": "sha512-WQ7vyeypDYnQIVieNJDF+GhItt46oR9bL2ossWJ9PrTxX57gwV8y1k1YKdhmrWOAVejp5ZDNPWKPyAM5/Ri0Kw==", + "license": "Apache-2.0", + "engines": { + "node": ">=14.15.1" + } + }, + "packages/snippet-manager/node_modules/@mongosh/history": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/@mongosh/history/-/history-2.3.7.tgz", + "integrity": "sha512-4EEyPZuFTHEAPUvn6ga4+xcz2NKrl5fJIU37T9eyWJb4BfpDxG+CrrLGRRMqfS+LHar7Xen/oEWWKOMvrt1x8g==", + "license": "Apache-2.0", + "dependencies": { + "mongodb-connection-string-url": "^3.0.1", + "mongodb-redact": "^1.1.2" + }, + "engines": { + "node": ">=14.15.1" + } + }, + "packages/snippet-manager/node_modules/@mongosh/i18n": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/@mongosh/i18n/-/i18n-2.3.7.tgz", + "integrity": "sha512-xH5ZK29jb4pf3cBOFpomz3Zq2PnZLTgBRiteqGLucTrGM1YZ7Nr81fFMEa8il0wTK2taQ8yuCvhGC0liiM+8sw==", + "license": "Apache-2.0", + "dependencies": { + "@mongosh/errors": "2.3.7" + }, + "engines": { + "node": ">=14.15.1" + } + }, + "packages/snippet-manager/node_modules/@mongosh/service-provider-core": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/@mongosh/service-provider-core/-/service-provider-core-2.3.7.tgz", + "integrity": "sha512-y6gQv3Pi6vSR0O1pIpBNDJv84oY+QKKUJAIjDRwGAmgRP6CuMXr25J6R57iLxVzsdhxPxZml1RXvvncM8gRGkA==", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/credential-providers": "^3.525.0", + "@mongosh/errors": "2.3.7", + "bson": "^6.10.1", + "mongodb": "^6.12.0", + "mongodb-build-info": "^1.7.2", + "mongodb-connection-string-url": "^3.0.1" + }, + "engines": { + "node": ">=14.15.1" + }, + "optionalDependencies": { + "mongodb-client-encryption": "^6.1.0" + } + }, + "packages/snippet-manager/node_modules/@mongosh/shell-api": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/@mongosh/shell-api/-/shell-api-2.3.7.tgz", + "integrity": "sha512-3aWHB74dUPrPGVQgOsfJUykx/sy4CbUXoZTUZA8VZt6i0aRZFuJ0bbEFmtZ7hM4cmacNVlqe+ry/6rxC7KL/hA==", + "license": "Apache-2.0", + "dependencies": { + "@mongosh/arg-parser": "2.3.7", + "@mongosh/errors": "2.3.7", + "@mongosh/history": "2.3.7", + "@mongosh/i18n": "2.3.7", + "@mongosh/service-provider-core": "2.3.7", + "mongodb-redact": "^1.1.2" + }, + "engines": { + "node": ">=14.15.1" + } + }, + "packages/snippet-manager/node_modules/@mongosh/types": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/@mongosh/types/-/types-2.3.7.tgz", + "integrity": "sha512-0rOQM9CtsGcpkBmQOjdSbZw/idWNuBl38+Fk7H74goEey7ojE/PZvKtcAwSaODsJIrDhCqWx+1w+TdspVokeAg==", + "license": "Apache-2.0", + "dependencies": { + "@mongodb-js/devtools-connect": "^3.3.4" + }, + "engines": { + "node": ">=14.15.1" + } + }, "packages/snippet-manager/node_modules/@types/cross-spawn": { "version": "6.0.6", "resolved": "https://registry.npmjs.org/@types/cross-spawn/-/cross-spawn-6.0.6.tgz", @@ -30052,30 +30379,6 @@ "node": ">=14.15.1" } }, - "packages/types/node_modules/@mongodb-js/devtools-connect": { - "version": "3.3.4", - "resolved": "https://registry.npmjs.org/@mongodb-js/devtools-connect/-/devtools-connect-3.3.4.tgz", - "integrity": "sha512-zD1uu/e2+/SbkSjzdxCg8PSVJkRY+/z1h75F1kZ2UPuy41PmLe9f7Lh8zC1rlR+uFUUcUc503QknfmvinnPSOg==", - "license": "Apache-2.0", - "dependencies": { - "@mongodb-js/devtools-proxy-support": "^0.4.2", - "@mongodb-js/oidc-http-server-pages": "1.1.3", - "lodash.merge": "^4.6.2", - "mongodb-connection-string-url": "^3.0.0", - "socks": "^2.7.3" - }, - "optionalDependencies": { - "kerberos": "^2.1.0", - "mongodb-client-encryption": "^6.1.0", - "os-dns-native": "^1.2.0", - "resolve-mongodb-srv": "^1.1.1" - }, - "peerDependencies": { - "@mongodb-js/oidc-plugin": "^1.1.0", - "mongodb": "^6.9.0", - "mongodb-log-writer": "^1.4.2" - } - }, "scripts/docker": { "name": "@mongosh/docker-build-scripts", "version": "2.3.6", diff --git a/package.json b/package.json index 5a6f0929c..030ab0dc9 100644 --- a/package.json +++ b/package.json @@ -148,24 +148,24 @@ "packages/history", "packages/java-shell", "packages/js-multiline-to-singleline", - "packages/types", - "packages/i18n", "packages/logging", + "packages/node-runtime-worker-thread", "packages/service-provider-core", - "packages/arg-parser", + "packages/snippet-manager", + "packages/types", + "packages/i18n", "packages/service-provider-node-driver", + "packages/arg-parser", "packages/shell-api", "packages/autocomplete", "packages/shell-evaluator", - "packages/snippet-manager", "packages/browser-runtime-core", "packages/editor", + "packages/browser-repl", "packages/browser-runtime-electron", "packages/cli-repl", "packages/e2e-tests", "packages/mongosh", - "packages/node-runtime-worker-thread", - "packages/browser-repl", "packages/connectivity-tests" ], "overrides": { From 4c9746827f620a171c7542a826b89b90464b6e4b Mon Sep 17 00:00:00 2001 From: gagik Date: Thu, 19 Dec 2024 11:08:57 +0100 Subject: [PATCH 04/27] restore changes --- THIRD_PARTY_NOTICES.md | 303 +++----- package-lock.json | 655 +++++------------- package.json | 12 +- packages/arg-parser/package.json | 6 +- packages/async-rewriter2/package.json | 2 +- packages/autocomplete/package.json | 4 +- packages/browser-repl/package.json | 14 +- packages/browser-runtime-core/package.json | 10 +- .../browser-runtime-electron/package.json | 10 +- packages/build/package.json | 2 +- packages/cli-repl/package.json | 30 +- packages/connectivity-tests/package.json | 4 +- packages/e2e-tests/package.json | 6 +- packages/editor/package.json | 12 +- packages/errors/package.json | 2 +- packages/history/package.json | 2 +- packages/i18n/package.json | 4 +- packages/java-shell/package.json | 2 +- .../js-multiline-to-singleline/package.json | 2 +- packages/logging/package.json | 2 +- packages/mongosh/package.json | 4 +- .../node-runtime-worker-thread/package.json | 2 +- packages/service-provider-core/package.json | 2 +- .../service-provider-node-driver/package.json | 8 +- packages/shell-api/package.json | 12 +- packages/shell-evaluator/package.json | 10 +- packages/snippet-manager/package.json | 2 +- packages/types/package.json | 2 +- scripts/docker/package.json | 2 +- 29 files changed, 362 insertions(+), 766 deletions(-) diff --git a/THIRD_PARTY_NOTICES.md b/THIRD_PARTY_NOTICES.md index 1b5bbf59a..0f38a7259 100644 --- a/THIRD_PARTY_NOTICES.md +++ b/THIRD_PARTY_NOTICES.md @@ -20347,54 +20347,30 @@ License tags: Unlicense License files: * LICENSE: - This is free and unencumbered software released into the public domain. - - - - Anyone is free to copy, modify, publish, use, compile, sell, or - - distribute this software, either in source code form or as a compiled - - binary, for any purpose, commercial or non-commercial, and by any - - means. - - - - In jurisdictions that recognize copyright laws, the author or authors - - of this software dedicate any and all copyright interest in the - - software to the public domain. We make this dedication for the benefit - - of the public at large and to the detriment of our heirs and - - successors. We intend this dedication to be an overt act of - - relinquishment in perpetuity of all present and future rights to this - - software under copyright law. - - - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - - IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR - - OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - - ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - - OTHER DEALINGS IN THE SOFTWARE. - - - - For more information, please refer to - + This is free and unencumbered software released into the public domain. + + Anyone is free to copy, modify, publish, use, compile, sell, or + distribute this software, either in source code form or as a compiled + binary, for any purpose, commercial or non-commercial, and by any + means. + + In jurisdictions that recognize copyright laws, the author or authors + of this software dedicate any and all copyright interest in the + software to the public domain. We make this dedication for the benefit + of the public at large and to the detriment of our heirs and + successors. We intend this dedication to be an overt act of + relinquishment in perpetuity of all present and future rights to this + software under copyright law. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR + OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + OTHER DEALINGS IN THE SOFTWARE. + + For more information, please refer to @@ -21456,20 +21432,13 @@ License tags: MIT License files: * LICENSE: - The MIT License (MIT) - - Copyright (c) 2015 Dmitry Ivanov - - - - Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - - - - The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - - - + The MIT License (MIT) + Copyright (c) 2015 Dmitry Ivanov + + Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -21743,42 +21712,24 @@ License tags: MIT License files: * LICENSE: - Copyright Brian White. All rights reserved. - - - - Permission is hereby granted, free of charge, to any person obtaining a copy - - of this software and associated documentation files (the "Software"), to - - deal in the Software without restriction, including without limitation the - - rights to use, copy, modify, merge, publish, distribute, sublicense, and/or - - sell copies of the Software, and to permit persons to whom the Software is - - furnished to do so, subject to the following conditions: - - - - The above copyright notice and this permission notice shall be included in - - all copies or substantial portions of the Software. - - - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - - FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS - + Copyright Brian White. All rights reserved. + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to + deal in the Software without restriction, including without limitation the + rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + sell copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -31258,62 +31209,36 @@ License tags: 0BSD License files: * CopyrightNotice.txt: - /*! ***************************************************************************** - - Copyright (c) Microsoft Corporation. - - - - Permission to use, copy, modify, and/or distribute this software for any - - purpose with or without fee is hereby granted. - - - - THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH - - REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY - - AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, - - INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM - - LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR - - OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - - PERFORMANCE OF THIS SOFTWARE. - - ***************************************************************************** */ - - - + /*! ***************************************************************************** + Copyright (c) Microsoft Corporation. + + Permission to use, copy, modify, and/or distribute this software for any + purpose with or without fee is hereby granted. + + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH + REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, + INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM + LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR + OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + PERFORMANCE OF THIS SOFTWARE. + ***************************************************************************** */ + * LICENSE.txt: - Copyright (c) Microsoft Corporation. - - - - Permission to use, copy, modify, and/or distribute this software for any - - purpose with or without fee is hereby granted. - - - - THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH - - REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY - - AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, - - INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM - - LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR - - OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - + Copyright (c) Microsoft Corporation. + + Permission to use, copy, modify, and/or distribute this software for any + purpose with or without fee is hereby granted. + + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH + REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, + INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM + LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR + OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. @@ -31324,62 +31249,36 @@ License tags: 0BSD License files: * CopyrightNotice.txt: - /****************************************************************************** - - Copyright (c) Microsoft Corporation. - - - - Permission to use, copy, modify, and/or distribute this software for any - - purpose with or without fee is hereby granted. - - - - THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH - - REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY - - AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, - - INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM - - LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR - - OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - - PERFORMANCE OF THIS SOFTWARE. - - ***************************************************************************** */ - - - + /****************************************************************************** + Copyright (c) Microsoft Corporation. + + Permission to use, copy, modify, and/or distribute this software for any + purpose with or without fee is hereby granted. + + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH + REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, + INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM + LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR + OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + PERFORMANCE OF THIS SOFTWARE. + ***************************************************************************** */ + * LICENSE.txt: - Copyright (c) Microsoft Corporation. - - - - Permission to use, copy, modify, and/or distribute this software for any - - purpose with or without fee is hereby granted. - - - - THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH - - REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY - - AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, - - INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM - - LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR - - OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - + Copyright (c) Microsoft Corporation. + + Permission to use, copy, modify, and/or distribute this software for any + purpose with or without fee is hereby granted. + + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH + REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, + INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM + LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR + OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/package-lock.json b/package-lock.json index 494ba87c9..06dc51b0f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,24 +17,24 @@ "packages/history", "packages/java-shell", "packages/js-multiline-to-singleline", - "packages/types", - "packages/i18n", "packages/logging", + "packages/node-runtime-worker-thread", "packages/service-provider-core", - "packages/arg-parser", + "packages/snippet-manager", + "packages/types", + "packages/i18n", "packages/service-provider-node-driver", + "packages/arg-parser", "packages/shell-api", "packages/autocomplete", "packages/shell-evaluator", - "packages/snippet-manager", "packages/browser-runtime-core", "packages/editor", + "packages/browser-repl", "packages/browser-runtime-electron", "packages/cli-repl", "packages/e2e-tests", "packages/mongosh", - "packages/node-runtime-worker-thread", - "packages/browser-repl", "packages/connectivity-tests" ], "bin": { @@ -5659,30 +5659,6 @@ "dev": true, "license": "Apache-2.0" }, - "node_modules/@mongodb-js/devtools-connect": { - "version": "3.3.4", - "resolved": "https://registry.npmjs.org/@mongodb-js/devtools-connect/-/devtools-connect-3.3.4.tgz", - "integrity": "sha512-zD1uu/e2+/SbkSjzdxCg8PSVJkRY+/z1h75F1kZ2UPuy41PmLe9f7Lh8zC1rlR+uFUUcUc503QknfmvinnPSOg==", - "license": "Apache-2.0", - "dependencies": { - "@mongodb-js/devtools-proxy-support": "^0.4.2", - "@mongodb-js/oidc-http-server-pages": "1.1.3", - "lodash.merge": "^4.6.2", - "mongodb-connection-string-url": "^3.0.0", - "socks": "^2.7.3" - }, - "optionalDependencies": { - "kerberos": "^2.1.0", - "mongodb-client-encryption": "^6.1.0", - "os-dns-native": "^1.2.0", - "resolve-mongodb-srv": "^1.1.1" - }, - "peerDependencies": { - "@mongodb-js/oidc-plugin": "^1.1.0", - "mongodb": "^6.9.0", - "mongodb-log-writer": "^1.4.2" - } - }, "node_modules/@mongodb-js/devtools-github-repo": { "version": "1.2.0", "license": "Apache-2.0", @@ -28954,11 +28930,11 @@ }, "packages/arg-parser": { "name": "@mongosh/arg-parser", - "version": "2.3.6", + "version": "2.3.7", "license": "Apache-2.0", "dependencies": { - "@mongosh/errors": "2.3.6", - "@mongosh/i18n": "2.3.6", + "@mongosh/errors": "2.3.7", + "@mongosh/i18n": "2.3.7", "mongodb-connection-string-url": "^3.0.1" }, "devDependencies": { @@ -28975,9 +28951,34 @@ "node": ">=14.15.1" } }, + "packages/arg-parser/node_modules/@mongodb-js/devtools-connect": { + "version": "3.3.4", + "resolved": "https://registry.npmjs.org/@mongodb-js/devtools-connect/-/devtools-connect-3.3.4.tgz", + "integrity": "sha512-zD1uu/e2+/SbkSjzdxCg8PSVJkRY+/z1h75F1kZ2UPuy41PmLe9f7Lh8zC1rlR+uFUUcUc503QknfmvinnPSOg==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@mongodb-js/devtools-proxy-support": "^0.4.2", + "@mongodb-js/oidc-http-server-pages": "1.1.3", + "lodash.merge": "^4.6.2", + "mongodb-connection-string-url": "^3.0.0", + "socks": "^2.7.3" + }, + "optionalDependencies": { + "kerberos": "^2.1.0", + "mongodb-client-encryption": "^6.1.0", + "os-dns-native": "^1.2.0", + "resolve-mongodb-srv": "^1.1.1" + }, + "peerDependencies": { + "@mongodb-js/oidc-plugin": "^1.1.0", + "mongodb": "^6.9.0", + "mongodb-log-writer": "^1.4.2" + } + }, "packages/async-rewriter2": { "name": "@mongosh/async-rewriter2", - "version": "2.3.6", + "version": "2.3.7", "license": "Apache-2.0", "dependencies": { "@babel/core": "^7.22.8", @@ -29004,11 +29005,11 @@ }, "packages/autocomplete": { "name": "@mongosh/autocomplete", - "version": "2.3.6", + "version": "2.3.7", "license": "Apache-2.0", "dependencies": { "@mongodb-js/mongodb-constants": "^0.10.1", - "@mongosh/shell-api": "2.3.6", + "@mongosh/shell-api": "2.3.7", "semver": "^7.5.4" }, "devDependencies": { @@ -29026,15 +29027,15 @@ }, "packages/browser-repl": { "name": "@mongosh/browser-repl", - "version": "2.3.6", + "version": "2.3.7", "license": "Apache-2.0", "dependencies": { - "@mongosh/browser-runtime-core": "2.3.6", - "@mongosh/errors": "2.3.6", - "@mongosh/history": "2.3.6", - "@mongosh/i18n": "2.3.6", - "@mongosh/node-runtime-worker-thread": "2.3.6", - "@mongosh/service-provider-core": "2.3.6", + "@mongosh/browser-runtime-core": "2.3.7", + "@mongosh/errors": "2.3.7", + "@mongosh/history": "2.3.7", + "@mongosh/i18n": "2.3.7", + "@mongosh/node-runtime-worker-thread": "2.3.7", + "@mongosh/service-provider-core": "2.3.7", "numeral": "^2.0.6", "text-table": "^0.2.0" }, @@ -29213,13 +29214,13 @@ }, "packages/browser-runtime-core": { "name": "@mongosh/browser-runtime-core", - "version": "2.3.6", + "version": "2.3.7", "license": "Apache-2.0", "dependencies": { - "@mongosh/autocomplete": "2.3.6", - "@mongosh/service-provider-core": "2.3.6", - "@mongosh/shell-api": "2.3.6", - "@mongosh/shell-evaluator": "2.3.6" + "@mongosh/autocomplete": "2.3.7", + "@mongosh/service-provider-core": "2.3.7", + "@mongosh/shell-api": "2.3.7", + "@mongosh/shell-evaluator": "2.3.7" }, "devDependencies": { "@mongodb-js/eslint-config-mongosh": "^1.0.0", @@ -29236,33 +29237,20 @@ "node": ">=14.15.1" } }, - "packages/browser-runtime-core/node_modules/@mongosh/types": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/@mongosh/types/-/types-2.3.7.tgz", - "integrity": "sha512-0rOQM9CtsGcpkBmQOjdSbZw/idWNuBl38+Fk7H74goEey7ojE/PZvKtcAwSaODsJIrDhCqWx+1w+TdspVokeAg==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "@mongodb-js/devtools-connect": "^3.3.4" - }, - "engines": { - "node": ">=14.15.1" - } - }, "packages/browser-runtime-electron": { "name": "@mongosh/browser-runtime-electron", - "version": "2.3.6", + "version": "2.3.7", "license": "Apache-2.0", "dependencies": { - "@mongosh/browser-runtime-core": "2.3.6", - "@mongosh/service-provider-core": "2.3.6", - "@mongosh/types": "2.3.6" + "@mongosh/browser-runtime-core": "2.3.7", + "@mongosh/service-provider-core": "2.3.7", + "@mongosh/types": "2.3.7" }, "devDependencies": { "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", - "@mongosh/service-provider-node-driver": "2.3.6", + "@mongosh/service-provider-node-driver": "2.3.7", "@types/sinon": "^7.5.1", "@types/sinon-chai": "^3.2.4", "depcheck": "^1.4.7", @@ -29281,7 +29269,7 @@ }, "packages/build": { "name": "@mongosh/build", - "version": "2.3.6", + "version": "2.3.7", "license": "Apache-2.0", "dependencies": { "@mongodb-js/devtools-github-repo": "^1.0.1", @@ -29406,24 +29394,24 @@ }, "packages/cli-repl": { "name": "@mongosh/cli-repl", - "version": "2.3.6", + "version": "2.3.7", "license": "Apache-2.0", "dependencies": { "@mongodb-js/devtools-proxy-support": "^0.4.2", - "@mongosh/arg-parser": "2.3.6", - "@mongosh/autocomplete": "2.3.6", - "@mongosh/editor": "2.3.6", - "@mongosh/errors": "2.3.6", - "@mongosh/history": "2.3.6", - "@mongosh/i18n": "2.3.6", - "@mongosh/js-multiline-to-singleline": "2.3.6", - "@mongosh/logging": "2.3.6", - "@mongosh/service-provider-core": "2.3.6", - "@mongosh/service-provider-node-driver": "2.3.6", - "@mongosh/shell-api": "2.3.6", - "@mongosh/shell-evaluator": "2.3.6", - "@mongosh/snippet-manager": "2.3.6", - "@mongosh/types": "2.3.6", + "@mongosh/arg-parser": "2.3.7", + "@mongosh/autocomplete": "2.3.7", + "@mongosh/editor": "2.3.7", + "@mongosh/errors": "2.3.7", + "@mongosh/history": "2.3.7", + "@mongosh/i18n": "2.3.7", + "@mongosh/js-multiline-to-singleline": "2.3.7", + "@mongosh/logging": "2.3.7", + "@mongosh/service-provider-core": "2.3.7", + "@mongosh/service-provider-node-driver": "2.3.7", + "@mongosh/shell-api": "2.3.7", + "@mongosh/shell-evaluator": "2.3.7", + "@mongosh/snippet-manager": "2.3.7", + "@mongosh/types": "2.3.7", "@segment/analytics-node": "^1.3.0", "ansi-escape-sequences": "^5.1.2", "askcharacter": "^2.0.4", @@ -29490,20 +29478,20 @@ }, "packages/connectivity-tests": { "name": "@mongosh/connectivity-tests", - "version": "2.3.6", + "version": "2.3.7", "license": "Apache-2.0", "devDependencies": { - "mongosh": "2.3.6" + "mongosh": "2.3.7" } }, "packages/e2e-tests": { "name": "@mongosh/e2e-tests", - "version": "2.3.6", + "version": "2.3.7", "license": "Apache-2.0", "dependencies": { "@mongodb-js/oidc-plugin": "^1.1.5", - "@mongosh/cli-repl": "2.3.6", - "@mongosh/service-provider-core": "2.3.6", + "@mongosh/cli-repl": "2.3.7", + "@mongosh/service-provider-core": "2.3.7", "strip-ansi": "^6.0.0" }, "devDependencies": { @@ -29613,14 +29601,14 @@ }, "packages/editor": { "name": "@mongosh/editor", - "version": "2.3.6", + "version": "2.3.7", "license": "Apache-2.0", "dependencies": { - "@mongosh/js-multiline-to-singleline": "2.3.6", - "@mongosh/service-provider-core": "2.3.6", - "@mongosh/shell-api": "2.3.6", - "@mongosh/shell-evaluator": "2.3.6", - "@mongosh/types": "2.3.6", + "@mongosh/js-multiline-to-singleline": "2.3.7", + "@mongosh/service-provider-core": "2.3.7", + "@mongosh/shell-api": "2.3.7", + "@mongosh/shell-evaluator": "2.3.7", + "@mongosh/types": "2.3.7", "js-beautify": "^1.15.1" }, "devDependencies": { @@ -29638,7 +29626,7 @@ }, "packages/errors": { "name": "@mongosh/errors", - "version": "2.3.6", + "version": "2.3.7", "license": "Apache-2.0", "devDependencies": { "@mongodb-js/eslint-config-mongosh": "^1.0.0", @@ -29657,7 +29645,7 @@ }, "packages/history": { "name": "@mongosh/history", - "version": "2.3.6", + "version": "2.3.7", "license": "Apache-2.0", "dependencies": { "mongodb-connection-string-url": "^3.0.1", @@ -29678,10 +29666,10 @@ }, "packages/i18n": { "name": "@mongosh/i18n", - "version": "2.3.6", + "version": "2.3.7", "license": "Apache-2.0", "dependencies": { - "@mongosh/errors": "2.3.6" + "@mongosh/errors": "2.3.7" }, "devDependencies": { "@mongodb-js/eslint-config-mongosh": "^1.0.0", @@ -29697,7 +29685,7 @@ }, "packages/java-shell": { "name": "@mongosh/java-shell", - "version": "2.3.6", + "version": "2.3.7", "license": "SSPL", "devDependencies": { "@mongodb-js/tsconfig-mongosh": "^1.0.0", @@ -29760,7 +29748,7 @@ }, "packages/js-multiline-to-singleline": { "name": "@mongosh/js-multiline-to-singleline", - "version": "2.3.6", + "version": "2.3.7", "license": "Apache-2.0", "dependencies": { "@babel/core": "^7.16.12", @@ -29781,7 +29769,7 @@ }, "packages/logging": { "name": "@mongosh/logging", - "version": "2.3.6", + "version": "2.3.7", "license": "Apache-2.0", "dependencies": { "@mongodb-js/devtools-connect": "^3.3.4", @@ -29803,45 +29791,35 @@ "node": ">=14.15.1" } }, - "packages/logging/node_modules/@mongosh/errors": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/@mongosh/errors/-/errors-2.3.7.tgz", - "integrity": "sha512-WQ7vyeypDYnQIVieNJDF+GhItt46oR9bL2ossWJ9PrTxX57gwV8y1k1YKdhmrWOAVejp5ZDNPWKPyAM5/Ri0Kw==", - "license": "Apache-2.0", - "engines": { - "node": ">=14.15.1" - } - }, - "packages/logging/node_modules/@mongosh/history": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/@mongosh/history/-/history-2.3.7.tgz", - "integrity": "sha512-4EEyPZuFTHEAPUvn6ga4+xcz2NKrl5fJIU37T9eyWJb4BfpDxG+CrrLGRRMqfS+LHar7Xen/oEWWKOMvrt1x8g==", + "packages/logging/node_modules/@mongodb-js/devtools-connect": { + "version": "3.3.4", + "resolved": "https://registry.npmjs.org/@mongodb-js/devtools-connect/-/devtools-connect-3.3.4.tgz", + "integrity": "sha512-zD1uu/e2+/SbkSjzdxCg8PSVJkRY+/z1h75F1kZ2UPuy41PmLe9f7Lh8zC1rlR+uFUUcUc503QknfmvinnPSOg==", "license": "Apache-2.0", "dependencies": { - "mongodb-connection-string-url": "^3.0.1", - "mongodb-redact": "^1.1.2" + "@mongodb-js/devtools-proxy-support": "^0.4.2", + "@mongodb-js/oidc-http-server-pages": "1.1.3", + "lodash.merge": "^4.6.2", + "mongodb-connection-string-url": "^3.0.0", + "socks": "^2.7.3" }, - "engines": { - "node": ">=14.15.1" - } - }, - "packages/logging/node_modules/@mongosh/types": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/@mongosh/types/-/types-2.3.7.tgz", - "integrity": "sha512-0rOQM9CtsGcpkBmQOjdSbZw/idWNuBl38+Fk7H74goEey7ojE/PZvKtcAwSaODsJIrDhCqWx+1w+TdspVokeAg==", - "license": "Apache-2.0", - "dependencies": { - "@mongodb-js/devtools-connect": "^3.3.4" + "optionalDependencies": { + "kerberos": "^2.1.0", + "mongodb-client-encryption": "^6.1.0", + "os-dns-native": "^1.2.0", + "resolve-mongodb-srv": "^1.1.1" }, - "engines": { - "node": ">=14.15.1" + "peerDependencies": { + "@mongodb-js/oidc-plugin": "^1.1.0", + "mongodb": "^6.9.0", + "mongodb-log-writer": "^1.4.2" } }, "packages/mongosh": { - "version": "2.3.6", + "version": "2.3.7", "license": "Apache-2.0", "dependencies": { - "@mongosh/cli-repl": "2.3.6" + "@mongosh/cli-repl": "2.3.7" }, "bin": { "mongosh": "bin/mongosh.js" @@ -29852,7 +29830,7 @@ }, "packages/node-runtime-worker-thread": { "name": "@mongosh/node-runtime-worker-thread", - "version": "2.3.6", + "version": "2.3.7", "license": "Apache-2.0", "dependencies": { "interruptor": "^1.0.1", @@ -29880,219 +29858,9 @@ "node": ">=14.15.1" } }, - "packages/node-runtime-worker-thread/node_modules/@mongosh/arg-parser": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/@mongosh/arg-parser/-/arg-parser-2.3.7.tgz", - "integrity": "sha512-cChpbvlSjaHAtO2nAgrJpWBhvL8BPZhjS0PWxlYlHIGdLSHKCjOA62QsAKTP57HIcs4lirhrvV3DqP9FZnKftg==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "@mongosh/errors": "2.3.7", - "@mongosh/i18n": "2.3.7", - "mongodb-connection-string-url": "^3.0.1" - }, - "engines": { - "node": ">=14.15.1" - } - }, - "packages/node-runtime-worker-thread/node_modules/@mongosh/async-rewriter2": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/@mongosh/async-rewriter2/-/async-rewriter2-2.3.7.tgz", - "integrity": "sha512-847ZzSbvoz0iveZt23AWD6iJQ7qm6CZdHOASVBvmKTyixf3rMt/y+L/xvOuZvz5kEU7eCaFa99eyW6SN4DBNog==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "@babel/core": "^7.22.8", - "@babel/plugin-transform-destructuring": "^7.22.5", - "@babel/plugin-transform-parameters": "^7.22.5", - "@babel/plugin-transform-shorthand-properties": "^7.22.5", - "@babel/types": "^7.22.5" - }, - "bin": { - "async-rewrite": "bin/async-rewrite.js" - }, - "engines": { - "node": ">=14.15.1" - } - }, - "packages/node-runtime-worker-thread/node_modules/@mongosh/autocomplete": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/@mongosh/autocomplete/-/autocomplete-2.3.7.tgz", - "integrity": "sha512-+LSbyX5ej4gD3uVL0hvgX66f/1V6BM1ccwEvIHQWePaIuprvThSE1mPwt8dl6Dz8PoqB/wzMp1nbUVE51pUoJA==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "@mongodb-js/mongodb-constants": "^0.10.1", - "@mongosh/shell-api": "2.3.7", - "semver": "^7.5.4" - }, - "engines": { - "node": ">=14.15.1" - } - }, - "packages/node-runtime-worker-thread/node_modules/@mongosh/browser-runtime-core": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/@mongosh/browser-runtime-core/-/browser-runtime-core-2.3.7.tgz", - "integrity": "sha512-L3HEGKqmZ8IPjcTTmUHu3oN1D1wv1MBWS1MhwkcAhprqOfLOu9vloLfX/uWV5+w8MqarWZZDQEzWkWrZ40y49A==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "@mongosh/autocomplete": "2.3.7", - "@mongosh/service-provider-core": "2.3.7", - "@mongosh/shell-api": "2.3.7", - "@mongosh/shell-evaluator": "2.3.7" - }, - "engines": { - "node": ">=14.15.1" - } - }, - "packages/node-runtime-worker-thread/node_modules/@mongosh/browser-runtime-electron": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/@mongosh/browser-runtime-electron/-/browser-runtime-electron-2.3.7.tgz", - "integrity": "sha512-y3RHWClFo1xqG3zZIohfAb/DKkTpc3irKrDy+MPs0NqeOgqrGhRq8tPZB8nN9SOK19DWfjTmfWUKBpdOL3Ou+g==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "@mongosh/browser-runtime-core": "2.3.7", - "@mongosh/service-provider-core": "2.3.7", - "@mongosh/types": "2.3.7" - }, - "engines": { - "node": ">=14.15.1" - } - }, - "packages/node-runtime-worker-thread/node_modules/@mongosh/errors": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/@mongosh/errors/-/errors-2.3.7.tgz", - "integrity": "sha512-WQ7vyeypDYnQIVieNJDF+GhItt46oR9bL2ossWJ9PrTxX57gwV8y1k1YKdhmrWOAVejp5ZDNPWKPyAM5/Ri0Kw==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": ">=14.15.1" - } - }, - "packages/node-runtime-worker-thread/node_modules/@mongosh/history": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/@mongosh/history/-/history-2.3.7.tgz", - "integrity": "sha512-4EEyPZuFTHEAPUvn6ga4+xcz2NKrl5fJIU37T9eyWJb4BfpDxG+CrrLGRRMqfS+LHar7Xen/oEWWKOMvrt1x8g==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "mongodb-connection-string-url": "^3.0.1", - "mongodb-redact": "^1.1.2" - }, - "engines": { - "node": ">=14.15.1" - } - }, - "packages/node-runtime-worker-thread/node_modules/@mongosh/i18n": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/@mongosh/i18n/-/i18n-2.3.7.tgz", - "integrity": "sha512-xH5ZK29jb4pf3cBOFpomz3Zq2PnZLTgBRiteqGLucTrGM1YZ7Nr81fFMEa8il0wTK2taQ8yuCvhGC0liiM+8sw==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "@mongosh/errors": "2.3.7" - }, - "engines": { - "node": ">=14.15.1" - } - }, - "packages/node-runtime-worker-thread/node_modules/@mongosh/service-provider-core": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/@mongosh/service-provider-core/-/service-provider-core-2.3.7.tgz", - "integrity": "sha512-y6gQv3Pi6vSR0O1pIpBNDJv84oY+QKKUJAIjDRwGAmgRP6CuMXr25J6R57iLxVzsdhxPxZml1RXvvncM8gRGkA==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/credential-providers": "^3.525.0", - "@mongosh/errors": "2.3.7", - "bson": "^6.10.1", - "mongodb": "^6.12.0", - "mongodb-build-info": "^1.7.2", - "mongodb-connection-string-url": "^3.0.1" - }, - "engines": { - "node": ">=14.15.1" - }, - "optionalDependencies": { - "mongodb-client-encryption": "^6.1.0" - } - }, - "packages/node-runtime-worker-thread/node_modules/@mongosh/service-provider-node-driver": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/@mongosh/service-provider-node-driver/-/service-provider-node-driver-2.3.7.tgz", - "integrity": "sha512-qxWwuwFcmI2cQxaBClof886vw2W0TNYNC0ewnjTtWo8EF01uGB9krATKp1rn5A+FX62z6dI1J0L0oYLpmlu68w==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "@mongodb-js/devtools-connect": "^3.3.4", - "@mongodb-js/oidc-plugin": "^1.1.5", - "@mongosh/errors": "2.3.7", - "@mongosh/service-provider-core": "2.3.7", - "@mongosh/types": "2.3.7", - "aws4": "^1.12.0", - "mongodb": "^6.12.0", - "mongodb-connection-string-url": "^3.0.1", - "socks": "^2.8.3" - }, - "engines": { - "node": ">=14.15.1" - }, - "optionalDependencies": { - "kerberos": "2.1.0", - "mongodb-client-encryption": "^6.1.0" - } - }, - "packages/node-runtime-worker-thread/node_modules/@mongosh/shell-api": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/@mongosh/shell-api/-/shell-api-2.3.7.tgz", - "integrity": "sha512-3aWHB74dUPrPGVQgOsfJUykx/sy4CbUXoZTUZA8VZt6i0aRZFuJ0bbEFmtZ7hM4cmacNVlqe+ry/6rxC7KL/hA==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "@mongosh/arg-parser": "2.3.7", - "@mongosh/errors": "2.3.7", - "@mongosh/history": "2.3.7", - "@mongosh/i18n": "2.3.7", - "@mongosh/service-provider-core": "2.3.7", - "mongodb-redact": "^1.1.2" - }, - "engines": { - "node": ">=14.15.1" - } - }, - "packages/node-runtime-worker-thread/node_modules/@mongosh/shell-evaluator": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/@mongosh/shell-evaluator/-/shell-evaluator-2.3.7.tgz", - "integrity": "sha512-pdG+ILkFiejOySti3QMte3vTHOQhLrjag8Gfm4DjnH2oK8z4Yw5lr4BfWS5u5JaSvtmmOIEW1mRp2UJbSiKjDA==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "@mongosh/async-rewriter2": "2.3.7", - "@mongosh/history": "2.3.7", - "@mongosh/shell-api": "2.3.7" - }, - "engines": { - "node": ">=14.15.1" - } - }, - "packages/node-runtime-worker-thread/node_modules/@mongosh/types": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/@mongosh/types/-/types-2.3.7.tgz", - "integrity": "sha512-0rOQM9CtsGcpkBmQOjdSbZw/idWNuBl38+Fk7H74goEey7ojE/PZvKtcAwSaODsJIrDhCqWx+1w+TdspVokeAg==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "@mongodb-js/devtools-connect": "^3.3.4" - }, - "engines": { - "node": ">=14.15.1" - } - }, "packages/service-provider-core": { "name": "@mongosh/service-provider-core", - "version": "2.3.6", + "version": "2.3.7", "license": "Apache-2.0", "dependencies": { "@aws-sdk/credential-providers": "^3.525.0", @@ -30117,25 +29885,16 @@ "mongodb-client-encryption": "^6.1.0" } }, - "packages/service-provider-core/node_modules/@mongosh/errors": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/@mongosh/errors/-/errors-2.3.7.tgz", - "integrity": "sha512-WQ7vyeypDYnQIVieNJDF+GhItt46oR9bL2ossWJ9PrTxX57gwV8y1k1YKdhmrWOAVejp5ZDNPWKPyAM5/Ri0Kw==", - "license": "Apache-2.0", - "engines": { - "node": ">=14.15.1" - } - }, "packages/service-provider-node-driver": { "name": "@mongosh/service-provider-node-driver", - "version": "2.3.6", + "version": "2.3.7", "license": "Apache-2.0", "dependencies": { "@mongodb-js/devtools-connect": "^3.3.4", "@mongodb-js/oidc-plugin": "^1.1.5", - "@mongosh/errors": "2.3.6", - "@mongosh/service-provider-core": "2.3.6", - "@mongosh/types": "2.3.6", + "@mongosh/errors": "2.3.7", + "@mongosh/service-provider-core": "2.3.7", + "@mongosh/types": "2.3.7", "aws4": "^1.12.0", "mongodb": "^6.12.0", "mongodb-connection-string-url": "^3.0.1", @@ -30158,16 +29917,40 @@ "mongodb-client-encryption": "^6.1.0" } }, + "packages/service-provider-node-driver/node_modules/@mongodb-js/devtools-connect": { + "version": "3.3.4", + "resolved": "https://registry.npmjs.org/@mongodb-js/devtools-connect/-/devtools-connect-3.3.4.tgz", + "integrity": "sha512-zD1uu/e2+/SbkSjzdxCg8PSVJkRY+/z1h75F1kZ2UPuy41PmLe9f7Lh8zC1rlR+uFUUcUc503QknfmvinnPSOg==", + "license": "Apache-2.0", + "dependencies": { + "@mongodb-js/devtools-proxy-support": "^0.4.2", + "@mongodb-js/oidc-http-server-pages": "1.1.3", + "lodash.merge": "^4.6.2", + "mongodb-connection-string-url": "^3.0.0", + "socks": "^2.7.3" + }, + "optionalDependencies": { + "kerberos": "^2.1.0", + "mongodb-client-encryption": "^6.1.0", + "os-dns-native": "^1.2.0", + "resolve-mongodb-srv": "^1.1.1" + }, + "peerDependencies": { + "@mongodb-js/oidc-plugin": "^1.1.0", + "mongodb": "^6.9.0", + "mongodb-log-writer": "^1.4.2" + } + }, "packages/shell-api": { "name": "@mongosh/shell-api", - "version": "2.3.6", + "version": "2.3.7", "license": "Apache-2.0", "dependencies": { - "@mongosh/arg-parser": "2.3.6", - "@mongosh/errors": "2.3.6", - "@mongosh/history": "2.3.6", - "@mongosh/i18n": "2.3.6", - "@mongosh/service-provider-core": "2.3.6", + "@mongosh/arg-parser": "2.3.7", + "@mongosh/errors": "2.3.7", + "@mongosh/history": "2.3.7", + "@mongosh/i18n": "2.3.7", + "@mongosh/service-provider-core": "2.3.7", "mongodb-redact": "^1.1.2" }, "devDependencies": { @@ -30186,33 +29969,20 @@ "node": ">=14.15.1" } }, - "packages/shell-api/node_modules/@mongosh/types": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/@mongosh/types/-/types-2.3.7.tgz", - "integrity": "sha512-0rOQM9CtsGcpkBmQOjdSbZw/idWNuBl38+Fk7H74goEey7ojE/PZvKtcAwSaODsJIrDhCqWx+1w+TdspVokeAg==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "@mongodb-js/devtools-connect": "^3.3.4" - }, - "engines": { - "node": ">=14.15.1" - } - }, "packages/shell-evaluator": { "name": "@mongosh/shell-evaluator", - "version": "2.3.6", + "version": "2.3.7", "license": "Apache-2.0", "dependencies": { - "@mongosh/async-rewriter2": "2.3.6", - "@mongosh/history": "2.3.6", - "@mongosh/shell-api": "2.3.6" + "@mongosh/async-rewriter2": "2.3.7", + "@mongosh/history": "2.3.7", + "@mongosh/shell-api": "2.3.7" }, "devDependencies": { "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", - "@mongosh/types": "2.3.6", + "@mongosh/types": "2.3.7", "@types/sinon-chai": "^3.2.4", "depcheck": "^1.4.7", "eslint": "^7.25.0", @@ -30224,7 +29994,7 @@ }, "packages/snippet-manager": { "name": "@mongosh/snippet-manager", - "version": "2.3.6", + "version": "2.3.7", "license": "Apache-2.0", "dependencies": { "@mongodb-js/devtools-proxy-support": "^0.4.2", @@ -30252,103 +30022,6 @@ "node": ">=14.15.1" } }, - "packages/snippet-manager/node_modules/@mongosh/arg-parser": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/@mongosh/arg-parser/-/arg-parser-2.3.7.tgz", - "integrity": "sha512-cChpbvlSjaHAtO2nAgrJpWBhvL8BPZhjS0PWxlYlHIGdLSHKCjOA62QsAKTP57HIcs4lirhrvV3DqP9FZnKftg==", - "license": "Apache-2.0", - "dependencies": { - "@mongosh/errors": "2.3.7", - "@mongosh/i18n": "2.3.7", - "mongodb-connection-string-url": "^3.0.1" - }, - "engines": { - "node": ">=14.15.1" - } - }, - "packages/snippet-manager/node_modules/@mongosh/errors": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/@mongosh/errors/-/errors-2.3.7.tgz", - "integrity": "sha512-WQ7vyeypDYnQIVieNJDF+GhItt46oR9bL2ossWJ9PrTxX57gwV8y1k1YKdhmrWOAVejp5ZDNPWKPyAM5/Ri0Kw==", - "license": "Apache-2.0", - "engines": { - "node": ">=14.15.1" - } - }, - "packages/snippet-manager/node_modules/@mongosh/history": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/@mongosh/history/-/history-2.3.7.tgz", - "integrity": "sha512-4EEyPZuFTHEAPUvn6ga4+xcz2NKrl5fJIU37T9eyWJb4BfpDxG+CrrLGRRMqfS+LHar7Xen/oEWWKOMvrt1x8g==", - "license": "Apache-2.0", - "dependencies": { - "mongodb-connection-string-url": "^3.0.1", - "mongodb-redact": "^1.1.2" - }, - "engines": { - "node": ">=14.15.1" - } - }, - "packages/snippet-manager/node_modules/@mongosh/i18n": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/@mongosh/i18n/-/i18n-2.3.7.tgz", - "integrity": "sha512-xH5ZK29jb4pf3cBOFpomz3Zq2PnZLTgBRiteqGLucTrGM1YZ7Nr81fFMEa8il0wTK2taQ8yuCvhGC0liiM+8sw==", - "license": "Apache-2.0", - "dependencies": { - "@mongosh/errors": "2.3.7" - }, - "engines": { - "node": ">=14.15.1" - } - }, - "packages/snippet-manager/node_modules/@mongosh/service-provider-core": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/@mongosh/service-provider-core/-/service-provider-core-2.3.7.tgz", - "integrity": "sha512-y6gQv3Pi6vSR0O1pIpBNDJv84oY+QKKUJAIjDRwGAmgRP6CuMXr25J6R57iLxVzsdhxPxZml1RXvvncM8gRGkA==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/credential-providers": "^3.525.0", - "@mongosh/errors": "2.3.7", - "bson": "^6.10.1", - "mongodb": "^6.12.0", - "mongodb-build-info": "^1.7.2", - "mongodb-connection-string-url": "^3.0.1" - }, - "engines": { - "node": ">=14.15.1" - }, - "optionalDependencies": { - "mongodb-client-encryption": "^6.1.0" - } - }, - "packages/snippet-manager/node_modules/@mongosh/shell-api": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/@mongosh/shell-api/-/shell-api-2.3.7.tgz", - "integrity": "sha512-3aWHB74dUPrPGVQgOsfJUykx/sy4CbUXoZTUZA8VZt6i0aRZFuJ0bbEFmtZ7hM4cmacNVlqe+ry/6rxC7KL/hA==", - "license": "Apache-2.0", - "dependencies": { - "@mongosh/arg-parser": "2.3.7", - "@mongosh/errors": "2.3.7", - "@mongosh/history": "2.3.7", - "@mongosh/i18n": "2.3.7", - "@mongosh/service-provider-core": "2.3.7", - "mongodb-redact": "^1.1.2" - }, - "engines": { - "node": ">=14.15.1" - } - }, - "packages/snippet-manager/node_modules/@mongosh/types": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/@mongosh/types/-/types-2.3.7.tgz", - "integrity": "sha512-0rOQM9CtsGcpkBmQOjdSbZw/idWNuBl38+Fk7H74goEey7ojE/PZvKtcAwSaODsJIrDhCqWx+1w+TdspVokeAg==", - "license": "Apache-2.0", - "dependencies": { - "@mongodb-js/devtools-connect": "^3.3.4" - }, - "engines": { - "node": ">=14.15.1" - } - }, "packages/snippet-manager/node_modules/@types/cross-spawn": { "version": "6.0.6", "resolved": "https://registry.npmjs.org/@types/cross-spawn/-/cross-spawn-6.0.6.tgz", @@ -30361,7 +30034,7 @@ }, "packages/types": { "name": "@mongosh/types", - "version": "2.3.6", + "version": "2.3.7", "license": "Apache-2.0", "dependencies": { "@mongodb-js/devtools-connect": "^3.3.4" @@ -30379,9 +30052,33 @@ "node": ">=14.15.1" } }, + "packages/types/node_modules/@mongodb-js/devtools-connect": { + "version": "3.3.4", + "resolved": "https://registry.npmjs.org/@mongodb-js/devtools-connect/-/devtools-connect-3.3.4.tgz", + "integrity": "sha512-zD1uu/e2+/SbkSjzdxCg8PSVJkRY+/z1h75F1kZ2UPuy41PmLe9f7Lh8zC1rlR+uFUUcUc503QknfmvinnPSOg==", + "license": "Apache-2.0", + "dependencies": { + "@mongodb-js/devtools-proxy-support": "^0.4.2", + "@mongodb-js/oidc-http-server-pages": "1.1.3", + "lodash.merge": "^4.6.2", + "mongodb-connection-string-url": "^3.0.0", + "socks": "^2.7.3" + }, + "optionalDependencies": { + "kerberos": "^2.1.0", + "mongodb-client-encryption": "^6.1.0", + "os-dns-native": "^1.2.0", + "resolve-mongodb-srv": "^1.1.1" + }, + "peerDependencies": { + "@mongodb-js/oidc-plugin": "^1.1.0", + "mongodb": "^6.9.0", + "mongodb-log-writer": "^1.4.2" + } + }, "scripts/docker": { "name": "@mongosh/docker-build-scripts", - "version": "2.3.6", + "version": "2.3.7", "license": "Apache-2.0", "dependencies": { "mongodb-crypt-library-version": "^1.0.5" diff --git a/package.json b/package.json index 030ab0dc9..5a6f0929c 100644 --- a/package.json +++ b/package.json @@ -148,24 +148,24 @@ "packages/history", "packages/java-shell", "packages/js-multiline-to-singleline", - "packages/logging", - "packages/node-runtime-worker-thread", - "packages/service-provider-core", - "packages/snippet-manager", "packages/types", "packages/i18n", - "packages/service-provider-node-driver", + "packages/logging", + "packages/service-provider-core", "packages/arg-parser", + "packages/service-provider-node-driver", "packages/shell-api", "packages/autocomplete", "packages/shell-evaluator", + "packages/snippet-manager", "packages/browser-runtime-core", "packages/editor", - "packages/browser-repl", "packages/browser-runtime-electron", "packages/cli-repl", "packages/e2e-tests", "packages/mongosh", + "packages/node-runtime-worker-thread", + "packages/browser-repl", "packages/connectivity-tests" ], "overrides": { diff --git a/packages/arg-parser/package.json b/packages/arg-parser/package.json index cd5495786..eec57eefd 100644 --- a/packages/arg-parser/package.json +++ b/packages/arg-parser/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/arg-parser", - "version": "2.3.6", + "version": "2.3.7", "description": "MongoDB Shell CLI Argument List Parser Package", "main": "./lib/index.js", "repository": { @@ -35,8 +35,8 @@ "unitTestsOnly": true }, "dependencies": { - "@mongosh/errors": "2.3.6", - "@mongosh/i18n": "2.3.6", + "@mongosh/errors": "2.3.7", + "@mongosh/i18n": "2.3.7", "mongodb-connection-string-url": "^3.0.1" }, "devDependencies": { diff --git a/packages/async-rewriter2/package.json b/packages/async-rewriter2/package.json index e61a9b5bc..17bd4cad1 100644 --- a/packages/async-rewriter2/package.json +++ b/packages/async-rewriter2/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/async-rewriter2", - "version": "2.3.6", + "version": "2.3.7", "description": "MongoDB Shell Async Rewriter Package", "main": "./lib/index.js", "scripts": { diff --git a/packages/autocomplete/package.json b/packages/autocomplete/package.json index 2583fe2e6..da6523f0c 100644 --- a/packages/autocomplete/package.json +++ b/packages/autocomplete/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/autocomplete", - "version": "2.3.6", + "version": "2.3.7", "description": "MongoDB Shell Autocomplete Package", "homepage": "https://github.com/mongodb-js/mongosh", "license": "Apache-2.0", @@ -44,7 +44,7 @@ }, "dependencies": { "@mongodb-js/mongodb-constants": "^0.10.1", - "@mongosh/shell-api": "2.3.6", + "@mongosh/shell-api": "2.3.7", "semver": "^7.5.4" } } diff --git a/packages/browser-repl/package.json b/packages/browser-repl/package.json index 1f1c30845..75ddf4eae 100644 --- a/packages/browser-repl/package.json +++ b/packages/browser-repl/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/browser-repl", - "version": "2.3.6", + "version": "2.3.7", "description": "Browser presentation component for Mongo Shell", "engines": { "node": ">=14.15.1" @@ -56,12 +56,12 @@ ] }, "dependencies": { - "@mongosh/browser-runtime-core": "2.3.6", - "@mongosh/errors": "2.3.6", - "@mongosh/history": "2.3.6", - "@mongosh/i18n": "2.3.6", - "@mongosh/node-runtime-worker-thread": "2.3.6", - "@mongosh/service-provider-core": "2.3.6", + "@mongosh/browser-runtime-core": "2.3.7", + "@mongosh/errors": "2.3.7", + "@mongosh/history": "2.3.7", + "@mongosh/i18n": "2.3.7", + "@mongosh/node-runtime-worker-thread": "2.3.7", + "@mongosh/service-provider-core": "2.3.7", "numeral": "^2.0.6", "text-table": "^0.2.0" }, diff --git a/packages/browser-runtime-core/package.json b/packages/browser-runtime-core/package.json index 95362521a..4dde65ae7 100644 --- a/packages/browser-runtime-core/package.json +++ b/packages/browser-runtime-core/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/browser-runtime-core", - "version": "2.3.6", + "version": "2.3.7", "description": "Mongosh browser runtime core", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -49,9 +49,9 @@ "rimraf": "^3.0.2" }, "dependencies": { - "@mongosh/autocomplete": "2.3.6", - "@mongosh/service-provider-core": "2.3.6", - "@mongosh/shell-api": "2.3.6", - "@mongosh/shell-evaluator": "2.3.6" + "@mongosh/autocomplete": "2.3.7", + "@mongosh/service-provider-core": "2.3.7", + "@mongosh/shell-api": "2.3.7", + "@mongosh/shell-evaluator": "2.3.7" } } diff --git a/packages/browser-runtime-electron/package.json b/packages/browser-runtime-electron/package.json index 3a7024874..5295b00c8 100644 --- a/packages/browser-runtime-electron/package.json +++ b/packages/browser-runtime-electron/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/browser-runtime-electron", - "version": "2.3.6", + "version": "2.3.7", "description": "Mongosh browser runtime electron", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -41,7 +41,7 @@ "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", - "@mongosh/service-provider-node-driver": "2.3.6", + "@mongosh/service-provider-node-driver": "2.3.7", "@types/sinon": "^7.5.1", "@types/sinon-chai": "^3.2.4", "depcheck": "^1.4.7", @@ -50,8 +50,8 @@ "rimraf": "^3.0.2" }, "dependencies": { - "@mongosh/browser-runtime-core": "2.3.6", - "@mongosh/service-provider-core": "2.3.6", - "@mongosh/types": "2.3.6" + "@mongosh/browser-runtime-core": "2.3.7", + "@mongosh/service-provider-core": "2.3.7", + "@mongosh/types": "2.3.7" } } diff --git a/packages/build/package.json b/packages/build/package.json index f3424962e..8f2830de7 100644 --- a/packages/build/package.json +++ b/packages/build/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/build", - "version": "2.3.6", + "version": "2.3.7", "private": true, "description": "MongoDB Shell Build Tools", "main": "lib/index.js", diff --git a/packages/cli-repl/package.json b/packages/cli-repl/package.json index 0e16d14fc..cc6810437 100644 --- a/packages/cli-repl/package.json +++ b/packages/cli-repl/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/cli-repl", - "version": "2.3.6", + "version": "2.3.7", "description": "MongoDB Shell CLI REPL Package", "homepage": "https://github.com/mongodb-js/mongosh", "author": "Compass Team ", @@ -63,20 +63,20 @@ }, "dependencies": { "@mongodb-js/devtools-proxy-support": "^0.4.2", - "@mongosh/arg-parser": "2.3.6", - "@mongosh/autocomplete": "2.3.6", - "@mongosh/editor": "2.3.6", - "@mongosh/errors": "2.3.6", - "@mongosh/history": "2.3.6", - "@mongosh/i18n": "2.3.6", - "@mongosh/js-multiline-to-singleline": "2.3.6", - "@mongosh/logging": "2.3.6", - "@mongosh/service-provider-core": "2.3.6", - "@mongosh/service-provider-node-driver": "2.3.6", - "@mongosh/shell-api": "2.3.6", - "@mongosh/shell-evaluator": "2.3.6", - "@mongosh/snippet-manager": "2.3.6", - "@mongosh/types": "2.3.6", + "@mongosh/arg-parser": "2.3.7", + "@mongosh/autocomplete": "2.3.7", + "@mongosh/editor": "2.3.7", + "@mongosh/errors": "2.3.7", + "@mongosh/history": "2.3.7", + "@mongosh/i18n": "2.3.7", + "@mongosh/js-multiline-to-singleline": "2.3.7", + "@mongosh/logging": "2.3.7", + "@mongosh/service-provider-core": "2.3.7", + "@mongosh/service-provider-node-driver": "2.3.7", + "@mongosh/shell-api": "2.3.7", + "@mongosh/shell-evaluator": "2.3.7", + "@mongosh/snippet-manager": "2.3.7", + "@mongosh/types": "2.3.7", "@segment/analytics-node": "^1.3.0", "ansi-escape-sequences": "^5.1.2", "askcharacter": "^2.0.4", diff --git a/packages/connectivity-tests/package.json b/packages/connectivity-tests/package.json index fabc82e00..0ecc11110 100644 --- a/packages/connectivity-tests/package.json +++ b/packages/connectivity-tests/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/connectivity-tests", - "version": "2.3.6", + "version": "2.3.7", "private": true, "license": "Apache-2.0", "scripts": { @@ -11,7 +11,7 @@ "test-ci-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test-ci" }, "devDependencies": { - "mongosh": "2.3.6" + "mongosh": "2.3.7" }, "mongosh": { "unitTestsOnly": true, diff --git a/packages/e2e-tests/package.json b/packages/e2e-tests/package.json index 535b371a8..a359d9a07 100644 --- a/packages/e2e-tests/package.json +++ b/packages/e2e-tests/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/e2e-tests", - "version": "2.3.6", + "version": "2.3.7", "private": true, "description": "MongoDB Shell E2E Tests Package", "homepage": "https://github.com/mongodb-js/mongosh", @@ -27,8 +27,8 @@ "node": ">=16.15.0" }, "dependencies": { - "@mongosh/cli-repl": "2.3.6", - "@mongosh/service-provider-core": "2.3.6", + "@mongosh/cli-repl": "2.3.7", + "@mongosh/service-provider-core": "2.3.7", "@mongodb-js/oidc-plugin": "^1.1.5", "strip-ansi": "^6.0.0" }, diff --git a/packages/editor/package.json b/packages/editor/package.json index 566691fc5..df6d22f49 100644 --- a/packages/editor/package.json +++ b/packages/editor/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/editor", - "version": "2.3.6", + "version": "2.3.7", "description": "MongoDB Shell External Editor", "main": "./lib/index.js", "repository": { @@ -35,11 +35,11 @@ "unitTestsOnly": true }, "dependencies": { - "@mongosh/js-multiline-to-singleline": "2.3.6", - "@mongosh/service-provider-core": "2.3.6", - "@mongosh/shell-api": "2.3.6", - "@mongosh/shell-evaluator": "2.3.6", - "@mongosh/types": "2.3.6", + "@mongosh/js-multiline-to-singleline": "2.3.7", + "@mongosh/service-provider-core": "2.3.7", + "@mongosh/shell-api": "2.3.7", + "@mongosh/shell-evaluator": "2.3.7", + "@mongosh/types": "2.3.7", "js-beautify": "^1.15.1" }, "devDependencies": { diff --git a/packages/errors/package.json b/packages/errors/package.json index 154f2ba94..b2771b58f 100644 --- a/packages/errors/package.json +++ b/packages/errors/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/errors", - "version": "2.3.6", + "version": "2.3.7", "description": "MongoDB Shell Errors Package", "homepage": "https://github.com/mongodb-js/mongosh", "license": "Apache-2.0", diff --git a/packages/history/package.json b/packages/history/package.json index 1ba741e06..79eaafd58 100644 --- a/packages/history/package.json +++ b/packages/history/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/history", - "version": "2.3.6", + "version": "2.3.7", "description": "MongoDB Shell History Package", "main": "./lib/index.js", "repository": { diff --git a/packages/i18n/package.json b/packages/i18n/package.json index c73b24847..6fd1fee90 100644 --- a/packages/i18n/package.json +++ b/packages/i18n/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/i18n", - "version": "2.3.6", + "version": "2.3.7", "description": "MongoDB Shell i18n Project", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -36,7 +36,7 @@ "unitTestsOnly": true }, "dependencies": { - "@mongosh/errors": "2.3.6" + "@mongosh/errors": "2.3.7" }, "devDependencies": { "@mongodb-js/eslint-config-mongosh": "^1.0.0", diff --git a/packages/java-shell/package.json b/packages/java-shell/package.json index b7e57a6fc..53458cd02 100644 --- a/packages/java-shell/package.json +++ b/packages/java-shell/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/java-shell", - "version": "2.3.6", + "version": "2.3.7", "private": true, "description": "Java application that uses mongosh-shell-api node module and MongoDB java driver to run mongo shell on JVM", "config": { diff --git a/packages/js-multiline-to-singleline/package.json b/packages/js-multiline-to-singleline/package.json index 88b451a24..777544763 100644 --- a/packages/js-multiline-to-singleline/package.json +++ b/packages/js-multiline-to-singleline/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/js-multiline-to-singleline", - "version": "2.3.6", + "version": "2.3.7", "description": "Make multiline JS into a single line", "main": "./lib/index.js", "repository": { diff --git a/packages/logging/package.json b/packages/logging/package.json index 11bb75e72..5298f800d 100644 --- a/packages/logging/package.json +++ b/packages/logging/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/logging", - "version": "2.3.6", + "version": "2.3.7", "description": "MongoDB Shell Logging Utilities Package", "homepage": "https://github.com/mongodb-js/mongosh", "license": "Apache-2.0", diff --git a/packages/mongosh/package.json b/packages/mongosh/package.json index 5b1c34b98..d599c5f39 100644 --- a/packages/mongosh/package.json +++ b/packages/mongosh/package.json @@ -1,6 +1,6 @@ { "name": "mongosh", - "version": "2.3.6", + "version": "2.3.7", "description": "MongoDB Shell CLI REPL", "keywords": [ "mongosh", @@ -39,6 +39,6 @@ "variants": [] }, "dependencies": { - "@mongosh/cli-repl": "2.3.6" + "@mongosh/cli-repl": "2.3.7" } } diff --git a/packages/node-runtime-worker-thread/package.json b/packages/node-runtime-worker-thread/package.json index 68cb41d0d..d83756cf5 100644 --- a/packages/node-runtime-worker-thread/package.json +++ b/packages/node-runtime-worker-thread/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/node-runtime-worker-thread", - "version": "2.3.6", + "version": "2.3.7", "description": "MongoDB shell runtime that lives in a worker thread", "homepage": "https://github.com/mongodb-js/mongosh", "license": "Apache-2.0", diff --git a/packages/service-provider-core/package.json b/packages/service-provider-core/package.json index b9450a076..13bbff4fc 100644 --- a/packages/service-provider-core/package.json +++ b/packages/service-provider-core/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/service-provider-core", - "version": "2.3.6", + "version": "2.3.7", "description": "MongoDB Shell Core Service Provider Package", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/service-provider-node-driver/package.json b/packages/service-provider-node-driver/package.json index 78031b739..f193c2d8b 100644 --- a/packages/service-provider-node-driver/package.json +++ b/packages/service-provider-node-driver/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/service-provider-node-driver", - "version": "2.3.6", + "version": "2.3.7", "description": "MongoDB Shell Server Service Provider Package", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -49,9 +49,9 @@ "dependencies": { "@mongodb-js/devtools-connect": "^3.3.4", "@mongodb-js/oidc-plugin": "^1.1.5", - "@mongosh/errors": "2.3.6", - "@mongosh/service-provider-core": "2.3.6", - "@mongosh/types": "2.3.6", + "@mongosh/errors": "2.3.7", + "@mongosh/service-provider-core": "2.3.7", + "@mongosh/types": "2.3.7", "aws4": "^1.12.0", "mongodb": "^6.12.0", "mongodb-connection-string-url": "^3.0.1", diff --git a/packages/shell-api/package.json b/packages/shell-api/package.json index 060f3df6d..a855b16ee 100644 --- a/packages/shell-api/package.json +++ b/packages/shell-api/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/shell-api", - "version": "2.3.6", + "version": "2.3.7", "description": "MongoDB Shell API Classes Package", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -40,11 +40,11 @@ "build" ], "dependencies": { - "@mongosh/arg-parser": "2.3.6", - "@mongosh/errors": "2.3.6", - "@mongosh/history": "2.3.6", - "@mongosh/i18n": "2.3.6", - "@mongosh/service-provider-core": "2.3.6", + "@mongosh/arg-parser": "2.3.7", + "@mongosh/errors": "2.3.7", + "@mongosh/history": "2.3.7", + "@mongosh/i18n": "2.3.7", + "@mongosh/service-provider-core": "2.3.7", "mongodb-redact": "^1.1.2" }, "devDependencies": { diff --git a/packages/shell-evaluator/package.json b/packages/shell-evaluator/package.json index 1896d9d9c..e8ab58688 100644 --- a/packages/shell-evaluator/package.json +++ b/packages/shell-evaluator/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/shell-evaluator", - "version": "2.3.6", + "version": "2.3.7", "description": "MongoDB Top Level API Package", "main": "./lib/index.js", "scripts": { @@ -38,15 +38,15 @@ "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", - "@mongosh/types": "2.3.6", + "@mongosh/types": "2.3.7", "@types/sinon-chai": "^3.2.4", "depcheck": "^1.4.7", "eslint": "^7.25.0", "prettier": "^2.8.8" }, "dependencies": { - "@mongosh/async-rewriter2": "2.3.6", - "@mongosh/history": "2.3.6", - "@mongosh/shell-api": "2.3.6" + "@mongosh/async-rewriter2": "2.3.7", + "@mongosh/history": "2.3.7", + "@mongosh/shell-api": "2.3.7" } } diff --git a/packages/snippet-manager/package.json b/packages/snippet-manager/package.json index ff56c6085..d64e8e8e1 100644 --- a/packages/snippet-manager/package.json +++ b/packages/snippet-manager/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/snippet-manager", - "version": "2.3.6", + "version": "2.3.7", "description": "MongoDB Shell Snippet Manager", "main": "./lib/index.js", "repository": { diff --git a/packages/types/package.json b/packages/types/package.json index 51d93c8dd..41e1744ca 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/types", - "version": "2.3.6", + "version": "2.3.7", "description": "Types for mongosh internals", "author": "Anna Henningsen ", "homepage": "https://github.com/mongodb-js/mongosh/tree/main/packages/types#readme", diff --git a/scripts/docker/package.json b/scripts/docker/package.json index 54bd1c29d..a22064f37 100644 --- a/scripts/docker/package.json +++ b/scripts/docker/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/docker-build-scripts", - "version": "2.3.6", + "version": "2.3.7", "private": true, "description": "MongoDB Shell Build Docker Images", "config": { From 8c9c214f8d0caf5252c1f328e4e6d0d409a5b473 Mon Sep 17 00:00:00 2001 From: gagik Date: Thu, 19 Dec 2024 11:21:55 +0100 Subject: [PATCH 05/27] ensure compatibility with old bump --- packages/build/src/npm-packages/bump.ts | 13 +++++++++++++ packages/build/src/npm-packages/index.ts | 1 + packages/build/src/release.ts | 8 +++++++- 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 packages/build/src/npm-packages/bump.ts diff --git a/packages/build/src/npm-packages/bump.ts b/packages/build/src/npm-packages/bump.ts new file mode 100644 index 000000000..38f3f03b5 --- /dev/null +++ b/packages/build/src/npm-packages/bump.ts @@ -0,0 +1,13 @@ +import { spawnSync } from '../helpers'; +import { PROJECT_ROOT } from './constants'; + +export function bumpNpmPackages() { + spawnSync('npm', ['run', 'bump-packages'], { + stdio: 'inherit', + cwd: PROJECT_ROOT, + encoding: 'utf8', + env: { + ...process.env, + }, + }); +} diff --git a/packages/build/src/npm-packages/index.ts b/packages/build/src/npm-packages/index.ts index 4d4931001..c41ed52be 100644 --- a/packages/build/src/npm-packages/index.ts +++ b/packages/build/src/npm-packages/index.ts @@ -1 +1,2 @@ export { publishNpmPackages } from './publish'; +export { bumpNpmPackages } from './bump'; diff --git a/packages/build/src/release.ts b/packages/build/src/release.ts index 2777990c8..b316f0d0a 100644 --- a/packages/build/src/release.ts +++ b/packages/build/src/release.ts @@ -14,7 +14,7 @@ import { } from './evergreen'; import { GithubRepo } from '@mongodb-js/devtools-github-repo'; import { publishToHomebrew } from './homebrew'; -import { publishNpmPackages } from './npm-packages'; +import { bumpNpmPackages, publishNpmPackages } from './npm-packages'; import { runPackage } from './packaging'; import { runDraft } from './run-draft'; import { runPublish } from './run-publish'; @@ -54,6 +54,12 @@ export async function release( redactConfig(config) ); + if (command === 'bump') { + // updates the version of internal packages to reflect the tagged one + bumpNpmPackages(); + return; + } + const octokit = new Octokit({ auth: config.githubToken, }); From 03ba37319a16e5669b871a27d8ed6af9f66ea5a7 Mon Sep 17 00:00:00 2001 From: gagik Date: Thu, 19 Dec 2024 13:44:29 +0100 Subject: [PATCH 06/27] wip --- configs/eslint-config-mongosh/package.json | 2 +- configs/tsconfig-mongosh/package.json | 2 +- package-lock.json | 292 +++++++++--------- packages/arg-parser/package.json | 10 +- packages/async-rewriter2/package.json | 6 +- packages/autocomplete/package.json | 8 +- packages/browser-repl/package.json | 18 +- packages/browser-runtime-core/package.json | 16 +- .../browser-runtime-electron/package.json | 14 +- packages/build/package.json | 6 +- packages/cli-repl/package.json | 34 +- packages/connectivity-tests/package.json | 4 +- packages/e2e-tests/package.json | 10 +- packages/editor/package.json | 16 +- packages/errors/package.json | 6 +- packages/history/package.json | 6 +- packages/i18n/package.json | 8 +- packages/java-shell/package.json | 4 +- .../js-multiline-to-singleline/package.json | 6 +- packages/logging/package.json | 12 +- packages/mongosh/package.json | 4 +- .../node-runtime-worker-thread/package.json | 16 +- packages/service-provider-core/package.json | 8 +- .../service-provider-node-driver/package.json | 12 +- packages/shell-api/package.json | 18 +- packages/shell-evaluator/package.json | 14 +- packages/snippet-manager/package.json | 12 +- packages/types/package.json | 6 +- scripts/docker/package.json | 2 +- 29 files changed, 286 insertions(+), 286 deletions(-) diff --git a/configs/eslint-config-mongosh/package.json b/configs/eslint-config-mongosh/package.json index dd95cbf3f..d0c201384 100644 --- a/configs/eslint-config-mongosh/package.json +++ b/configs/eslint-config-mongosh/package.json @@ -1,6 +1,6 @@ { "name": "@mongodb-js/eslint-config-mongosh", - "version": "1.0.0", + "version": "1.0.2", "private": true, "description": "Shared Mongosh eslint configuration", "license": "SSPL", diff --git a/configs/tsconfig-mongosh/package.json b/configs/tsconfig-mongosh/package.json index 4b3440b2b..4b846acf9 100644 --- a/configs/tsconfig-mongosh/package.json +++ b/configs/tsconfig-mongosh/package.json @@ -1,6 +1,6 @@ { "name": "@mongodb-js/tsconfig-mongosh", - "version": "1.0.0", + "version": "1.0.2", "private": true, "description": "Shared Mongosh Typescript configuration", "license": "SSPL", diff --git a/package-lock.json b/package-lock.json index 06dc51b0f..5e1260dc2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,24 +17,24 @@ "packages/history", "packages/java-shell", "packages/js-multiline-to-singleline", - "packages/logging", - "packages/node-runtime-worker-thread", - "packages/service-provider-core", - "packages/snippet-manager", "packages/types", "packages/i18n", - "packages/service-provider-node-driver", + "packages/logging", + "packages/service-provider-core", "packages/arg-parser", + "packages/service-provider-node-driver", "packages/shell-api", "packages/autocomplete", "packages/shell-evaluator", + "packages/snippet-manager", "packages/browser-runtime-core", "packages/editor", - "packages/browser-repl", "packages/browser-runtime-electron", "packages/cli-repl", "packages/e2e-tests", "packages/mongosh", + "packages/node-runtime-worker-thread", + "packages/browser-repl", "packages/connectivity-tests" ], "bin": { @@ -89,7 +89,7 @@ }, "configs/eslint-config-mongosh": { "name": "@mongodb-js/eslint-config-mongosh", - "version": "1.0.0", + "version": "1.0.2", "license": "SSPL", "dependencies": { "@babel/core": "^7.21.4", @@ -113,7 +113,7 @@ }, "configs/tsconfig-mongosh": { "name": "@mongodb-js/tsconfig-mongosh", - "version": "1.0.0", + "version": "1.0.2", "license": "SSPL", "devDependencies": { "@mongodb-js/prettier-config-devtools": "^1.0.0", @@ -28930,18 +28930,18 @@ }, "packages/arg-parser": { "name": "@mongosh/arg-parser", - "version": "2.3.7", + "version": "4.0.0", "license": "Apache-2.0", "dependencies": { - "@mongosh/errors": "2.3.7", - "@mongosh/i18n": "2.3.7", + "@mongosh/errors": "2.5.0", + "@mongosh/i18n": "2.5.0", "mongodb-connection-string-url": "^3.0.1" }, "devDependencies": { "@mongodb-js/devtools-connect": "^3.3.4", - "@mongodb-js/eslint-config-mongosh": "^1.0.0", + "@mongodb-js/eslint-config-mongosh": "^1.0.2", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.0", + "@mongodb-js/tsconfig-mongosh": "^1.0.2", "depcheck": "^1.4.7", "eslint": "^7.25.0", "mongodb": "^6.12.0", @@ -28978,7 +28978,7 @@ }, "packages/async-rewriter2": { "name": "@mongosh/async-rewriter2", - "version": "2.3.7", + "version": "2.5.0", "license": "Apache-2.0", "dependencies": { "@babel/core": "^7.22.8", @@ -28991,9 +28991,9 @@ "async-rewrite": "bin/async-rewrite.js" }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.0", + "@mongodb-js/eslint-config-mongosh": "^1.0.2", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.0", + "@mongodb-js/tsconfig-mongosh": "^1.0.2", "@types/babel__core": "^7.20.1", "depcheck": "^1.4.7", "eslint": "^7.25.0", @@ -29005,17 +29005,17 @@ }, "packages/autocomplete": { "name": "@mongosh/autocomplete", - "version": "2.3.7", + "version": "4.0.0", "license": "Apache-2.0", "dependencies": { "@mongodb-js/mongodb-constants": "^0.10.1", - "@mongosh/shell-api": "2.3.7", + "@mongosh/shell-api": "4.0.0", "semver": "^7.5.4" }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.0", + "@mongodb-js/eslint-config-mongosh": "^1.0.2", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.0", + "@mongodb-js/tsconfig-mongosh": "^1.0.2", "depcheck": "^1.4.7", "eslint": "^7.25.0", "mocha": "^10.2.0", @@ -29027,15 +29027,15 @@ }, "packages/browser-repl": { "name": "@mongosh/browser-repl", - "version": "2.3.7", + "version": "4.0.0", "license": "Apache-2.0", "dependencies": { - "@mongosh/browser-runtime-core": "2.3.7", - "@mongosh/errors": "2.3.7", - "@mongosh/history": "2.3.7", - "@mongosh/i18n": "2.3.7", - "@mongosh/node-runtime-worker-thread": "2.3.7", - "@mongosh/service-provider-core": "2.3.7", + "@mongosh/browser-runtime-core": "4.0.0", + "@mongosh/errors": "2.5.0", + "@mongosh/history": "2.5.0", + "@mongosh/i18n": "2.5.0", + "@mongosh/node-runtime-worker-thread": "4.0.0", + "@mongosh/service-provider-core": "4.0.0", "numeral": "^2.0.6", "text-table": "^0.2.0" }, @@ -29046,9 +29046,9 @@ "@babel/preset-typescript": "^7.18.6", "@mongodb-js/compass-components": "*", "@mongodb-js/compass-editor": "*", - "@mongodb-js/eslint-config-mongosh": "^1.0.0", + "@mongodb-js/eslint-config-mongosh": "^1.0.2", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.0", + "@mongodb-js/tsconfig-mongosh": "^1.0.2", "@pmmmwh/react-refresh-webpack-plugin": "^0.5.8", "@testing-library/dom": "^8.20.1", "@testing-library/react": "^12.1.5", @@ -29214,19 +29214,19 @@ }, "packages/browser-runtime-core": { "name": "@mongosh/browser-runtime-core", - "version": "2.3.7", + "version": "4.0.0", "license": "Apache-2.0", "dependencies": { - "@mongosh/autocomplete": "2.3.7", - "@mongosh/service-provider-core": "2.3.7", - "@mongosh/shell-api": "2.3.7", - "@mongosh/shell-evaluator": "2.3.7" + "@mongosh/autocomplete": "4.0.0", + "@mongosh/service-provider-core": "4.0.0", + "@mongosh/shell-api": "4.0.0", + "@mongosh/shell-evaluator": "4.0.0" }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.0", + "@mongodb-js/eslint-config-mongosh": "^1.0.2", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.0", - "@mongosh/types": "2.3.7", + "@mongodb-js/tsconfig-mongosh": "^1.0.2", + "@mongosh/types": "4.0.0", "bson": "^6.10.1", "depcheck": "^1.4.7", "eslint": "^7.25.0", @@ -29239,18 +29239,18 @@ }, "packages/browser-runtime-electron": { "name": "@mongosh/browser-runtime-electron", - "version": "2.3.7", + "version": "4.0.0", "license": "Apache-2.0", "dependencies": { - "@mongosh/browser-runtime-core": "2.3.7", - "@mongosh/service-provider-core": "2.3.7", - "@mongosh/types": "2.3.7" + "@mongosh/browser-runtime-core": "4.0.0", + "@mongosh/service-provider-core": "4.0.0", + "@mongosh/types": "4.0.0" }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.0", + "@mongodb-js/eslint-config-mongosh": "^1.0.2", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.0", - "@mongosh/service-provider-node-driver": "2.3.7", + "@mongodb-js/tsconfig-mongosh": "^1.0.2", + "@mongosh/service-provider-node-driver": "4.0.0", "@types/sinon": "^7.5.1", "@types/sinon-chai": "^3.2.4", "depcheck": "^1.4.7", @@ -29269,7 +29269,7 @@ }, "packages/build": { "name": "@mongosh/build", - "version": "2.3.7", + "version": "4.0.0", "license": "Apache-2.0", "dependencies": { "@mongodb-js/devtools-github-repo": "^1.0.1", @@ -29292,10 +29292,10 @@ "tmp-promise": "^3.0.2" }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.0", + "@mongodb-js/eslint-config-mongosh": "^1.0.2", "@mongodb-js/monorepo-tools": "^1.1.10", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.0", + "@mongodb-js/tsconfig-mongosh": "^1.0.2", "@types/command-exists": "^1.2.0", "@types/cross-spawn": "^6.0.6", "@types/download": "^8.0.1", @@ -29394,24 +29394,24 @@ }, "packages/cli-repl": { "name": "@mongosh/cli-repl", - "version": "2.3.7", + "version": "4.0.0", "license": "Apache-2.0", "dependencies": { "@mongodb-js/devtools-proxy-support": "^0.4.2", - "@mongosh/arg-parser": "2.3.7", - "@mongosh/autocomplete": "2.3.7", - "@mongosh/editor": "2.3.7", - "@mongosh/errors": "2.3.7", - "@mongosh/history": "2.3.7", - "@mongosh/i18n": "2.3.7", - "@mongosh/js-multiline-to-singleline": "2.3.7", - "@mongosh/logging": "2.3.7", - "@mongosh/service-provider-core": "2.3.7", - "@mongosh/service-provider-node-driver": "2.3.7", - "@mongosh/shell-api": "2.3.7", - "@mongosh/shell-evaluator": "2.3.7", - "@mongosh/snippet-manager": "2.3.7", - "@mongosh/types": "2.3.7", + "@mongosh/arg-parser": "4.0.0", + "@mongosh/autocomplete": "4.0.0", + "@mongosh/editor": "4.0.0", + "@mongosh/errors": "2.5.0", + "@mongosh/history": "2.5.0", + "@mongosh/i18n": "2.5.0", + "@mongosh/js-multiline-to-singleline": "2.5.0", + "@mongosh/logging": "4.0.0", + "@mongosh/service-provider-core": "4.0.0", + "@mongosh/service-provider-node-driver": "4.0.0", + "@mongosh/shell-api": "4.0.0", + "@mongosh/shell-evaluator": "4.0.0", + "@mongosh/snippet-manager": "4.0.0", + "@mongosh/types": "4.0.0", "@segment/analytics-node": "^1.3.0", "ansi-escape-sequences": "^5.1.2", "askcharacter": "^2.0.4", @@ -29432,10 +29432,10 @@ "mongosh": "bin/mongosh.js" }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.0", + "@mongodb-js/eslint-config-mongosh": "^1.0.2", "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/sbom-tools": "^0.7.0", - "@mongodb-js/tsconfig-mongosh": "^1.0.0", + "@mongodb-js/tsconfig-mongosh": "^1.0.2", "@types/ansi-escape-sequences": "^4.0.0", "@types/chai-as-promised": "^7.1.3", "@types/js-yaml": "^4.0.5", @@ -29478,27 +29478,27 @@ }, "packages/connectivity-tests": { "name": "@mongosh/connectivity-tests", - "version": "2.3.7", + "version": "2.5.0", "license": "Apache-2.0", "devDependencies": { - "mongosh": "2.3.7" + "mongosh": "4.0.0" } }, "packages/e2e-tests": { "name": "@mongosh/e2e-tests", - "version": "2.3.7", + "version": "4.0.0", "license": "Apache-2.0", "dependencies": { "@mongodb-js/oidc-plugin": "^1.1.5", - "@mongosh/cli-repl": "2.3.7", - "@mongosh/service-provider-core": "2.3.7", + "@mongosh/cli-repl": "4.0.0", + "@mongosh/service-provider-core": "4.0.0", "strip-ansi": "^6.0.0" }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.0", + "@mongodb-js/eslint-config-mongosh": "^1.0.2", "@mongodb-js/oidc-mock-provider": "^0.10.2", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.0", + "@mongodb-js/tsconfig-mongosh": "^1.0.2", "@types/chai-as-promised": "^7.1.3", "@types/node": "^14.14.6", "@types/rimraf": "^3.0.0", @@ -29601,20 +29601,20 @@ }, "packages/editor": { "name": "@mongosh/editor", - "version": "2.3.7", + "version": "4.0.0", "license": "Apache-2.0", "dependencies": { - "@mongosh/js-multiline-to-singleline": "2.3.7", - "@mongosh/service-provider-core": "2.3.7", - "@mongosh/shell-api": "2.3.7", - "@mongosh/shell-evaluator": "2.3.7", - "@mongosh/types": "2.3.7", + "@mongosh/js-multiline-to-singleline": "2.5.0", + "@mongosh/service-provider-core": "4.0.0", + "@mongosh/shell-api": "4.0.0", + "@mongosh/shell-evaluator": "4.0.0", + "@mongosh/types": "4.0.0", "js-beautify": "^1.15.1" }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.0", + "@mongodb-js/eslint-config-mongosh": "^1.0.2", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.0", + "@mongodb-js/tsconfig-mongosh": "^1.0.2", "depcheck": "^1.4.7", "eslint": "^7.25.0", "nanobus": "^4.5.0", @@ -29626,12 +29626,12 @@ }, "packages/errors": { "name": "@mongosh/errors", - "version": "2.3.7", + "version": "2.5.0", "license": "Apache-2.0", "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.0", + "@mongodb-js/eslint-config-mongosh": "^1.0.2", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.0", + "@mongodb-js/tsconfig-mongosh": "^1.0.2", "chalk": "^4.1.2", "depcheck": "^1.4.7", "eslint": "^7.25.0", @@ -29645,16 +29645,16 @@ }, "packages/history": { "name": "@mongosh/history", - "version": "2.3.7", + "version": "2.5.0", "license": "Apache-2.0", "dependencies": { "mongodb-connection-string-url": "^3.0.1", "mongodb-redact": "^1.1.2" }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.0", + "@mongodb-js/eslint-config-mongosh": "^1.0.2", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.0", + "@mongodb-js/tsconfig-mongosh": "^1.0.2", "depcheck": "^1.4.7", "eslint": "^7.25.0", "mongodb-connection-string-url": "^3.0.1", @@ -29666,15 +29666,15 @@ }, "packages/i18n": { "name": "@mongosh/i18n", - "version": "2.3.7", + "version": "2.5.0", "license": "Apache-2.0", "dependencies": { - "@mongosh/errors": "2.3.7" + "@mongosh/errors": "2.5.0" }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.0", + "@mongodb-js/eslint-config-mongosh": "^1.0.2", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.0", + "@mongodb-js/tsconfig-mongosh": "^1.0.2", "depcheck": "^1.4.7", "eslint": "^7.25.0", "prettier": "^2.8.8" @@ -29685,10 +29685,10 @@ }, "packages/java-shell": { "name": "@mongosh/java-shell", - "version": "2.3.7", + "version": "2.5.0", "license": "SSPL", "devDependencies": { - "@mongodb-js/tsconfig-mongosh": "^1.0.0", + "@mongodb-js/tsconfig-mongosh": "^1.0.2", "assert": "^1.5.0", "buffer": "^6.0.3", "crypto-browserify": "^3.12.0", @@ -29748,16 +29748,16 @@ }, "packages/js-multiline-to-singleline": { "name": "@mongosh/js-multiline-to-singleline", - "version": "2.3.7", + "version": "2.5.0", "license": "Apache-2.0", "dependencies": { "@babel/core": "^7.16.12", "@babel/types": "^7.21.2" }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.0", + "@mongodb-js/eslint-config-mongosh": "^1.0.2", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.0", + "@mongodb-js/tsconfig-mongosh": "^1.0.2", "@types/babel__core": "^7.1.18", "depcheck": "^1.4.7", "eslint": "^7.25.0", @@ -29769,20 +29769,20 @@ }, "packages/logging": { "name": "@mongosh/logging", - "version": "2.3.7", + "version": "4.0.0", "license": "Apache-2.0", "dependencies": { "@mongodb-js/devtools-connect": "^3.3.4", - "@mongosh/errors": "2.3.7", - "@mongosh/history": "2.3.7", - "@mongosh/types": "2.3.7", + "@mongosh/errors": "2.5.0", + "@mongosh/history": "2.5.0", + "@mongosh/types": "4.0.0", "mongodb-log-writer": "^1.4.2", "mongodb-redact": "^1.1.2" }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.0", + "@mongodb-js/eslint-config-mongosh": "^1.0.2", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.0", + "@mongodb-js/tsconfig-mongosh": "^1.0.2", "depcheck": "^1.4.7", "eslint": "^7.25.0", "prettier": "^2.8.8" @@ -29816,10 +29816,10 @@ } }, "packages/mongosh": { - "version": "2.3.7", + "version": "4.0.0", "license": "Apache-2.0", "dependencies": { - "@mongosh/cli-repl": "2.3.7" + "@mongosh/cli-repl": "4.0.0" }, "bin": { "mongosh": "bin/mongosh.js" @@ -29830,7 +29830,7 @@ }, "packages/node-runtime-worker-thread": { "name": "@mongosh/node-runtime-worker-thread", - "version": "2.3.7", + "version": "4.0.0", "license": "Apache-2.0", "dependencies": { "interruptor": "^1.0.1", @@ -29838,14 +29838,14 @@ "web-worker": "^1.3.0" }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.0", + "@mongodb-js/eslint-config-mongosh": "^1.0.2", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.0", - "@mongosh/browser-runtime-core": "2.3.7", - "@mongosh/browser-runtime-electron": "2.3.7", - "@mongosh/service-provider-core": "2.3.7", - "@mongosh/service-provider-node-driver": "2.3.7", - "@mongosh/types": "2.3.7", + "@mongodb-js/tsconfig-mongosh": "^1.0.2", + "@mongosh/browser-runtime-core": "4.0.0", + "@mongosh/browser-runtime-electron": "4.0.0", + "@mongosh/service-provider-core": "4.0.0", + "@mongosh/service-provider-node-driver": "4.0.0", + "@mongosh/types": "4.0.0", "bson": "^6.10.1", "depcheck": "^1.4.7", "eslint": "^7.25.0", @@ -29860,20 +29860,20 @@ }, "packages/service-provider-core": { "name": "@mongosh/service-provider-core", - "version": "2.3.7", + "version": "4.0.0", "license": "Apache-2.0", "dependencies": { "@aws-sdk/credential-providers": "^3.525.0", - "@mongosh/errors": "2.3.7", + "@mongosh/errors": "2.5.0", "bson": "^6.10.1", "mongodb": "^6.12.0", "mongodb-build-info": "^1.7.2", "mongodb-connection-string-url": "^3.0.1" }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.0", + "@mongodb-js/eslint-config-mongosh": "^1.0.2", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.0", + "@mongodb-js/tsconfig-mongosh": "^1.0.2", "depcheck": "^1.4.7", "eslint": "^7.25.0", "prettier": "^2.8.8" @@ -29887,23 +29887,23 @@ }, "packages/service-provider-node-driver": { "name": "@mongosh/service-provider-node-driver", - "version": "2.3.7", + "version": "4.0.0", "license": "Apache-2.0", "dependencies": { "@mongodb-js/devtools-connect": "^3.3.4", "@mongodb-js/oidc-plugin": "^1.1.5", - "@mongosh/errors": "2.3.7", - "@mongosh/service-provider-core": "2.3.7", - "@mongosh/types": "2.3.7", + "@mongosh/errors": "2.5.0", + "@mongosh/service-provider-core": "4.0.0", + "@mongosh/types": "4.0.0", "aws4": "^1.12.0", "mongodb": "^6.12.0", "mongodb-connection-string-url": "^3.0.1", "socks": "^2.8.3" }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.0", + "@mongodb-js/eslint-config-mongosh": "^1.0.2", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.0", + "@mongodb-js/tsconfig-mongosh": "^1.0.2", "@types/sinon-chai": "^3.2.4", "depcheck": "^1.4.7", "eslint": "^7.25.0", @@ -29943,21 +29943,21 @@ }, "packages/shell-api": { "name": "@mongosh/shell-api", - "version": "2.3.7", + "version": "4.0.0", "license": "Apache-2.0", "dependencies": { - "@mongosh/arg-parser": "2.3.7", - "@mongosh/errors": "2.3.7", - "@mongosh/history": "2.3.7", - "@mongosh/i18n": "2.3.7", - "@mongosh/service-provider-core": "2.3.7", + "@mongosh/arg-parser": "4.0.0", + "@mongosh/errors": "2.5.0", + "@mongosh/history": "2.5.0", + "@mongosh/i18n": "2.5.0", + "@mongosh/service-provider-core": "4.0.0", "mongodb-redact": "^1.1.2" }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.0", + "@mongodb-js/eslint-config-mongosh": "^1.0.2", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.0", - "@mongosh/types": "2.3.7", + "@mongodb-js/tsconfig-mongosh": "^1.0.2", + "@mongosh/types": "4.0.0", "bson": "^6.10.1", "depcheck": "^1.4.7", "eslint": "^7.25.0", @@ -29971,18 +29971,18 @@ }, "packages/shell-evaluator": { "name": "@mongosh/shell-evaluator", - "version": "2.3.7", + "version": "4.0.0", "license": "Apache-2.0", "dependencies": { - "@mongosh/async-rewriter2": "2.3.7", - "@mongosh/history": "2.3.7", - "@mongosh/shell-api": "2.3.7" + "@mongosh/async-rewriter2": "2.5.0", + "@mongosh/history": "2.5.0", + "@mongosh/shell-api": "4.0.0" }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.0", + "@mongodb-js/eslint-config-mongosh": "^1.0.2", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.0", - "@mongosh/types": "2.3.7", + "@mongodb-js/tsconfig-mongosh": "^1.0.2", + "@mongosh/types": "4.0.0", "@types/sinon-chai": "^3.2.4", "depcheck": "^1.4.7", "eslint": "^7.25.0", @@ -29994,13 +29994,13 @@ }, "packages/snippet-manager": { "name": "@mongosh/snippet-manager", - "version": "2.3.7", + "version": "4.0.0", "license": "Apache-2.0", "dependencies": { "@mongodb-js/devtools-proxy-support": "^0.4.2", - "@mongosh/errors": "2.3.7", - "@mongosh/shell-api": "2.3.7", - "@mongosh/types": "2.3.7", + "@mongosh/errors": "2.5.0", + "@mongosh/shell-api": "4.0.0", + "@mongosh/types": "4.0.0", "bson": "^6.10.1", "cross-spawn": "^7.0.5", "escape-string-regexp": "^4.0.0", @@ -30008,9 +30008,9 @@ "tar": "^6.1.15" }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.0", + "@mongodb-js/eslint-config-mongosh": "^1.0.2", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.0", + "@mongodb-js/tsconfig-mongosh": "^1.0.2", "@types/cross-spawn": "^6.0.6", "@types/tar": "^4.0.4", "depcheck": "^1.4.7", @@ -30034,15 +30034,15 @@ }, "packages/types": { "name": "@mongosh/types", - "version": "2.3.7", + "version": "4.0.0", "license": "Apache-2.0", "dependencies": { "@mongodb-js/devtools-connect": "^3.3.4" }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.0", + "@mongodb-js/eslint-config-mongosh": "^1.0.2", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.0", + "@mongodb-js/tsconfig-mongosh": "^1.0.2", "depcheck": "^1.4.7", "eslint": "^7.25.0", "mongodb": "^6.12.0", @@ -30078,7 +30078,7 @@ }, "scripts/docker": { "name": "@mongosh/docker-build-scripts", - "version": "2.3.7", + "version": "4.0.0", "license": "Apache-2.0", "dependencies": { "mongodb-crypt-library-version": "^1.0.5" diff --git a/packages/arg-parser/package.json b/packages/arg-parser/package.json index eec57eefd..5bc30dc9d 100644 --- a/packages/arg-parser/package.json +++ b/packages/arg-parser/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/arg-parser", - "version": "2.3.7", + "version": "4.0.0", "description": "MongoDB Shell CLI Argument List Parser Package", "main": "./lib/index.js", "repository": { @@ -35,15 +35,15 @@ "unitTestsOnly": true }, "dependencies": { - "@mongosh/errors": "2.3.7", - "@mongosh/i18n": "2.3.7", + "@mongosh/errors": "2.5.0", + "@mongosh/i18n": "2.5.0", "mongodb-connection-string-url": "^3.0.1" }, "devDependencies": { "@mongodb-js/devtools-connect": "^3.3.4", - "@mongodb-js/eslint-config-mongosh": "^1.0.0", + "@mongodb-js/eslint-config-mongosh": "^1.0.2", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.0", + "@mongodb-js/tsconfig-mongosh": "^1.0.2", "depcheck": "^1.4.7", "eslint": "^7.25.0", "mongodb": "^6.12.0", diff --git a/packages/async-rewriter2/package.json b/packages/async-rewriter2/package.json index 17bd4cad1..f8bc0fdf1 100644 --- a/packages/async-rewriter2/package.json +++ b/packages/async-rewriter2/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/async-rewriter2", - "version": "2.3.7", + "version": "2.5.0", "description": "MongoDB Shell Async Rewriter Package", "main": "./lib/index.js", "scripts": { @@ -47,9 +47,9 @@ "@babel/types": "^7.22.5" }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.0", + "@mongodb-js/eslint-config-mongosh": "^1.0.2", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.0", + "@mongodb-js/tsconfig-mongosh": "^1.0.2", "@types/babel__core": "^7.20.1", "depcheck": "^1.4.7", "eslint": "^7.25.0", diff --git a/packages/autocomplete/package.json b/packages/autocomplete/package.json index da6523f0c..9171d57f9 100644 --- a/packages/autocomplete/package.json +++ b/packages/autocomplete/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/autocomplete", - "version": "2.3.7", + "version": "4.0.0", "description": "MongoDB Shell Autocomplete Package", "homepage": "https://github.com/mongodb-js/mongosh", "license": "Apache-2.0", @@ -34,9 +34,9 @@ "unitTestsOnly": true }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.0", + "@mongodb-js/eslint-config-mongosh": "^1.0.2", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.0", + "@mongodb-js/tsconfig-mongosh": "^1.0.2", "depcheck": "^1.4.7", "eslint": "^7.25.0", "mocha": "^10.2.0", @@ -44,7 +44,7 @@ }, "dependencies": { "@mongodb-js/mongodb-constants": "^0.10.1", - "@mongosh/shell-api": "2.3.7", + "@mongosh/shell-api": "4.0.0", "semver": "^7.5.4" } } diff --git a/packages/browser-repl/package.json b/packages/browser-repl/package.json index 75ddf4eae..388c2b6d7 100644 --- a/packages/browser-repl/package.json +++ b/packages/browser-repl/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/browser-repl", - "version": "2.3.7", + "version": "4.0.0", "description": "Browser presentation component for Mongo Shell", "engines": { "node": ">=14.15.1" @@ -56,12 +56,12 @@ ] }, "dependencies": { - "@mongosh/browser-runtime-core": "2.3.7", - "@mongosh/errors": "2.3.7", - "@mongosh/history": "2.3.7", - "@mongosh/i18n": "2.3.7", - "@mongosh/node-runtime-worker-thread": "2.3.7", - "@mongosh/service-provider-core": "2.3.7", + "@mongosh/browser-runtime-core": "4.0.0", + "@mongosh/errors": "2.5.0", + "@mongosh/history": "2.5.0", + "@mongosh/i18n": "2.5.0", + "@mongosh/node-runtime-worker-thread": "4.0.0", + "@mongosh/service-provider-core": "4.0.0", "numeral": "^2.0.6", "text-table": "^0.2.0" }, @@ -73,9 +73,9 @@ "mongodb": "^6.12.0", "@mongodb-js/compass-components": "*", "@mongodb-js/compass-editor": "*", - "@mongodb-js/eslint-config-mongosh": "^1.0.0", + "@mongodb-js/eslint-config-mongosh": "^1.0.2", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.0", + "@mongodb-js/tsconfig-mongosh": "^1.0.2", "@pmmmwh/react-refresh-webpack-plugin": "^0.5.8", "@testing-library/dom": "^8.20.1", "@testing-library/react": "^12.1.5", diff --git a/packages/browser-runtime-core/package.json b/packages/browser-runtime-core/package.json index 4dde65ae7..5e924b9b0 100644 --- a/packages/browser-runtime-core/package.json +++ b/packages/browser-runtime-core/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/browser-runtime-core", - "version": "2.3.7", + "version": "4.0.0", "description": "Mongosh browser runtime core", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -38,10 +38,10 @@ "unitTestsOnly": true }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.0", + "@mongodb-js/eslint-config-mongosh": "^1.0.2", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.0", - "@mongosh/types": "2.3.7", + "@mongodb-js/tsconfig-mongosh": "^1.0.2", + "@mongosh/types": "4.0.0", "bson": "^6.10.1", "depcheck": "^1.4.7", "eslint": "^7.25.0", @@ -49,9 +49,9 @@ "rimraf": "^3.0.2" }, "dependencies": { - "@mongosh/autocomplete": "2.3.7", - "@mongosh/service-provider-core": "2.3.7", - "@mongosh/shell-api": "2.3.7", - "@mongosh/shell-evaluator": "2.3.7" + "@mongosh/autocomplete": "4.0.0", + "@mongosh/service-provider-core": "4.0.0", + "@mongosh/shell-api": "4.0.0", + "@mongosh/shell-evaluator": "4.0.0" } } diff --git a/packages/browser-runtime-electron/package.json b/packages/browser-runtime-electron/package.json index 5295b00c8..b9930b1c5 100644 --- a/packages/browser-runtime-electron/package.json +++ b/packages/browser-runtime-electron/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/browser-runtime-electron", - "version": "2.3.7", + "version": "4.0.0", "description": "Mongosh browser runtime electron", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -38,10 +38,10 @@ "unitTestsOnly": true }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.0", + "@mongodb-js/eslint-config-mongosh": "^1.0.2", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.0", - "@mongosh/service-provider-node-driver": "2.3.7", + "@mongodb-js/tsconfig-mongosh": "^1.0.2", + "@mongosh/service-provider-node-driver": "4.0.0", "@types/sinon": "^7.5.1", "@types/sinon-chai": "^3.2.4", "depcheck": "^1.4.7", @@ -50,8 +50,8 @@ "rimraf": "^3.0.2" }, "dependencies": { - "@mongosh/browser-runtime-core": "2.3.7", - "@mongosh/service-provider-core": "2.3.7", - "@mongosh/types": "2.3.7" + "@mongosh/browser-runtime-core": "4.0.0", + "@mongosh/service-provider-core": "4.0.0", + "@mongosh/types": "4.0.0" } } diff --git a/packages/build/package.json b/packages/build/package.json index 8f2830de7..aeeac72d6 100644 --- a/packages/build/package.json +++ b/packages/build/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/build", - "version": "2.3.7", + "version": "4.0.0", "private": true, "description": "MongoDB Shell Build Tools", "main": "lib/index.js", @@ -39,10 +39,10 @@ "unitTestsOnly": true }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.0", + "@mongodb-js/eslint-config-mongosh": "^1.0.2", "@mongodb-js/monorepo-tools": "^1.1.10", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.0", + "@mongodb-js/tsconfig-mongosh": "^1.0.2", "@types/command-exists": "^1.2.0", "@types/cross-spawn": "^6.0.6", "@types/download": "^8.0.1", diff --git a/packages/cli-repl/package.json b/packages/cli-repl/package.json index cc6810437..bf1901245 100644 --- a/packages/cli-repl/package.json +++ b/packages/cli-repl/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/cli-repl", - "version": "2.3.7", + "version": "4.0.0", "description": "MongoDB Shell CLI REPL Package", "homepage": "https://github.com/mongodb-js/mongosh", "author": "Compass Team ", @@ -63,20 +63,20 @@ }, "dependencies": { "@mongodb-js/devtools-proxy-support": "^0.4.2", - "@mongosh/arg-parser": "2.3.7", - "@mongosh/autocomplete": "2.3.7", - "@mongosh/editor": "2.3.7", - "@mongosh/errors": "2.3.7", - "@mongosh/history": "2.3.7", - "@mongosh/i18n": "2.3.7", - "@mongosh/js-multiline-to-singleline": "2.3.7", - "@mongosh/logging": "2.3.7", - "@mongosh/service-provider-core": "2.3.7", - "@mongosh/service-provider-node-driver": "2.3.7", - "@mongosh/shell-api": "2.3.7", - "@mongosh/shell-evaluator": "2.3.7", - "@mongosh/snippet-manager": "2.3.7", - "@mongosh/types": "2.3.7", + "@mongosh/arg-parser": "4.0.0", + "@mongosh/autocomplete": "4.0.0", + "@mongosh/editor": "4.0.0", + "@mongosh/errors": "2.5.0", + "@mongosh/history": "2.5.0", + "@mongosh/i18n": "2.5.0", + "@mongosh/js-multiline-to-singleline": "2.5.0", + "@mongosh/logging": "4.0.0", + "@mongosh/service-provider-core": "4.0.0", + "@mongosh/service-provider-node-driver": "4.0.0", + "@mongosh/shell-api": "4.0.0", + "@mongosh/shell-evaluator": "4.0.0", + "@mongosh/snippet-manager": "4.0.0", + "@mongosh/types": "4.0.0", "@segment/analytics-node": "^1.3.0", "ansi-escape-sequences": "^5.1.2", "askcharacter": "^2.0.4", @@ -95,10 +95,10 @@ }, "devDependencies": { "mongodb": "^6.12.0", - "@mongodb-js/eslint-config-mongosh": "^1.0.0", + "@mongodb-js/eslint-config-mongosh": "^1.0.2", "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/sbom-tools": "^0.7.0", - "@mongodb-js/tsconfig-mongosh": "^1.0.0", + "@mongodb-js/tsconfig-mongosh": "^1.0.2", "@types/ansi-escape-sequences": "^4.0.0", "@types/js-yaml": "^4.0.5", "@types/node": "^14.14.6", diff --git a/packages/connectivity-tests/package.json b/packages/connectivity-tests/package.json index 0ecc11110..72ccde8ee 100644 --- a/packages/connectivity-tests/package.json +++ b/packages/connectivity-tests/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/connectivity-tests", - "version": "2.3.7", + "version": "2.5.0", "private": true, "license": "Apache-2.0", "scripts": { @@ -11,7 +11,7 @@ "test-ci-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test-ci" }, "devDependencies": { - "mongosh": "2.3.7" + "mongosh": "4.0.0" }, "mongosh": { "unitTestsOnly": true, diff --git a/packages/e2e-tests/package.json b/packages/e2e-tests/package.json index a359d9a07..bb4e6f673 100644 --- a/packages/e2e-tests/package.json +++ b/packages/e2e-tests/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/e2e-tests", - "version": "2.3.7", + "version": "4.0.0", "private": true, "description": "MongoDB Shell E2E Tests Package", "homepage": "https://github.com/mongodb-js/mongosh", @@ -27,16 +27,16 @@ "node": ">=16.15.0" }, "dependencies": { - "@mongosh/cli-repl": "2.3.7", - "@mongosh/service-provider-core": "2.3.7", + "@mongosh/cli-repl": "4.0.0", + "@mongosh/service-provider-core": "4.0.0", "@mongodb-js/oidc-plugin": "^1.1.5", "strip-ansi": "^6.0.0" }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.0", + "@mongodb-js/eslint-config-mongosh": "^1.0.2", "@mongodb-js/oidc-mock-provider": "^0.10.2", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.0", + "@mongodb-js/tsconfig-mongosh": "^1.0.2", "@types/chai-as-promised": "^7.1.3", "@types/node": "^14.14.6", "@types/rimraf": "^3.0.0", diff --git a/packages/editor/package.json b/packages/editor/package.json index df6d22f49..6a96ed337 100644 --- a/packages/editor/package.json +++ b/packages/editor/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/editor", - "version": "2.3.7", + "version": "4.0.0", "description": "MongoDB Shell External Editor", "main": "./lib/index.js", "repository": { @@ -35,17 +35,17 @@ "unitTestsOnly": true }, "dependencies": { - "@mongosh/js-multiline-to-singleline": "2.3.7", - "@mongosh/service-provider-core": "2.3.7", - "@mongosh/shell-api": "2.3.7", - "@mongosh/shell-evaluator": "2.3.7", - "@mongosh/types": "2.3.7", + "@mongosh/js-multiline-to-singleline": "2.5.0", + "@mongosh/service-provider-core": "4.0.0", + "@mongosh/shell-api": "4.0.0", + "@mongosh/shell-evaluator": "4.0.0", + "@mongosh/types": "4.0.0", "js-beautify": "^1.15.1" }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.0", + "@mongodb-js/eslint-config-mongosh": "^1.0.2", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.0", + "@mongodb-js/tsconfig-mongosh": "^1.0.2", "depcheck": "^1.4.7", "eslint": "^7.25.0", "nanobus": "^4.5.0", diff --git a/packages/errors/package.json b/packages/errors/package.json index b2771b58f..1ea49580b 100644 --- a/packages/errors/package.json +++ b/packages/errors/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/errors", - "version": "2.3.7", + "version": "2.5.0", "description": "MongoDB Shell Errors Package", "homepage": "https://github.com/mongodb-js/mongosh", "license": "Apache-2.0", @@ -36,9 +36,9 @@ }, "dependencies": {}, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.0", + "@mongodb-js/eslint-config-mongosh": "^1.0.2", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.0", + "@mongodb-js/tsconfig-mongosh": "^1.0.2", "chalk": "^4.1.2", "depcheck": "^1.4.7", "eslint": "^7.25.0", diff --git a/packages/history/package.json b/packages/history/package.json index 79eaafd58..6cf6625c1 100644 --- a/packages/history/package.json +++ b/packages/history/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/history", - "version": "2.3.7", + "version": "2.5.0", "description": "MongoDB Shell History Package", "main": "./lib/index.js", "repository": { @@ -39,9 +39,9 @@ "mongodb-redact": "^1.1.2" }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.0", + "@mongodb-js/eslint-config-mongosh": "^1.0.2", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.0", + "@mongodb-js/tsconfig-mongosh": "^1.0.2", "depcheck": "^1.4.7", "eslint": "^7.25.0", "mongodb-connection-string-url": "^3.0.1", diff --git a/packages/i18n/package.json b/packages/i18n/package.json index 6fd1fee90..f96d21c48 100644 --- a/packages/i18n/package.json +++ b/packages/i18n/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/i18n", - "version": "2.3.7", + "version": "2.5.0", "description": "MongoDB Shell i18n Project", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -36,12 +36,12 @@ "unitTestsOnly": true }, "dependencies": { - "@mongosh/errors": "2.3.7" + "@mongosh/errors": "2.5.0" }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.0", + "@mongodb-js/eslint-config-mongosh": "^1.0.2", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.0", + "@mongodb-js/tsconfig-mongosh": "^1.0.2", "depcheck": "^1.4.7", "eslint": "^7.25.0", "prettier": "^2.8.8" diff --git a/packages/java-shell/package.json b/packages/java-shell/package.json index 53458cd02..1cbe51fd0 100644 --- a/packages/java-shell/package.json +++ b/packages/java-shell/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/java-shell", - "version": "2.3.7", + "version": "2.5.0", "private": true, "description": "Java application that uses mongosh-shell-api node module and MongoDB java driver to run mongo shell on JVM", "config": { @@ -18,7 +18,7 @@ "test-ci-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test-ci" }, "devDependencies": { - "@mongodb-js/tsconfig-mongosh": "^1.0.0", + "@mongodb-js/tsconfig-mongosh": "^1.0.2", "assert": "^1.5.0", "buffer": "^6.0.3", "crypto-browserify": "^3.12.0", diff --git a/packages/js-multiline-to-singleline/package.json b/packages/js-multiline-to-singleline/package.json index 777544763..cac333a87 100644 --- a/packages/js-multiline-to-singleline/package.json +++ b/packages/js-multiline-to-singleline/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/js-multiline-to-singleline", - "version": "2.3.7", + "version": "2.5.0", "description": "Make multiline JS into a single line", "main": "./lib/index.js", "repository": { @@ -39,9 +39,9 @@ "@babel/types": "^7.21.2" }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.0", + "@mongodb-js/eslint-config-mongosh": "^1.0.2", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.0", + "@mongodb-js/tsconfig-mongosh": "^1.0.2", "@types/babel__core": "^7.1.18", "depcheck": "^1.4.7", "eslint": "^7.25.0", diff --git a/packages/logging/package.json b/packages/logging/package.json index 5298f800d..21cfcbb9d 100644 --- a/packages/logging/package.json +++ b/packages/logging/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/logging", - "version": "2.3.7", + "version": "4.0.0", "description": "MongoDB Shell Logging Utilities Package", "homepage": "https://github.com/mongodb-js/mongosh", "license": "Apache-2.0", @@ -18,16 +18,16 @@ }, "dependencies": { "@mongodb-js/devtools-connect": "^3.3.4", - "@mongosh/errors": "2.3.7", - "@mongosh/history": "2.3.7", - "@mongosh/types": "2.3.7", + "@mongosh/errors": "2.5.0", + "@mongosh/history": "2.5.0", + "@mongosh/types": "4.0.0", "mongodb-log-writer": "^1.4.2", "mongodb-redact": "^1.1.2" }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.0", + "@mongodb-js/eslint-config-mongosh": "^1.0.2", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.0", + "@mongodb-js/tsconfig-mongosh": "^1.0.2", "depcheck": "^1.4.7", "eslint": "^7.25.0", "prettier": "^2.8.8" diff --git a/packages/mongosh/package.json b/packages/mongosh/package.json index d599c5f39..5dc91f3c3 100644 --- a/packages/mongosh/package.json +++ b/packages/mongosh/package.json @@ -1,6 +1,6 @@ { "name": "mongosh", - "version": "2.3.7", + "version": "4.0.0", "description": "MongoDB Shell CLI REPL", "keywords": [ "mongosh", @@ -39,6 +39,6 @@ "variants": [] }, "dependencies": { - "@mongosh/cli-repl": "2.3.7" + "@mongosh/cli-repl": "4.0.0" } } diff --git a/packages/node-runtime-worker-thread/package.json b/packages/node-runtime-worker-thread/package.json index d83756cf5..94eee353d 100644 --- a/packages/node-runtime-worker-thread/package.json +++ b/packages/node-runtime-worker-thread/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/node-runtime-worker-thread", - "version": "2.3.7", + "version": "4.0.0", "description": "MongoDB shell runtime that lives in a worker thread", "homepage": "https://github.com/mongodb-js/mongosh", "license": "Apache-2.0", @@ -34,14 +34,14 @@ "reformat": "npm run prettier -- --write . && npm run eslint --fix" }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.0", + "@mongodb-js/eslint-config-mongosh": "^1.0.2", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.0", - "@mongosh/browser-runtime-core": "2.3.7", - "@mongosh/browser-runtime-electron": "2.3.7", - "@mongosh/service-provider-core": "2.3.7", - "@mongosh/service-provider-node-driver": "2.3.7", - "@mongosh/types": "2.3.7", + "@mongodb-js/tsconfig-mongosh": "^1.0.2", + "@mongosh/browser-runtime-core": "4.0.0", + "@mongosh/browser-runtime-electron": "4.0.0", + "@mongosh/service-provider-core": "4.0.0", + "@mongosh/service-provider-node-driver": "4.0.0", + "@mongosh/types": "4.0.0", "bson": "^6.10.1", "depcheck": "^1.4.7", "eslint": "^7.25.0", diff --git a/packages/service-provider-core/package.json b/packages/service-provider-core/package.json index 13bbff4fc..6bddd23a7 100644 --- a/packages/service-provider-core/package.json +++ b/packages/service-provider-core/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/service-provider-core", - "version": "2.3.7", + "version": "4.0.0", "description": "MongoDB Shell Core Service Provider Package", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -44,7 +44,7 @@ }, "dependencies": { "@aws-sdk/credential-providers": "^3.525.0", - "@mongosh/errors": "2.3.7", + "@mongosh/errors": "2.5.0", "bson": "^6.10.1", "mongodb": "^6.12.0", "mongodb-build-info": "^1.7.2", @@ -54,9 +54,9 @@ "mongodb-client-encryption": "^6.1.0" }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.0", + "@mongodb-js/eslint-config-mongosh": "^1.0.2", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.0", + "@mongodb-js/tsconfig-mongosh": "^1.0.2", "depcheck": "^1.4.7", "eslint": "^7.25.0", "prettier": "^2.8.8" diff --git a/packages/service-provider-node-driver/package.json b/packages/service-provider-node-driver/package.json index f193c2d8b..ac72545a8 100644 --- a/packages/service-provider-node-driver/package.json +++ b/packages/service-provider-node-driver/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/service-provider-node-driver", - "version": "2.3.7", + "version": "4.0.0", "description": "MongoDB Shell Server Service Provider Package", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -49,9 +49,9 @@ "dependencies": { "@mongodb-js/devtools-connect": "^3.3.4", "@mongodb-js/oidc-plugin": "^1.1.5", - "@mongosh/errors": "2.3.7", - "@mongosh/service-provider-core": "2.3.7", - "@mongosh/types": "2.3.7", + "@mongosh/errors": "2.5.0", + "@mongosh/service-provider-core": "4.0.0", + "@mongosh/types": "4.0.0", "aws4": "^1.12.0", "mongodb": "^6.12.0", "mongodb-connection-string-url": "^3.0.1", @@ -62,9 +62,9 @@ "mongodb-client-encryption": "^6.1.0" }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.0", + "@mongodb-js/eslint-config-mongosh": "^1.0.2", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.0", + "@mongodb-js/tsconfig-mongosh": "^1.0.2", "@types/sinon-chai": "^3.2.4", "depcheck": "^1.4.7", "eslint": "^7.25.0", diff --git a/packages/shell-api/package.json b/packages/shell-api/package.json index a855b16ee..a510d240d 100644 --- a/packages/shell-api/package.json +++ b/packages/shell-api/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/shell-api", - "version": "2.3.7", + "version": "4.0.0", "description": "MongoDB Shell API Classes Package", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -40,18 +40,18 @@ "build" ], "dependencies": { - "@mongosh/arg-parser": "2.3.7", - "@mongosh/errors": "2.3.7", - "@mongosh/history": "2.3.7", - "@mongosh/i18n": "2.3.7", - "@mongosh/service-provider-core": "2.3.7", + "@mongosh/arg-parser": "4.0.0", + "@mongosh/errors": "2.5.0", + "@mongosh/history": "2.5.0", + "@mongosh/i18n": "2.5.0", + "@mongosh/service-provider-core": "4.0.0", "mongodb-redact": "^1.1.2" }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.0", + "@mongodb-js/eslint-config-mongosh": "^1.0.2", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.0", - "@mongosh/types": "2.3.7", + "@mongodb-js/tsconfig-mongosh": "^1.0.2", + "@mongosh/types": "4.0.0", "bson": "^6.10.1", "depcheck": "^1.4.7", "eslint": "^7.25.0", diff --git a/packages/shell-evaluator/package.json b/packages/shell-evaluator/package.json index e8ab58688..8950a2ced 100644 --- a/packages/shell-evaluator/package.json +++ b/packages/shell-evaluator/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/shell-evaluator", - "version": "2.3.7", + "version": "4.0.0", "description": "MongoDB Top Level API Package", "main": "./lib/index.js", "scripts": { @@ -35,18 +35,18 @@ "unitTestsOnly": true }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.0", + "@mongodb-js/eslint-config-mongosh": "^1.0.2", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.0", - "@mongosh/types": "2.3.7", + "@mongodb-js/tsconfig-mongosh": "^1.0.2", + "@mongosh/types": "4.0.0", "@types/sinon-chai": "^3.2.4", "depcheck": "^1.4.7", "eslint": "^7.25.0", "prettier": "^2.8.8" }, "dependencies": { - "@mongosh/async-rewriter2": "2.3.7", - "@mongosh/history": "2.3.7", - "@mongosh/shell-api": "2.3.7" + "@mongosh/async-rewriter2": "2.5.0", + "@mongosh/history": "2.5.0", + "@mongosh/shell-api": "4.0.0" } } diff --git a/packages/snippet-manager/package.json b/packages/snippet-manager/package.json index d64e8e8e1..8ef26b1c6 100644 --- a/packages/snippet-manager/package.json +++ b/packages/snippet-manager/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/snippet-manager", - "version": "2.3.7", + "version": "4.0.0", "description": "MongoDB Shell Snippet Manager", "main": "./lib/index.js", "repository": { @@ -36,9 +36,9 @@ }, "dependencies": { "@mongodb-js/devtools-proxy-support": "^0.4.2", - "@mongosh/errors": "2.3.7", - "@mongosh/shell-api": "2.3.7", - "@mongosh/types": "2.3.7", + "@mongosh/errors": "2.5.0", + "@mongosh/shell-api": "4.0.0", + "@mongosh/types": "4.0.0", "bson": "^6.10.1", "cross-spawn": "^7.0.5", "escape-string-regexp": "^4.0.0", @@ -46,9 +46,9 @@ "tar": "^6.1.15" }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.0", + "@mongodb-js/eslint-config-mongosh": "^1.0.2", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.0", + "@mongodb-js/tsconfig-mongosh": "^1.0.2", "@types/cross-spawn": "^6.0.6", "@types/tar": "^4.0.4", "depcheck": "^1.4.7", diff --git a/packages/types/package.json b/packages/types/package.json index 41e1744ca..2bc741c5c 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/types", - "version": "2.3.7", + "version": "4.0.0", "description": "Types for mongosh internals", "author": "Anna Henningsen ", "homepage": "https://github.com/mongodb-js/mongosh/tree/main/packages/types#readme", @@ -41,9 +41,9 @@ "@mongodb-js/devtools-connect": "^3.3.4" }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.0", + "@mongodb-js/eslint-config-mongosh": "^1.0.2", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.0", + "@mongodb-js/tsconfig-mongosh": "^1.0.2", "depcheck": "^1.4.7", "eslint": "^7.25.0", "mongodb": "^6.12.0", diff --git a/scripts/docker/package.json b/scripts/docker/package.json index a22064f37..b630c70bb 100644 --- a/scripts/docker/package.json +++ b/scripts/docker/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/docker-build-scripts", - "version": "2.3.7", + "version": "4.0.0", "private": true, "description": "MongoDB Shell Build Docker Images", "config": { From ad630dc169741b0375d847c03ca06d3a51a3773c Mon Sep 17 00:00:00 2001 From: gagik Date: Mon, 30 Dec 2024 12:48:06 +0100 Subject: [PATCH 07/27] switch to bump script --- package.json | 2 +- packages/build/package.json | 1 + packages/build/src/npm-packages/bump.ts | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 5a6f0929c..06bab4135 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ "prepare": "husky", "precommit": "precommit", "preinstall": "node scripts/sort-workspaces.js", - "bump-packages": "bump-monorepo-packages" + "bump-packages": "npm run bump --workspace @mongosh/build" }, "config": { "unsafe-perm": true diff --git a/packages/build/package.json b/packages/build/package.json index aeeac72d6..af3e4d3de 100644 --- a/packages/build/package.json +++ b/packages/build/package.json @@ -25,6 +25,7 @@ "depcheck": "depcheck", "evergreen-release": "ts-node -r ../../scripts/import-expansions.js src/index.ts", "release": "ts-node src/index.ts trigger-release", + "bump": "ts-node src/index.ts bump", "prettier": "prettier", "reformat": "npm run prettier -- --write . && npm run eslint --fix" }, diff --git a/packages/build/src/npm-packages/bump.ts b/packages/build/src/npm-packages/bump.ts index 38f3f03b5..8b9f9b07f 100644 --- a/packages/build/src/npm-packages/bump.ts +++ b/packages/build/src/npm-packages/bump.ts @@ -1,6 +1,8 @@ import { spawnSync } from '../helpers'; import { PROJECT_ROOT } from './constants'; +const PACKAGES_TO_SKIP_BUMPING = ['mongosh', '@mongosh/cli-repl']; + export function bumpNpmPackages() { spawnSync('npm', ['run', 'bump-packages'], { stdio: 'inherit', @@ -8,6 +10,7 @@ export function bumpNpmPackages() { encoding: 'utf8', env: { ...process.env, + SKIP_BUMP_PACKAGES: PACKAGES_TO_SKIP_BUMPING.join(','), }, }); } From 45469f968038906d1ccd902af9ae1f2bad5371ce Mon Sep 17 00:00:00 2001 From: gagik Date: Mon, 30 Dec 2024 18:03:59 +0100 Subject: [PATCH 08/27] fix package bumping --- packages/build/src/npm-packages/bump.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/build/src/npm-packages/bump.ts b/packages/build/src/npm-packages/bump.ts index 8b9f9b07f..c7573c94e 100644 --- a/packages/build/src/npm-packages/bump.ts +++ b/packages/build/src/npm-packages/bump.ts @@ -4,7 +4,7 @@ import { PROJECT_ROOT } from './constants'; const PACKAGES_TO_SKIP_BUMPING = ['mongosh', '@mongosh/cli-repl']; export function bumpNpmPackages() { - spawnSync('npm', ['run', 'bump-packages'], { + spawnSync('npx', ['bump-monorepo-packages'], { stdio: 'inherit', cwd: PROJECT_ROOT, encoding: 'utf8', From be919e019b94213af8e1f64c7af3b17d093b7e7d Mon Sep 17 00:00:00 2001 From: gagik Date: Mon, 30 Dec 2024 18:38:39 +0100 Subject: [PATCH 09/27] check if bump is necessary for installs --- .evergreen/install-npm-deps.sh | 2 - package.json | 2 +- packages/build/src/npm-packages/bump.ts | 54 +++++++++++++++++++++++-- packages/build/src/release.ts | 6 +++ 4 files changed, 58 insertions(+), 6 deletions(-) diff --git a/.evergreen/install-npm-deps.sh b/.evergreen/install-npm-deps.sh index 97cffcc7e..daca8211e 100644 --- a/.evergreen/install-npm-deps.sh +++ b/.evergreen/install-npm-deps.sh @@ -31,7 +31,5 @@ npm run mark-ci-required-optional-dependencies # along with its types, but npm wouldn't try and compile the addon (npm ci && test -e node_modules/mongodb-client-encryption) || npm ci --ignore-scripts -npm run evergreen-release bump - echo "npm packages after installation" npm ls || true diff --git a/package.json b/package.json index 06bab4135..f6c9a8b0f 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ "prepare": "husky", "precommit": "precommit", "preinstall": "node scripts/sort-workspaces.js", - "bump-packages": "npm run bump --workspace @mongosh/build" + "bump-packages": "npm run bump-packages --workspace @mongosh/build" }, "config": { "unsafe-perm": true diff --git a/packages/build/src/npm-packages/bump.ts b/packages/build/src/npm-packages/bump.ts index c7573c94e..1132f2268 100644 --- a/packages/build/src/npm-packages/bump.ts +++ b/packages/build/src/npm-packages/bump.ts @@ -1,16 +1,64 @@ import { spawnSync } from '../helpers'; import { PROJECT_ROOT } from './constants'; -const PACKAGES_TO_SKIP_BUMPING = ['mongosh', '@mongosh/cli-repl']; +import { promises as fs } from 'fs'; +import path from 'path'; +import { getPackagesInTopologicalOrder } from '@mongodb-js/monorepo-tools'; +/** Packages which get bumped only as part of the mongosh release. */ +const MONGOSH_RELEASE_PACKAGES = ['mongosh', '@mongosh/cli-repl']; + +/** This bumps only the main mongosh release packages to the set version. */ +export async function bumpMongosh(version: string): Promise { + console.info(`mongosh: Bumping package versions to ${version}`); + const monorepoRootPath = path.resolve(__dirname, '..', '..', '..', '..'); + const packages = await getPackagesInTopologicalOrder(monorepoRootPath); + + const workspaceNames = packages + .map((p) => p.name) + .filter((name) => MONGOSH_RELEASE_PACKAGES.includes(name)); + + const locations = [monorepoRootPath, ...packages.map((p) => p.location)]; + + for (const location of locations) { + const packageJsonPath = path.join(location, 'package.json'); + const packageJson = JSON.parse(await fs.readFile(packageJsonPath, 'utf8')); + + packageJson.version = version; + for (const grouping of [ + 'dependencies', + 'devDependencies', + 'optionalDependencies', + 'peerDependencies', + ]) { + if (!packageJson[grouping]) { + continue; + } + + for (const name of Object.keys(packageJson[grouping])) { + if (!workspaceNames.includes(name)) { + continue; + } + packageJson[grouping][name] = version; + } + } + + await fs.writeFile( + packageJsonPath, + JSON.stringify(packageJson, null, 2) + '\n' + ); + } +} + +/** Bump packages without setting a new version of mongosh. */ export function bumpNpmPackages() { - spawnSync('npx', ['bump-monorepo-packages'], { + spawnSync('bump-monorepo-packages', [], { stdio: 'inherit', cwd: PROJECT_ROOT, encoding: 'utf8', env: { ...process.env, - SKIP_BUMP_PACKAGES: PACKAGES_TO_SKIP_BUMPING.join(','), + SKIP_BUMP_PACKAGES: MONGOSH_RELEASE_PACKAGES.join(','), }, }); } diff --git a/packages/build/src/release.ts b/packages/build/src/release.ts index b316f0d0a..c88fee872 100644 --- a/packages/build/src/release.ts +++ b/packages/build/src/release.ts @@ -22,9 +22,11 @@ import { runUpload } from './run-upload'; import { runSign } from './packaging/run-sign'; import { runDownloadAndListArtifacts } from './run-download-and-list-artifacts'; import { runDownloadCryptLibrary } from './packaging/run-download-crypt-library'; +import { bumpMongosh } from './npm-packages/bump'; export type ReleaseCommand = | 'bump' + | 'bump-packages' | 'compile' | 'package' | 'sign' @@ -55,6 +57,10 @@ export async function release( ); if (command === 'bump') { + await bumpMongosh(config.version); + bumpNpmPackages(); + return; + } else if (command === 'bump-packages') { // updates the version of internal packages to reflect the tagged one bumpNpmPackages(); return; From 43c551db5644b0286cd06dd49ddff65044f66e73 Mon Sep 17 00:00:00 2001 From: gagik Date: Mon, 30 Dec 2024 19:12:19 +0100 Subject: [PATCH 10/27] remove old tests --- .../build/src/npm-packages/publish.spec.ts | 40 ------------------- 1 file changed, 40 deletions(-) diff --git a/packages/build/src/npm-packages/publish.spec.ts b/packages/build/src/npm-packages/publish.spec.ts index fc4666566..08815dc49 100644 --- a/packages/build/src/npm-packages/publish.spec.ts +++ b/packages/build/src/npm-packages/publish.spec.ts @@ -15,46 +15,6 @@ describe('npm-packages publishNpmPackages', function () { spawnSync = sinon.stub(); }); - it('fails if packages have different versions', function () { - listNpmPackages.returns([ - { name: 'packageA', version: '0.0.1' }, - { name: 'packageB', version: '0.0.2' }, - ]); - try { - publishNpmPackages( - false, - listNpmPackages, - markBumpedFilesAsAssumeUnchanged, - spawnSync - ); - } catch (e: any) { - expect(markBumpedFilesAsAssumeUnchanged).to.not.have.been.called; - expect(spawnSync).to.not.have.been.called; - return; - } - expect.fail('Expected error'); - }); - - it('fails if packages have placeholder versions', function () { - listNpmPackages.returns([ - { name: 'packageA', version: '2.3.7' }, - { name: 'packageB', version: '2.3.7' }, - ]); - try { - publishNpmPackages( - false, - listNpmPackages, - markBumpedFilesAsAssumeUnchanged, - spawnSync - ); - } catch (e: any) { - expect(markBumpedFilesAsAssumeUnchanged).to.not.have.been.called; - expect(spawnSync).to.not.have.been.called; - return; - } - expect.fail('Expected error'); - }); - it('calls lerna to publish packages for a real version', function () { const lernaBin = path.resolve( __dirname, From 71aaa7990706c89547131b9c84f17f1f2e9bd104 Mon Sep 17 00:00:00 2001 From: gagik Date: Tue, 31 Dec 2024 10:30:33 +0100 Subject: [PATCH 11/27] add publish-packages --- .github/workflows/release-packages.yml | 62 ++++++++++++++++++++++++++ package.json | 3 +- packages/build/src/release.ts | 5 --- 3 files changed, 64 insertions(+), 6 deletions(-) create mode 100644 .github/workflows/release-packages.yml diff --git a/.github/workflows/release-packages.yml b/.github/workflows/release-packages.yml new file mode 100644 index 000000000..849fcc2a9 --- /dev/null +++ b/.github/workflows/release-packages.yml @@ -0,0 +1,62 @@ +name: Publish +on: + # NOTE: avoid using the manual execution unless is the only way to fix some issue, + # rather retry failed jobs in case of flakes. The manual execution can potentially + # cause the tags to point to a different commit that the one used to publish + # the packages + workflow_dispatch: + push: + branches: + - main + +jobs: + publish: + if: | + github.event_name == 'workflow_dispatch' || + startsWith(github.event.head_commit.message, 'chore(release): bump package versions') + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + with: + # don't checkout a detatched HEAD + ref: ${{ github.head_ref }} + + # this is important so git log has the whole history + fetch-depth: '0' + + - name: Setup git + run: | + git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com" + git config --local user.name "github-actions[bot]" + + - name: "Use Node.js 14" + uses: actions/setup-node@v3 + with: + node-version: 20.16.0 + + - name: Install npm@10.2.4 + run: npm install -g npm@10.2.4 + + - name: Install Dependencies + run: | + npm run bootstrap-ci + shell: bash + + - name: "Publish what is not already in NPM" + env: + NPM_TOKEN: ${{ secrets.DEVTOOLSBOT_NPM_TOKEN }} + run: | + echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" >> .npmrc + npm config list + echo "Publishing packages as $(npm whoami)" + git update-index --assume-unchanged .npmrc + npm run publish-packages + + - name: "Publish tags" + run: | + npx lerna list -a --json | \ + jq -r '.[] | .name + "@" + .version' | \ + xargs -i sh -c "git tag -a {} -m {} || true" + git push --follow-tags diff --git a/package.json b/package.json index f6c9a8b0f..5f7bc42db 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,8 @@ "prepare": "husky", "precommit": "precommit", "preinstall": "node scripts/sort-workspaces.js", - "bump-packages": "npm run bump-packages --workspace @mongosh/build" + "bump-packages": "npm run bump-packages --workspace @mongosh/build", + "publish-packages": "lerna publish from-package --no-verify-access --no-push --no-git-tag-version --yes" }, "config": { "unsafe-perm": true diff --git a/packages/build/src/release.ts b/packages/build/src/release.ts index c88fee872..50241a0b4 100644 --- a/packages/build/src/release.ts +++ b/packages/build/src/release.ts @@ -26,7 +26,6 @@ import { bumpMongosh } from './npm-packages/bump'; export type ReleaseCommand = | 'bump' - | 'bump-packages' | 'compile' | 'package' | 'sign' @@ -60,10 +59,6 @@ export async function release( await bumpMongosh(config.version); bumpNpmPackages(); return; - } else if (command === 'bump-packages') { - // updates the version of internal packages to reflect the tagged one - bumpNpmPackages(); - return; } const octokit = new Octokit({ From ceb13e717341741984e7e7e9deeb511bc170d77c Mon Sep 17 00:00:00 2001 From: gagik Date: Tue, 31 Dec 2024 11:05:53 +0100 Subject: [PATCH 12/27] remove package.json changes --- configs/eslint-config-mongosh/package.json | 2 +- configs/tsconfig-mongosh/package.json | 2 +- package-lock.json | 280 +++++++++--------- packages/arg-parser/package.json | 10 +- packages/async-rewriter2/package.json | 6 +- packages/autocomplete/package.json | 8 +- packages/browser-repl/package.json | 18 +- packages/browser-runtime-core/package.json | 16 +- .../browser-runtime-electron/package.json | 14 +- packages/build/package.json | 7 +- packages/build/src/npm-packages/bump.ts | 5 +- packages/build/src/npm-packages/constants.ts | 3 + packages/build/src/npm-packages/index.ts | 2 +- packages/build/src/npm-packages/publish.ts | 9 +- packages/cli-repl/package.json | 34 +-- packages/connectivity-tests/package.json | 4 +- packages/e2e-tests/package.json | 10 +- packages/editor/package.json | 16 +- packages/errors/package.json | 6 +- packages/history/package.json | 6 +- packages/i18n/package.json | 8 +- packages/java-shell/package.json | 4 +- .../js-multiline-to-singleline/package.json | 6 +- packages/logging/package.json | 12 +- packages/mongosh/package.json | 4 +- .../node-runtime-worker-thread/package.json | 16 +- packages/service-provider-core/package.json | 8 +- .../service-provider-node-driver/package.json | 12 +- packages/shell-api/package.json | 18 +- packages/shell-evaluator/package.json | 14 +- packages/snippet-manager/package.json | 12 +- packages/types/package.json | 6 +- scripts/docker/package.json | 2 +- 33 files changed, 286 insertions(+), 294 deletions(-) diff --git a/configs/eslint-config-mongosh/package.json b/configs/eslint-config-mongosh/package.json index d0c201384..dd95cbf3f 100644 --- a/configs/eslint-config-mongosh/package.json +++ b/configs/eslint-config-mongosh/package.json @@ -1,6 +1,6 @@ { "name": "@mongodb-js/eslint-config-mongosh", - "version": "1.0.2", + "version": "1.0.0", "private": true, "description": "Shared Mongosh eslint configuration", "license": "SSPL", diff --git a/configs/tsconfig-mongosh/package.json b/configs/tsconfig-mongosh/package.json index 4b846acf9..4b3440b2b 100644 --- a/configs/tsconfig-mongosh/package.json +++ b/configs/tsconfig-mongosh/package.json @@ -1,6 +1,6 @@ { "name": "@mongodb-js/tsconfig-mongosh", - "version": "1.0.2", + "version": "1.0.0", "private": true, "description": "Shared Mongosh Typescript configuration", "license": "SSPL", diff --git a/package-lock.json b/package-lock.json index 5e1260dc2..95c4d8780 100644 --- a/package-lock.json +++ b/package-lock.json @@ -89,7 +89,7 @@ }, "configs/eslint-config-mongosh": { "name": "@mongodb-js/eslint-config-mongosh", - "version": "1.0.2", + "version": "1.0.0", "license": "SSPL", "dependencies": { "@babel/core": "^7.21.4", @@ -113,7 +113,7 @@ }, "configs/tsconfig-mongosh": { "name": "@mongodb-js/tsconfig-mongosh", - "version": "1.0.2", + "version": "1.0.0", "license": "SSPL", "devDependencies": { "@mongodb-js/prettier-config-devtools": "^1.0.0", @@ -28930,18 +28930,18 @@ }, "packages/arg-parser": { "name": "@mongosh/arg-parser", - "version": "4.0.0", + "version": "0.0.0-dev.0", "license": "Apache-2.0", "dependencies": { - "@mongosh/errors": "2.5.0", - "@mongosh/i18n": "2.5.0", + "@mongosh/errors": "0.0.0-dev.0", + "@mongosh/i18n": "0.0.0-dev.0", "mongodb-connection-string-url": "^3.0.1" }, "devDependencies": { "@mongodb-js/devtools-connect": "^3.3.4", - "@mongodb-js/eslint-config-mongosh": "^1.0.2", + "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.2", + "@mongodb-js/tsconfig-mongosh": "^1.0.0", "depcheck": "^1.4.7", "eslint": "^7.25.0", "mongodb": "^6.12.0", @@ -28978,7 +28978,7 @@ }, "packages/async-rewriter2": { "name": "@mongosh/async-rewriter2", - "version": "2.5.0", + "version": "0.0.0-dev.0", "license": "Apache-2.0", "dependencies": { "@babel/core": "^7.22.8", @@ -28991,9 +28991,9 @@ "async-rewrite": "bin/async-rewrite.js" }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.2", + "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.2", + "@mongodb-js/tsconfig-mongosh": "^1.0.0", "@types/babel__core": "^7.20.1", "depcheck": "^1.4.7", "eslint": "^7.25.0", @@ -29005,17 +29005,17 @@ }, "packages/autocomplete": { "name": "@mongosh/autocomplete", - "version": "4.0.0", + "version": "0.0.0-dev.0", "license": "Apache-2.0", "dependencies": { "@mongodb-js/mongodb-constants": "^0.10.1", - "@mongosh/shell-api": "4.0.0", + "@mongosh/shell-api": "0.0.0-dev.0", "semver": "^7.5.4" }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.2", + "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.2", + "@mongodb-js/tsconfig-mongosh": "^1.0.0", "depcheck": "^1.4.7", "eslint": "^7.25.0", "mocha": "^10.2.0", @@ -29027,15 +29027,15 @@ }, "packages/browser-repl": { "name": "@mongosh/browser-repl", - "version": "4.0.0", + "version": "0.0.0-dev.0", "license": "Apache-2.0", "dependencies": { - "@mongosh/browser-runtime-core": "4.0.0", - "@mongosh/errors": "2.5.0", - "@mongosh/history": "2.5.0", - "@mongosh/i18n": "2.5.0", - "@mongosh/node-runtime-worker-thread": "4.0.0", - "@mongosh/service-provider-core": "4.0.0", + "@mongosh/browser-runtime-core": "0.0.0-dev.0", + "@mongosh/errors": "0.0.0-dev.0", + "@mongosh/history": "0.0.0-dev.0", + "@mongosh/i18n": "0.0.0-dev.0", + "@mongosh/node-runtime-worker-thread": "0.0.0-dev.0", + "@mongosh/service-provider-core": "0.0.0-dev.0", "numeral": "^2.0.6", "text-table": "^0.2.0" }, @@ -29046,9 +29046,9 @@ "@babel/preset-typescript": "^7.18.6", "@mongodb-js/compass-components": "*", "@mongodb-js/compass-editor": "*", - "@mongodb-js/eslint-config-mongosh": "^1.0.2", + "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.2", + "@mongodb-js/tsconfig-mongosh": "^1.0.0", "@pmmmwh/react-refresh-webpack-plugin": "^0.5.8", "@testing-library/dom": "^8.20.1", "@testing-library/react": "^12.1.5", @@ -29214,19 +29214,19 @@ }, "packages/browser-runtime-core": { "name": "@mongosh/browser-runtime-core", - "version": "4.0.0", + "version": "0.0.0-dev.0", "license": "Apache-2.0", "dependencies": { - "@mongosh/autocomplete": "4.0.0", - "@mongosh/service-provider-core": "4.0.0", - "@mongosh/shell-api": "4.0.0", - "@mongosh/shell-evaluator": "4.0.0" + "@mongosh/autocomplete": "0.0.0-dev.0", + "@mongosh/service-provider-core": "0.0.0-dev.0", + "@mongosh/shell-api": "0.0.0-dev.0", + "@mongosh/shell-evaluator": "0.0.0-dev.0" }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.2", + "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.2", - "@mongosh/types": "4.0.0", + "@mongodb-js/tsconfig-mongosh": "^1.0.0", + "@mongosh/types": "0.0.0-dev.0", "bson": "^6.10.1", "depcheck": "^1.4.7", "eslint": "^7.25.0", @@ -29239,18 +29239,18 @@ }, "packages/browser-runtime-electron": { "name": "@mongosh/browser-runtime-electron", - "version": "4.0.0", + "version": "0.0.0-dev.0", "license": "Apache-2.0", "dependencies": { - "@mongosh/browser-runtime-core": "4.0.0", - "@mongosh/service-provider-core": "4.0.0", - "@mongosh/types": "4.0.0" + "@mongosh/browser-runtime-core": "0.0.0-dev.0", + "@mongosh/service-provider-core": "0.0.0-dev.0", + "@mongosh/types": "0.0.0-dev.0" }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.2", + "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.2", - "@mongosh/service-provider-node-driver": "4.0.0", + "@mongodb-js/tsconfig-mongosh": "^1.0.0", + "@mongosh/service-provider-node-driver": "0.0.0-dev.0", "@types/sinon": "^7.5.1", "@types/sinon-chai": "^3.2.4", "depcheck": "^1.4.7", @@ -29269,7 +29269,7 @@ }, "packages/build": { "name": "@mongosh/build", - "version": "4.0.0", + "version": "0.0.0-dev.0", "license": "Apache-2.0", "dependencies": { "@mongodb-js/devtools-github-repo": "^1.0.1", @@ -29292,10 +29292,10 @@ "tmp-promise": "^3.0.2" }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.2", + "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/monorepo-tools": "^1.1.10", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.2", + "@mongodb-js/tsconfig-mongosh": "^1.0.0", "@types/command-exists": "^1.2.0", "@types/cross-spawn": "^6.0.6", "@types/download": "^8.0.1", @@ -29394,24 +29394,24 @@ }, "packages/cli-repl": { "name": "@mongosh/cli-repl", - "version": "4.0.0", + "version": "0.0.0-dev.0", "license": "Apache-2.0", "dependencies": { "@mongodb-js/devtools-proxy-support": "^0.4.2", - "@mongosh/arg-parser": "4.0.0", - "@mongosh/autocomplete": "4.0.0", - "@mongosh/editor": "4.0.0", - "@mongosh/errors": "2.5.0", - "@mongosh/history": "2.5.0", - "@mongosh/i18n": "2.5.0", - "@mongosh/js-multiline-to-singleline": "2.5.0", - "@mongosh/logging": "4.0.0", - "@mongosh/service-provider-core": "4.0.0", - "@mongosh/service-provider-node-driver": "4.0.0", - "@mongosh/shell-api": "4.0.0", - "@mongosh/shell-evaluator": "4.0.0", - "@mongosh/snippet-manager": "4.0.0", - "@mongosh/types": "4.0.0", + "@mongosh/arg-parser": "0.0.0-dev.0", + "@mongosh/autocomplete": "0.0.0-dev.0", + "@mongosh/editor": "0.0.0-dev.0", + "@mongosh/errors": "0.0.0-dev.0", + "@mongosh/history": "0.0.0-dev.0", + "@mongosh/i18n": "0.0.0-dev.0", + "@mongosh/js-multiline-to-singleline": "0.0.0-dev.0", + "@mongosh/logging": "0.0.0-dev.0", + "@mongosh/service-provider-core": "0.0.0-dev.0", + "@mongosh/service-provider-node-driver": "0.0.0-dev.0", + "@mongosh/shell-api": "0.0.0-dev.0", + "@mongosh/shell-evaluator": "0.0.0-dev.0", + "@mongosh/snippet-manager": "0.0.0-dev.0", + "@mongosh/types": "0.0.0-dev.0", "@segment/analytics-node": "^1.3.0", "ansi-escape-sequences": "^5.1.2", "askcharacter": "^2.0.4", @@ -29432,10 +29432,10 @@ "mongosh": "bin/mongosh.js" }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.2", + "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/sbom-tools": "^0.7.0", - "@mongodb-js/tsconfig-mongosh": "^1.0.2", + "@mongodb-js/tsconfig-mongosh": "^1.0.0", "@types/ansi-escape-sequences": "^4.0.0", "@types/chai-as-promised": "^7.1.3", "@types/js-yaml": "^4.0.5", @@ -29478,27 +29478,27 @@ }, "packages/connectivity-tests": { "name": "@mongosh/connectivity-tests", - "version": "2.5.0", + "version": "0.0.0-dev.0", "license": "Apache-2.0", "devDependencies": { - "mongosh": "4.0.0" + "mongosh": "0.0.0-dev.0" } }, "packages/e2e-tests": { "name": "@mongosh/e2e-tests", - "version": "4.0.0", + "version": "0.0.0-dev.0", "license": "Apache-2.0", "dependencies": { "@mongodb-js/oidc-plugin": "^1.1.5", - "@mongosh/cli-repl": "4.0.0", - "@mongosh/service-provider-core": "4.0.0", + "@mongosh/cli-repl": "0.0.0-dev.0", + "@mongosh/service-provider-core": "0.0.0-dev.0", "strip-ansi": "^6.0.0" }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.2", + "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/oidc-mock-provider": "^0.10.2", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.2", + "@mongodb-js/tsconfig-mongosh": "^1.0.0", "@types/chai-as-promised": "^7.1.3", "@types/node": "^14.14.6", "@types/rimraf": "^3.0.0", @@ -29601,20 +29601,20 @@ }, "packages/editor": { "name": "@mongosh/editor", - "version": "4.0.0", + "version": "0.0.0-dev.0", "license": "Apache-2.0", "dependencies": { - "@mongosh/js-multiline-to-singleline": "2.5.0", - "@mongosh/service-provider-core": "4.0.0", - "@mongosh/shell-api": "4.0.0", - "@mongosh/shell-evaluator": "4.0.0", - "@mongosh/types": "4.0.0", + "@mongosh/js-multiline-to-singleline": "0.0.0-dev.0", + "@mongosh/service-provider-core": "0.0.0-dev.0", + "@mongosh/shell-api": "0.0.0-dev.0", + "@mongosh/shell-evaluator": "0.0.0-dev.0", + "@mongosh/types": "0.0.0-dev.0", "js-beautify": "^1.15.1" }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.2", + "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.2", + "@mongodb-js/tsconfig-mongosh": "^1.0.0", "depcheck": "^1.4.7", "eslint": "^7.25.0", "nanobus": "^4.5.0", @@ -29626,12 +29626,12 @@ }, "packages/errors": { "name": "@mongosh/errors", - "version": "2.5.0", + "version": "0.0.0-dev.0", "license": "Apache-2.0", "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.2", + "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.2", + "@mongodb-js/tsconfig-mongosh": "^1.0.0", "chalk": "^4.1.2", "depcheck": "^1.4.7", "eslint": "^7.25.0", @@ -29645,16 +29645,16 @@ }, "packages/history": { "name": "@mongosh/history", - "version": "2.5.0", + "version": "0.0.0-dev.0", "license": "Apache-2.0", "dependencies": { "mongodb-connection-string-url": "^3.0.1", "mongodb-redact": "^1.1.2" }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.2", + "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.2", + "@mongodb-js/tsconfig-mongosh": "^1.0.0", "depcheck": "^1.4.7", "eslint": "^7.25.0", "mongodb-connection-string-url": "^3.0.1", @@ -29666,15 +29666,15 @@ }, "packages/i18n": { "name": "@mongosh/i18n", - "version": "2.5.0", + "version": "0.0.0-dev.0", "license": "Apache-2.0", "dependencies": { - "@mongosh/errors": "2.5.0" + "@mongosh/errors": "0.0.0-dev.0" }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.2", + "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.2", + "@mongodb-js/tsconfig-mongosh": "^1.0.0", "depcheck": "^1.4.7", "eslint": "^7.25.0", "prettier": "^2.8.8" @@ -29685,10 +29685,10 @@ }, "packages/java-shell": { "name": "@mongosh/java-shell", - "version": "2.5.0", + "version": "0.0.0-dev.0", "license": "SSPL", "devDependencies": { - "@mongodb-js/tsconfig-mongosh": "^1.0.2", + "@mongodb-js/tsconfig-mongosh": "^1.0.0", "assert": "^1.5.0", "buffer": "^6.0.3", "crypto-browserify": "^3.12.0", @@ -29748,16 +29748,16 @@ }, "packages/js-multiline-to-singleline": { "name": "@mongosh/js-multiline-to-singleline", - "version": "2.5.0", + "version": "0.0.0-dev.0", "license": "Apache-2.0", "dependencies": { "@babel/core": "^7.16.12", "@babel/types": "^7.21.2" }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.2", + "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.2", + "@mongodb-js/tsconfig-mongosh": "^1.0.0", "@types/babel__core": "^7.1.18", "depcheck": "^1.4.7", "eslint": "^7.25.0", @@ -29769,20 +29769,20 @@ }, "packages/logging": { "name": "@mongosh/logging", - "version": "4.0.0", + "version": "0.0.0-dev.0", "license": "Apache-2.0", "dependencies": { "@mongodb-js/devtools-connect": "^3.3.4", - "@mongosh/errors": "2.5.0", - "@mongosh/history": "2.5.0", - "@mongosh/types": "4.0.0", + "@mongosh/errors": "0.0.0-dev.0", + "@mongosh/history": "0.0.0-dev.0", + "@mongosh/types": "0.0.0-dev.0", "mongodb-log-writer": "^1.4.2", "mongodb-redact": "^1.1.2" }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.2", + "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.2", + "@mongodb-js/tsconfig-mongosh": "^1.0.0", "depcheck": "^1.4.7", "eslint": "^7.25.0", "prettier": "^2.8.8" @@ -29816,10 +29816,10 @@ } }, "packages/mongosh": { - "version": "4.0.0", + "version": "0.0.0-dev.0", "license": "Apache-2.0", "dependencies": { - "@mongosh/cli-repl": "4.0.0" + "@mongosh/cli-repl": "0.0.0-dev.0" }, "bin": { "mongosh": "bin/mongosh.js" @@ -29830,7 +29830,7 @@ }, "packages/node-runtime-worker-thread": { "name": "@mongosh/node-runtime-worker-thread", - "version": "4.0.0", + "version": "0.0.0-dev.0", "license": "Apache-2.0", "dependencies": { "interruptor": "^1.0.1", @@ -29838,14 +29838,14 @@ "web-worker": "^1.3.0" }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.2", + "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.2", - "@mongosh/browser-runtime-core": "4.0.0", - "@mongosh/browser-runtime-electron": "4.0.0", - "@mongosh/service-provider-core": "4.0.0", - "@mongosh/service-provider-node-driver": "4.0.0", - "@mongosh/types": "4.0.0", + "@mongodb-js/tsconfig-mongosh": "^1.0.0", + "@mongosh/browser-runtime-core": "0.0.0-dev.0", + "@mongosh/browser-runtime-electron": "0.0.0-dev.0", + "@mongosh/service-provider-core": "0.0.0-dev.0", + "@mongosh/service-provider-node-driver": "0.0.0-dev.0", + "@mongosh/types": "0.0.0-dev.0", "bson": "^6.10.1", "depcheck": "^1.4.7", "eslint": "^7.25.0", @@ -29860,20 +29860,20 @@ }, "packages/service-provider-core": { "name": "@mongosh/service-provider-core", - "version": "4.0.0", + "version": "0.0.0-dev.0", "license": "Apache-2.0", "dependencies": { "@aws-sdk/credential-providers": "^3.525.0", - "@mongosh/errors": "2.5.0", + "@mongosh/errors": "0.0.0-dev.0", "bson": "^6.10.1", "mongodb": "^6.12.0", "mongodb-build-info": "^1.7.2", "mongodb-connection-string-url": "^3.0.1" }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.2", + "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.2", + "@mongodb-js/tsconfig-mongosh": "^1.0.0", "depcheck": "^1.4.7", "eslint": "^7.25.0", "prettier": "^2.8.8" @@ -29887,23 +29887,23 @@ }, "packages/service-provider-node-driver": { "name": "@mongosh/service-provider-node-driver", - "version": "4.0.0", + "version": "0.0.0-dev.0", "license": "Apache-2.0", "dependencies": { "@mongodb-js/devtools-connect": "^3.3.4", "@mongodb-js/oidc-plugin": "^1.1.5", - "@mongosh/errors": "2.5.0", - "@mongosh/service-provider-core": "4.0.0", - "@mongosh/types": "4.0.0", + "@mongosh/errors": "0.0.0-dev.0", + "@mongosh/service-provider-core": "0.0.0-dev.0", + "@mongosh/types": "0.0.0-dev.0", "aws4": "^1.12.0", "mongodb": "^6.12.0", "mongodb-connection-string-url": "^3.0.1", "socks": "^2.8.3" }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.2", + "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.2", + "@mongodb-js/tsconfig-mongosh": "^1.0.0", "@types/sinon-chai": "^3.2.4", "depcheck": "^1.4.7", "eslint": "^7.25.0", @@ -29943,21 +29943,21 @@ }, "packages/shell-api": { "name": "@mongosh/shell-api", - "version": "4.0.0", + "version": "0.0.0-dev.0", "license": "Apache-2.0", "dependencies": { - "@mongosh/arg-parser": "4.0.0", - "@mongosh/errors": "2.5.0", - "@mongosh/history": "2.5.0", - "@mongosh/i18n": "2.5.0", - "@mongosh/service-provider-core": "4.0.0", + "@mongosh/arg-parser": "0.0.0-dev.0", + "@mongosh/errors": "0.0.0-dev.0", + "@mongosh/history": "0.0.0-dev.0", + "@mongosh/i18n": "0.0.0-dev.0", + "@mongosh/service-provider-core": "0.0.0-dev.0", "mongodb-redact": "^1.1.2" }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.2", + "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.2", - "@mongosh/types": "4.0.0", + "@mongodb-js/tsconfig-mongosh": "^1.0.0", + "@mongosh/types": "0.0.0-dev.0", "bson": "^6.10.1", "depcheck": "^1.4.7", "eslint": "^7.25.0", @@ -29971,18 +29971,18 @@ }, "packages/shell-evaluator": { "name": "@mongosh/shell-evaluator", - "version": "4.0.0", + "version": "0.0.0-dev.0", "license": "Apache-2.0", "dependencies": { - "@mongosh/async-rewriter2": "2.5.0", - "@mongosh/history": "2.5.0", - "@mongosh/shell-api": "4.0.0" + "@mongosh/async-rewriter2": "0.0.0-dev.0", + "@mongosh/history": "0.0.0-dev.0", + "@mongosh/shell-api": "0.0.0-dev.0" }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.2", + "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.2", - "@mongosh/types": "4.0.0", + "@mongodb-js/tsconfig-mongosh": "^1.0.0", + "@mongosh/types": "0.0.0-dev.0", "@types/sinon-chai": "^3.2.4", "depcheck": "^1.4.7", "eslint": "^7.25.0", @@ -29994,13 +29994,13 @@ }, "packages/snippet-manager": { "name": "@mongosh/snippet-manager", - "version": "4.0.0", + "version": "0.0.0-dev.0", "license": "Apache-2.0", "dependencies": { "@mongodb-js/devtools-proxy-support": "^0.4.2", - "@mongosh/errors": "2.5.0", - "@mongosh/shell-api": "4.0.0", - "@mongosh/types": "4.0.0", + "@mongosh/errors": "0.0.0-dev.0", + "@mongosh/shell-api": "0.0.0-dev.0", + "@mongosh/types": "0.0.0-dev.0", "bson": "^6.10.1", "cross-spawn": "^7.0.5", "escape-string-regexp": "^4.0.0", @@ -30008,9 +30008,9 @@ "tar": "^6.1.15" }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.2", + "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.2", + "@mongodb-js/tsconfig-mongosh": "^1.0.0", "@types/cross-spawn": "^6.0.6", "@types/tar": "^4.0.4", "depcheck": "^1.4.7", @@ -30034,15 +30034,15 @@ }, "packages/types": { "name": "@mongosh/types", - "version": "4.0.0", + "version": "0.0.0-dev.0", "license": "Apache-2.0", "dependencies": { "@mongodb-js/devtools-connect": "^3.3.4" }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.2", + "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.2", + "@mongodb-js/tsconfig-mongosh": "^1.0.0", "depcheck": "^1.4.7", "eslint": "^7.25.0", "mongodb": "^6.12.0", @@ -30078,7 +30078,7 @@ }, "scripts/docker": { "name": "@mongosh/docker-build-scripts", - "version": "4.0.0", + "version": "0.0.0-dev.0", "license": "Apache-2.0", "dependencies": { "mongodb-crypt-library-version": "^1.0.5" diff --git a/packages/arg-parser/package.json b/packages/arg-parser/package.json index 5bc30dc9d..c784148e7 100644 --- a/packages/arg-parser/package.json +++ b/packages/arg-parser/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/arg-parser", - "version": "4.0.0", + "version": "0.0.0-dev.0", "description": "MongoDB Shell CLI Argument List Parser Package", "main": "./lib/index.js", "repository": { @@ -35,15 +35,15 @@ "unitTestsOnly": true }, "dependencies": { - "@mongosh/errors": "2.5.0", - "@mongosh/i18n": "2.5.0", + "@mongosh/errors": "0.0.0-dev.0", + "@mongosh/i18n": "0.0.0-dev.0", "mongodb-connection-string-url": "^3.0.1" }, "devDependencies": { "@mongodb-js/devtools-connect": "^3.3.4", - "@mongodb-js/eslint-config-mongosh": "^1.0.2", + "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.2", + "@mongodb-js/tsconfig-mongosh": "^1.0.0", "depcheck": "^1.4.7", "eslint": "^7.25.0", "mongodb": "^6.12.0", diff --git a/packages/async-rewriter2/package.json b/packages/async-rewriter2/package.json index f8bc0fdf1..0d2e5be0e 100644 --- a/packages/async-rewriter2/package.json +++ b/packages/async-rewriter2/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/async-rewriter2", - "version": "2.5.0", + "version": "0.0.0-dev.0", "description": "MongoDB Shell Async Rewriter Package", "main": "./lib/index.js", "scripts": { @@ -47,9 +47,9 @@ "@babel/types": "^7.22.5" }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.2", + "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.2", + "@mongodb-js/tsconfig-mongosh": "^1.0.0", "@types/babel__core": "^7.20.1", "depcheck": "^1.4.7", "eslint": "^7.25.0", diff --git a/packages/autocomplete/package.json b/packages/autocomplete/package.json index 9171d57f9..b3d2e4b97 100644 --- a/packages/autocomplete/package.json +++ b/packages/autocomplete/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/autocomplete", - "version": "4.0.0", + "version": "0.0.0-dev.0", "description": "MongoDB Shell Autocomplete Package", "homepage": "https://github.com/mongodb-js/mongosh", "license": "Apache-2.0", @@ -34,9 +34,9 @@ "unitTestsOnly": true }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.2", + "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.2", + "@mongodb-js/tsconfig-mongosh": "^1.0.0", "depcheck": "^1.4.7", "eslint": "^7.25.0", "mocha": "^10.2.0", @@ -44,7 +44,7 @@ }, "dependencies": { "@mongodb-js/mongodb-constants": "^0.10.1", - "@mongosh/shell-api": "4.0.0", + "@mongosh/shell-api": "0.0.0-dev.0", "semver": "^7.5.4" } } diff --git a/packages/browser-repl/package.json b/packages/browser-repl/package.json index 388c2b6d7..b4dfeeed0 100644 --- a/packages/browser-repl/package.json +++ b/packages/browser-repl/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/browser-repl", - "version": "4.0.0", + "version": "0.0.0-dev.0", "description": "Browser presentation component for Mongo Shell", "engines": { "node": ">=14.15.1" @@ -56,12 +56,12 @@ ] }, "dependencies": { - "@mongosh/browser-runtime-core": "4.0.0", - "@mongosh/errors": "2.5.0", - "@mongosh/history": "2.5.0", - "@mongosh/i18n": "2.5.0", - "@mongosh/node-runtime-worker-thread": "4.0.0", - "@mongosh/service-provider-core": "4.0.0", + "@mongosh/browser-runtime-core": "0.0.0-dev.0", + "@mongosh/errors": "0.0.0-dev.0", + "@mongosh/history": "0.0.0-dev.0", + "@mongosh/i18n": "0.0.0-dev.0", + "@mongosh/node-runtime-worker-thread": "0.0.0-dev.0", + "@mongosh/service-provider-core": "0.0.0-dev.0", "numeral": "^2.0.6", "text-table": "^0.2.0" }, @@ -73,9 +73,9 @@ "mongodb": "^6.12.0", "@mongodb-js/compass-components": "*", "@mongodb-js/compass-editor": "*", - "@mongodb-js/eslint-config-mongosh": "^1.0.2", + "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.2", + "@mongodb-js/tsconfig-mongosh": "^1.0.0", "@pmmmwh/react-refresh-webpack-plugin": "^0.5.8", "@testing-library/dom": "^8.20.1", "@testing-library/react": "^12.1.5", diff --git a/packages/browser-runtime-core/package.json b/packages/browser-runtime-core/package.json index 5e924b9b0..723871e73 100644 --- a/packages/browser-runtime-core/package.json +++ b/packages/browser-runtime-core/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/browser-runtime-core", - "version": "4.0.0", + "version": "0.0.0-dev.0", "description": "Mongosh browser runtime core", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -38,10 +38,10 @@ "unitTestsOnly": true }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.2", + "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.2", - "@mongosh/types": "4.0.0", + "@mongodb-js/tsconfig-mongosh": "^1.0.0", + "@mongosh/types": "0.0.0-dev.0", "bson": "^6.10.1", "depcheck": "^1.4.7", "eslint": "^7.25.0", @@ -49,9 +49,9 @@ "rimraf": "^3.0.2" }, "dependencies": { - "@mongosh/autocomplete": "4.0.0", - "@mongosh/service-provider-core": "4.0.0", - "@mongosh/shell-api": "4.0.0", - "@mongosh/shell-evaluator": "4.0.0" + "@mongosh/autocomplete": "0.0.0-dev.0", + "@mongosh/service-provider-core": "0.0.0-dev.0", + "@mongosh/shell-api": "0.0.0-dev.0", + "@mongosh/shell-evaluator": "0.0.0-dev.0" } } diff --git a/packages/browser-runtime-electron/package.json b/packages/browser-runtime-electron/package.json index b9930b1c5..70946b7d0 100644 --- a/packages/browser-runtime-electron/package.json +++ b/packages/browser-runtime-electron/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/browser-runtime-electron", - "version": "4.0.0", + "version": "0.0.0-dev.0", "description": "Mongosh browser runtime electron", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -38,10 +38,10 @@ "unitTestsOnly": true }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.2", + "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.2", - "@mongosh/service-provider-node-driver": "4.0.0", + "@mongodb-js/tsconfig-mongosh": "^1.0.0", + "@mongosh/service-provider-node-driver": "0.0.0-dev.0", "@types/sinon": "^7.5.1", "@types/sinon-chai": "^3.2.4", "depcheck": "^1.4.7", @@ -50,8 +50,8 @@ "rimraf": "^3.0.2" }, "dependencies": { - "@mongosh/browser-runtime-core": "4.0.0", - "@mongosh/service-provider-core": "4.0.0", - "@mongosh/types": "4.0.0" + "@mongosh/browser-runtime-core": "0.0.0-dev.0", + "@mongosh/service-provider-core": "0.0.0-dev.0", + "@mongosh/types": "0.0.0-dev.0" } } diff --git a/packages/build/package.json b/packages/build/package.json index af3e4d3de..a4963c70c 100644 --- a/packages/build/package.json +++ b/packages/build/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/build", - "version": "4.0.0", + "version": "0.0.0-dev.0", "private": true, "description": "MongoDB Shell Build Tools", "main": "lib/index.js", @@ -25,7 +25,6 @@ "depcheck": "depcheck", "evergreen-release": "ts-node -r ../../scripts/import-expansions.js src/index.ts", "release": "ts-node src/index.ts trigger-release", - "bump": "ts-node src/index.ts bump", "prettier": "prettier", "reformat": "npm run prettier -- --write . && npm run eslint --fix" }, @@ -40,10 +39,10 @@ "unitTestsOnly": true }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.2", + "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/monorepo-tools": "^1.1.10", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.2", + "@mongodb-js/tsconfig-mongosh": "^1.0.0", "@types/command-exists": "^1.2.0", "@types/cross-spawn": "^6.0.6", "@types/download": "^8.0.1", diff --git a/packages/build/src/npm-packages/bump.ts b/packages/build/src/npm-packages/bump.ts index 1132f2268..85cfdd5f8 100644 --- a/packages/build/src/npm-packages/bump.ts +++ b/packages/build/src/npm-packages/bump.ts @@ -1,13 +1,10 @@ import { spawnSync } from '../helpers'; -import { PROJECT_ROOT } from './constants'; +import { MONGOSH_RELEASE_PACKAGES, PROJECT_ROOT } from './constants'; import { promises as fs } from 'fs'; import path from 'path'; import { getPackagesInTopologicalOrder } from '@mongodb-js/monorepo-tools'; -/** Packages which get bumped only as part of the mongosh release. */ -const MONGOSH_RELEASE_PACKAGES = ['mongosh', '@mongosh/cli-repl']; - /** This bumps only the main mongosh release packages to the set version. */ export async function bumpMongosh(version: string): Promise { console.info(`mongosh: Bumping package versions to ${version}`); diff --git a/packages/build/src/npm-packages/constants.ts b/packages/build/src/npm-packages/constants.ts index 5d0c6f8d3..f677e6d2b 100644 --- a/packages/build/src/npm-packages/constants.ts +++ b/packages/build/src/npm-packages/constants.ts @@ -7,3 +7,6 @@ export const LERNA_BIN = path.resolve( '.bin', 'lerna' ); + +/** Packages which get bumped only as part of the mongosh release. */ +export const MONGOSH_RELEASE_PACKAGES = ['mongosh', '@mongosh/cli-repl']; diff --git a/packages/build/src/npm-packages/index.ts b/packages/build/src/npm-packages/index.ts index c41ed52be..350977521 100644 --- a/packages/build/src/npm-packages/index.ts +++ b/packages/build/src/npm-packages/index.ts @@ -1,2 +1,2 @@ -export { publishNpmPackages } from './publish'; export { bumpNpmPackages } from './bump'; +export { publishNpmPackages } from './publish'; diff --git a/packages/build/src/npm-packages/publish.ts b/packages/build/src/npm-packages/publish.ts index ebf73b782..624c45760 100644 --- a/packages/build/src/npm-packages/publish.ts +++ b/packages/build/src/npm-packages/publish.ts @@ -12,14 +12,6 @@ export function publishNpmPackages( ): void { const packages = listNpmPackages(); - const versions = Array.from(new Set(packages.map(({ version }) => version))); - - if (versions.length !== 1) { - throw new Error( - `Refusing to publish packages with multiple versions: ${versions}` - ); - } - // Lerna requires a clean repository for a publish from-package (--force-publish does not have any effect here) // we use git update-index --assume-unchanged on files we know have been bumped markBumpedFilesAsAssumeUnchangedFn(packages, true); @@ -34,6 +26,7 @@ export function publishNpmPackages( '--no-push', '--exact', '--no-git-tag-version', + '--force-publish', '--yes', '--no-verify-access', ], diff --git a/packages/cli-repl/package.json b/packages/cli-repl/package.json index bf1901245..43c735443 100644 --- a/packages/cli-repl/package.json +++ b/packages/cli-repl/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/cli-repl", - "version": "4.0.0", + "version": "0.0.0-dev.0", "description": "MongoDB Shell CLI REPL Package", "homepage": "https://github.com/mongodb-js/mongosh", "author": "Compass Team ", @@ -63,20 +63,20 @@ }, "dependencies": { "@mongodb-js/devtools-proxy-support": "^0.4.2", - "@mongosh/arg-parser": "4.0.0", - "@mongosh/autocomplete": "4.0.0", - "@mongosh/editor": "4.0.0", - "@mongosh/errors": "2.5.0", - "@mongosh/history": "2.5.0", - "@mongosh/i18n": "2.5.0", - "@mongosh/js-multiline-to-singleline": "2.5.0", - "@mongosh/logging": "4.0.0", - "@mongosh/service-provider-core": "4.0.0", - "@mongosh/service-provider-node-driver": "4.0.0", - "@mongosh/shell-api": "4.0.0", - "@mongosh/shell-evaluator": "4.0.0", - "@mongosh/snippet-manager": "4.0.0", - "@mongosh/types": "4.0.0", + "@mongosh/arg-parser": "0.0.0-dev.0", + "@mongosh/autocomplete": "0.0.0-dev.0", + "@mongosh/editor": "0.0.0-dev.0", + "@mongosh/errors": "0.0.0-dev.0", + "@mongosh/history": "0.0.0-dev.0", + "@mongosh/i18n": "0.0.0-dev.0", + "@mongosh/js-multiline-to-singleline": "0.0.0-dev.0", + "@mongosh/logging": "0.0.0-dev.0", + "@mongosh/service-provider-core": "0.0.0-dev.0", + "@mongosh/service-provider-node-driver": "0.0.0-dev.0", + "@mongosh/shell-api": "0.0.0-dev.0", + "@mongosh/shell-evaluator": "0.0.0-dev.0", + "@mongosh/snippet-manager": "0.0.0-dev.0", + "@mongosh/types": "0.0.0-dev.0", "@segment/analytics-node": "^1.3.0", "ansi-escape-sequences": "^5.1.2", "askcharacter": "^2.0.4", @@ -95,10 +95,10 @@ }, "devDependencies": { "mongodb": "^6.12.0", - "@mongodb-js/eslint-config-mongosh": "^1.0.2", + "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/sbom-tools": "^0.7.0", - "@mongodb-js/tsconfig-mongosh": "^1.0.2", + "@mongodb-js/tsconfig-mongosh": "^1.0.0", "@types/ansi-escape-sequences": "^4.0.0", "@types/js-yaml": "^4.0.5", "@types/node": "^14.14.6", diff --git a/packages/connectivity-tests/package.json b/packages/connectivity-tests/package.json index 72ccde8ee..4ef44a9b2 100644 --- a/packages/connectivity-tests/package.json +++ b/packages/connectivity-tests/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/connectivity-tests", - "version": "2.5.0", + "version": "0.0.0-dev.0", "private": true, "license": "Apache-2.0", "scripts": { @@ -11,7 +11,7 @@ "test-ci-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test-ci" }, "devDependencies": { - "mongosh": "4.0.0" + "mongosh": "0.0.0-dev.0" }, "mongosh": { "unitTestsOnly": true, diff --git a/packages/e2e-tests/package.json b/packages/e2e-tests/package.json index bb4e6f673..326647057 100644 --- a/packages/e2e-tests/package.json +++ b/packages/e2e-tests/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/e2e-tests", - "version": "4.0.0", + "version": "0.0.0-dev.0", "private": true, "description": "MongoDB Shell E2E Tests Package", "homepage": "https://github.com/mongodb-js/mongosh", @@ -27,16 +27,16 @@ "node": ">=16.15.0" }, "dependencies": { - "@mongosh/cli-repl": "4.0.0", - "@mongosh/service-provider-core": "4.0.0", + "@mongosh/cli-repl": "0.0.0-dev.0", + "@mongosh/service-provider-core": "0.0.0-dev.0", "@mongodb-js/oidc-plugin": "^1.1.5", "strip-ansi": "^6.0.0" }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.2", + "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/oidc-mock-provider": "^0.10.2", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.2", + "@mongodb-js/tsconfig-mongosh": "^1.0.0", "@types/chai-as-promised": "^7.1.3", "@types/node": "^14.14.6", "@types/rimraf": "^3.0.0", diff --git a/packages/editor/package.json b/packages/editor/package.json index 6a96ed337..57e07395a 100644 --- a/packages/editor/package.json +++ b/packages/editor/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/editor", - "version": "4.0.0", + "version": "0.0.0-dev.0", "description": "MongoDB Shell External Editor", "main": "./lib/index.js", "repository": { @@ -35,17 +35,17 @@ "unitTestsOnly": true }, "dependencies": { - "@mongosh/js-multiline-to-singleline": "2.5.0", - "@mongosh/service-provider-core": "4.0.0", - "@mongosh/shell-api": "4.0.0", - "@mongosh/shell-evaluator": "4.0.0", - "@mongosh/types": "4.0.0", + "@mongosh/js-multiline-to-singleline": "0.0.0-dev.0", + "@mongosh/service-provider-core": "0.0.0-dev.0", + "@mongosh/shell-api": "0.0.0-dev.0", + "@mongosh/shell-evaluator": "0.0.0-dev.0", + "@mongosh/types": "0.0.0-dev.0", "js-beautify": "^1.15.1" }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.2", + "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.2", + "@mongodb-js/tsconfig-mongosh": "^1.0.0", "depcheck": "^1.4.7", "eslint": "^7.25.0", "nanobus": "^4.5.0", diff --git a/packages/errors/package.json b/packages/errors/package.json index 1ea49580b..4736c169b 100644 --- a/packages/errors/package.json +++ b/packages/errors/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/errors", - "version": "2.5.0", + "version": "0.0.0-dev.0", "description": "MongoDB Shell Errors Package", "homepage": "https://github.com/mongodb-js/mongosh", "license": "Apache-2.0", @@ -36,9 +36,9 @@ }, "dependencies": {}, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.2", + "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.2", + "@mongodb-js/tsconfig-mongosh": "^1.0.0", "chalk": "^4.1.2", "depcheck": "^1.4.7", "eslint": "^7.25.0", diff --git a/packages/history/package.json b/packages/history/package.json index 6cf6625c1..21df6a136 100644 --- a/packages/history/package.json +++ b/packages/history/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/history", - "version": "2.5.0", + "version": "0.0.0-dev.0", "description": "MongoDB Shell History Package", "main": "./lib/index.js", "repository": { @@ -39,9 +39,9 @@ "mongodb-redact": "^1.1.2" }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.2", + "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.2", + "@mongodb-js/tsconfig-mongosh": "^1.0.0", "depcheck": "^1.4.7", "eslint": "^7.25.0", "mongodb-connection-string-url": "^3.0.1", diff --git a/packages/i18n/package.json b/packages/i18n/package.json index f96d21c48..e717cf762 100644 --- a/packages/i18n/package.json +++ b/packages/i18n/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/i18n", - "version": "2.5.0", + "version": "0.0.0-dev.0", "description": "MongoDB Shell i18n Project", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -36,12 +36,12 @@ "unitTestsOnly": true }, "dependencies": { - "@mongosh/errors": "2.5.0" + "@mongosh/errors": "0.0.0-dev.0" }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.2", + "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.2", + "@mongodb-js/tsconfig-mongosh": "^1.0.0", "depcheck": "^1.4.7", "eslint": "^7.25.0", "prettier": "^2.8.8" diff --git a/packages/java-shell/package.json b/packages/java-shell/package.json index 1cbe51fd0..f541d15ef 100644 --- a/packages/java-shell/package.json +++ b/packages/java-shell/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/java-shell", - "version": "2.5.0", + "version": "0.0.0-dev.0", "private": true, "description": "Java application that uses mongosh-shell-api node module and MongoDB java driver to run mongo shell on JVM", "config": { @@ -18,7 +18,7 @@ "test-ci-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test-ci" }, "devDependencies": { - "@mongodb-js/tsconfig-mongosh": "^1.0.2", + "@mongodb-js/tsconfig-mongosh": "^1.0.0", "assert": "^1.5.0", "buffer": "^6.0.3", "crypto-browserify": "^3.12.0", diff --git a/packages/js-multiline-to-singleline/package.json b/packages/js-multiline-to-singleline/package.json index cac333a87..06b21592a 100644 --- a/packages/js-multiline-to-singleline/package.json +++ b/packages/js-multiline-to-singleline/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/js-multiline-to-singleline", - "version": "2.5.0", + "version": "0.0.0-dev.0", "description": "Make multiline JS into a single line", "main": "./lib/index.js", "repository": { @@ -39,9 +39,9 @@ "@babel/types": "^7.21.2" }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.2", + "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.2", + "@mongodb-js/tsconfig-mongosh": "^1.0.0", "@types/babel__core": "^7.1.18", "depcheck": "^1.4.7", "eslint": "^7.25.0", diff --git a/packages/logging/package.json b/packages/logging/package.json index 21cfcbb9d..bcaf18607 100644 --- a/packages/logging/package.json +++ b/packages/logging/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/logging", - "version": "4.0.0", + "version": "0.0.0-dev.0", "description": "MongoDB Shell Logging Utilities Package", "homepage": "https://github.com/mongodb-js/mongosh", "license": "Apache-2.0", @@ -18,16 +18,16 @@ }, "dependencies": { "@mongodb-js/devtools-connect": "^3.3.4", - "@mongosh/errors": "2.5.0", - "@mongosh/history": "2.5.0", - "@mongosh/types": "4.0.0", + "@mongosh/errors": "0.0.0-dev.0", + "@mongosh/history": "0.0.0-dev.0", + "@mongosh/types": "0.0.0-dev.0", "mongodb-log-writer": "^1.4.2", "mongodb-redact": "^1.1.2" }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.2", + "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.2", + "@mongodb-js/tsconfig-mongosh": "^1.0.0", "depcheck": "^1.4.7", "eslint": "^7.25.0", "prettier": "^2.8.8" diff --git a/packages/mongosh/package.json b/packages/mongosh/package.json index 5dc91f3c3..dc77b76af 100644 --- a/packages/mongosh/package.json +++ b/packages/mongosh/package.json @@ -1,6 +1,6 @@ { "name": "mongosh", - "version": "4.0.0", + "version": "0.0.0-dev.0", "description": "MongoDB Shell CLI REPL", "keywords": [ "mongosh", @@ -39,6 +39,6 @@ "variants": [] }, "dependencies": { - "@mongosh/cli-repl": "4.0.0" + "@mongosh/cli-repl": "0.0.0-dev.0" } } diff --git a/packages/node-runtime-worker-thread/package.json b/packages/node-runtime-worker-thread/package.json index 94eee353d..211205f6b 100644 --- a/packages/node-runtime-worker-thread/package.json +++ b/packages/node-runtime-worker-thread/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/node-runtime-worker-thread", - "version": "4.0.0", + "version": "0.0.0-dev.0", "description": "MongoDB shell runtime that lives in a worker thread", "homepage": "https://github.com/mongodb-js/mongosh", "license": "Apache-2.0", @@ -34,14 +34,14 @@ "reformat": "npm run prettier -- --write . && npm run eslint --fix" }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.2", + "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.2", - "@mongosh/browser-runtime-core": "4.0.0", - "@mongosh/browser-runtime-electron": "4.0.0", - "@mongosh/service-provider-core": "4.0.0", - "@mongosh/service-provider-node-driver": "4.0.0", - "@mongosh/types": "4.0.0", + "@mongodb-js/tsconfig-mongosh": "^1.0.0", + "@mongosh/browser-runtime-core": "0.0.0-dev.0", + "@mongosh/browser-runtime-electron": "0.0.0-dev.0", + "@mongosh/service-provider-core": "0.0.0-dev.0", + "@mongosh/service-provider-node-driver": "0.0.0-dev.0", + "@mongosh/types": "0.0.0-dev.0", "bson": "^6.10.1", "depcheck": "^1.4.7", "eslint": "^7.25.0", diff --git a/packages/service-provider-core/package.json b/packages/service-provider-core/package.json index 6bddd23a7..94847a855 100644 --- a/packages/service-provider-core/package.json +++ b/packages/service-provider-core/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/service-provider-core", - "version": "4.0.0", + "version": "0.0.0-dev.0", "description": "MongoDB Shell Core Service Provider Package", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -44,7 +44,7 @@ }, "dependencies": { "@aws-sdk/credential-providers": "^3.525.0", - "@mongosh/errors": "2.5.0", + "@mongosh/errors": "0.0.0-dev.0", "bson": "^6.10.1", "mongodb": "^6.12.0", "mongodb-build-info": "^1.7.2", @@ -54,9 +54,9 @@ "mongodb-client-encryption": "^6.1.0" }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.2", + "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.2", + "@mongodb-js/tsconfig-mongosh": "^1.0.0", "depcheck": "^1.4.7", "eslint": "^7.25.0", "prettier": "^2.8.8" diff --git a/packages/service-provider-node-driver/package.json b/packages/service-provider-node-driver/package.json index ac72545a8..4f9d72106 100644 --- a/packages/service-provider-node-driver/package.json +++ b/packages/service-provider-node-driver/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/service-provider-node-driver", - "version": "4.0.0", + "version": "0.0.0-dev.0", "description": "MongoDB Shell Server Service Provider Package", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -49,9 +49,9 @@ "dependencies": { "@mongodb-js/devtools-connect": "^3.3.4", "@mongodb-js/oidc-plugin": "^1.1.5", - "@mongosh/errors": "2.5.0", - "@mongosh/service-provider-core": "4.0.0", - "@mongosh/types": "4.0.0", + "@mongosh/errors": "0.0.0-dev.0", + "@mongosh/service-provider-core": "0.0.0-dev.0", + "@mongosh/types": "0.0.0-dev.0", "aws4": "^1.12.0", "mongodb": "^6.12.0", "mongodb-connection-string-url": "^3.0.1", @@ -62,9 +62,9 @@ "mongodb-client-encryption": "^6.1.0" }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.2", + "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.2", + "@mongodb-js/tsconfig-mongosh": "^1.0.0", "@types/sinon-chai": "^3.2.4", "depcheck": "^1.4.7", "eslint": "^7.25.0", diff --git a/packages/shell-api/package.json b/packages/shell-api/package.json index a510d240d..429920d6d 100644 --- a/packages/shell-api/package.json +++ b/packages/shell-api/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/shell-api", - "version": "4.0.0", + "version": "0.0.0-dev.0", "description": "MongoDB Shell API Classes Package", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -40,18 +40,18 @@ "build" ], "dependencies": { - "@mongosh/arg-parser": "4.0.0", - "@mongosh/errors": "2.5.0", - "@mongosh/history": "2.5.0", - "@mongosh/i18n": "2.5.0", - "@mongosh/service-provider-core": "4.0.0", + "@mongosh/arg-parser": "0.0.0-dev.0", + "@mongosh/errors": "0.0.0-dev.0", + "@mongosh/history": "0.0.0-dev.0", + "@mongosh/i18n": "0.0.0-dev.0", + "@mongosh/service-provider-core": "0.0.0-dev.0", "mongodb-redact": "^1.1.2" }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.2", + "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.2", - "@mongosh/types": "4.0.0", + "@mongodb-js/tsconfig-mongosh": "^1.0.0", + "@mongosh/types": "0.0.0-dev.0", "bson": "^6.10.1", "depcheck": "^1.4.7", "eslint": "^7.25.0", diff --git a/packages/shell-evaluator/package.json b/packages/shell-evaluator/package.json index 8950a2ced..7952764ee 100644 --- a/packages/shell-evaluator/package.json +++ b/packages/shell-evaluator/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/shell-evaluator", - "version": "4.0.0", + "version": "0.0.0-dev.0", "description": "MongoDB Top Level API Package", "main": "./lib/index.js", "scripts": { @@ -35,18 +35,18 @@ "unitTestsOnly": true }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.2", + "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.2", - "@mongosh/types": "4.0.0", + "@mongodb-js/tsconfig-mongosh": "^1.0.0", + "@mongosh/types": "0.0.0-dev.0", "@types/sinon-chai": "^3.2.4", "depcheck": "^1.4.7", "eslint": "^7.25.0", "prettier": "^2.8.8" }, "dependencies": { - "@mongosh/async-rewriter2": "2.5.0", - "@mongosh/history": "2.5.0", - "@mongosh/shell-api": "4.0.0" + "@mongosh/async-rewriter2": "0.0.0-dev.0", + "@mongosh/history": "0.0.0-dev.0", + "@mongosh/shell-api": "0.0.0-dev.0" } } diff --git a/packages/snippet-manager/package.json b/packages/snippet-manager/package.json index 8ef26b1c6..5684fbe12 100644 --- a/packages/snippet-manager/package.json +++ b/packages/snippet-manager/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/snippet-manager", - "version": "4.0.0", + "version": "0.0.0-dev.0", "description": "MongoDB Shell Snippet Manager", "main": "./lib/index.js", "repository": { @@ -36,9 +36,9 @@ }, "dependencies": { "@mongodb-js/devtools-proxy-support": "^0.4.2", - "@mongosh/errors": "2.5.0", - "@mongosh/shell-api": "4.0.0", - "@mongosh/types": "4.0.0", + "@mongosh/errors": "0.0.0-dev.0", + "@mongosh/shell-api": "0.0.0-dev.0", + "@mongosh/types": "0.0.0-dev.0", "bson": "^6.10.1", "cross-spawn": "^7.0.5", "escape-string-regexp": "^4.0.0", @@ -46,9 +46,9 @@ "tar": "^6.1.15" }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.2", + "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.2", + "@mongodb-js/tsconfig-mongosh": "^1.0.0", "@types/cross-spawn": "^6.0.6", "@types/tar": "^4.0.4", "depcheck": "^1.4.7", diff --git a/packages/types/package.json b/packages/types/package.json index 2bc741c5c..7c7e7d755 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/types", - "version": "4.0.0", + "version": "0.0.0-dev.0", "description": "Types for mongosh internals", "author": "Anna Henningsen ", "homepage": "https://github.com/mongodb-js/mongosh/tree/main/packages/types#readme", @@ -41,9 +41,9 @@ "@mongodb-js/devtools-connect": "^3.3.4" }, "devDependencies": { - "@mongodb-js/eslint-config-mongosh": "^1.0.2", + "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", - "@mongodb-js/tsconfig-mongosh": "^1.0.2", + "@mongodb-js/tsconfig-mongosh": "^1.0.0", "depcheck": "^1.4.7", "eslint": "^7.25.0", "mongodb": "^6.12.0", diff --git a/scripts/docker/package.json b/scripts/docker/package.json index b630c70bb..9560b97a8 100644 --- a/scripts/docker/package.json +++ b/scripts/docker/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/docker-build-scripts", - "version": "4.0.0", + "version": "0.0.0-dev.0", "private": true, "description": "MongoDB Shell Build Docker Images", "config": { From 42d19ea0c3b6aacd3092bb1decd977fb8e5e0a04 Mon Sep 17 00:00:00 2001 From: gagik Date: Tue, 31 Dec 2024 11:25:09 +0100 Subject: [PATCH 13/27] add ignore list --- packages/build/src/npm-packages/bump.ts | 11 +++++++++-- packages/build/src/npm-packages/constants.ts | 6 ++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/packages/build/src/npm-packages/bump.ts b/packages/build/src/npm-packages/bump.ts index 85cfdd5f8..a06787feb 100644 --- a/packages/build/src/npm-packages/bump.ts +++ b/packages/build/src/npm-packages/bump.ts @@ -1,5 +1,9 @@ import { spawnSync } from '../helpers'; -import { MONGOSH_RELEASE_PACKAGES, PROJECT_ROOT } from './constants'; +import { + IGNORE_BUMP_PACKAGES, + MONGOSH_RELEASE_PACKAGES, + PROJECT_ROOT, +} from './constants'; import { promises as fs } from 'fs'; import path from 'path'; @@ -55,7 +59,10 @@ export function bumpNpmPackages() { encoding: 'utf8', env: { ...process.env, - SKIP_BUMP_PACKAGES: MONGOSH_RELEASE_PACKAGES.join(','), + SKIP_BUMP_PACKAGES: [ + ...IGNORE_BUMP_PACKAGES, + ...MONGOSH_RELEASE_PACKAGES, + ].join(','), }, }); } diff --git a/packages/build/src/npm-packages/constants.ts b/packages/build/src/npm-packages/constants.ts index f677e6d2b..1d742f920 100644 --- a/packages/build/src/npm-packages/constants.ts +++ b/packages/build/src/npm-packages/constants.ts @@ -10,3 +10,9 @@ export const LERNA_BIN = path.resolve( /** Packages which get bumped only as part of the mongosh release. */ export const MONGOSH_RELEASE_PACKAGES = ['mongosh', '@mongosh/cli-repl']; + +/** Packages which always get ignored when doing a release or bump */ +export const IGNORE_BUMP_PACKAGES = [ + '@mongodb-js/eslint-config-mongosh', + '@mongodb-js/tsconfig-mongosh', +]; From bad9d596846234f4d4d4f689cb9dc8e9b1adbd8d Mon Sep 17 00:00:00 2001 From: gagik Date: Tue, 31 Dec 2024 12:02:42 +0100 Subject: [PATCH 14/27] set non-release package.json to 2.3.7 --- package-lock.json | 176 +++++++++--------- packages/arg-parser/package.json | 6 +- packages/async-rewriter2/package.json | 2 +- packages/autocomplete/package.json | 4 +- packages/browser-repl/package.json | 14 +- packages/browser-runtime-core/package.json | 12 +- .../browser-runtime-electron/package.json | 10 +- packages/build/package.json | 2 +- packages/cli-repl/package.json | 28 +-- packages/connectivity-tests/package.json | 2 +- packages/e2e-tests/package.json | 4 +- packages/editor/package.json | 12 +- packages/errors/package.json | 2 +- packages/history/package.json | 2 +- packages/i18n/package.json | 4 +- packages/java-shell/package.json | 2 +- .../js-multiline-to-singleline/package.json | 2 +- packages/logging/package.json | 8 +- .../node-runtime-worker-thread/package.json | 12 +- packages/service-provider-core/package.json | 4 +- .../service-provider-node-driver/package.json | 8 +- packages/shell-api/package.json | 14 +- packages/shell-evaluator/package.json | 10 +- packages/snippet-manager/package.json | 8 +- packages/types/package.json | 2 +- scripts/docker/package.json | 2 +- 26 files changed, 176 insertions(+), 176 deletions(-) diff --git a/package-lock.json b/package-lock.json index 95c4d8780..72fca0de6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -28930,11 +28930,11 @@ }, "packages/arg-parser": { "name": "@mongosh/arg-parser", - "version": "0.0.0-dev.0", + "version": "2.3.7", "license": "Apache-2.0", "dependencies": { - "@mongosh/errors": "0.0.0-dev.0", - "@mongosh/i18n": "0.0.0-dev.0", + "@mongosh/errors": "2.3.7", + "@mongosh/i18n": "2.3.7", "mongodb-connection-string-url": "^3.0.1" }, "devDependencies": { @@ -28978,7 +28978,7 @@ }, "packages/async-rewriter2": { "name": "@mongosh/async-rewriter2", - "version": "0.0.0-dev.0", + "version": "2.3.7", "license": "Apache-2.0", "dependencies": { "@babel/core": "^7.22.8", @@ -29005,11 +29005,11 @@ }, "packages/autocomplete": { "name": "@mongosh/autocomplete", - "version": "0.0.0-dev.0", + "version": "2.3.7", "license": "Apache-2.0", "dependencies": { "@mongodb-js/mongodb-constants": "^0.10.1", - "@mongosh/shell-api": "0.0.0-dev.0", + "@mongosh/shell-api": "2.3.7", "semver": "^7.5.4" }, "devDependencies": { @@ -29027,15 +29027,15 @@ }, "packages/browser-repl": { "name": "@mongosh/browser-repl", - "version": "0.0.0-dev.0", + "version": "2.3.7", "license": "Apache-2.0", "dependencies": { - "@mongosh/browser-runtime-core": "0.0.0-dev.0", - "@mongosh/errors": "0.0.0-dev.0", - "@mongosh/history": "0.0.0-dev.0", - "@mongosh/i18n": "0.0.0-dev.0", - "@mongosh/node-runtime-worker-thread": "0.0.0-dev.0", - "@mongosh/service-provider-core": "0.0.0-dev.0", + "@mongosh/browser-runtime-core": "2.3.7", + "@mongosh/errors": "2.3.7", + "@mongosh/history": "2.3.7", + "@mongosh/i18n": "2.3.7", + "@mongosh/node-runtime-worker-thread": "2.3.7", + "@mongosh/service-provider-core": "2.3.7", "numeral": "^2.0.6", "text-table": "^0.2.0" }, @@ -29214,19 +29214,19 @@ }, "packages/browser-runtime-core": { "name": "@mongosh/browser-runtime-core", - "version": "0.0.0-dev.0", + "version": "2.3.7", "license": "Apache-2.0", "dependencies": { - "@mongosh/autocomplete": "0.0.0-dev.0", - "@mongosh/service-provider-core": "0.0.0-dev.0", - "@mongosh/shell-api": "0.0.0-dev.0", - "@mongosh/shell-evaluator": "0.0.0-dev.0" + "@mongosh/autocomplete": "2.3.7", + "@mongosh/service-provider-core": "2.3.7", + "@mongosh/shell-api": "2.3.7", + "@mongosh/shell-evaluator": "2.3.7" }, "devDependencies": { "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", - "@mongosh/types": "0.0.0-dev.0", + "@mongosh/types": "2.3.7", "bson": "^6.10.1", "depcheck": "^1.4.7", "eslint": "^7.25.0", @@ -29239,18 +29239,18 @@ }, "packages/browser-runtime-electron": { "name": "@mongosh/browser-runtime-electron", - "version": "0.0.0-dev.0", + "version": "2.3.7", "license": "Apache-2.0", "dependencies": { - "@mongosh/browser-runtime-core": "0.0.0-dev.0", - "@mongosh/service-provider-core": "0.0.0-dev.0", - "@mongosh/types": "0.0.0-dev.0" + "@mongosh/browser-runtime-core": "2.3.7", + "@mongosh/service-provider-core": "2.3.7", + "@mongosh/types": "2.3.7" }, "devDependencies": { "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", - "@mongosh/service-provider-node-driver": "0.0.0-dev.0", + "@mongosh/service-provider-node-driver": "2.3.7", "@types/sinon": "^7.5.1", "@types/sinon-chai": "^3.2.4", "depcheck": "^1.4.7", @@ -29269,7 +29269,7 @@ }, "packages/build": { "name": "@mongosh/build", - "version": "0.0.0-dev.0", + "version": "2.3.7", "license": "Apache-2.0", "dependencies": { "@mongodb-js/devtools-github-repo": "^1.0.1", @@ -29398,20 +29398,20 @@ "license": "Apache-2.0", "dependencies": { "@mongodb-js/devtools-proxy-support": "^0.4.2", - "@mongosh/arg-parser": "0.0.0-dev.0", - "@mongosh/autocomplete": "0.0.0-dev.0", - "@mongosh/editor": "0.0.0-dev.0", - "@mongosh/errors": "0.0.0-dev.0", - "@mongosh/history": "0.0.0-dev.0", - "@mongosh/i18n": "0.0.0-dev.0", - "@mongosh/js-multiline-to-singleline": "0.0.0-dev.0", - "@mongosh/logging": "0.0.0-dev.0", - "@mongosh/service-provider-core": "0.0.0-dev.0", - "@mongosh/service-provider-node-driver": "0.0.0-dev.0", - "@mongosh/shell-api": "0.0.0-dev.0", - "@mongosh/shell-evaluator": "0.0.0-dev.0", - "@mongosh/snippet-manager": "0.0.0-dev.0", - "@mongosh/types": "0.0.0-dev.0", + "@mongosh/arg-parser": "2.3.7", + "@mongosh/autocomplete": "2.3.7", + "@mongosh/editor": "2.3.7", + "@mongosh/errors": "2.3.7", + "@mongosh/history": "2.3.7", + "@mongosh/i18n": "2.3.7", + "@mongosh/js-multiline-to-singleline": "2.3.7", + "@mongosh/logging": "2.3.7", + "@mongosh/service-provider-core": "2.3.7", + "@mongosh/service-provider-node-driver": "2.3.7", + "@mongosh/shell-api": "2.3.7", + "@mongosh/shell-evaluator": "2.3.7", + "@mongosh/snippet-manager": "2.3.7", + "@mongosh/types": "2.3.7", "@segment/analytics-node": "^1.3.0", "ansi-escape-sequences": "^5.1.2", "askcharacter": "^2.0.4", @@ -29478,7 +29478,7 @@ }, "packages/connectivity-tests": { "name": "@mongosh/connectivity-tests", - "version": "0.0.0-dev.0", + "version": "2.3.7", "license": "Apache-2.0", "devDependencies": { "mongosh": "0.0.0-dev.0" @@ -29486,12 +29486,12 @@ }, "packages/e2e-tests": { "name": "@mongosh/e2e-tests", - "version": "0.0.0-dev.0", + "version": "2.3.7", "license": "Apache-2.0", "dependencies": { "@mongodb-js/oidc-plugin": "^1.1.5", "@mongosh/cli-repl": "0.0.0-dev.0", - "@mongosh/service-provider-core": "0.0.0-dev.0", + "@mongosh/service-provider-core": "2.3.7", "strip-ansi": "^6.0.0" }, "devDependencies": { @@ -29601,14 +29601,14 @@ }, "packages/editor": { "name": "@mongosh/editor", - "version": "0.0.0-dev.0", + "version": "2.3.7", "license": "Apache-2.0", "dependencies": { - "@mongosh/js-multiline-to-singleline": "0.0.0-dev.0", - "@mongosh/service-provider-core": "0.0.0-dev.0", - "@mongosh/shell-api": "0.0.0-dev.0", - "@mongosh/shell-evaluator": "0.0.0-dev.0", - "@mongosh/types": "0.0.0-dev.0", + "@mongosh/js-multiline-to-singleline": "2.3.7", + "@mongosh/service-provider-core": "2.3.7", + "@mongosh/shell-api": "2.3.7", + "@mongosh/shell-evaluator": "2.3.7", + "@mongosh/types": "2.3.7", "js-beautify": "^1.15.1" }, "devDependencies": { @@ -29626,7 +29626,7 @@ }, "packages/errors": { "name": "@mongosh/errors", - "version": "0.0.0-dev.0", + "version": "2.3.7", "license": "Apache-2.0", "devDependencies": { "@mongodb-js/eslint-config-mongosh": "^1.0.0", @@ -29645,7 +29645,7 @@ }, "packages/history": { "name": "@mongosh/history", - "version": "0.0.0-dev.0", + "version": "2.3.7", "license": "Apache-2.0", "dependencies": { "mongodb-connection-string-url": "^3.0.1", @@ -29666,10 +29666,10 @@ }, "packages/i18n": { "name": "@mongosh/i18n", - "version": "0.0.0-dev.0", + "version": "2.3.7", "license": "Apache-2.0", "dependencies": { - "@mongosh/errors": "0.0.0-dev.0" + "@mongosh/errors": "2.3.7" }, "devDependencies": { "@mongodb-js/eslint-config-mongosh": "^1.0.0", @@ -29685,7 +29685,7 @@ }, "packages/java-shell": { "name": "@mongosh/java-shell", - "version": "0.0.0-dev.0", + "version": "2.3.7", "license": "SSPL", "devDependencies": { "@mongodb-js/tsconfig-mongosh": "^1.0.0", @@ -29748,7 +29748,7 @@ }, "packages/js-multiline-to-singleline": { "name": "@mongosh/js-multiline-to-singleline", - "version": "0.0.0-dev.0", + "version": "2.3.7", "license": "Apache-2.0", "dependencies": { "@babel/core": "^7.16.12", @@ -29769,13 +29769,13 @@ }, "packages/logging": { "name": "@mongosh/logging", - "version": "0.0.0-dev.0", + "version": "2.3.7", "license": "Apache-2.0", "dependencies": { "@mongodb-js/devtools-connect": "^3.3.4", - "@mongosh/errors": "0.0.0-dev.0", - "@mongosh/history": "0.0.0-dev.0", - "@mongosh/types": "0.0.0-dev.0", + "@mongosh/errors": "2.3.7", + "@mongosh/history": "2.3.7", + "@mongosh/types": "2.3.7", "mongodb-log-writer": "^1.4.2", "mongodb-redact": "^1.1.2" }, @@ -29830,7 +29830,7 @@ }, "packages/node-runtime-worker-thread": { "name": "@mongosh/node-runtime-worker-thread", - "version": "0.0.0-dev.0", + "version": "2.3.7", "license": "Apache-2.0", "dependencies": { "interruptor": "^1.0.1", @@ -29841,11 +29841,11 @@ "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", - "@mongosh/browser-runtime-core": "0.0.0-dev.0", - "@mongosh/browser-runtime-electron": "0.0.0-dev.0", - "@mongosh/service-provider-core": "0.0.0-dev.0", - "@mongosh/service-provider-node-driver": "0.0.0-dev.0", - "@mongosh/types": "0.0.0-dev.0", + "@mongosh/browser-runtime-core": "2.3.7", + "@mongosh/browser-runtime-electron": "2.3.7", + "@mongosh/service-provider-core": "2.3.7", + "@mongosh/service-provider-node-driver": "2.3.7", + "@mongosh/types": "2.3.7", "bson": "^6.10.1", "depcheck": "^1.4.7", "eslint": "^7.25.0", @@ -29860,11 +29860,11 @@ }, "packages/service-provider-core": { "name": "@mongosh/service-provider-core", - "version": "0.0.0-dev.0", + "version": "2.3.7", "license": "Apache-2.0", "dependencies": { "@aws-sdk/credential-providers": "^3.525.0", - "@mongosh/errors": "0.0.0-dev.0", + "@mongosh/errors": "2.3.7", "bson": "^6.10.1", "mongodb": "^6.12.0", "mongodb-build-info": "^1.7.2", @@ -29887,14 +29887,14 @@ }, "packages/service-provider-node-driver": { "name": "@mongosh/service-provider-node-driver", - "version": "0.0.0-dev.0", + "version": "2.3.7", "license": "Apache-2.0", "dependencies": { "@mongodb-js/devtools-connect": "^3.3.4", "@mongodb-js/oidc-plugin": "^1.1.5", - "@mongosh/errors": "0.0.0-dev.0", - "@mongosh/service-provider-core": "0.0.0-dev.0", - "@mongosh/types": "0.0.0-dev.0", + "@mongosh/errors": "2.3.7", + "@mongosh/service-provider-core": "2.3.7", + "@mongosh/types": "2.3.7", "aws4": "^1.12.0", "mongodb": "^6.12.0", "mongodb-connection-string-url": "^3.0.1", @@ -29943,21 +29943,21 @@ }, "packages/shell-api": { "name": "@mongosh/shell-api", - "version": "0.0.0-dev.0", + "version": "2.3.7", "license": "Apache-2.0", "dependencies": { - "@mongosh/arg-parser": "0.0.0-dev.0", - "@mongosh/errors": "0.0.0-dev.0", - "@mongosh/history": "0.0.0-dev.0", - "@mongosh/i18n": "0.0.0-dev.0", - "@mongosh/service-provider-core": "0.0.0-dev.0", + "@mongosh/arg-parser": "2.3.7", + "@mongosh/errors": "2.3.7", + "@mongosh/history": "2.3.7", + "@mongosh/i18n": "2.3.7", + "@mongosh/service-provider-core": "2.3.7", "mongodb-redact": "^1.1.2" }, "devDependencies": { "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", - "@mongosh/types": "0.0.0-dev.0", + "@mongosh/types": "2.3.7", "bson": "^6.10.1", "depcheck": "^1.4.7", "eslint": "^7.25.0", @@ -29971,18 +29971,18 @@ }, "packages/shell-evaluator": { "name": "@mongosh/shell-evaluator", - "version": "0.0.0-dev.0", + "version": "2.3.7", "license": "Apache-2.0", "dependencies": { - "@mongosh/async-rewriter2": "0.0.0-dev.0", - "@mongosh/history": "0.0.0-dev.0", - "@mongosh/shell-api": "0.0.0-dev.0" + "@mongosh/async-rewriter2": "2.3.7", + "@mongosh/history": "2.3.7", + "@mongosh/shell-api": "2.3.7" }, "devDependencies": { "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", - "@mongosh/types": "0.0.0-dev.0", + "@mongosh/types": "2.3.7", "@types/sinon-chai": "^3.2.4", "depcheck": "^1.4.7", "eslint": "^7.25.0", @@ -29994,13 +29994,13 @@ }, "packages/snippet-manager": { "name": "@mongosh/snippet-manager", - "version": "0.0.0-dev.0", + "version": "2.3.7", "license": "Apache-2.0", "dependencies": { "@mongodb-js/devtools-proxy-support": "^0.4.2", - "@mongosh/errors": "0.0.0-dev.0", - "@mongosh/shell-api": "0.0.0-dev.0", - "@mongosh/types": "0.0.0-dev.0", + "@mongosh/errors": "2.3.7", + "@mongosh/shell-api": "2.3.7", + "@mongosh/types": "2.3.7", "bson": "^6.10.1", "cross-spawn": "^7.0.5", "escape-string-regexp": "^4.0.0", @@ -30034,7 +30034,7 @@ }, "packages/types": { "name": "@mongosh/types", - "version": "0.0.0-dev.0", + "version": "2.3.7", "license": "Apache-2.0", "dependencies": { "@mongodb-js/devtools-connect": "^3.3.4" @@ -30078,7 +30078,7 @@ }, "scripts/docker": { "name": "@mongosh/docker-build-scripts", - "version": "0.0.0-dev.0", + "version": "2.3.7", "license": "Apache-2.0", "dependencies": { "mongodb-crypt-library-version": "^1.0.5" diff --git a/packages/arg-parser/package.json b/packages/arg-parser/package.json index c784148e7..eec57eefd 100644 --- a/packages/arg-parser/package.json +++ b/packages/arg-parser/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/arg-parser", - "version": "0.0.0-dev.0", + "version": "2.3.7", "description": "MongoDB Shell CLI Argument List Parser Package", "main": "./lib/index.js", "repository": { @@ -35,8 +35,8 @@ "unitTestsOnly": true }, "dependencies": { - "@mongosh/errors": "0.0.0-dev.0", - "@mongosh/i18n": "0.0.0-dev.0", + "@mongosh/errors": "2.3.7", + "@mongosh/i18n": "2.3.7", "mongodb-connection-string-url": "^3.0.1" }, "devDependencies": { diff --git a/packages/async-rewriter2/package.json b/packages/async-rewriter2/package.json index 0d2e5be0e..17bd4cad1 100644 --- a/packages/async-rewriter2/package.json +++ b/packages/async-rewriter2/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/async-rewriter2", - "version": "0.0.0-dev.0", + "version": "2.3.7", "description": "MongoDB Shell Async Rewriter Package", "main": "./lib/index.js", "scripts": { diff --git a/packages/autocomplete/package.json b/packages/autocomplete/package.json index b3d2e4b97..da6523f0c 100644 --- a/packages/autocomplete/package.json +++ b/packages/autocomplete/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/autocomplete", - "version": "0.0.0-dev.0", + "version": "2.3.7", "description": "MongoDB Shell Autocomplete Package", "homepage": "https://github.com/mongodb-js/mongosh", "license": "Apache-2.0", @@ -44,7 +44,7 @@ }, "dependencies": { "@mongodb-js/mongodb-constants": "^0.10.1", - "@mongosh/shell-api": "0.0.0-dev.0", + "@mongosh/shell-api": "2.3.7", "semver": "^7.5.4" } } diff --git a/packages/browser-repl/package.json b/packages/browser-repl/package.json index b4dfeeed0..75ddf4eae 100644 --- a/packages/browser-repl/package.json +++ b/packages/browser-repl/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/browser-repl", - "version": "0.0.0-dev.0", + "version": "2.3.7", "description": "Browser presentation component for Mongo Shell", "engines": { "node": ">=14.15.1" @@ -56,12 +56,12 @@ ] }, "dependencies": { - "@mongosh/browser-runtime-core": "0.0.0-dev.0", - "@mongosh/errors": "0.0.0-dev.0", - "@mongosh/history": "0.0.0-dev.0", - "@mongosh/i18n": "0.0.0-dev.0", - "@mongosh/node-runtime-worker-thread": "0.0.0-dev.0", - "@mongosh/service-provider-core": "0.0.0-dev.0", + "@mongosh/browser-runtime-core": "2.3.7", + "@mongosh/errors": "2.3.7", + "@mongosh/history": "2.3.7", + "@mongosh/i18n": "2.3.7", + "@mongosh/node-runtime-worker-thread": "2.3.7", + "@mongosh/service-provider-core": "2.3.7", "numeral": "^2.0.6", "text-table": "^0.2.0" }, diff --git a/packages/browser-runtime-core/package.json b/packages/browser-runtime-core/package.json index 723871e73..4dde65ae7 100644 --- a/packages/browser-runtime-core/package.json +++ b/packages/browser-runtime-core/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/browser-runtime-core", - "version": "0.0.0-dev.0", + "version": "2.3.7", "description": "Mongosh browser runtime core", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -41,7 +41,7 @@ "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", - "@mongosh/types": "0.0.0-dev.0", + "@mongosh/types": "2.3.7", "bson": "^6.10.1", "depcheck": "^1.4.7", "eslint": "^7.25.0", @@ -49,9 +49,9 @@ "rimraf": "^3.0.2" }, "dependencies": { - "@mongosh/autocomplete": "0.0.0-dev.0", - "@mongosh/service-provider-core": "0.0.0-dev.0", - "@mongosh/shell-api": "0.0.0-dev.0", - "@mongosh/shell-evaluator": "0.0.0-dev.0" + "@mongosh/autocomplete": "2.3.7", + "@mongosh/service-provider-core": "2.3.7", + "@mongosh/shell-api": "2.3.7", + "@mongosh/shell-evaluator": "2.3.7" } } diff --git a/packages/browser-runtime-electron/package.json b/packages/browser-runtime-electron/package.json index 70946b7d0..5295b00c8 100644 --- a/packages/browser-runtime-electron/package.json +++ b/packages/browser-runtime-electron/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/browser-runtime-electron", - "version": "0.0.0-dev.0", + "version": "2.3.7", "description": "Mongosh browser runtime electron", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -41,7 +41,7 @@ "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", - "@mongosh/service-provider-node-driver": "0.0.0-dev.0", + "@mongosh/service-provider-node-driver": "2.3.7", "@types/sinon": "^7.5.1", "@types/sinon-chai": "^3.2.4", "depcheck": "^1.4.7", @@ -50,8 +50,8 @@ "rimraf": "^3.0.2" }, "dependencies": { - "@mongosh/browser-runtime-core": "0.0.0-dev.0", - "@mongosh/service-provider-core": "0.0.0-dev.0", - "@mongosh/types": "0.0.0-dev.0" + "@mongosh/browser-runtime-core": "2.3.7", + "@mongosh/service-provider-core": "2.3.7", + "@mongosh/types": "2.3.7" } } diff --git a/packages/build/package.json b/packages/build/package.json index a4963c70c..8f2830de7 100644 --- a/packages/build/package.json +++ b/packages/build/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/build", - "version": "0.0.0-dev.0", + "version": "2.3.7", "private": true, "description": "MongoDB Shell Build Tools", "main": "lib/index.js", diff --git a/packages/cli-repl/package.json b/packages/cli-repl/package.json index 43c735443..d2d30d59e 100644 --- a/packages/cli-repl/package.json +++ b/packages/cli-repl/package.json @@ -63,20 +63,20 @@ }, "dependencies": { "@mongodb-js/devtools-proxy-support": "^0.4.2", - "@mongosh/arg-parser": "0.0.0-dev.0", - "@mongosh/autocomplete": "0.0.0-dev.0", - "@mongosh/editor": "0.0.0-dev.0", - "@mongosh/errors": "0.0.0-dev.0", - "@mongosh/history": "0.0.0-dev.0", - "@mongosh/i18n": "0.0.0-dev.0", - "@mongosh/js-multiline-to-singleline": "0.0.0-dev.0", - "@mongosh/logging": "0.0.0-dev.0", - "@mongosh/service-provider-core": "0.0.0-dev.0", - "@mongosh/service-provider-node-driver": "0.0.0-dev.0", - "@mongosh/shell-api": "0.0.0-dev.0", - "@mongosh/shell-evaluator": "0.0.0-dev.0", - "@mongosh/snippet-manager": "0.0.0-dev.0", - "@mongosh/types": "0.0.0-dev.0", + "@mongosh/arg-parser": "2.3.7", + "@mongosh/autocomplete": "2.3.7", + "@mongosh/editor": "2.3.7", + "@mongosh/errors": "2.3.7", + "@mongosh/history": "2.3.7", + "@mongosh/i18n": "2.3.7", + "@mongosh/js-multiline-to-singleline": "2.3.7", + "@mongosh/logging": "2.3.7", + "@mongosh/service-provider-core": "2.3.7", + "@mongosh/service-provider-node-driver": "2.3.7", + "@mongosh/shell-api": "2.3.7", + "@mongosh/shell-evaluator": "2.3.7", + "@mongosh/snippet-manager": "2.3.7", + "@mongosh/types": "2.3.7", "@segment/analytics-node": "^1.3.0", "ansi-escape-sequences": "^5.1.2", "askcharacter": "^2.0.4", diff --git a/packages/connectivity-tests/package.json b/packages/connectivity-tests/package.json index 4ef44a9b2..183e56286 100644 --- a/packages/connectivity-tests/package.json +++ b/packages/connectivity-tests/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/connectivity-tests", - "version": "0.0.0-dev.0", + "version": "2.3.7", "private": true, "license": "Apache-2.0", "scripts": { diff --git a/packages/e2e-tests/package.json b/packages/e2e-tests/package.json index 326647057..8b1b65f7f 100644 --- a/packages/e2e-tests/package.json +++ b/packages/e2e-tests/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/e2e-tests", - "version": "0.0.0-dev.0", + "version": "2.3.7", "private": true, "description": "MongoDB Shell E2E Tests Package", "homepage": "https://github.com/mongodb-js/mongosh", @@ -28,7 +28,7 @@ }, "dependencies": { "@mongosh/cli-repl": "0.0.0-dev.0", - "@mongosh/service-provider-core": "0.0.0-dev.0", + "@mongosh/service-provider-core": "2.3.7", "@mongodb-js/oidc-plugin": "^1.1.5", "strip-ansi": "^6.0.0" }, diff --git a/packages/editor/package.json b/packages/editor/package.json index 57e07395a..df6d22f49 100644 --- a/packages/editor/package.json +++ b/packages/editor/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/editor", - "version": "0.0.0-dev.0", + "version": "2.3.7", "description": "MongoDB Shell External Editor", "main": "./lib/index.js", "repository": { @@ -35,11 +35,11 @@ "unitTestsOnly": true }, "dependencies": { - "@mongosh/js-multiline-to-singleline": "0.0.0-dev.0", - "@mongosh/service-provider-core": "0.0.0-dev.0", - "@mongosh/shell-api": "0.0.0-dev.0", - "@mongosh/shell-evaluator": "0.0.0-dev.0", - "@mongosh/types": "0.0.0-dev.0", + "@mongosh/js-multiline-to-singleline": "2.3.7", + "@mongosh/service-provider-core": "2.3.7", + "@mongosh/shell-api": "2.3.7", + "@mongosh/shell-evaluator": "2.3.7", + "@mongosh/types": "2.3.7", "js-beautify": "^1.15.1" }, "devDependencies": { diff --git a/packages/errors/package.json b/packages/errors/package.json index 4736c169b..b2771b58f 100644 --- a/packages/errors/package.json +++ b/packages/errors/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/errors", - "version": "0.0.0-dev.0", + "version": "2.3.7", "description": "MongoDB Shell Errors Package", "homepage": "https://github.com/mongodb-js/mongosh", "license": "Apache-2.0", diff --git a/packages/history/package.json b/packages/history/package.json index 21df6a136..79eaafd58 100644 --- a/packages/history/package.json +++ b/packages/history/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/history", - "version": "0.0.0-dev.0", + "version": "2.3.7", "description": "MongoDB Shell History Package", "main": "./lib/index.js", "repository": { diff --git a/packages/i18n/package.json b/packages/i18n/package.json index e717cf762..6fd1fee90 100644 --- a/packages/i18n/package.json +++ b/packages/i18n/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/i18n", - "version": "0.0.0-dev.0", + "version": "2.3.7", "description": "MongoDB Shell i18n Project", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -36,7 +36,7 @@ "unitTestsOnly": true }, "dependencies": { - "@mongosh/errors": "0.0.0-dev.0" + "@mongosh/errors": "2.3.7" }, "devDependencies": { "@mongodb-js/eslint-config-mongosh": "^1.0.0", diff --git a/packages/java-shell/package.json b/packages/java-shell/package.json index f541d15ef..53458cd02 100644 --- a/packages/java-shell/package.json +++ b/packages/java-shell/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/java-shell", - "version": "0.0.0-dev.0", + "version": "2.3.7", "private": true, "description": "Java application that uses mongosh-shell-api node module and MongoDB java driver to run mongo shell on JVM", "config": { diff --git a/packages/js-multiline-to-singleline/package.json b/packages/js-multiline-to-singleline/package.json index 06b21592a..777544763 100644 --- a/packages/js-multiline-to-singleline/package.json +++ b/packages/js-multiline-to-singleline/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/js-multiline-to-singleline", - "version": "0.0.0-dev.0", + "version": "2.3.7", "description": "Make multiline JS into a single line", "main": "./lib/index.js", "repository": { diff --git a/packages/logging/package.json b/packages/logging/package.json index bcaf18607..5298f800d 100644 --- a/packages/logging/package.json +++ b/packages/logging/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/logging", - "version": "0.0.0-dev.0", + "version": "2.3.7", "description": "MongoDB Shell Logging Utilities Package", "homepage": "https://github.com/mongodb-js/mongosh", "license": "Apache-2.0", @@ -18,9 +18,9 @@ }, "dependencies": { "@mongodb-js/devtools-connect": "^3.3.4", - "@mongosh/errors": "0.0.0-dev.0", - "@mongosh/history": "0.0.0-dev.0", - "@mongosh/types": "0.0.0-dev.0", + "@mongosh/errors": "2.3.7", + "@mongosh/history": "2.3.7", + "@mongosh/types": "2.3.7", "mongodb-log-writer": "^1.4.2", "mongodb-redact": "^1.1.2" }, diff --git a/packages/node-runtime-worker-thread/package.json b/packages/node-runtime-worker-thread/package.json index 211205f6b..d83756cf5 100644 --- a/packages/node-runtime-worker-thread/package.json +++ b/packages/node-runtime-worker-thread/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/node-runtime-worker-thread", - "version": "0.0.0-dev.0", + "version": "2.3.7", "description": "MongoDB shell runtime that lives in a worker thread", "homepage": "https://github.com/mongodb-js/mongosh", "license": "Apache-2.0", @@ -37,11 +37,11 @@ "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", - "@mongosh/browser-runtime-core": "0.0.0-dev.0", - "@mongosh/browser-runtime-electron": "0.0.0-dev.0", - "@mongosh/service-provider-core": "0.0.0-dev.0", - "@mongosh/service-provider-node-driver": "0.0.0-dev.0", - "@mongosh/types": "0.0.0-dev.0", + "@mongosh/browser-runtime-core": "2.3.7", + "@mongosh/browser-runtime-electron": "2.3.7", + "@mongosh/service-provider-core": "2.3.7", + "@mongosh/service-provider-node-driver": "2.3.7", + "@mongosh/types": "2.3.7", "bson": "^6.10.1", "depcheck": "^1.4.7", "eslint": "^7.25.0", diff --git a/packages/service-provider-core/package.json b/packages/service-provider-core/package.json index 94847a855..13bbff4fc 100644 --- a/packages/service-provider-core/package.json +++ b/packages/service-provider-core/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/service-provider-core", - "version": "0.0.0-dev.0", + "version": "2.3.7", "description": "MongoDB Shell Core Service Provider Package", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -44,7 +44,7 @@ }, "dependencies": { "@aws-sdk/credential-providers": "^3.525.0", - "@mongosh/errors": "0.0.0-dev.0", + "@mongosh/errors": "2.3.7", "bson": "^6.10.1", "mongodb": "^6.12.0", "mongodb-build-info": "^1.7.2", diff --git a/packages/service-provider-node-driver/package.json b/packages/service-provider-node-driver/package.json index 4f9d72106..f193c2d8b 100644 --- a/packages/service-provider-node-driver/package.json +++ b/packages/service-provider-node-driver/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/service-provider-node-driver", - "version": "0.0.0-dev.0", + "version": "2.3.7", "description": "MongoDB Shell Server Service Provider Package", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -49,9 +49,9 @@ "dependencies": { "@mongodb-js/devtools-connect": "^3.3.4", "@mongodb-js/oidc-plugin": "^1.1.5", - "@mongosh/errors": "0.0.0-dev.0", - "@mongosh/service-provider-core": "0.0.0-dev.0", - "@mongosh/types": "0.0.0-dev.0", + "@mongosh/errors": "2.3.7", + "@mongosh/service-provider-core": "2.3.7", + "@mongosh/types": "2.3.7", "aws4": "^1.12.0", "mongodb": "^6.12.0", "mongodb-connection-string-url": "^3.0.1", diff --git a/packages/shell-api/package.json b/packages/shell-api/package.json index 429920d6d..a855b16ee 100644 --- a/packages/shell-api/package.json +++ b/packages/shell-api/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/shell-api", - "version": "0.0.0-dev.0", + "version": "2.3.7", "description": "MongoDB Shell API Classes Package", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -40,18 +40,18 @@ "build" ], "dependencies": { - "@mongosh/arg-parser": "0.0.0-dev.0", - "@mongosh/errors": "0.0.0-dev.0", - "@mongosh/history": "0.0.0-dev.0", - "@mongosh/i18n": "0.0.0-dev.0", - "@mongosh/service-provider-core": "0.0.0-dev.0", + "@mongosh/arg-parser": "2.3.7", + "@mongosh/errors": "2.3.7", + "@mongosh/history": "2.3.7", + "@mongosh/i18n": "2.3.7", + "@mongosh/service-provider-core": "2.3.7", "mongodb-redact": "^1.1.2" }, "devDependencies": { "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", - "@mongosh/types": "0.0.0-dev.0", + "@mongosh/types": "2.3.7", "bson": "^6.10.1", "depcheck": "^1.4.7", "eslint": "^7.25.0", diff --git a/packages/shell-evaluator/package.json b/packages/shell-evaluator/package.json index 7952764ee..e8ab58688 100644 --- a/packages/shell-evaluator/package.json +++ b/packages/shell-evaluator/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/shell-evaluator", - "version": "0.0.0-dev.0", + "version": "2.3.7", "description": "MongoDB Top Level API Package", "main": "./lib/index.js", "scripts": { @@ -38,15 +38,15 @@ "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", - "@mongosh/types": "0.0.0-dev.0", + "@mongosh/types": "2.3.7", "@types/sinon-chai": "^3.2.4", "depcheck": "^1.4.7", "eslint": "^7.25.0", "prettier": "^2.8.8" }, "dependencies": { - "@mongosh/async-rewriter2": "0.0.0-dev.0", - "@mongosh/history": "0.0.0-dev.0", - "@mongosh/shell-api": "0.0.0-dev.0" + "@mongosh/async-rewriter2": "2.3.7", + "@mongosh/history": "2.3.7", + "@mongosh/shell-api": "2.3.7" } } diff --git a/packages/snippet-manager/package.json b/packages/snippet-manager/package.json index 5684fbe12..d64e8e8e1 100644 --- a/packages/snippet-manager/package.json +++ b/packages/snippet-manager/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/snippet-manager", - "version": "0.0.0-dev.0", + "version": "2.3.7", "description": "MongoDB Shell Snippet Manager", "main": "./lib/index.js", "repository": { @@ -36,9 +36,9 @@ }, "dependencies": { "@mongodb-js/devtools-proxy-support": "^0.4.2", - "@mongosh/errors": "0.0.0-dev.0", - "@mongosh/shell-api": "0.0.0-dev.0", - "@mongosh/types": "0.0.0-dev.0", + "@mongosh/errors": "2.3.7", + "@mongosh/shell-api": "2.3.7", + "@mongosh/types": "2.3.7", "bson": "^6.10.1", "cross-spawn": "^7.0.5", "escape-string-regexp": "^4.0.0", diff --git a/packages/types/package.json b/packages/types/package.json index 7c7e7d755..41e1744ca 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/types", - "version": "0.0.0-dev.0", + "version": "2.3.7", "description": "Types for mongosh internals", "author": "Anna Henningsen ", "homepage": "https://github.com/mongodb-js/mongosh/tree/main/packages/types#readme", diff --git a/scripts/docker/package.json b/scripts/docker/package.json index 9560b97a8..a22064f37 100644 --- a/scripts/docker/package.json +++ b/scripts/docker/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/docker-build-scripts", - "version": "0.0.0-dev.0", + "version": "2.3.7", "private": true, "description": "MongoDB Shell Build Docker Images", "config": { From 193aa0987bf557f568f187125464ccda909be774 Mon Sep 17 00:00:00 2001 From: gagik Date: Tue, 31 Dec 2024 12:24:43 +0100 Subject: [PATCH 15/27] add bumping commit to release draft --- .evergreen/evergreen.yml.in | 3 +++ packages/build/src/npm-packages/bump.ts | 10 ++++++---- packages/build/src/npm-packages/index.ts | 2 +- packages/build/src/release.ts | 8 ++++---- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.evergreen/evergreen.yml.in b/.evergreen/evergreen.yml.in index f0c7ba969..3a8b14b81 100644 --- a/.evergreen/evergreen.yml.in +++ b/.evergreen/evergreen.yml.in @@ -917,6 +917,9 @@ functions: { export NODE_JS_VERSION=${node_js_version} source .evergreen/setup-env.sh + npm run evergreen-release bump + git add . + git commit --no-allow-empty -m "chore(release): bump to prepare for mongosh release" npm run evergreen-release draft } diff --git a/packages/build/src/npm-packages/bump.ts b/packages/build/src/npm-packages/bump.ts index a06787feb..544b605bd 100644 --- a/packages/build/src/npm-packages/bump.ts +++ b/packages/build/src/npm-packages/bump.ts @@ -9,8 +9,10 @@ import { promises as fs } from 'fs'; import path from 'path'; import { getPackagesInTopologicalOrder } from '@mongodb-js/monorepo-tools'; -/** This bumps only the main mongosh release packages to the set version. */ -export async function bumpMongosh(version: string): Promise { +/** Bumps only the main mongosh release packages to the set version. */ +export async function bumpMongoshReleasePackages( + version: string +): Promise { console.info(`mongosh: Bumping package versions to ${version}`); const monorepoRootPath = path.resolve(__dirname, '..', '..', '..', '..'); const packages = await getPackagesInTopologicalOrder(monorepoRootPath); @@ -51,8 +53,8 @@ export async function bumpMongosh(version: string): Promise { } } -/** Bump packages without setting a new version of mongosh. */ -export function bumpNpmPackages() { +/** Bumps independent packages without setting a new version of mongosh. */ +export function bumpIndependentPackages() { spawnSync('bump-monorepo-packages', [], { stdio: 'inherit', cwd: PROJECT_ROOT, diff --git a/packages/build/src/npm-packages/index.ts b/packages/build/src/npm-packages/index.ts index 350977521..272f540d5 100644 --- a/packages/build/src/npm-packages/index.ts +++ b/packages/build/src/npm-packages/index.ts @@ -1,2 +1,2 @@ -export { bumpNpmPackages } from './bump'; +export { bumpIndependentPackages } from './bump'; export { publishNpmPackages } from './publish'; diff --git a/packages/build/src/release.ts b/packages/build/src/release.ts index 50241a0b4..ded54215d 100644 --- a/packages/build/src/release.ts +++ b/packages/build/src/release.ts @@ -14,7 +14,7 @@ import { } from './evergreen'; import { GithubRepo } from '@mongodb-js/devtools-github-repo'; import { publishToHomebrew } from './homebrew'; -import { bumpNpmPackages, publishNpmPackages } from './npm-packages'; +import { bumpIndependentPackages, publishNpmPackages } from './npm-packages'; import { runPackage } from './packaging'; import { runDraft } from './run-draft'; import { runPublish } from './run-publish'; @@ -22,7 +22,7 @@ import { runUpload } from './run-upload'; import { runSign } from './packaging/run-sign'; import { runDownloadAndListArtifacts } from './run-download-and-list-artifacts'; import { runDownloadCryptLibrary } from './packaging/run-download-crypt-library'; -import { bumpMongosh } from './npm-packages/bump'; +import { bumpMongoshReleasePackages } from './npm-packages/bump'; export type ReleaseCommand = | 'bump' @@ -56,8 +56,8 @@ export async function release( ); if (command === 'bump') { - await bumpMongosh(config.version); - bumpNpmPackages(); + bumpIndependentPackages(); + await bumpMongoshReleasePackages(config.version); return; } From a19f40895d3d20f56c1b9c64695941a97aed5fbc Mon Sep 17 00:00:00 2001 From: gagik Date: Tue, 31 Dec 2024 12:30:41 +0100 Subject: [PATCH 16/27] set all to 2.3.7 --- package-lock.json | 10 +++++----- packages/cli-repl/package.json | 2 +- packages/connectivity-tests/package.json | 2 +- packages/e2e-tests/package.json | 2 +- packages/mongosh/package.json | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index 72fca0de6..6123da22c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -29394,7 +29394,7 @@ }, "packages/cli-repl": { "name": "@mongosh/cli-repl", - "version": "0.0.0-dev.0", + "version": "2.3.7", "license": "Apache-2.0", "dependencies": { "@mongodb-js/devtools-proxy-support": "^0.4.2", @@ -29481,7 +29481,7 @@ "version": "2.3.7", "license": "Apache-2.0", "devDependencies": { - "mongosh": "0.0.0-dev.0" + "mongosh": "2.3.7" } }, "packages/e2e-tests": { @@ -29490,7 +29490,7 @@ "license": "Apache-2.0", "dependencies": { "@mongodb-js/oidc-plugin": "^1.1.5", - "@mongosh/cli-repl": "0.0.0-dev.0", + "@mongosh/cli-repl": "2.3.7", "@mongosh/service-provider-core": "2.3.7", "strip-ansi": "^6.0.0" }, @@ -29816,10 +29816,10 @@ } }, "packages/mongosh": { - "version": "0.0.0-dev.0", + "version": "2.3.7", "license": "Apache-2.0", "dependencies": { - "@mongosh/cli-repl": "0.0.0-dev.0" + "@mongosh/cli-repl": "2.3.7" }, "bin": { "mongosh": "bin/mongosh.js" diff --git a/packages/cli-repl/package.json b/packages/cli-repl/package.json index d2d30d59e..cc6810437 100644 --- a/packages/cli-repl/package.json +++ b/packages/cli-repl/package.json @@ -1,6 +1,6 @@ { "name": "@mongosh/cli-repl", - "version": "0.0.0-dev.0", + "version": "2.3.7", "description": "MongoDB Shell CLI REPL Package", "homepage": "https://github.com/mongodb-js/mongosh", "author": "Compass Team ", diff --git a/packages/connectivity-tests/package.json b/packages/connectivity-tests/package.json index 183e56286..0ecc11110 100644 --- a/packages/connectivity-tests/package.json +++ b/packages/connectivity-tests/package.json @@ -11,7 +11,7 @@ "test-ci-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test-ci" }, "devDependencies": { - "mongosh": "0.0.0-dev.0" + "mongosh": "2.3.7" }, "mongosh": { "unitTestsOnly": true, diff --git a/packages/e2e-tests/package.json b/packages/e2e-tests/package.json index 8b1b65f7f..a359d9a07 100644 --- a/packages/e2e-tests/package.json +++ b/packages/e2e-tests/package.json @@ -27,7 +27,7 @@ "node": ">=16.15.0" }, "dependencies": { - "@mongosh/cli-repl": "0.0.0-dev.0", + "@mongosh/cli-repl": "2.3.7", "@mongosh/service-provider-core": "2.3.7", "@mongodb-js/oidc-plugin": "^1.1.5", "strip-ansi": "^6.0.0" diff --git a/packages/mongosh/package.json b/packages/mongosh/package.json index dc77b76af..d599c5f39 100644 --- a/packages/mongosh/package.json +++ b/packages/mongosh/package.json @@ -1,6 +1,6 @@ { "name": "mongosh", - "version": "0.0.0-dev.0", + "version": "2.3.7", "description": "MongoDB Shell CLI REPL", "keywords": [ "mongosh", @@ -39,6 +39,6 @@ "variants": [] }, "dependencies": { - "@mongosh/cli-repl": "0.0.0-dev.0" + "@mongosh/cli-repl": "2.3.7" } } From 7ec404984d647ec1d5fb9bcf7ca4bdeff32aaf2c Mon Sep 17 00:00:00 2001 From: Gagik Amaryan Date: Tue, 31 Dec 2024 13:18:56 +0100 Subject: [PATCH 17/27] Update .github/workflows/release-packages.yml Co-authored-by: Nikola Irinchev --- .github/workflows/release-packages.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/release-packages.yml b/.github/workflows/release-packages.yml index 849fcc2a9..70e19e1c0 100644 --- a/.github/workflows/release-packages.yml +++ b/.github/workflows/release-packages.yml @@ -18,14 +18,11 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: # don't checkout a detatched HEAD ref: ${{ github.head_ref }} - # this is important so git log has the whole history - fetch-depth: '0' - - name: Setup git run: | git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com" From 67c690de53485e9e8dd9c380246185ac8e73dfdd Mon Sep 17 00:00:00 2001 From: gagik Date: Tue, 31 Dec 2024 13:19:18 +0100 Subject: [PATCH 18/27] fix removed compass skip --- .github/workflows/bump-packages.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/bump-packages.yml b/.github/workflows/bump-packages.yml index a98adf2ef..0f7348bd8 100644 --- a/.github/workflows/bump-packages.yml +++ b/.github/workflows/bump-packages.yml @@ -39,7 +39,6 @@ jobs: - name: Bump packages env: LAST_BUMP_COMMIT_MESSAGE: "chore(release): bump package versions" - SKIP_BUMP_PACKAGES: "mongodb-compass" run: | npm run bump-packages git add . From 9c4b387cc73de9f006390cf93b7701f0d6e4f8bf Mon Sep 17 00:00:00 2001 From: gagik Date: Tue, 31 Dec 2024 13:55:30 +0100 Subject: [PATCH 19/27] switch to use app token --- .github/workflows/release-packages.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release-packages.yml b/.github/workflows/release-packages.yml index 70e19e1c0..215958957 100644 --- a/.github/workflows/release-packages.yml +++ b/.github/workflows/release-packages.yml @@ -18,16 +18,18 @@ jobs: runs-on: ubuntu-latest steps: + - name: Create Github App Token + uses: mongodb-js/devtools-shared/actions/setup-bot-token@main + id: app-token + with: + app-id: ${{ vars.DEVTOOLS_BOT_APP_ID }} + private-key: ${{ secrets.DEVTOOLS_BOT_PRIVATE_KEY }} + - uses: actions/checkout@v4 with: # don't checkout a detatched HEAD ref: ${{ github.head_ref }} - - name: Setup git - run: | - git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com" - git config --local user.name "github-actions[bot]" - - name: "Use Node.js 14" uses: actions/setup-node@v3 with: From 4f4336987063450c6c05914f9c56eba1e6dec6dc Mon Sep 17 00:00:00 2001 From: gagik Date: Tue, 31 Dec 2024 14:14:38 +0100 Subject: [PATCH 20/27] use bump in install script --- .evergreen/evergreen.yml.in | 1 - .evergreen/install-npm-deps.sh | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.evergreen/evergreen.yml.in b/.evergreen/evergreen.yml.in index 3a8b14b81..a36506f61 100644 --- a/.evergreen/evergreen.yml.in +++ b/.evergreen/evergreen.yml.in @@ -917,7 +917,6 @@ functions: { export NODE_JS_VERSION=${node_js_version} source .evergreen/setup-env.sh - npm run evergreen-release bump git add . git commit --no-allow-empty -m "chore(release): bump to prepare for mongosh release" npm run evergreen-release draft diff --git a/.evergreen/install-npm-deps.sh b/.evergreen/install-npm-deps.sh index daca8211e..97cffcc7e 100644 --- a/.evergreen/install-npm-deps.sh +++ b/.evergreen/install-npm-deps.sh @@ -31,5 +31,7 @@ npm run mark-ci-required-optional-dependencies # along with its types, but npm wouldn't try and compile the addon (npm ci && test -e node_modules/mongodb-client-encryption) || npm ci --ignore-scripts +npm run evergreen-release bump + echo "npm packages after installation" npm ls || true From c9fd3565ead55626a4f39606ddbe845781986808 Mon Sep 17 00:00:00 2001 From: gagik Date: Tue, 31 Dec 2024 15:19:42 +0100 Subject: [PATCH 21/27] remove bump step --- .evergreen/install-npm-deps.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/.evergreen/install-npm-deps.sh b/.evergreen/install-npm-deps.sh index 97cffcc7e..daca8211e 100644 --- a/.evergreen/install-npm-deps.sh +++ b/.evergreen/install-npm-deps.sh @@ -31,7 +31,5 @@ npm run mark-ci-required-optional-dependencies # along with its types, but npm wouldn't try and compile the addon (npm ci && test -e node_modules/mongodb-client-encryption) || npm ci --ignore-scripts -npm run evergreen-release bump - echo "npm packages after installation" npm ls || true From 285eda647e98e352dec0af735df55e9a8fa3ccf2 Mon Sep 17 00:00:00 2001 From: gagik Date: Mon, 6 Jan 2025 12:09:38 +0100 Subject: [PATCH 22/27] align with future release move changes --- ...ckages.yml => bump-auxiliary-packages.yml} | 12 ++-- ...ges.yml => release-auxiliary-packages.yml} | 8 +-- package-lock.json | 4 +- package.json | 12 ++-- packages/build/package.json | 4 ++ packages/build/src/config/config.ts | 1 + packages/build/src/index.ts | 1 + packages/build/src/npm-packages/bump.ts | 14 +++-- packages/build/src/npm-packages/constants.ts | 4 +- .../build/src/npm-packages/publish.spec.ts | 2 + packages/build/src/npm-packages/publish.ts | 61 ++++++++++++++----- packages/build/src/release.ts | 4 +- packages/build/src/run-publish.ts | 2 +- 13 files changed, 85 insertions(+), 44 deletions(-) rename .github/workflows/{bump-packages.yml => bump-auxiliary-packages.yml} (79%) rename .github/workflows/{release-packages.yml => release-auxiliary-packages.yml} (87%) diff --git a/.github/workflows/bump-packages.yml b/.github/workflows/bump-auxiliary-packages.yml similarity index 79% rename from .github/workflows/bump-packages.yml rename to .github/workflows/bump-auxiliary-packages.yml index 0f7348bd8..caa0024b5 100644 --- a/.github/workflows/bump-packages.yml +++ b/.github/workflows/bump-auxiliary-packages.yml @@ -1,4 +1,4 @@ -name: Bump packages +name: Bump auxiliary package versions on: workflow_dispatch: push: @@ -38,9 +38,9 @@ jobs: - name: Bump packages env: - LAST_BUMP_COMMIT_MESSAGE: "chore(release): bump package versions" + LAST_BUMP_COMMIT_MESSAGE: "chore(release): bump auxiliary package versions" run: | - npm run bump-packages + npm run bump-auxiliary git add . git commit --no-allow-empty -m "$LAST_BUMP_COMMIT_MESSAGE" || true @@ -48,9 +48,9 @@ jobs: uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # 7.0.5 with: token: ${{ steps.app-token.outputs.token }} - commit-message: "chore(release): bump package versions" - branch: ci/bump-packages - title: "chore(release): bump package versions" + commit-message: "chore(release): bump auxiliary package versions" + branch: ci/bump-auxiliary-packages + title: "chore(release): bump auxiliary package versions" labels: no-title-validation body: | - Bump package versions diff --git a/.github/workflows/release-packages.yml b/.github/workflows/release-auxiliary-packages.yml similarity index 87% rename from .github/workflows/release-packages.yml rename to .github/workflows/release-auxiliary-packages.yml index 215958957..8e825b60e 100644 --- a/.github/workflows/release-packages.yml +++ b/.github/workflows/release-auxiliary-packages.yml @@ -1,4 +1,4 @@ -name: Publish +name: Publish Auxiliary Packages on: # NOTE: avoid using the manual execution unless is the only way to fix some issue, # rather retry failed jobs in case of flakes. The manual execution can potentially @@ -53,9 +53,3 @@ jobs: git update-index --assume-unchanged .npmrc npm run publish-packages - - name: "Publish tags" - run: | - npx lerna list -a --json | \ - jq -r '.[] | .name + "@" + .version' | \ - xargs -i sh -c "git tag -a {} -m {} || true" - git push --follow-tags diff --git a/package-lock.json b/package-lock.json index 6123da22c..e177e74ec 100644 --- a/package-lock.json +++ b/package-lock.json @@ -66,7 +66,7 @@ "nyc": "^15.1.0", "pkg-up": "^3.1.0", "rimraf": "^3.0.2", - "semver": "^7.5.4", + "semver": "^7.6.3", "sinon": "^7.5.0", "sinon-chai": "^3.5.0", "terser-webpack-plugin": "^4.2.3", @@ -5847,7 +5847,7 @@ "toposort": "^2.0.2" }, "bin": { - "bump-monorepo-packages": "bin/bump-packages.js", + "bump-monorepo-packages": "bin/bump-auxiliary.js", "depalign": "bin/depalign.js", "monorepo-where": "bin/where.js", "precommit": "bin/precommit.js" diff --git a/package.json b/package.json index 5f7bc42db..af12edefb 100644 --- a/package.json +++ b/package.json @@ -71,8 +71,8 @@ "prepare": "husky", "precommit": "precommit", "preinstall": "node scripts/sort-workspaces.js", - "bump-packages": "npm run bump-packages --workspace @mongosh/build", - "publish-packages": "lerna publish from-package --no-verify-access --no-push --no-git-tag-version --yes" + "bump-auxiliary": "npm run bump-auxiliary --workspace @mongosh/build", + "publish-auxiliary": "npm run publish-auxiliary --workspace @mongosh/build" }, "config": { "unsafe-perm": true @@ -100,6 +100,7 @@ "@babel/compat-data": "^7.9.0", "@mongodb-js/monorepo-tools": "^1.1.10", "@mongodb-js/sbom-tools": "^0.7.0", + "@pkgjs/nv": "^0.2.2", "@types/chai": "^4.2.5", "@types/mocha": "^5.2.7", "@types/node": "^14.14.6", @@ -109,6 +110,7 @@ "@types/which": "^1.3.2", "chai": "^4.2.0", "cross-env": "^6.0.3", + "depcheck": "^1.4.7", "duplexpair": "^1.0.2", "find-up": "^5.0.0", "glob": "^10.3.12", @@ -120,7 +122,7 @@ "nyc": "^15.1.0", "pkg-up": "^3.1.0", "rimraf": "^3.0.2", - "semver": "^7.5.4", + "semver": "^7.6.3", "sinon": "^7.5.0", "sinon-chai": "^3.5.0", "terser-webpack-plugin": "^4.2.3", @@ -132,9 +134,7 @@ "webpack-bundle-analyzer": "^4.7.0", "webpack-cli": "^4.3.1", "which": "^2.0.2", - "yaml": "^1.10.0", - "depcheck": "^1.4.7", - "@pkgjs/nv": "^0.2.2" + "yaml": "^1.10.0" }, "optionalDependencies": { "lerna": "^8.1.8" diff --git a/packages/build/package.json b/packages/build/package.json index 8f2830de7..774f9cb8c 100644 --- a/packages/build/package.json +++ b/packages/build/package.json @@ -26,6 +26,10 @@ "evergreen-release": "ts-node -r ../../scripts/import-expansions.js src/index.ts", "release": "ts-node src/index.ts trigger-release", "prettier": "prettier", + "bump": "ts-node src/index.ts bump", + "publish": "ts-node src/index.ts publish", + "bump-auxiliary": "ts-node src/index.ts bump --auxiliary", + "publish-auxiliary": "ts-node src/index.ts publish --auxiliary", "reformat": "npm run prettier -- --write . && npm run eslint --fix" }, "license": "Apache-2.0", diff --git a/packages/build/src/config/config.ts b/packages/build/src/config/config.ts index 4502f48ab..0e1b6daf2 100644 --- a/packages/build/src/config/config.ts +++ b/packages/build/src/config/config.ts @@ -46,4 +46,5 @@ export interface Config { artifactUrlExtraTag?: string; manpage?: ManPageConfig; isDryRun?: boolean; + isAuxiliaryOnly?: boolean; } diff --git a/packages/build/src/index.ts b/packages/build/src/index.ts index 064557fa6..496226a9f 100644 --- a/packages/build/src/index.ts +++ b/packages/build/src/index.ts @@ -59,6 +59,7 @@ if (require.main === module) { } config.isDryRun ||= process.argv.includes('--dry-run'); + config.isAuxiliaryOnly ||= process.argv.includes('--auxiliary'); await release(command, config); } diff --git a/packages/build/src/npm-packages/bump.ts b/packages/build/src/npm-packages/bump.ts index 544b605bd..dde1ba719 100644 --- a/packages/build/src/npm-packages/bump.ts +++ b/packages/build/src/npm-packages/bump.ts @@ -1,6 +1,6 @@ import { spawnSync } from '../helpers'; import { - IGNORE_BUMP_PACKAGES, + MONGOSH_RELEASE_ONLY_PACKAGES, MONGOSH_RELEASE_PACKAGES, PROJECT_ROOT, } from './constants'; @@ -10,9 +10,13 @@ import path from 'path'; import { getPackagesInTopologicalOrder } from '@mongodb-js/monorepo-tools'; /** Bumps only the main mongosh release packages to the set version. */ -export async function bumpMongoshReleasePackages( - version: string -): Promise { +export async function bumpMongoshReleasePackages(): Promise { + const version = process.env.MONGOSH_RELEASE_VERSION; + if (!version) { + throw new Error( + 'MONGOSH_RELEASE_VERSION version not specified during mongosh bump' + ); + } console.info(`mongosh: Bumping package versions to ${version}`); const monorepoRootPath = path.resolve(__dirname, '..', '..', '..', '..'); const packages = await getPackagesInTopologicalOrder(monorepoRootPath); @@ -62,7 +66,7 @@ export function bumpIndependentPackages() { env: { ...process.env, SKIP_BUMP_PACKAGES: [ - ...IGNORE_BUMP_PACKAGES, + ...MONGOSH_RELEASE_ONLY_PACKAGES, ...MONGOSH_RELEASE_PACKAGES, ].join(','), }, diff --git a/packages/build/src/npm-packages/constants.ts b/packages/build/src/npm-packages/constants.ts index 1d742f920..54d331230 100644 --- a/packages/build/src/npm-packages/constants.ts +++ b/packages/build/src/npm-packages/constants.ts @@ -11,8 +11,8 @@ export const LERNA_BIN = path.resolve( /** Packages which get bumped only as part of the mongosh release. */ export const MONGOSH_RELEASE_PACKAGES = ['mongosh', '@mongosh/cli-repl']; -/** Packages which always get ignored when doing a release or bump */ -export const IGNORE_BUMP_PACKAGES = [ +/** Packages which always get excluded when doing a release or bump */ +export const EXCLUDE_RELEASE_PACKAGES = [ '@mongodb-js/eslint-config-mongosh', '@mongodb-js/tsconfig-mongosh', ]; diff --git a/packages/build/src/npm-packages/publish.spec.ts b/packages/build/src/npm-packages/publish.spec.ts index 08815dc49..ab28a8ce8 100644 --- a/packages/build/src/npm-packages/publish.spec.ts +++ b/packages/build/src/npm-packages/publish.spec.ts @@ -30,6 +30,7 @@ describe('npm-packages publishNpmPackages', function () { listNpmPackages.returns(packages); publishNpmPackages( + false, false, listNpmPackages, markBumpedFilesAsAssumeUnchanged, @@ -69,6 +70,7 @@ describe('npm-packages publishNpmPackages', function () { try { publishNpmPackages( + false, false, listNpmPackages, markBumpedFilesAsAssumeUnchanged, diff --git a/packages/build/src/npm-packages/publish.ts b/packages/build/src/npm-packages/publish.ts index 624c45760..6165b0d19 100644 --- a/packages/build/src/npm-packages/publish.ts +++ b/packages/build/src/npm-packages/publish.ts @@ -1,17 +1,40 @@ import path from 'path'; -import { LERNA_BIN, PROJECT_ROOT } from './constants'; +import { + EXCLUDE_RELEASE_PACKAGES, + LERNA_BIN, + MONGOSH_RELEASE_PACKAGES, + PROJECT_ROOT, +} from './constants'; import type { LernaPackageDescription } from './list'; import { listNpmPackages as listNpmPackagesFn } from './list'; import { spawnSync } from '../helpers/spawn-sync'; +import type { SpawnSyncOptionsWithStringEncoding } from 'child_process'; export function publishNpmPackages( - isDryRun: boolean, + isDryRun = false, + isAuxiliaryOnly = false, listNpmPackages: typeof listNpmPackagesFn = listNpmPackagesFn, markBumpedFilesAsAssumeUnchangedFn: typeof markBumpedFilesAsAssumeUnchanged = markBumpedFilesAsAssumeUnchanged, spawnSyncFn: typeof spawnSync = spawnSync ): void { - const packages = listNpmPackages(); + const commandOptions: SpawnSyncOptionsWithStringEncoding = { + stdio: 'inherit', + cwd: PROJECT_ROOT, + encoding: 'utf8', + env: { + ...process.env, + ...(isDryRun ? { npm_config_dry_run: 'true' } : {}), + }, + }; + let packages = listNpmPackages().filter( + (packageConfig) => !EXCLUDE_RELEASE_PACKAGES.includes(packageConfig.name) + ); + if (isAuxiliaryOnly) { + packages = packages.filter( + (packageConfig) => !MONGOSH_RELEASE_PACKAGES.includes(packageConfig.name) + ); + } // Lerna requires a clean repository for a publish from-package (--force-publish does not have any effect here) // we use git update-index --assume-unchanged on files we know have been bumped markBumpedFilesAsAssumeUnchangedFn(packages, true); @@ -23,26 +46,36 @@ export function publishNpmPackages( 'from-package', '--no-private', '--no-changelog', - '--no-push', '--exact', - '--no-git-tag-version', + // During mongosh releases we handle the tags manually + ...(!isAuxiliaryOnly ? ['--no-git-tag-version', '--no-push'] : []), '--force-publish', '--yes', '--no-verify-access', ], - { - stdio: 'inherit', - cwd: PROJECT_ROOT, - encoding: 'utf8', - env: { - ...process.env, - ...(isDryRun ? { npm_config_dry_run: 'true' } : {}), - }, - } + commandOptions ); } finally { markBumpedFilesAsAssumeUnchangedFn(packages, false); } + + if (!isAuxiliaryOnly) { + const mongoshVersion = packages.find( + (packageConfig) => packageConfig.name === 'mongosh' + )?.version; + + if (!mongoshVersion) { + throw new Error('Mongosh package not found'); + } + + spawnSync( + 'git', + ['tag', '-a', mongoshVersion, '-m', mongoshVersion], + commandOptions + ); + + spawnSync('git', ['push', '--follow-tags'], commandOptions); + } } export function markBumpedFilesAsAssumeUnchanged( diff --git a/packages/build/src/release.ts b/packages/build/src/release.ts index ded54215d..ccd7547a2 100644 --- a/packages/build/src/release.ts +++ b/packages/build/src/release.ts @@ -57,7 +57,9 @@ export async function release( if (command === 'bump') { bumpIndependentPackages(); - await bumpMongoshReleasePackages(config.version); + if (!config.isAuxiliaryOnly) { + await bumpMongoshReleasePackages(); + } return; } diff --git a/packages/build/src/run-publish.ts b/packages/build/src/run-publish.ts index 4c8eaeb6c..c057fc4cc 100644 --- a/packages/build/src/run-publish.ts +++ b/packages/build/src/run-publish.ts @@ -81,7 +81,7 @@ export async function runPublish( // ensures the segment api key to be present in the published packages await writeBuildInfo(config, 'packaged'); - publishNpmPackages(!!config.isDryRun); + publishNpmPackages(config.isDryRun, config.isAuxiliaryOnly); await publishToHomebrew( homebrewCoreGithubRepo, From 69c8d6ea303d7d6244e2aa94c91d7c13b57eac5b Mon Sep 17 00:00:00 2001 From: gagik Date: Mon, 6 Jan 2025 13:27:20 +0100 Subject: [PATCH 23/27] shorter --- .github/workflows/bump-auxiliary-packages.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/bump-auxiliary-packages.yml b/.github/workflows/bump-auxiliary-packages.yml index caa0024b5..9ca900620 100644 --- a/.github/workflows/bump-auxiliary-packages.yml +++ b/.github/workflows/bump-auxiliary-packages.yml @@ -1,4 +1,4 @@ -name: Bump auxiliary package versions +name: Bump auxiliary packages on: workflow_dispatch: push: @@ -38,7 +38,7 @@ jobs: - name: Bump packages env: - LAST_BUMP_COMMIT_MESSAGE: "chore(release): bump auxiliary package versions" + LAST_BUMP_COMMIT_MESSAGE: "chore(release): bump auxiliary packages" run: | npm run bump-auxiliary git add . @@ -48,9 +48,9 @@ jobs: uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # 7.0.5 with: token: ${{ steps.app-token.outputs.token }} - commit-message: "chore(release): bump auxiliary package versions" + commit-message: "chore(release): bump auxiliary packages" branch: ci/bump-auxiliary-packages - title: "chore(release): bump auxiliary package versions" + title: "chore(release): bump auxiliary packages" labels: no-title-validation body: | - Bump package versions From 68e3e62d049f23858a4b9572fa78613c0fbf2fbc Mon Sep 17 00:00:00 2001 From: gagik Date: Mon, 6 Jan 2025 14:09:37 +0100 Subject: [PATCH 24/27] fix naming --- .github/workflows/bump-auxiliary-packages.yml | 4 ++-- ...-auxiliary-packages.yml => publish-auxiliary-packages.yml} | 4 ++-- packages/build/src/npm-packages/bump.ts | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) rename .github/workflows/{release-auxiliary-packages.yml => publish-auxiliary-packages.yml} (95%) diff --git a/.github/workflows/bump-auxiliary-packages.yml b/.github/workflows/bump-auxiliary-packages.yml index 9ca900620..469b64869 100644 --- a/.github/workflows/bump-auxiliary-packages.yml +++ b/.github/workflows/bump-auxiliary-packages.yml @@ -1,4 +1,4 @@ -name: Bump auxiliary packages +name: Bump Auxiliary Packages on: workflow_dispatch: push: @@ -53,4 +53,4 @@ jobs: title: "chore(release): bump auxiliary packages" labels: no-title-validation body: | - - Bump package versions + - Bumps auxiliary package versions. Merging will trigger a release of these packages. diff --git a/.github/workflows/release-auxiliary-packages.yml b/.github/workflows/publish-auxiliary-packages.yml similarity index 95% rename from .github/workflows/release-auxiliary-packages.yml rename to .github/workflows/publish-auxiliary-packages.yml index 8e825b60e..56904bbd0 100644 --- a/.github/workflows/release-auxiliary-packages.yml +++ b/.github/workflows/publish-auxiliary-packages.yml @@ -13,7 +13,7 @@ jobs: publish: if: | github.event_name == 'workflow_dispatch' || - startsWith(github.event.head_commit.message, 'chore(release): bump package versions') + startsWith(github.event.head_commit.message, 'chore(release): bump auxiliary package versions') runs-on: ubuntu-latest @@ -51,5 +51,5 @@ jobs: npm config list echo "Publishing packages as $(npm whoami)" git update-index --assume-unchanged .npmrc - npm run publish-packages + npm run publish-auxiliary diff --git a/packages/build/src/npm-packages/bump.ts b/packages/build/src/npm-packages/bump.ts index dde1ba719..c7f9996f7 100644 --- a/packages/build/src/npm-packages/bump.ts +++ b/packages/build/src/npm-packages/bump.ts @@ -1,6 +1,6 @@ import { spawnSync } from '../helpers'; import { - MONGOSH_RELEASE_ONLY_PACKAGES, + EXCLUDE_RELEASE_PACKAGES, MONGOSH_RELEASE_PACKAGES, PROJECT_ROOT, } from './constants'; @@ -66,7 +66,7 @@ export function bumpIndependentPackages() { env: { ...process.env, SKIP_BUMP_PACKAGES: [ - ...MONGOSH_RELEASE_ONLY_PACKAGES, + ...EXCLUDE_RELEASE_PACKAGES, ...MONGOSH_RELEASE_PACKAGES, ].join(','), }, From ae5b5d4ae28baefec07c206bb836e9fd2476011d Mon Sep 17 00:00:00 2001 From: Gagik Amaryan Date: Mon, 6 Jan 2025 16:40:30 +0100 Subject: [PATCH 25/27] Update .github/workflows/publish-auxiliary-packages.yml Co-authored-by: Anna Henningsen --- .github/workflows/publish-auxiliary-packages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-auxiliary-packages.yml b/.github/workflows/publish-auxiliary-packages.yml index 56904bbd0..aa6c5b780 100644 --- a/.github/workflows/publish-auxiliary-packages.yml +++ b/.github/workflows/publish-auxiliary-packages.yml @@ -30,7 +30,7 @@ jobs: # don't checkout a detatched HEAD ref: ${{ github.head_ref }} - - name: "Use Node.js 14" + - name: "Use Node.js 20" uses: actions/setup-node@v3 with: node-version: 20.16.0 From fc9a4066aa7bcc2c4e1962efccb396fb80103d9c Mon Sep 17 00:00:00 2001 From: gagik Date: Mon, 6 Jan 2025 16:25:47 +0100 Subject: [PATCH 26/27] re-add bump --- .evergreen/install-npm-deps.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.evergreen/install-npm-deps.sh b/.evergreen/install-npm-deps.sh index daca8211e..97cffcc7e 100644 --- a/.evergreen/install-npm-deps.sh +++ b/.evergreen/install-npm-deps.sh @@ -31,5 +31,7 @@ npm run mark-ci-required-optional-dependencies # along with its types, but npm wouldn't try and compile the addon (npm ci && test -e node_modules/mongodb-client-encryption) || npm ci --ignore-scripts +npm run evergreen-release bump + echo "npm packages after installation" npm ls || true From 72f04bdd6414c154f4f30beaf79bd1ce12709a51 Mon Sep 17 00:00:00 2001 From: gagik Date: Mon, 6 Jan 2025 16:42:44 +0100 Subject: [PATCH 27/27] Apply most changes from review --- .evergreen/evergreen.yml.in | 4 ++-- .../workflows/publish-auxiliary-packages.yml | 3 +-- packages/build/src/config/config.ts | 2 +- packages/build/src/index.ts | 2 +- packages/build/src/npm-packages/bump.ts | 4 ++-- packages/build/src/npm-packages/index.ts | 2 +- packages/build/src/npm-packages/publish.ts | 20 ++++++++++--------- packages/build/src/release.ts | 6 +++--- packages/build/src/run-publish.ts | 2 +- 9 files changed, 23 insertions(+), 22 deletions(-) diff --git a/.evergreen/evergreen.yml.in b/.evergreen/evergreen.yml.in index a36506f61..8ac30e335 100644 --- a/.evergreen/evergreen.yml.in +++ b/.evergreen/evergreen.yml.in @@ -917,9 +917,9 @@ functions: { export NODE_JS_VERSION=${node_js_version} source .evergreen/setup-env.sh - git add . - git commit --no-allow-empty -m "chore(release): bump to prepare for mongosh release" npm run evergreen-release draft + git add . + git commit --no-allow-empty -m "chore(release): bump to prepare for mongosh release" } release_publish_download_and_list_artifacts: diff --git a/.github/workflows/publish-auxiliary-packages.yml b/.github/workflows/publish-auxiliary-packages.yml index aa6c5b780..4f2bbd94f 100644 --- a/.github/workflows/publish-auxiliary-packages.yml +++ b/.github/workflows/publish-auxiliary-packages.yml @@ -47,9 +47,8 @@ jobs: env: NPM_TOKEN: ${{ secrets.DEVTOOLSBOT_NPM_TOKEN }} run: | - echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" >> .npmrc + echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" >> ~/.npmrc npm config list echo "Publishing packages as $(npm whoami)" - git update-index --assume-unchanged .npmrc npm run publish-auxiliary diff --git a/packages/build/src/config/config.ts b/packages/build/src/config/config.ts index 0e1b6daf2..47d376aa9 100644 --- a/packages/build/src/config/config.ts +++ b/packages/build/src/config/config.ts @@ -46,5 +46,5 @@ export interface Config { artifactUrlExtraTag?: string; manpage?: ManPageConfig; isDryRun?: boolean; - isAuxiliaryOnly?: boolean; + useAuxiliaryPackagesOnly?: boolean; } diff --git a/packages/build/src/index.ts b/packages/build/src/index.ts index 496226a9f..665e90d94 100644 --- a/packages/build/src/index.ts +++ b/packages/build/src/index.ts @@ -59,7 +59,7 @@ if (require.main === module) { } config.isDryRun ||= process.argv.includes('--dry-run'); - config.isAuxiliaryOnly ||= process.argv.includes('--auxiliary'); + config.useAuxiliaryPackagesOnly ||= process.argv.includes('--auxiliary'); await release(command, config); } diff --git a/packages/build/src/npm-packages/bump.ts b/packages/build/src/npm-packages/bump.ts index c7f9996f7..e55f5081a 100644 --- a/packages/build/src/npm-packages/bump.ts +++ b/packages/build/src/npm-packages/bump.ts @@ -57,8 +57,8 @@ export async function bumpMongoshReleasePackages(): Promise { } } -/** Bumps independent packages without setting a new version of mongosh. */ -export function bumpIndependentPackages() { +/** Bumps auxiliary packages without setting a new version of mongosh. */ +export function bumpAuxiliaryPackages() { spawnSync('bump-monorepo-packages', [], { stdio: 'inherit', cwd: PROJECT_ROOT, diff --git a/packages/build/src/npm-packages/index.ts b/packages/build/src/npm-packages/index.ts index 272f540d5..57d33567a 100644 --- a/packages/build/src/npm-packages/index.ts +++ b/packages/build/src/npm-packages/index.ts @@ -1,2 +1,2 @@ -export { bumpIndependentPackages } from './bump'; +export { bumpAuxiliaryPackages } from './bump'; export { publishNpmPackages } from './publish'; diff --git a/packages/build/src/npm-packages/publish.ts b/packages/build/src/npm-packages/publish.ts index 6165b0d19..0d278dcc4 100644 --- a/packages/build/src/npm-packages/publish.ts +++ b/packages/build/src/npm-packages/publish.ts @@ -7,15 +7,15 @@ import { } from './constants'; import type { LernaPackageDescription } from './list'; import { listNpmPackages as listNpmPackagesFn } from './list'; -import { spawnSync } from '../helpers/spawn-sync'; +import { spawnSync as spawnSyncFn } from '../helpers/spawn-sync'; import type { SpawnSyncOptionsWithStringEncoding } from 'child_process'; export function publishNpmPackages( isDryRun = false, - isAuxiliaryOnly = false, + useAuxiliaryPackagesOnly = false, listNpmPackages: typeof listNpmPackagesFn = listNpmPackagesFn, markBumpedFilesAsAssumeUnchangedFn: typeof markBumpedFilesAsAssumeUnchanged = markBumpedFilesAsAssumeUnchanged, - spawnSyncFn: typeof spawnSync = spawnSync + spawnSync: typeof spawnSyncFn = spawnSyncFn ): void { const commandOptions: SpawnSyncOptionsWithStringEncoding = { stdio: 'inherit', @@ -30,7 +30,7 @@ export function publishNpmPackages( (packageConfig) => !EXCLUDE_RELEASE_PACKAGES.includes(packageConfig.name) ); - if (isAuxiliaryOnly) { + if (useAuxiliaryPackagesOnly) { packages = packages.filter( (packageConfig) => !MONGOSH_RELEASE_PACKAGES.includes(packageConfig.name) ); @@ -39,7 +39,7 @@ export function publishNpmPackages( // we use git update-index --assume-unchanged on files we know have been bumped markBumpedFilesAsAssumeUnchangedFn(packages, true); try { - spawnSyncFn( + spawnSync( LERNA_BIN, [ 'publish', @@ -48,7 +48,9 @@ export function publishNpmPackages( '--no-changelog', '--exact', // During mongosh releases we handle the tags manually - ...(!isAuxiliaryOnly ? ['--no-git-tag-version', '--no-push'] : []), + ...(!useAuxiliaryPackagesOnly + ? ['--no-git-tag-version', '--no-push'] + : []), '--force-publish', '--yes', '--no-verify-access', @@ -59,7 +61,7 @@ export function publishNpmPackages( markBumpedFilesAsAssumeUnchangedFn(packages, false); } - if (!isAuxiliaryOnly) { + if (!useAuxiliaryPackagesOnly) { const mongoshVersion = packages.find( (packageConfig) => packageConfig.name === 'mongosh' )?.version; @@ -81,7 +83,7 @@ export function publishNpmPackages( export function markBumpedFilesAsAssumeUnchanged( packages: LernaPackageDescription[], assumeUnchanged: boolean, - spawnSyncFn: typeof spawnSync = spawnSync + spawnSync: typeof spawnSyncFn = spawnSyncFn ): void { const filesToAssume = [ path.resolve(PROJECT_ROOT, 'lerna.json'), @@ -93,7 +95,7 @@ export function markBumpedFilesAsAssumeUnchanged( } for (const f of filesToAssume) { - spawnSyncFn( + spawnSync( 'git', [ 'update-index', diff --git a/packages/build/src/release.ts b/packages/build/src/release.ts index ccd7547a2..120a0929c 100644 --- a/packages/build/src/release.ts +++ b/packages/build/src/release.ts @@ -14,7 +14,7 @@ import { } from './evergreen'; import { GithubRepo } from '@mongodb-js/devtools-github-repo'; import { publishToHomebrew } from './homebrew'; -import { bumpIndependentPackages, publishNpmPackages } from './npm-packages'; +import { bumpAuxiliaryPackages, publishNpmPackages } from './npm-packages'; import { runPackage } from './packaging'; import { runDraft } from './run-draft'; import { runPublish } from './run-publish'; @@ -56,8 +56,8 @@ export async function release( ); if (command === 'bump') { - bumpIndependentPackages(); - if (!config.isAuxiliaryOnly) { + bumpAuxiliaryPackages(); + if (!config.useAuxiliaryPackagesOnly) { await bumpMongoshReleasePackages(); } return; diff --git a/packages/build/src/run-publish.ts b/packages/build/src/run-publish.ts index c057fc4cc..3fb0ae4fb 100644 --- a/packages/build/src/run-publish.ts +++ b/packages/build/src/run-publish.ts @@ -81,7 +81,7 @@ export async function runPublish( // ensures the segment api key to be present in the published packages await writeBuildInfo(config, 'packaged'); - publishNpmPackages(config.isDryRun, config.isAuxiliaryOnly); + publishNpmPackages(config.isDryRun, config.useAuxiliaryPackagesOnly); await publishToHomebrew( homebrewCoreGithubRepo,