Merge upstream coder/code-server (Code 1.139.1) - #12
Merged
Merged
Conversation
* Update Code to 1.139.1 * Bump proxy-addr to 2.0.8 * Add preinstall setup to build Already had this in the release build step, not sure why it is not in the main build step. But we started getting errors building native modules in ci, and this seems to be why. * Fix quick input It types too quickly, before the input is visible.
Brings Code 1.139.1, the proxy-addr and ip-address bumps, the build workflow's preinstall fix for native modules, the quick input e2e fix, the Helm docs sync and the Cloudflare Rocket Loader docs (coder#8021-coder#8026). Conflicts were the chart values and Helm docs. Both keep this fork's ghcr.io/motuslabs/code-server image repository and take upstream's 4.139.1 tag and refreshed values table. osc52-clipboard.diff is refreshed for an 8-line offset in clipboardService.ts; the hunk itself is unchanged.
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Replaces #11, which proposed merging
coder:maindirectly: it conflicted with this fork and would have merged a moving branch.Brings five upstream commits:
53c2f325Update Code to 1.139.1 (Update Code to 1.139.1 coder/code-server#8021) — submodule to04c0d99f, proxy-addr 2.0.8, Node 24.20.0, build workflow preinstall fix, quick input e2e fix96e468eaUpdate Helm chart and changelog with 4.139.1 (Update Helm chart and changelog with 4.139.1 coder/code-server#8022)2bb012c1Sync Helm docs table and badges with the chart (docs(helm): sync values table and badges with the chart coder/code-server#8024)fa7caee4Bump ip-address from 10.4.0 to 10.7.2 (Bump ip-address from 10.4.0 to 10.7.2 coder/code-server#8023)f871c166Document that Cloudflare Rocket Loader must be disabled (docs: note that Cloudflare Rocket Loader must be disabled coder/code-server#8026)Conflicts
Two, both the image repository again.
ci/helm-chart/values.yamlkeepsghcr.io/motuslabs/code-server(#2) and takes the4.139.1tag.docs/helm.mdtakes upstream's regenerated values table with theimage.repositoryrow set back toghcr.io/motuslabs/code-server. Outside the table the file matches upstream.Chart.yaml(3.54.0/4.139.1) andCHANGELOG.mdmerged cleanly.Patch refresh
osc52-clipboard.diffapplied with an 8-line offset inclipboardService.ts, so it is refreshed. The only change is the hunk header (@@ -124→@@ -132).Verification
update-vscode.shmethod, and both match.npm run buildclean; prettier check passes on the touched files.npm run test:unit: 342 passed, 1 failed — the same environmentalcreateApp › should unlink a socket before listening on the socketfailure as Merge upstream coder/code-server (Code 1.138.0) #9. This container hasip_unprivileged_port_start=0, so binding port 2 succeeds. The merge touches neithersrc/nortest/unit.🤖 Generated with Claude Code