Skip to content

Commit 89f265b

Browse files
committed
try using pnpm overrides
1 parent 3bdce84 commit 89f265b

File tree

2 files changed

+17
-8
lines changed

2 files changed

+17
-8
lines changed

scripts/docker/ubuntu24.04-xvfb.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ RUN if [ -z "$NODE_JS_VERSION" ]; then echo "Error: NODE_JS_VERSION is not defin
77
ENV NODE_JS_VERSION=${NODE_JS_VERSION}
88
ENV DEBIAN_FRONTEND=noninteractive
99
RUN apt-get update
10-
RUN apt-get -y -qq install git curl apt-transport-https ca-certificates apt-utils software-properties-common
10+
RUN apt-get -y -qq install git curl apt-transport-https ca-certificates apt-utils software-properties-common jq
1111

1212
# Install Node.js using nvm (reusing pattern from .evergreen/install-node.sh)
1313
ENV NVM_DIR="/root/.nvm"

testing/test-vscode.sh

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,23 @@ rm -rf "$test_root_dir" && mkdir -p "$test_root_dir"
1212
cd "$test_root_dir"
1313
git clone --depth=10 https://github.com/mongodb-js/vscode.git
1414
cd vscode
15+
# Build overrides object for all local mongosh packages
16+
overrides="{"
17+
for pkg_dir in "$mongosh_root_dir"/packages/*/; do
18+
if [ -f "$pkg_dir/package.json" ]; then
19+
pkg_name=$(jq -r '.name' "$pkg_dir/package.json")
20+
overrides="$overrides\"$pkg_name\":\"file:$pkg_dir\","
21+
fi
22+
done
23+
# Add other required packages
24+
overrides="$overrides\"mongodb\":\"file:$mongosh_root_dir/node_modules/mongodb\","
25+
overrides="$overrides\"@mongodb-js/devtools-connect\":\"file:$mongosh_root_dir/node_modules/@mongodb-js/devtools-connect\","
26+
overrides="$overrides\"@mongodb-js/devtools-proxy-support\":\"file:$mongosh_root_dir/node_modules/@mongodb-js/devtools-proxy-support\""
27+
overrides="$overrides}"
28+
29+
# Add pnpm overrides to package.json
30+
jq --argjson overrides "$overrides" '.pnpm.overrides = $overrides' package.json > package.json.tmp && mv package.json.tmp package.json
1531
pnpm install
16-
rm -rf node_modules/@mongosh node_modules/mongodb node_modules/@mongodb-js/devtools-connect node_modules/@mongodb-js/devtools-proxy-support
17-
(cd node_modules && \
18-
ln -s "$mongosh_root_dir/packages" @mongosh && \
19-
ln -s "$mongosh_root_dir/node_modules/mongodb" mongodb && \
20-
cd @mongodb-js && \
21-
ln -s "$mongosh_root_dir/node_modules/@mongodb-js/devtools-connect" devtools-connect && \
22-
ln -s "$mongosh_root_dir/node_modules/@mongodb-js/devtools-proxy-support" devtools-proxy-support)
2332
# This test can require a lot of memory so we bump the maximum size.
2433
NODE_OPTIONS='--max-old-space-size=4096 --no-experimental-strip-types' pnpm test
2534
cd /tmp

0 commit comments

Comments
 (0)