Skip to content

chore: move to patches #4997

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 18 commits into from
Mar 22, 2022
Merged

chore: move to patches #4997

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
e52ebe0
Move integration types into code-server
code-asher Mar 15, 2022
2d4f1b1
Disable connection token
code-asher Mar 16, 2022
52ca450
Add product.json to build process
code-asher Mar 16, 2022
1758468
Ship with remote agent package.json
code-asher Mar 16, 2022
430448b
Let Code handle errors
code-asher Mar 16, 2022
8f1d5a6
Move manifest override into code-server
code-asher Mar 17, 2022
1bba7e3
Move to patches
code-asher Mar 17, 2022
5bc0088
Use pre-packaged Code
code-asher Mar 21, 2022
284d4bc
Ignore all packaged directories
code-asher Mar 21, 2022
1e933a7
Rename SpawnCli type to SpawnCodeCli
code-asher Mar 21, 2022
c5af3f0
Replace cdr in product links with coder
code-asher Mar 21, 2022
7c85c75
Add comments to types pulled from Code
code-asher Mar 21, 2022
7673f70
Add links to matching Code types
code-asher Mar 21, 2022
41ec493
Update Code's server arguments
code-asher Mar 21, 2022
0e45f00
Update CLI test with new default
code-asher Mar 21, 2022
38a3e14
Add comment on Service-Worker-Allowed header
code-asher Mar 21, 2022
1f9ed36
fixup! Update CLI test with new default
code-asher Mar 21, 2022
16834c1
Fix incorrect contributing steps
code-asher Mar 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Ship with remote agent package.json 
Instead of the root one.  This contains fewer dependencies.
  • Loading branch information
@code-asher
code-asher committed Mar 22, 2022
commit 175846867641c709e82c6fe84d4d5bb96b05774f
14 changes: 9 additions & 5 deletions ci/build/build-release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ EOF

bundle_vscode() {
mkdir -p "$VSCODE_OUT_PATH"
rsync "$VSCODE_SRC_PATH/yarn.lock" "$VSCODE_OUT_PATH"
rsync "$VSCODE_SRC_PATH/out-vscode-reh-web${MINIFY:+-min}/" "$VSCODE_OUT_PATH/out"

rsync "$VSCODE_SRC_PATH/.build/extensions/" "$VSCODE_OUT_PATH/extensions"
Expand Down Expand Up @@ -126,10 +125,15 @@ bundle_vscode() {
EOF
) > "$VSCODE_OUT_PATH/product.json"

# We remove the scripts field so that later on we can run
# yarn to fetch node_modules if necessary without build scripts running.
# We cannot use --no-scripts because we still want dependent package scripts to run.
jq 'del(.scripts)' < "$VSCODE_SRC_PATH/package.json" > "$VSCODE_OUT_PATH/package.json"
# Use the package.json for the web/remote server. It does not have the right
# version though so pull that from the main package.json. Also remove keytar
# since the web does not rely on it and that removes the dependency on
# libsecret.
jq --slurp '.[0] * {version: .[1].version} | del(.dependencies.keytar)' \
"$VSCODE_SRC_PATH/remote/package.json" \
"$VSCODE_SRC_PATH/package.json" > "$VSCODE_OUT_PATH/package.json"

rsync "$VSCODE_SRC_PATH/remote/yarn.lock" "$VSCODE_OUT_PATH/yarn.lock"

pushd "$VSCODE_OUT_PATH"
symlink_asar
Expand Down