Merge upstream coder/code-server (Code 1.138.0) - #9
Merged
Merged
Conversation
The lower bound check ran before the parser had resolved the value, so it only saw a value with the --idle-timeout-seconds=<value> form. With the space-separated form the value was still undefined at that point, Number(undefined) is NaN, and NaN <= 60 is false, so anything got through. Move the check below the block that pulls the value from the next argument so both forms are validated the same way.
Brings Code 1.138.0, the proxy URL rewrite fix (coder#8012) and the --idle-timeout-seconds validation fix (coder#8009). Conflicts were the chart and changelog. The chart keeps this fork's ghcr.io/motuslabs/code-server image repository and takes upstream's 3.53.0 / 4.138.0 versions; the changelog keeps both release sections in date order, 4.138.0 above our 4.137.1. Upstream's rebase of external-file-actions.diff onto 1.138.0 comes with the merge, which is the conflict our own update run could not resolve.
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.
First upstream merge under the policy from #6: Code updates come from coder/code-server rather than this fork bumping the submodule itself.
Brings four commits:
59c988c7Update Code to 1.138.0 — submodule to7debcd0eef5eba43Preserve path, query, and fragment in proxy URL rewrite (fix: preserve path, query, and fragment in proxy URLs (#7668) coder/code-server#8012)8a7bf87aFix--idle-timeout-secondsvalidation being skipped (Fix --idle-timeout-seconds validation being skipped coder/code-server#8009)cd0f21dcUpdate Helm chart and changelog with 4.138.0 (Update Helm chart and changelog with 4.138.0 coder/code-server#8014)This also resolves, for free, the conflict our own update run could not.
external-file-actions.difffailed to apply against 1.138.0 because Code addedIsChromeOSContextto thecontextkeys.jsimport that the patch carries as a context line. Upstream rebased it; the merge takes their version.Conflicts
Three, all in the chart and changelog.
ci/helm-chart/values.yamlis the one that mattered: taking upstream wholesale would have reverted the image repository tocodercom/code-serverand undone #2. Keptghcr.io/motuslabs/code-server, took the4.138.0tag.ci/helm-chart/Chart.yamltakes upstream's3.53.0/4.138.0, which stays monotonic over our3.52.1.CHANGELOG.mdkeeps both release sections in date order — 4.138.0 (09-19) above our 4.137.1 (09-18) — with upstream's unreleased idle-timeout entry under## Unreleased.Verification
osc52-clipboard.diffincluded.csp-hashes.diffsubstitutes a sha256 string, so it applies whether or not the hash is still right. Recomputed both with the same methodupdate-vscode.shuses; both match the 1.138.0 content, so Code did not change those inline scripts.npm run buildclean.npm run test:unit: 342 passed, 1 failed —createApp › should unlink a socket before listening on the socket, which expectslisten EACCES: permission denied. Pre-existing and environmental: it fails identically on2fe0e203in a worktree, and the merge touches neithersrc/node/app.tsnor its test.patches/now differs from upstream by exactlyosc52-clipboard.diffand itsseriesline, which is the intended fork delta.Please merge with a merge commit, not squash
Squashing would discard the second parent, and the next
git merge upstream/mainwould then re-conflict on everything already resolved here. This is the one case where the repository's squash convention should not apply.🤖 Generated with Claude Code