mirror of
https://github.com/coder/code-server.git
synced 2026-06-11 20:47:10 +02:00
Compare commits
1 Commits
main
...
update/1.1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1e0400f3c3 |
@@ -128,9 +128,7 @@ bundle_vscode() {
|
|||||||
|
|
||||||
# Merge the package.json for the web/remote server so we can include
|
# Merge the package.json for the web/remote server so we can include
|
||||||
# dependencies, since we want to ship this via NPM.
|
# dependencies, since we want to ship this via NPM.
|
||||||
# Also override the name to prevent vulnerability scanners from
|
jq --slurp '.[0] * .[1]' \
|
||||||
# misidentifying this package as VS Code (see #7071).
|
|
||||||
jq --slurp '.[0] * .[1] | .name = "code-oss-dev"' \
|
|
||||||
"$VSCODE_SRC_PATH/remote/package.json" \
|
"$VSCODE_SRC_PATH/remote/package.json" \
|
||||||
"$VSCODE_OUT_PATH/package.json" > "$VSCODE_OUT_PATH/package.json.merged"
|
"$VSCODE_OUT_PATH/package.json" > "$VSCODE_OUT_PATH/package.json.merged"
|
||||||
mv "$VSCODE_OUT_PATH/package.json.merged" "$VSCODE_OUT_PATH/package.json"
|
mv "$VSCODE_OUT_PATH/package.json.merged" "$VSCODE_OUT_PATH/package.json"
|
||||||
|
|||||||
Submodule lib/vscode updated: 6a44c352bd...1b50d58d73
Reference in New Issue
Block a user