Skip to content

Commit 8b0f8b5

Browse files
authored
Merge branch 'main' into move-refresh-up
2 parents 518c1f8 + 73cd425 commit 8b0f8b5

File tree

488 files changed

+12248
-10902
lines changed

Some content is hidden

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

488 files changed

+12248
-10902
lines changed

.evergreen.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
stepback: false
22
exec_timeout_secs: 5400
3+
foliage_should_block_merges: false
34
ignore:
45
- docs/**/*.md
56
- AUTHORS

.evergreen/buildvariants-and-tasks.in.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,12 @@ buildvariants:
290290
<% } %>
291291
<% } %>
292292

293+
- name: test-can-bundle-compass-web
294+
display_name: Test Can Bundle Compass Web
295+
run_on: ubuntu2004-large
296+
tasks:
297+
- name: test-can-bundle-compass-web
298+
293299
- name: test-web-sandbox-atlas-cloud
294300
display_name: Test Web Sandbox (w/ Atlas Cloud login)
295301
run_on: ubuntu2004-large
@@ -557,6 +563,19 @@ tasks:
557563
<% } %>
558564
<% } %>
559565

566+
- name: test-can-bundle-compass-web
567+
tags:
568+
- run-on-pr
569+
- assigned_to_jira_team_compass_compass
570+
- foliage_check_task_only
571+
commands:
572+
- func: prepare
573+
- func: install
574+
- func: bootstrap
575+
- func: compile-compass-web
576+
vars:
577+
debug: 'compass*,electron*,hadron*,mongo*'
578+
560579
- name: test-web-sandbox-atlas-cloud
561580
tags:
562581
- required-for-publish

.evergreen/buildvariants-and-tasks.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,11 @@ buildvariants:
280280
- name: test-web-sandbox-firefox-1
281281
- name: test-web-sandbox-firefox-2
282282
- name: test-web-sandbox-firefox-3
283+
- name: test-can-bundle-compass-web
284+
display_name: Test Can Bundle Compass Web
285+
run_on: ubuntu2004-large
286+
tasks:
287+
- name: test-can-bundle-compass-web
283288
- name: test-web-sandbox-atlas-cloud
284289
display_name: Test Web Sandbox (w/ Atlas Cloud login)
285290
run_on: ubuntu2004-large
@@ -1552,6 +1557,18 @@ tasks:
15521557
e2e_test_groups: 3
15531558
e2e_test_group: 3
15541559
debug: compass-e2e-tests*,electron*,hadron*,mongo*
1560+
- name: test-can-bundle-compass-web
1561+
tags:
1562+
- run-on-pr
1563+
- assigned_to_jira_team_compass_compass
1564+
- foliage_check_task_only
1565+
commands:
1566+
- func: prepare
1567+
- func: install
1568+
- func: bootstrap
1569+
- func: compile-compass-web
1570+
vars:
1571+
debug: compass*,electron*,hadron*,mongo*
15551572
- name: test-web-sandbox-atlas-cloud
15561573
tags:
15571574
- required-for-publish

.evergreen/functions.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -688,6 +688,22 @@ functions:
688688
npm run --workspace @mongodb-js/compass-smoke-tests start -- dispatch --ref ${branch_name}
689689
fi
690690
691+
# Creating the webpack compass-web bundle ensures
692+
# that the bundle size does not grow too large for.
693+
# The webpack compile fails when it exceeds the size limit.
694+
compile-compass-web:
695+
- command: shell.exec
696+
# Fail the task if it's idle for 10 mins
697+
timeout_secs: 600
698+
params:
699+
working_dir: src
700+
shell: bash
701+
env:
702+
DEBUG: ${debug|}
703+
script: |
704+
set -e
705+
npm run --workspace @mongodb-js/compass-web compile
706+
691707
test-web-sandbox:
692708
- command: shell.exec
693709
# Fail the task if it's idle for 10 mins

.evergreen/print-compass-env.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ if [[ "${EVERGREEN_PROJECT}" == "10gen-compass-main" ]]; then
4343
month=$(escapeLeadingZero "${ts[1]}")
4444
day=$(escapeLeadingZero "${ts[2]}")
4545
hour=$(escapeLeadingZero "${ts[3]}")
46-
minute="${ts[4]}"
47-
second="${ts[5]}"
46+
minute=$(escapeLeadingZero "${ts[4]}")
47+
second=$(escapeLeadingZero "${ts[5]}")
4848
export DEV_VERSION_IDENTIFIER="${year}.${month}.${day}-dev.${hour}${minute}${second}"
4949
fi
5050
fi

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @mongodb-js/compass-developers
File renamed without changes.

.github/workflows/test-installers.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,10 @@ jobs:
4646
run: echo "[Evergreen Task](${{ github.event.inputs.evergreen_task_url }})" >> $GITHUB_STEP_SUMMARY
4747
test:
4848
name: ${{ matrix.package }} test ${{ matrix.test }} (${{ matrix.hadron-distribution }})
49-
timeout-minutes: 30
49+
# Windows specifically takes A TON of time to bootstrap itself before being
50+
# able to run tests, so we're setting the timeout pretty high to account for
51+
# that
52+
timeout-minutes: 60
5053
strategy:
5154
fail-fast: false
5255
matrix:
@@ -174,7 +177,11 @@ jobs:
174177
runs-on: ${{ matrix.runs-on }}
175178
container: ${{ matrix.container }}
176179
env:
177-
DEBUG: compass:smoketests:*
180+
DEBUG: compass:smoketests:*,compass-e2e-tests:*
181+
# Similar to total task timeout, setting these higher than the default
182+
# value to account for very slow windows machines
183+
COMPASS_E2E_MOCHA_TIMEOUT: 720000 # 12min
184+
COMPASS_E2E_WEBDRIVER_WAITFOR_TIMEOUT: 360000 # 6min
178185
steps:
179186
- name: Checkout
180187
uses: actions/checkout@v2

.github/workflows/update-eslint.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,10 @@ jobs:
3838
3939
- name: Bump eslint
4040
run: |
41-
npm i --save eslint@8 -w @mongodb-js/eslint-config-compass
41+
npm i --save --workspace @mongodb-js/eslint-config-compass \
42+
eslint@8 \
43+
@typescript-eslint/eslint-plugin@latest \
44+
@typescript-eslint/parser@latest
4245
4346
- name: Create Pull Request
4447
uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # 7.0.5

.snyk

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,14 @@ ignore:
7575
expecting to be able to update to electron v33 (or later) soon
7676
expires: 2025-06-20T04:40:36.098Z
7777
created: 2025-03-21T04:40:36.107Z
78+
SNYK-JS-ELECTRON-10245168:
79+
- '*':
80+
reason: >-
81+
Not applicable: this requires attacker to load hand crafted html
82+
inside the app. Putting on a short expiration time as we're
83+
expecting to be able to update to electron v36 soon
84+
expires: 2025-06-27T10:50:52.405Z
85+
created: 2025-05-28T10:50:52.409Z
7886
# patches apply the minimum changes required to fix a vulnerability
7987
patch:
8088
'npm:ms:20170412':

0 commit comments

Comments
 (0)