Skip to content

Commit 9c3d664

Browse files
authored
Merge branch 'main' into ci/update-mongosh
2 parents cad2b69 + 7dd50cd commit 9c3d664

27 files changed

Lines changed: 1648 additions & 1019 deletions

File tree

.depcheckrc

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,37 @@
11
ignores:
22
- '@mongodb-js/bump-monorepo-packages'
33
- '@mongodb-js/sbom-tools'
4+
45
# TODO: We keep testing-library/dom at the root to work around weird npm
56
# workspace hoising issues caused by outdated transient dependencies. This can
67
# go away when we update all our usage of @testing-library packages to the
78
# version matching what @leafygreen is using
89
- '@testing-library/dom'
10+
911
# npm picks up the node-gyp installation in this repository rather than the
1012
# one it ships with, so we install one of our own to get the version right
1113
# (because we need one with vscode 2022 support for github actions CI)
1214
- 'node-gyp'
13-
# lerna is used as a script
14-
- 'lerna'
15+
16+
# npm@11 has issues with applying overrides to the dependencies installed in
17+
# the workspaces: if a workspace dependency has a dependency on the package we
18+
# are trying to override, the override will not be applied during install and
19+
# incorrect version will end up in the dependency tree, indicated by the
20+
# ELSPROBLEMS error. We can work around this by installing the dependency that
21+
# is triggering the issue at the root of the monorepo, in that case the
22+
# override will be correctly applied to the dependency
23+
#
24+
# IMPORTANT: It is not enough to install the dependency you are trying to
25+
# override at root, it needs to be the dependencies (one or many) that is
26+
# causing the ELSPROBLEMS issue itself
27+
- '@mongodb-js/diagramming'
28+
- '@mongodb-js/eslint-config-devtools'
29+
- ag-grid-react
30+
- braintrust
31+
# TODO: we removed all enzyme tests, remove this from the shared mocha config
32+
# so that it doesn't end up in our transitive deps at all
33+
- chai-enzyme
34+
- express
35+
- react-leaflet
36+
- react-leaflet-draw
37+
- reflux

.evergreen/connectivity-tests/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ ENV COMPASS_RUN_DOCKER_TESTS="true"
2020
COPY . /compass-monorepo-root
2121
WORKDIR /compass-monorepo-root
2222

23-
RUN npm i -g npm@10.2.4
23+
RUN npm i -g npm@11.13.0
2424
RUN npm run bootstrap-ci
2525

2626
CMD ["bash", ".evergreen/connectivity-tests/entrypoint.sh"]

.evergreen/functions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ variables:
3333
EVERGREEN_WORKDIR: ${workdir}
3434
EVERGREEN_CREATED_AT: ${created_at}
3535
NODE_JS_VERSION: '22.21.1'
36-
NPM_VERSION: '10.2.4'
36+
NPM_VERSION: '11.13.0'
3737
# secrets
3838
HADRON_METRICS_INTERCOM_APP_ID: ${metrics_intercom_app_id}
3939
HADRON_METRICS_SEGMENT_API_KEY: ${metrics_segment_api_key}

.github/workflows/authors-and-third-party-notices.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ jobs:
4343
node-version: 22.21.1
4444
cache: 'npm'
4545

46-
- name: Install npm@10.2.4
46+
- name: Install npm@11.13.0
4747
run: |
48-
npm install -g npm@10.2.4
48+
npm install -g npm@11.13.0
4949
5050
- name: Install Dependencies
5151
run: |

.github/workflows/bump-packages.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ jobs:
3434
node-version: 22.21.1
3535
cache: 'npm'
3636

37-
- name: Install npm@10.2.4
37+
- name: Install npm@11.13.0
3838
run: |
39-
npm install -g npm@10.2.4
39+
npm install -g npm@11.13.0
4040
4141
- name: Install Dependencies
4242
run: |

.github/workflows/publish-compass-web.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ jobs:
5353
node-version: 22.21.1
5454
cache: 'npm'
5555

56-
- name: Install npm@10.2.4
56+
- name: Install npm@11.13.0
5757
run: |
58-
npm install -g npm@10.2.4
58+
npm install -g npm@11.13.0
5959
npm -v
6060
6161
- id: define_environments
@@ -116,9 +116,9 @@ jobs:
116116
node-version: 22.21.1
117117
cache: 'npm'
118118

119-
- name: Install npm@10.2.4
119+
- name: Install npm@11.13.0
120120
run: |
121-
npm install -g npm@10.2.4
121+
npm install -g npm@11.13.0
122122
npm -v
123123
124124
- id: check_if_deployed

.github/workflows/publish-compass.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ jobs:
2828
node-version: 22.21.1
2929
cache: 'npm'
3030

31-
- name: Install npm@10.2.4
31+
- name: Install npm@11.13.0
3232
run: |
33-
npm install -g npm@10.2.4
33+
npm install -g npm@11.13.0
3434
3535
- name: Install Dependencies
3636
run: |

.github/workflows/publish-packages.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ jobs:
3939
with:
4040
node-version: 22.21.1
4141

42-
- name: Install npm@10.2.4
43-
run: npm install -g npm@10.2.4
42+
- name: Install npm@11.13.0
43+
run: npm install -g npm@11.13.0
4444

4545
- name: Install Dependencies
4646
run: |

.github/workflows/start-beta.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ jobs:
3636
node-version: 22.21.1
3737
cache: 'npm'
3838

39-
- name: Install npm@10.2.4
39+
- name: Install npm@11.13.0
4040
run: |
41-
npm install -g npm@10.2.4
41+
npm install -g npm@11.13.0
4242
4343
- name: Install Dependencies
4444
run: |

.github/workflows/start-ga.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ jobs:
3636
node-version: 22.21.1
3737
cache: 'npm'
3838

39-
- name: Install npm@10.2.4
39+
- name: Install npm@11.13.0
4040
run: |
41-
npm install -g npm@10.2.4
41+
npm install -g npm@11.13.0
4242
4343
- name: Install Dependencies
4444
run: |

0 commit comments

Comments
 (0)