Skip to content

Commit 30f0687

Browse files
committed
Ship with remote package.json files
Instead of the root one. These should contain the minimum dependencies we need to ship with (so we will no longer be installing keytar, etc).
1 parent 90541a7 commit 30f0687

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

ci/build/build-release.sh

+6-4
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,12 @@ bundle_vscode() {
126126
EOF
127127
) > "$VSCODE_OUT_PATH/product.json"
128128

129-
# We remove the scripts field so that later on we can run
130-
# yarn to fetch node_modules if necessary without build scripts running.
131-
# We cannot use --no-scripts because we still want dependent package scripts to run.
132-
jq 'del(.scripts)' < "$VSCODE_SRC_PATH/package.json" > "$VSCODE_OUT_PATH/package.json"
129+
# Use the package.json for the web and remote server. They do not have the
130+
# right version though so pull that from the main package.json
131+
jq --slurp '.[0] * .[1] * {version: .[2].version}' \
132+
"$VSCODE_SRC_PATH/remote/package.json" \
133+
"$VSCODE_SRC_PATH/remote/web/package.json" \
134+
"$VSCODE_SRC_PATH/package.json" > "$VSCODE_OUT_PATH/package.json"
133135

134136
pushd "$VSCODE_OUT_PATH"
135137
symlink_asar

0 commit comments

Comments
 (0)