Skip to content

Commit f907b86

Browse files
lerouxblerouxb
authored
Merge branch 'main' into msi-shortcutName
2 parents cd308bd + 2b2a627 commit f907b86

File tree

97 files changed

+2748
-2949
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+2748
-2949
lines changed

‎.evergreen/print-compass-env.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ function printVar(name, value) {
2222
function printCompassEnv() {
2323
let {
2424
// This is an env var set in bash that we exported in print-compass-env.sh
25-
OSTYPE
25+
OSTYPE,
2626
} = process.env;
2727

2828
// We have to operate on bash's PATH env var where the c:\ style paths have
@@ -55,6 +55,13 @@ function printCompassEnv() {
5555

5656
const pathsToPrepend = [];
5757

58+
if (process.env.PLATFORM === 'linux') {
59+
// To build node modules on linux post electron 13 we need a newer c++
60+
// compiler version and at least python v3.9, this adds it.
61+
// https://jira.mongodb.org/browse/COMPASS-5150
62+
pathsToPrepend.unshift('/opt/devtools/bin');
63+
}
64+
5865
if (OSTYPE === 'cygwin') {
5966
// NOTE lucas: for git-core addition, See
6067
// https://jira.mongodb.org/browse/COMPASS-4122
@@ -68,13 +75,6 @@ function printCompassEnv() {
6875
pathsToPrepend.unshift(`${newPWD}/.deps/bin`);
6976
}
7077

71-
if (process.env.PLATFORM === 'linux') {
72-
// To build node modules on linux post electron 13 we need a newer c++
73-
// compiler version and at least python v3.9, this adds it.
74-
// https://jira.mongodb.org/browse/COMPASS-5150
75-
pathsToPrepend.unshift('/opt/mongodbtoolchain/v4/bin');
76-
}
77-
7878
pathsToPrepend.unshift(`${originalPWD}/.evergreen/docker-config/bin`);
7979

8080
PATH = maybePrependPaths(PATH, pathsToPrepend);

‎.github/workflows/bump-packages.yaml‎

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,15 @@ jobs:
2424
with:
2525
# don't checkout a detatched HEAD
2626
ref: ${{ github.head_ref }}
27+
# this is important so git log can pick up on the whole history to
28+
# find last publish commit
29+
fetch-depth: '0'
2730
token: ${{ steps.app-token.outputs.token }}
2831

2932
- uses: actions/setup-node@v4
3033
with:
3134
node-version: 20.16.0
32-
cache: "npm"
35+
cache: 'npm'
3336

3437
- name: Install [email protected]
3538
run: |
@@ -42,17 +45,27 @@ jobs:
4245
4346
- name: Bump packages
4447
env:
45-
SKIP_BUMP_PACKAGES: "mongodb-compass"
48+
SKIP_BUMP_PACKAGES: 'mongodb-compass'
49+
# Do not remove this variable, bump-packages script uses this env var
50+
# to find the previous commit
51+
LAST_BUMP_COMMIT_MESSAGE: 'chore(release): bump package versions'
4652
run: npm run bump-packages
4753

4854
- name: Create Pull Request
4955
uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # 7.0.5
5056
with:
5157
token: ${{ steps.app-token.outputs.token }}
52-
commit-message: "chore(release): bump package versions"
58+
commit-message: 'chore(release): bump package versions'
5359
branch: ci/bump-packages
54-
title: "chore(release): bump package versions"
60+
title: 'chore(release): bump package versions'
5561
labels: no-title-validation
56-
author: "${{ steps.app-token.outputs.app-slug}}[bot] <${{ steps.app-token.outputs.app-email }}>"
57-
body: |
58-
- Bump package versions
62+
author: '${{ steps.app-token.outputs.app-slug}}[bot] <${{ steps.app-token.outputs.app-email }}>'
63+
body: >-
64+
<p>This PR is autogenerated and updates the version of every package
65+
in the monorepo that was changed since last publish. If you need to
66+
publish packages to update the version elsewhere, <strong>you can do
67+
this at your own convenience by just merging this PR</strong>.</p>
68+
69+
<p>After PR is merged, it starts an automatic publish process via
70+
GitHub Actions, you can follow the process <a href="https://github.com/mongodb-js/compass/actions/workflows/publish-packages.yaml">
71+
on the publish workflow page</a>.</p>

‎THIRD-PARTY-NOTICES.md‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
The following third-party software is used by and included in **Mongodb Compass**.
2-
This document was automatically generated on Tue Apr 08 2025.
2+
This document was automatically generated on Fri Apr 11 2025.
33

44
## List of dependencies
55

@@ -208,7 +208,7 @@ This document was automatically generated on Tue Apr 08 2025.
208208
| **[core-js](#2d0305d15eab4ad23db10b97faf9d8e8e0d5ad30a616c5892d1edd535d8a08c8)** | 3.17.3 | MIT |
209209
| **[cpu-features](#fa992e00865a6ed732ac63bbf64c89ee2da4ec39944684e6002a3a34b5adb65c)** | 0.0.9 | MIT |
210210
| **[crelt](#9eba7acaba2af9d27a0a18fcf40d1f133ffa888d85321e4633e7dac58cab2db9)** | 1.0.5 | MIT |
211-
| **[cross-fetch](#2cd4375069c47bf89a4b399cd21cd9573086803b2cb9fc56c29df5a598e051e5)** | 3.1.8 | MIT |
211+
| **[cross-fetch](#a20c045c29ed2b3df6d5165307a9aeb0ed2d67089b57f716fdc3dd82d9c40bc7)** | 3.2.0 | MIT |
212212
| **[cross-spawn](#18650458ca35439e7a812c8f7c2ed7a891653f9c6686fd1f0456eb4f645d367d)** | 7.0.5 | MIT |
213213
| **[css-loader](#36a5fb6f554559a2f884527f4dd7aa81131ccc3b1aee899472cfec2eda765798)** | 4.3.0 | MIT |
214214
| **[d3-flextree](#d4848a862048d0f4733db2a8631b802f3b5f86f2d4a1efb77fc8b8cf9a06bf73)** | 2.1.2 | WTFPL |
@@ -311,7 +311,7 @@ This document was automatically generated on Tue Apr 08 2025.
311311
| **[interruptor](#e8a35d2ce64b947fb7a1aba891bc1e4eb166be57a59249cda1fcc689e767b6bc)** | 1.0.2 | Apache-2.0 |
312312
| **[ip-address](#8de6e89459554be8a933663b25ae1d1ffee71458028fa8cbe5d68b349438a8c8)** | 9.0.5 | MIT |
313313
| **[ipaddr.js](#38a5a1606dbc89a9c65a28d1e9ebe3c8d323e107a77c495a56dbf522211676d2)** | 1.9.1 | MIT |
314-
| **[ipaddr.js](#d8a1c47a5dc5581d8d9e84268efa779a5140196540c2a4425e8317c1eeb93fb7)** | 2.1.0 | MIT |
314+
| **[ipaddr.js](#4995da0c4dcb2b5992f306ab16aeed26ed94f375597565c205c98d1925713577)** | 2.2.0 | MIT |
315315
| **[ipv6-normalize](#7a4346dbf206011966449898fcd37178a9be89acf6dff120b676d4c4d0dec203)** | 1.0.1 | MIT |
316316
| **[is-docker](#893885e21608c60de02539fa3bd5a98f7068127aa5fab86a215bfec41a3119a4)** | 2.2.1 | MIT |
317317
| **[is-docker](#b21de9a8d47c7c165b912be5c7a36eae3939076531e05733aa2ac7f1099dc46d)** | 3.0.0 | MIT |
@@ -429,7 +429,7 @@ This document was automatically generated on Tue Apr 08 2025.
429429
| **[modify-filename](#7153be07939379ccf0072006c519fba2bdf5ab79ca8bb59bc5273f87a7bacbf6)** | 1.1.0 | MIT |
430430
| **[mongodb-build-info](#f0a98c22ae0766702726f79e058ac6dc4e4bead8557b67b816f40bd13fb54170)** | 1.7.2 | Apache-2.0 |
431431
| **[mongodb-client-encryption](#4bfa384a74d9b7da2ef68a7c6792e662d64dd2dc08303f7400c63fda55922482)** | 6.3.0 | Apache-2.0 |
432-
| **[mongodb-cloud-info](#a784f3b401cf51746f49964e044db933529b3e3791e557702715730f5a3f1e46)** | 2.1.2 | Apache-2.0 |
432+
| **[mongodb-cloud-info](#5437e58440df6b1fefae8943353daf4f333e29974720113bcddd634c6bcc3f75)** | 2.1.7 | Apache-2.0 |
433433
| **[mongodb-connection-string-url](#2e1146256a89ebd24e3398881e03807fe363d58444e6b7952ea50bd6108707bc)** | 3.0.1 | Apache-2.0 |
434434
| **[mongodb-log-writer](#88666983cb95a6ccc6128f1044a0dcc126ed2a0291334daa221a96de19595c42)** | 2.4.0 | Apache-2.0 |
435435
| **[mongodb-ns](#68260f4d06e4d16a28d4139e391264d220e891ac6f0fb844b925a0cc37792aff)** | 2.4.2 | MIT |
@@ -17769,9 +17769,9 @@ License files:
1776917769
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
1777017770
THE SOFTWARE.
1777117771

17772-
<a id="2cd4375069c47bf89a4b399cd21cd9573086803b2cb9fc56c29df5a598e051e5"></a>
17772+
<a id="a20c045c29ed2b3df6d5165307a9aeb0ed2d67089b57f716fdc3dd82d9c40bc7"></a>
1777317773

17774-
### [cross-fetch](https://www.npmjs.com/package/cross-fetch) (version 3.1.8)
17774+
### [cross-fetch](https://www.npmjs.com/package/cross-fetch) (version 3.2.0)
1777517775

1777617776
License tags: MIT
1777717777

@@ -21903,9 +21903,9 @@ License files:
2190321903
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2190421904
THE SOFTWARE.
2190521905

21906-
<a id="d8a1c47a5dc5581d8d9e84268efa779a5140196540c2a4425e8317c1eeb93fb7"></a>
21906+
<a id="4995da0c4dcb2b5992f306ab16aeed26ed94f375597565c205c98d1925713577"></a>
2190721907

21908-
### [ipaddr.js](https://www.npmjs.com/package/ipaddr.js) (version 2.1.0)
21908+
### [ipaddr.js](https://www.npmjs.com/package/ipaddr.js) (version 2.2.0)
2190921909

2191021910
License tags: MIT
2191121911

@@ -26366,9 +26366,9 @@ License files:
2636626366
See the License for the specific language governing permissions and
2636726367
limitations under the License.
2636826368

26369-
<a id="a784f3b401cf51746f49964e044db933529b3e3791e557702715730f5a3f1e46"></a>
26369+
<a id="5437e58440df6b1fefae8943353daf4f333e29974720113bcddd634c6bcc3f75"></a>
2637026370

26371-
### [mongodb-cloud-info](https://www.npmjs.com/package/mongodb-cloud-info) (version 2.1.2)
26371+
### [mongodb-cloud-info](https://www.npmjs.com/package/mongodb-cloud-info) (version 2.1.7)
2637226372

2637326373
License tags: Apache-2.0
2637426374

‎configs/eslint-config-compass/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@mongodb-js/eslint-config-compass",
3-
"version": "1.3.7",
3+
"version": "1.3.8",
44
"description": "Shared Compass eslint configuration",
55
"license": "SSPL",
66
"main": "index.js",
@@ -17,7 +17,7 @@
1717
"@babel/core": "^7.21.4",
1818
"@babel/eslint-parser": "^7.14.3",
1919
"@mongodb-js/eslint-config-devtools": "^0.9.9",
20-
"@mongodb-js/eslint-plugin-compass": "^1.2.7",
20+
"@mongodb-js/eslint-plugin-compass": "^1.2.8",
2121
"@typescript-eslint/eslint-plugin": "^5.59.0",
2222
"@typescript-eslint/parser": "^5.59.0",
2323
"eslint": "^7.25.0",

‎configs/eslint-plugin-compass/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"email": "[email protected]"
1414
},
1515
"homepage": "https://github.com/mongodb-js/compass",
16-
"version": "1.2.7",
16+
"version": "1.2.8",
1717
"repository": {
1818
"type": "git",
1919
"url": "https://github.com/mongodb-js/compass.git"
@@ -37,8 +37,8 @@
3737
"reformat": "npm run eslint . -- --fix && npm run prettier -- --write ."
3838
},
3939
"devDependencies": {
40-
"@mongodb-js/mocha-config-compass": "^1.6.7",
41-
"@mongodb-js/prettier-config-compass": "^1.2.7",
40+
"@mongodb-js/mocha-config-compass": "^1.6.8",
41+
"@mongodb-js/prettier-config-compass": "^1.2.8",
4242
"depcheck": "^1.4.1",
4343
"eslint": "^7.25.0",
4444
"mocha": "^10.2.0",

‎configs/mocha-config-compass/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"name": "@mongodb-js/mocha-config-compass",
3-
"version": "1.6.7",
3+
"version": "1.6.8",
44
"description": "Shared mocha mocha configuration for Compass packages",
55
"license": "SSPL",
66
"main": "index.js",
77
"devDependencies": {
8-
"@mongodb-js/prettier-config-compass": "^1.2.7"
8+
"@mongodb-js/prettier-config-compass": "^1.2.8"
99
},
1010
"scripts": {
1111
"prettier": "prettier-compass",

‎configs/prettier-config-compass/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@mongodb-js/prettier-config-compass",
3-
"version": "1.2.7",
3+
"version": "1.2.8",
44
"description": "Shared Compass prettier configuration",
55
"license": "SSPL",
66
"main": "index.js",

‎configs/testing-library-compass/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"email": "[email protected]"
1212
},
1313
"homepage": "https://github.com/mongodb-js/compass",
14-
"version": "1.2.7",
14+
"version": "1.2.8",
1515
"repository": {
1616
"type": "git",
1717
"url": "https://github.com/mongodb-js/compass.git"
@@ -45,10 +45,10 @@
4545
"reformat": "npm run eslint . -- --fix && npm run prettier -- --write ."
4646
},
4747
"devDependencies": {
48-
"@mongodb-js/eslint-config-compass": "^1.3.7",
49-
"@mongodb-js/mocha-config-compass": "^1.6.7",
50-
"@mongodb-js/prettier-config-compass": "^1.2.7",
51-
"@mongodb-js/tsconfig-compass": "^1.2.7",
48+
"@mongodb-js/eslint-config-compass": "^1.3.8",
49+
"@mongodb-js/mocha-config-compass": "^1.6.8",
50+
"@mongodb-js/prettier-config-compass": "^1.2.8",
51+
"@mongodb-js/tsconfig-compass": "^1.2.8",
5252
"@types/chai": "^4.2.21",
5353
"@types/mocha": "^9.0.0",
5454
"@types/sinon-chai": "^3.2.5",

‎configs/tsconfig-compass/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@mongodb-js/tsconfig-compass",
3-
"version": "1.2.7",
3+
"version": "1.2.8",
44
"description": "Shared Compass Typescript configuration",
55
"license": "SSPL",
66
"files": [
@@ -11,7 +11,7 @@
1111
"typescript": "^5.0.4"
1212
},
1313
"devDependencies": {
14-
"@mongodb-js/prettier-config-compass": "^1.2.7"
14+
"@mongodb-js/prettier-config-compass": "^1.2.8"
1515
},
1616
"dependencies": {
1717
"@mongodb-js/tsconfig-devtools": "^1.0.0"

‎configs/webpack-config-compass/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"email": "[email protected]"
1414
},
1515
"homepage": "https://github.com/mongodb-js/compass",
16-
"version": "1.6.7",
16+
"version": "1.6.8",
1717
"repository": {
1818
"type": "git",
1919
"url": "https://github.com/mongodb-js/compass.git"
@@ -45,9 +45,9 @@
4545
"reformat": "npm run eslint . -- --fix && npm run prettier -- --write ."
4646
},
4747
"devDependencies": {
48-
"@mongodb-js/eslint-config-compass": "^1.3.7",
49-
"@mongodb-js/prettier-config-compass": "^1.2.7",
50-
"@mongodb-js/tsconfig-compass": "^1.2.7",
48+
"@mongodb-js/eslint-config-compass": "^1.3.8",
49+
"@mongodb-js/prettier-config-compass": "^1.2.8",
50+
"@mongodb-js/tsconfig-compass": "^1.2.8",
5151
"@types/cli-progress": "^3.9.2",
5252
"@types/html-webpack-plugin": "^3.2.9",
5353
"@types/webpack-bundle-analyzer": "^4.7.0",

0 commit comments

Comments
 (0)