Skip to content

Commit 67ad9c0

Browse files
Merge remote-tracking branch 'origin/main' into beta-releases
2 parents 21313cb + 1d58f8c commit 67ad9c0

File tree

112 files changed

+3574
-3117
lines changed

Some content is hidden

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

112 files changed

+3574
-3117
lines changed

.evergreen/functions.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ variables:
4242
# drop support for some older linux platforms, so we are keeping them out of
4343
# sync for now
4444
# TODO: https://jira.mongodb.org/browse/COMPASS-6915
45-
NODE_JS_VERSION: '16.20.2'
46-
NPM_VERSION: '8.19.4'
45+
NODE_JS_VERSION: '18.19.1'
46+
NPM_VERSION: '10.2.4'
4747
# secrets
4848
HADRON_METRICS_INTERCOM_APP_ID: ${metrics_intercom_app_id}
4949
HADRON_METRICS_SEGMENT_API_KEY: ${metrics_segment_api_key}
@@ -197,7 +197,7 @@ functions:
197197
echo "(if npm fails, debug.log will be uploaded to S3)"
198198
199199
# Install dependencies
200-
bash ".evergreen/retry-with-backoff.sh" npm ci --unsafe-perm
200+
bash ".evergreen/retry-with-backoff.sh" .evergreen/npm_ci.sh
201201
202202
bootstrap:
203203
- command: shell.exec

.evergreen/npm_ci.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/usr/bin/env bash
2+
3+
set -e
4+
5+
npm cache clean -f
6+
rm -rf node_modules
7+
find configs -name 'node_modules' -type d -prune -exec rm -rf '{}' +
8+
find packages -name 'node_modules' -type d -prune -exec rm -rf '{}' +
9+
find scripts -name 'node_modules' -type d -prune -exec rm -rf '{}' +
10+
npm ci --unsafe-perm

.evergreen/preinstall.sh

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,20 @@ if [ -n "$IS_WINDOWS" ]; then
4343
cd ..
4444
.evergreen/node-gyp-bug-workaround.sh
4545
else
46-
echo "Installing nodejs v${NODE_JS_VERSION} for ${PLATFORM} on ${ARCH}..."
46+
if command -v ldd &> /dev/null && `ldd $(which bash) | grep 'libc.so' | awk '{print $3}'` | grep -Eq 'release version 2.(1|2[0-7])'; then
47+
echo "Installing unofficial nodejs compiled for glibc 2.17 v${NODE_JS_VERSION} for ${PLATFORM} on ${ARCH}..."
48+
49+
bash "${SCRIPTDIR}/retry-with-backoff.sh" curl -fs \
50+
-o ".deps/node-v${NODE_JS_VERSION}-${PLATFORM}-$ARCH.tar.gz" \
51+
--url "https://unofficial-builds.nodejs.org/download/release/v${NODE_JS_VERSION}/node-v${NODE_JS_VERSION}-${PLATFORM}-$ARCH-glibc-217.tar.gz"
52+
else
53+
echo "Installing nodejs v${NODE_JS_VERSION} for ${PLATFORM} on ${ARCH}..."
54+
55+
bash "${SCRIPTDIR}/retry-with-backoff.sh" curl -fs \
56+
-o ".deps/node-v${NODE_JS_VERSION}-${PLATFORM}-$ARCH.tar.gz" \
57+
--url "https://nodejs.org/download/release/v${NODE_JS_VERSION}/node-v${NODE_JS_VERSION}-${PLATFORM}-$ARCH.tar.gz"
58+
fi
4759

48-
bash "${SCRIPTDIR}/retry-with-backoff.sh" curl -fs \
49-
-o ".deps/node-v${NODE_JS_VERSION}-${PLATFORM}-$ARCH.tar.gz" \
50-
--url "https://nodejs.org/download/release/v${NODE_JS_VERSION}/node-v${NODE_JS_VERSION}-${PLATFORM}-$ARCH.tar.gz"
5160
cd .deps
5261
tar xzf node-v$NODE_JS_VERSION-$PLATFORM-$ARCH.tar.gz --strip-components=1
5362

THIRD-PARTY-NOTICES.md

Lines changed: 1 addition & 1 deletion
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 Thu Feb 29 2024.
2+
This document was automatically generated on Sun Mar 03 2024.
33

44
## List of dependencies
55

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.0.16",
3+
"version": "1.0.17",
44
"description": "Shared Compass eslint configuration",
55
"license": "SSPL",
66
"main": "index.js",
@@ -16,7 +16,7 @@
1616
"@babel/core": "^7.21.4",
1717
"@babel/eslint-parser": "^7.14.3",
1818
"@mongodb-js/eslint-config-devtools": "^0.9.9",
19-
"@mongodb-js/eslint-plugin-compass": "^1.0.14",
19+
"@mongodb-js/eslint-plugin-compass": "^1.0.15",
2020
"@typescript-eslint/eslint-plugin": "^5.59.0",
2121
"@typescript-eslint/parser": "^5.59.0",
2222
"eslint-config-prettier": "^8.3.0",

configs/eslint-config-compass/plugin.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ module.exports = {
2121
restrictedProviderImport('@mongodb-js/compass-logging'),
2222
restrictedProviderImport('@mongodb-js/compass-app-stores'),
2323
restrictedProviderImport('@mongodb-js/my-queries-storage'),
24-
// TODO(COMPASS-7412): enable when possible
25-
// restrictedProviderImport('@mongodb-js/atlas-service'),
24+
restrictedProviderImport('@mongodb-js/atlas-service'),
2625
restrictedProviderImport('compass-preferences-model'),
2726
{
2827
paths: require('module').builtinModules,

configs/eslint-plugin-compass/package.json

Lines changed: 2 additions & 2 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.0.14",
16+
"version": "1.0.15",
1717
"repository": {
1818
"type": "git",
1919
"url": "https://github.com/mongodb-js/compass.git"
@@ -37,7 +37,7 @@
3737
"reformat": "npm run eslint . -- --fix && npm run prettier -- --write ."
3838
},
3939
"devDependencies": {
40-
"@mongodb-js/mocha-config-compass": "^1.3.6",
40+
"@mongodb-js/mocha-config-compass": "^1.3.7",
4141
"@mongodb-js/prettier-config-compass": "^1.0.1",
4242
"depcheck": "^1.4.1",
4343
"eslint": "^7.25.0",

configs/mocha-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/mocha-config-compass",
3-
"version": "1.3.6",
3+
"version": "1.3.7",
44
"description": "Shared mocha mocha configuration for Compass packages",
55
"license": "SSPL",
66
"main": "index.js",

configs/webpack-config-compass/package.json

Lines changed: 2 additions & 2 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.3.4",
16+
"version": "1.3.5",
1717
"repository": {
1818
"type": "git",
1919
"url": "https://github.com/mongodb-js/compass.git"
@@ -45,7 +45,7 @@
4545
"reformat": "npm run eslint . -- --fix && npm run prettier -- --write ."
4646
},
4747
"devDependencies": {
48-
"@mongodb-js/eslint-config-compass": "^1.0.16",
48+
"@mongodb-js/eslint-config-compass": "^1.0.17",
4949
"@mongodb-js/prettier-config-compass": "^1.0.1",
5050
"@mongodb-js/tsconfig-compass": "^1.0.3",
5151
"@types/cli-progress": "^3.9.2",

0 commit comments

Comments
 (0)