Skip to content

Commit ad17239

Browse files
committed
Fix vscode-ripgrep rebuild error
1 parent 63638ba commit ad17239

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

scripts/tasks.bash

+3-8
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,7 @@ function build-code-server() {
9898
# latest glibc. This means you must build on the target system.
9999
log "Installing remote dependencies"
100100
cd "${vscodeSourcePath}/remote"
101-
# TODO: vscode-ripgrep errors saying node_modules doesn't exist.
102-
# TODO: yarn --force should be the same but it doesn't fix it.
103-
npm rebuild || true
101+
yarn --production --force --build-from-source
104102
cp -r "${vscodeSourcePath}/remote/node_modules" "${codeServerBuildPath}"
105103

106104
# Only keep the production dependencies.
@@ -131,14 +129,11 @@ function build-vscode() {
131129
if [[ ! -d "${vscodeSourcePath}/node_modules" ]] ; then
132130
exit-if-ci
133131
log "Installing VS Code dependencies"
134-
# Not entirely sure why but there seem to be problems with native modules
135-
# so rebuild them.
136-
# TODO: vscode-ripgrep errors saying node_modules doesn't exist.
137-
# TODO: yarn --force should be the same but it'.
138-
npm rebuild || true
132+
yarn
139133

140134
# Keep just what we need to keep the pre-built archive smaller.
141135
rm -rf "${vscodeSourcePath}/test"
136+
rm -rf "${vscodeSourcePath}/remote/node_modules" # Will rebuild.
142137
else
143138
log "${vscodeSourceName}/node_modules already exists, skipping install"
144139
fi

0 commit comments

Comments
 (0)