From 223ecf7c300871162ff1892bc08dbadbf808e581 Mon Sep 17 00:00:00 2001 From: Asher Date: Mon, 4 Mar 2024 06:52:54 -0900 Subject: [PATCH 001/497] Release v4.22.0 --- CHANGELOG.md | 8 ++++++++ ci/helm-chart/Chart.yaml | 4 ++-- ci/helm-chart/values.yaml | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0dcc9b05490f..529854b43303 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,14 @@ Code v99.99.999 ## Unreleased +## [4.22.0](https://github.com/coder/code-server/releases/tag/v4.22.0) - 2021-03-03 + +Code v1.87.0 + +## Changed + +- Updated to Code 1.87.0. + ## [4.21.2](https://github.com/coder/code-server/releases/tag/v4.21.2) - 2021-02-28 Code v1.86.2 diff --git a/ci/helm-chart/Chart.yaml b/ci/helm-chart/Chart.yaml index 12237ae954ba..e524e00db61a 100644 --- a/ci/helm-chart/Chart.yaml +++ b/ci/helm-chart/Chart.yaml @@ -15,9 +15,9 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 3.17.2 +version: 3.18.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 4.21.2 +appVersion: 4.22.0 diff --git a/ci/helm-chart/values.yaml b/ci/helm-chart/values.yaml index 9b546053436c..5bdef0e29077 100644 --- a/ci/helm-chart/values.yaml +++ b/ci/helm-chart/values.yaml @@ -6,7 +6,7 @@ replicaCount: 1 image: repository: codercom/code-server - tag: '4.21.2' + tag: '4.22.0' pullPolicy: Always # Specifies one or more secrets to be used when pulling images from a From 275c130845bb9eb4df38b83e3c56fce8fdbb014b Mon Sep 17 00:00:00 2001 From: Asher Date: Wed, 6 Mar 2024 14:04:01 -0900 Subject: [PATCH 002/497] Update Arch Linux action username This broke due to the username being changed, and GitHub does not appear to put any redirects in place. --- .github/workflows/publish.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index e38a26f30f32..31ef97754978 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -132,7 +132,7 @@ jobs: echo "VERSION=${TAG#v}" >> $GITHUB_ENV - name: Validate package - uses: hapakaien/archlinux-package-action@v2 + uses: heyhusen/archlinux-package-action@v2 env: VERSION: ${{ env.VERSION }} with: From 56b59922809998079999ea8f4f7e46ef02d3c4a1 Mon Sep 17 00:00:00 2001 From: Asher Date: Wed, 6 Mar 2024 14:10:57 -0900 Subject: [PATCH 003/497] Pin Arch Linux action version We are still getting the old one, I think? --- .github/workflows/publish.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 31ef97754978..684f1fbda635 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -132,7 +132,7 @@ jobs: echo "VERSION=${TAG#v}" >> $GITHUB_ENV - name: Validate package - uses: heyhusen/archlinux-package-action@v2 + uses: heyhusen/archlinux-package-action@v2.2.1 env: VERSION: ${{ env.VERSION }} with: From 107a3fd4100b75637c2c773c83e5c2329c58bcc7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Mar 2024 10:15:42 -0900 Subject: [PATCH 004/497] chore: bump codecov/codecov-action from 3 to 4 (#6706) Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 3 to 4. - [Release notes](https://github.com/codecov/codecov-action/releases) - [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/codecov/codecov-action/compare/v3...v4) --- updated-dependencies: - dependency-name: codecov/codecov-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build.yaml | 2 +- .github/workflows/release.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index b95b6d7af521..9832f8fdf988 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -195,7 +195,7 @@ jobs: run: yarn test:unit - name: Upload coverage report to Codecov - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: token: ${{ secrets.CODECOV_TOKEN }} if: success() diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 911ff57f294d..8ba38294568f 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -77,7 +77,7 @@ jobs: run: yarn test:integration - name: Upload coverage report to Codecov - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: token: ${{ secrets.CODECOV_TOKEN }} if: success() From 66c7f7d8b1a59df662b10232090608f04f2cc29a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Mar 2024 10:17:25 -0900 Subject: [PATCH 005/497] chore: bump @typescript-eslint/parser from 6.17.0 to 6.21.0 (#6703) Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 6.17.0 to 6.21.0. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.21.0/packages/parser) --- updated-dependencies: - dependency-name: "@typescript-eslint/parser" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 82 +++++++++++++++++++++++++++---------------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/yarn.lock b/yarn.lock index 95c0fba37f29..78cdbaf422a2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -377,24 +377,16 @@ ts-api-utils "^1.0.1" "@typescript-eslint/parser@^6.7.2": - version "6.17.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.17.0.tgz#8cd7a0599888ca6056082225b2fdf9a635bf32a1" - integrity sha512-C4bBaX2orvhK+LlwrY8oWGmSl4WolCfYm513gEccdWZj0CwGadbIADb0FtVEcI+WzUyjyoBj2JRP8g25E6IB8A== - dependencies: - "@typescript-eslint/scope-manager" "6.17.0" - "@typescript-eslint/types" "6.17.0" - "@typescript-eslint/typescript-estree" "6.17.0" - "@typescript-eslint/visitor-keys" "6.17.0" + version "6.21.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.21.0.tgz#af8fcf66feee2edc86bc5d1cf45e33b0630bf35b" + integrity sha512-tbsV1jPne5CkFQCgPBcDOt30ItF7aJoZL997JSF7MhGQqOeT3svWRYxiqlfA5RUdlHN6Fi+EI9bxqbdyAUZjYQ== + dependencies: + "@typescript-eslint/scope-manager" "6.21.0" + "@typescript-eslint/types" "6.21.0" + "@typescript-eslint/typescript-estree" "6.21.0" + "@typescript-eslint/visitor-keys" "6.21.0" debug "^4.3.4" -"@typescript-eslint/scope-manager@6.17.0": - version "6.17.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.17.0.tgz#70e6c1334d0d76562dfa61aed9009c140a7601b4" - integrity sha512-RX7a8lwgOi7am0k17NUO0+ZmMOX4PpjLtLRgLmT1d3lBYdWH4ssBUbwdmc5pdRX8rXon8v9x8vaoOSpkHfcXGA== - dependencies: - "@typescript-eslint/types" "6.17.0" - "@typescript-eslint/visitor-keys" "6.17.0" - "@typescript-eslint/scope-manager@6.20.0": version "6.20.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.20.0.tgz#8a926e60f6c47feb5bab878246dc2ae465730151" @@ -403,6 +395,14 @@ "@typescript-eslint/types" "6.20.0" "@typescript-eslint/visitor-keys" "6.20.0" +"@typescript-eslint/scope-manager@6.21.0": + version "6.21.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.21.0.tgz#ea8a9bfc8f1504a6ac5d59a6df308d3a0630a2b1" + integrity sha512-OwLUIWZJry80O99zvqXVEioyniJMa+d2GrqpUTqi5/v5D5rOrppJVBPa0yKCblcigC0/aYAzxxqQ1B+DS2RYsg== + dependencies: + "@typescript-eslint/types" "6.21.0" + "@typescript-eslint/visitor-keys" "6.21.0" + "@typescript-eslint/type-utils@6.20.0": version "6.20.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.20.0.tgz#d395475cd0f3610dd80c7d8716fa0db767da3831" @@ -413,23 +413,23 @@ debug "^4.3.4" ts-api-utils "^1.0.1" -"@typescript-eslint/types@6.17.0": - version "6.17.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.17.0.tgz#844a92eb7c527110bf9a7d177e3f22bd5a2f40cb" - integrity sha512-qRKs9tvc3a4RBcL/9PXtKSehI/q8wuU9xYJxe97WFxnzH8NWWtcW3ffNS+EWg8uPvIerhjsEZ+rHtDqOCiH57A== - "@typescript-eslint/types@6.20.0": version "6.20.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.20.0.tgz#5ccd74c29011ae7714ae6973e4ec0c634708b448" integrity sha512-MM9mfZMAhiN4cOEcUOEx+0HmuaW3WBfukBZPCfwSqFnQy0grXYtngKCqpQN339X3RrwtzspWJrpbrupKYUSBXQ== -"@typescript-eslint/typescript-estree@6.17.0": - version "6.17.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.17.0.tgz#b913d19886c52d8dc3db856903a36c6c64fd62aa" - integrity sha512-gVQe+SLdNPfjlJn5VNGhlOhrXz4cajwFd5kAgWtZ9dCZf4XJf8xmgCTLIqec7aha3JwgLI2CK6GY1043FRxZwg== +"@typescript-eslint/types@6.21.0": + version "6.21.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.21.0.tgz#205724c5123a8fef7ecd195075fa6e85bac3436d" + integrity sha512-1kFmZ1rOm5epu9NZEZm1kckCDGj5UJEf7P1kliH4LKu/RkwpsfqqGmY2OOcUs18lSlQBKLDYBOGxRVtrMN5lpg== + +"@typescript-eslint/typescript-estree@6.20.0": + version "6.20.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.20.0.tgz#5b2d0975949e6bdd8d45ee1471461ef5fadc5542" + integrity sha512-RnRya9q5m6YYSpBN7IzKu9FmLcYtErkDkc8/dKv81I9QiLLtVBHrjz+Ev/crAqgMNW2FCsoZF4g2QUylMnJz+g== dependencies: - "@typescript-eslint/types" "6.17.0" - "@typescript-eslint/visitor-keys" "6.17.0" + "@typescript-eslint/types" "6.20.0" + "@typescript-eslint/visitor-keys" "6.20.0" debug "^4.3.4" globby "^11.1.0" is-glob "^4.0.3" @@ -437,13 +437,13 @@ semver "^7.5.4" ts-api-utils "^1.0.1" -"@typescript-eslint/typescript-estree@6.20.0": - version "6.20.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.20.0.tgz#5b2d0975949e6bdd8d45ee1471461ef5fadc5542" - integrity sha512-RnRya9q5m6YYSpBN7IzKu9FmLcYtErkDkc8/dKv81I9QiLLtVBHrjz+Ev/crAqgMNW2FCsoZF4g2QUylMnJz+g== +"@typescript-eslint/typescript-estree@6.21.0": + version "6.21.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.21.0.tgz#c47ae7901db3b8bddc3ecd73daff2d0895688c46" + integrity sha512-6npJTkZcO+y2/kr+z0hc4HwNfrrP4kNYh57ek7yCNlrBjWQ1Y0OS7jiZTkgumrvkX5HkEKXFZkkdFNkaW2wmUQ== dependencies: - "@typescript-eslint/types" "6.20.0" - "@typescript-eslint/visitor-keys" "6.20.0" + "@typescript-eslint/types" "6.21.0" + "@typescript-eslint/visitor-keys" "6.21.0" debug "^4.3.4" globby "^11.1.0" is-glob "^4.0.3" @@ -464,14 +464,6 @@ "@typescript-eslint/typescript-estree" "6.20.0" semver "^7.5.4" -"@typescript-eslint/visitor-keys@6.17.0": - version "6.17.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.17.0.tgz#3ed043709c39b43ec1e58694f329e0b0430c26b6" - integrity sha512-H6VwB/k3IuIeQOyYczyyKN8wH6ed8EwliaYHLxOIhyF0dYEIsN8+Bk3GE19qafeMKyZJJHP8+O1HiFhFLUNKSg== - dependencies: - "@typescript-eslint/types" "6.17.0" - eslint-visitor-keys "^3.4.1" - "@typescript-eslint/visitor-keys@6.20.0": version "6.20.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.20.0.tgz#f7ada27f2803de89df0edd9fd7be22c05ce6a498" @@ -480,6 +472,14 @@ "@typescript-eslint/types" "6.20.0" eslint-visitor-keys "^3.4.1" +"@typescript-eslint/visitor-keys@6.21.0": + version "6.21.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.21.0.tgz#87a99d077aa507e20e238b11d56cc26ade45fe47" + integrity sha512-JJtkDduxLi9bivAB+cYOVMtbkqdPOhZ+ZI5LC47MIRrDV4Yn2o+ZnW10Nkmr28xRpSpdJ6Sm42Hjf2+REYXm0A== + dependencies: + "@typescript-eslint/types" "6.21.0" + eslint-visitor-keys "^3.4.1" + "@ungap/structured-clone@^1.2.0": version "1.2.0" resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406" From 9f2c776a7799eb5d0443a6c33bb1878895edaa43 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Mar 2024 10:18:02 -0900 Subject: [PATCH 006/497] chore: bump prettier-plugin-sh from 0.13.1 to 0.14.0 (#6700) Bumps [prettier-plugin-sh](https://github.com/un-ts/prettier) from 0.13.1 to 0.14.0. - [Release notes](https://github.com/un-ts/prettier/releases) - [Changelog](https://github.com/un-ts/prettier/blob/master/CHANGELOG.md) - [Commits](https://github.com/un-ts/prettier/compare/prettier-plugin-sh@0.13.1...prettier-plugin-sh@0.14.0) --- updated-dependencies: - dependency-name: prettier-plugin-sh dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 57add0914702..73e3e5da752f 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "eslint-plugin-import": "^2.28.1", "eslint-plugin-prettier": "^5.0.0", "prettier": "^3.0.3", - "prettier-plugin-sh": "^0.13.1", + "prettier-plugin-sh": "^0.14.0", "ts-node": "^10.9.1", "typescript": "^5.2.2" }, diff --git a/yarn.lock b/yarn.lock index 78cdbaf422a2..8f7c270631a5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2798,10 +2798,10 @@ prettier-linter-helpers@^1.0.0: dependencies: fast-diff "^1.1.2" -prettier-plugin-sh@^0.13.1: - version "0.13.1" - resolved "https://registry.yarnpkg.com/prettier-plugin-sh/-/prettier-plugin-sh-0.13.1.tgz#99388c0811994f24334d5233eb5a7cb874dcb840" - integrity sha512-ytMcl1qK4s4BOFGvsc9b0+k9dYECal7U29bL/ke08FEUsF/JLN0j6Peo0wUkFDG4y2UHLMhvpyd6Sd3zDXe/eg== +prettier-plugin-sh@^0.14.0: + version "0.14.0" + resolved "https://registry.yarnpkg.com/prettier-plugin-sh/-/prettier-plugin-sh-0.14.0.tgz#22b186adea79b36212ccd9faa8dd01f33ef34ff6" + integrity sha512-hfXulj5+zEl/ulrO5kMuuTPKmXvOg0bnLHY1hKFNN/N+/903iZbNp8NyZBTsgI8dtkSgFfAEIQq0IQTyP1ZVFQ== dependencies: mvdan-sh "^0.10.1" sh-syntax "^0.4.1" From 5453d0287238e73e7c8b595c34e57838e99fce65 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Mar 2024 10:20:04 -0900 Subject: [PATCH 007/497] chore: bump aquasecurity/trivy-action from 0.16.1 to 0.18.0 (#6705) Bumps [aquasecurity/trivy-action](https://github.com/aquasecurity/trivy-action) from 0.16.1 to 0.18.0. - [Release notes](https://github.com/aquasecurity/trivy-action/releases) - [Commits](https://github.com/aquasecurity/trivy-action/compare/d43c1f16c00cfd3978dde6c07f4bbcf9eb6993ca...062f2592684a31eb3aa050cc61e7ca1451cecd3d) --- updated-dependencies: - dependency-name: aquasecurity/trivy-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/security.yaml | 2 +- .github/workflows/trivy-docker.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/security.yaml b/.github/workflows/security.yaml index 3c8d726fd011..864287fb5b41 100644 --- a/.github/workflows/security.yaml +++ b/.github/workflows/security.yaml @@ -55,7 +55,7 @@ jobs: fetch-depth: 0 - name: Run Trivy vulnerability scanner in repo mode - uses: aquasecurity/trivy-action@d43c1f16c00cfd3978dde6c07f4bbcf9eb6993ca + uses: aquasecurity/trivy-action@062f2592684a31eb3aa050cc61e7ca1451cecd3d with: scan-type: "fs" scan-ref: "." diff --git a/.github/workflows/trivy-docker.yaml b/.github/workflows/trivy-docker.yaml index cae7e23b4327..a15cd26a3eda 100644 --- a/.github/workflows/trivy-docker.yaml +++ b/.github/workflows/trivy-docker.yaml @@ -51,7 +51,7 @@ jobs: uses: actions/checkout@v4 - name: Run Trivy vulnerability scanner in image mode - uses: aquasecurity/trivy-action@d43c1f16c00cfd3978dde6c07f4bbcf9eb6993ca + uses: aquasecurity/trivy-action@062f2592684a31eb3aa050cc61e7ca1451cecd3d with: image-ref: "docker.io/codercom/code-server:latest" ignore-unfixed: true From 720d14db3e5f531c902f12f2bb874caa8d0c39ab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Mar 2024 10:32:06 -0900 Subject: [PATCH 008/497] chore: bump rotating-file-stream from 3.1.1 to 3.2.1 (#6704) Bumps [rotating-file-stream](https://github.com/iccicci/rotating-file-stream) from 3.1.1 to 3.2.1. - [Changelog](https://github.com/iccicci/rotating-file-stream/blob/master/CHANGELOG.md) - [Commits](https://github.com/iccicci/rotating-file-stream/compare/v3.1.1...v3.2.1) --- updated-dependencies: - dependency-name: rotating-file-stream dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 8f7c270631a5..2fb138f09dc7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2974,9 +2974,9 @@ rimraf@^3.0.2: glob "^7.1.3" rotating-file-stream@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/rotating-file-stream/-/rotating-file-stream-3.1.1.tgz#1c126ab2d34ab19c703909922182468b66d6b893" - integrity sha512-PNF1iDkxcZG+T87uUzLlcO4aquTCyY8yl+Q/OTK4dMwhwWDYWU4ZATYeIXHmYVGIzqZ2MrpY4WIkYc9Bsc3Nzw== + version "3.2.1" + resolved "https://registry.yarnpkg.com/rotating-file-stream/-/rotating-file-stream-3.2.1.tgz#1d0a536d75884eedc3a677f5b0871fdc69f97d22" + integrity sha512-n2B18CJb+n2VA5Tdle+1NP2toEcRv68CjAOBjHmwcyswNwMVsrN3gVRZ9ymH3sapaiGY8jc9OhhV5b6I5rAeiA== router@2.0.0-alpha.1: version "2.0.0-alpha.1" From 4c4c566d86f02440a80459d2f5c088827a932d2b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Mar 2024 11:03:16 -0900 Subject: [PATCH 009/497] chore: bump proxy-agent from 6.3.1 to 6.4.0 (#6702) Bumps [proxy-agent](https://github.com/TooTallNate/proxy-agents/tree/HEAD/packages/proxy-agent) from 6.3.1 to 6.4.0. - [Release notes](https://github.com/TooTallNate/proxy-agents/releases) - [Changelog](https://github.com/TooTallNate/proxy-agents/blob/main/packages/proxy-agent/CHANGELOG.md) - [Commits](https://github.com/TooTallNate/proxy-agents/commits/proxy-agent@6.4.0/packages/proxy-agent) --- updated-dependencies: - dependency-name: proxy-agent dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/yarn.lock b/yarn.lock index 2fb138f09dc7..5d282c48cc18 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1845,10 +1845,10 @@ http-errors@~1.7.2: statuses ">= 1.5.0 < 2" toidentifier "1.0.0" -http-proxy-agent@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-7.0.0.tgz#e9096c5afd071a3fce56e6252bb321583c124673" - integrity sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ== +http-proxy-agent@^7.0.0, http-proxy-agent@^7.0.1: + version "7.0.2" + resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz#9a8b1f246866c028509486585f62b8f2c18c270e" + integrity sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig== dependencies: agent-base "^7.1.0" debug "^4.3.4" @@ -1875,10 +1875,10 @@ https-proxy-agent@^5.0.0: agent-base "6" debug "4" -https-proxy-agent@^7.0.2: - version "7.0.2" - resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.2.tgz#e2645b846b90e96c6e6f347fb5b2e41f1590b09b" - integrity sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA== +https-proxy-agent@^7.0.2, https-proxy-agent@^7.0.3: + version "7.0.4" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz#8e97b841a029ad8ddc8731f26595bad868cb4168" + integrity sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg== dependencies: agent-base "^7.0.2" debug "4" @@ -2820,14 +2820,14 @@ proxy-addr@~2.0.5: ipaddr.js "1.9.1" proxy-agent@^6.3.1: - version "6.3.1" - resolved "https://registry.yarnpkg.com/proxy-agent/-/proxy-agent-6.3.1.tgz#40e7b230552cf44fd23ffaf7c59024b692612687" - integrity sha512-Rb5RVBy1iyqOtNl15Cw/llpeLH8bsb37gM1FUfKQ+Wck6xHlbAhWGUFiTRHtkjqGTA5pSHz6+0hrPW/oECihPQ== + version "6.4.0" + resolved "https://registry.yarnpkg.com/proxy-agent/-/proxy-agent-6.4.0.tgz#b4e2dd51dee2b377748aef8d45604c2d7608652d" + integrity sha512-u0piLU+nCOHMgGjRbimiXmA9kM/L9EHh3zL81xCdp7m+Y2pHIsnmbdDoEDoAz5geaonNR6q6+yOPQs6n4T6sBQ== dependencies: agent-base "^7.0.2" debug "^4.3.4" - http-proxy-agent "^7.0.0" - https-proxy-agent "^7.0.2" + http-proxy-agent "^7.0.1" + https-proxy-agent "^7.0.3" lru-cache "^7.14.1" pac-proxy-agent "^7.0.1" proxy-from-env "^1.1.0" From f9c0624f85b2340a79041ca5b38725bcfe00a2ee Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Mar 2024 11:04:03 -0900 Subject: [PATCH 010/497] chore: bump @typescript-eslint/eslint-plugin from 6.20.0 to 6.21.0 (#6701) Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 6.20.0 to 6.21.0. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.21.0/packages/eslint-plugin) --- updated-dependencies: - dependency-name: "@typescript-eslint/eslint-plugin" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 75 +++++++++++++++---------------------------------------- 1 file changed, 20 insertions(+), 55 deletions(-) diff --git a/yarn.lock b/yarn.lock index 5d282c48cc18..22c3d77ca92c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -360,15 +360,15 @@ "@types/node" "*" "@typescript-eslint/eslint-plugin@^6.7.2": - version "6.20.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.20.0.tgz#9cf31546d2d5e884602626d89b0e0d2168ac25ed" - integrity sha512-fTwGQUnjhoYHeSF6m5pWNkzmDDdsKELYrOBxhjMrofPqCkoC2k3B2wvGHFxa1CTIqkEn88nlW1HVMztjo2K8Hg== + version "6.21.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.21.0.tgz#30830c1ca81fd5f3c2714e524c4303e0194f9cd3" + integrity sha512-oy9+hTPCUFpngkEZUSzbf9MxI65wbKFoQYsgPdILTfbUldp5ovUuphZVe4i30emU9M/kP+T64Di0mxl7dSw3MA== dependencies: "@eslint-community/regexpp" "^4.5.1" - "@typescript-eslint/scope-manager" "6.20.0" - "@typescript-eslint/type-utils" "6.20.0" - "@typescript-eslint/utils" "6.20.0" - "@typescript-eslint/visitor-keys" "6.20.0" + "@typescript-eslint/scope-manager" "6.21.0" + "@typescript-eslint/type-utils" "6.21.0" + "@typescript-eslint/utils" "6.21.0" + "@typescript-eslint/visitor-keys" "6.21.0" debug "^4.3.4" graphemer "^1.4.0" ignore "^5.2.4" @@ -387,14 +387,6 @@ "@typescript-eslint/visitor-keys" "6.21.0" debug "^4.3.4" -"@typescript-eslint/scope-manager@6.20.0": - version "6.20.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.20.0.tgz#8a926e60f6c47feb5bab878246dc2ae465730151" - integrity sha512-p4rvHQRDTI1tGGMDFQm+GtxP1ZHyAh64WANVoyEcNMpaTFn3ox/3CcgtIlELnRfKzSs/DwYlDccJEtr3O6qBvA== - dependencies: - "@typescript-eslint/types" "6.20.0" - "@typescript-eslint/visitor-keys" "6.20.0" - "@typescript-eslint/scope-manager@6.21.0": version "6.21.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.21.0.tgz#ea8a9bfc8f1504a6ac5d59a6df308d3a0630a2b1" @@ -403,40 +395,21 @@ "@typescript-eslint/types" "6.21.0" "@typescript-eslint/visitor-keys" "6.21.0" -"@typescript-eslint/type-utils@6.20.0": - version "6.20.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.20.0.tgz#d395475cd0f3610dd80c7d8716fa0db767da3831" - integrity sha512-qnSobiJQb1F5JjN0YDRPHruQTrX7ICsmltXhkV536mp4idGAYrIyr47zF/JmkJtEcAVnIz4gUYJ7gOZa6SmN4g== +"@typescript-eslint/type-utils@6.21.0": + version "6.21.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.21.0.tgz#6473281cfed4dacabe8004e8521cee0bd9d4c01e" + integrity sha512-rZQI7wHfao8qMX3Rd3xqeYSMCL3SoiSQLBATSiVKARdFGCYSRvmViieZjqc58jKgs8Y8i9YvVVhRbHSTA4VBag== dependencies: - "@typescript-eslint/typescript-estree" "6.20.0" - "@typescript-eslint/utils" "6.20.0" + "@typescript-eslint/typescript-estree" "6.21.0" + "@typescript-eslint/utils" "6.21.0" debug "^4.3.4" ts-api-utils "^1.0.1" -"@typescript-eslint/types@6.20.0": - version "6.20.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.20.0.tgz#5ccd74c29011ae7714ae6973e4ec0c634708b448" - integrity sha512-MM9mfZMAhiN4cOEcUOEx+0HmuaW3WBfukBZPCfwSqFnQy0grXYtngKCqpQN339X3RrwtzspWJrpbrupKYUSBXQ== - "@typescript-eslint/types@6.21.0": version "6.21.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.21.0.tgz#205724c5123a8fef7ecd195075fa6e85bac3436d" integrity sha512-1kFmZ1rOm5epu9NZEZm1kckCDGj5UJEf7P1kliH4LKu/RkwpsfqqGmY2OOcUs18lSlQBKLDYBOGxRVtrMN5lpg== -"@typescript-eslint/typescript-estree@6.20.0": - version "6.20.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.20.0.tgz#5b2d0975949e6bdd8d45ee1471461ef5fadc5542" - integrity sha512-RnRya9q5m6YYSpBN7IzKu9FmLcYtErkDkc8/dKv81I9QiLLtVBHrjz+Ev/crAqgMNW2FCsoZF4g2QUylMnJz+g== - dependencies: - "@typescript-eslint/types" "6.20.0" - "@typescript-eslint/visitor-keys" "6.20.0" - debug "^4.3.4" - globby "^11.1.0" - is-glob "^4.0.3" - minimatch "9.0.3" - semver "^7.5.4" - ts-api-utils "^1.0.1" - "@typescript-eslint/typescript-estree@6.21.0": version "6.21.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.21.0.tgz#c47ae7901db3b8bddc3ecd73daff2d0895688c46" @@ -451,27 +424,19 @@ semver "^7.5.4" ts-api-utils "^1.0.1" -"@typescript-eslint/utils@6.20.0": - version "6.20.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.20.0.tgz#0e52afcfaa51af5656490ba4b7437cc3aa28633d" - integrity sha512-/EKuw+kRu2vAqCoDwDCBtDRU6CTKbUmwwI7SH7AashZ+W+7o8eiyy6V2cdOqN49KsTcASWsC5QeghYuRDTyOOg== +"@typescript-eslint/utils@6.21.0": + version "6.21.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.21.0.tgz#4714e7a6b39e773c1c8e97ec587f520840cd8134" + integrity sha512-NfWVaC8HP9T8cbKQxHcsJBY5YE1O33+jpMwN45qzWWaPDZgLIbo12toGMWnmhvCpd3sIxkpDw3Wv1B3dYrbDQQ== dependencies: "@eslint-community/eslint-utils" "^4.4.0" "@types/json-schema" "^7.0.12" "@types/semver" "^7.5.0" - "@typescript-eslint/scope-manager" "6.20.0" - "@typescript-eslint/types" "6.20.0" - "@typescript-eslint/typescript-estree" "6.20.0" + "@typescript-eslint/scope-manager" "6.21.0" + "@typescript-eslint/types" "6.21.0" + "@typescript-eslint/typescript-estree" "6.21.0" semver "^7.5.4" -"@typescript-eslint/visitor-keys@6.20.0": - version "6.20.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.20.0.tgz#f7ada27f2803de89df0edd9fd7be22c05ce6a498" - integrity sha512-E8Cp98kRe4gKHjJD4NExXKz/zOJ1A2hhZc+IMVD6i7w4yjIvh6VyuRI0gRtxAsXtoC35uGMaQ9rjI2zJaXDEAw== - dependencies: - "@typescript-eslint/types" "6.20.0" - eslint-visitor-keys "^3.4.1" - "@typescript-eslint/visitor-keys@6.21.0": version "6.21.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.21.0.tgz#87a99d077aa507e20e238b11d56cc26ade45fe47" From 8c65ff8d0dd2dec0d94546230656ab5b0120538c Mon Sep 17 00:00:00 2001 From: Olivier Benz Date: Mon, 11 Mar 2024 21:51:08 +0100 Subject: [PATCH 011/497] Update Code to 1.87.1 (#6714) --- lib/vscode | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/vscode b/lib/vscode index 019f4d1419fb..1e790d77f816 160000 --- a/lib/vscode +++ b/lib/vscode @@ -1 +1 @@ -Subproject commit 019f4d1419fbc8219a181fab7892ebccf7ee29a2 +Subproject commit 1e790d77f81672c49be070e04474901747115651 From 132f7d1470444448a6dd46f1d6ffccba1fb3ea26 Mon Sep 17 00:00:00 2001 From: Asher Date: Mon, 11 Mar 2024 14:13:21 -0800 Subject: [PATCH 012/497] Default keepAlive to true for proxy agent --- patches/keepalive.diff | 15 +++++++++++++++ patches/series | 1 + src/node/update.ts | 1 + 3 files changed, 17 insertions(+) create mode 100644 patches/keepalive.diff diff --git a/patches/keepalive.diff b/patches/keepalive.diff new file mode 100644 index 000000000000..443fc2f383d1 --- /dev/null +++ b/patches/keepalive.diff @@ -0,0 +1,15 @@ +This can be removed after upgrading to Node >= 19 as keepAlive is defaulted to +true after 19. + +Index: code-server/lib/vscode/src/vs/platform/request/node/proxy.ts +=================================================================== +--- code-server.orig/lib/vscode/src/vs/platform/request/node/proxy.ts ++++ code-server/lib/vscode/src/vs/platform/request/node/proxy.ts +@@ -42,6 +42,7 @@ export async function getProxyAgent(rawR + port: (proxyEndpoint.port ? +proxyEndpoint.port : 0) || (proxyEndpoint.protocol === 'https' ? 443 : 80), + auth: proxyEndpoint.auth, + rejectUnauthorized: isBoolean(options.strictSSL) ? options.strictSSL : true, ++ keepAlive: true, + }; + + return requestURL.protocol === 'http:' diff --git a/patches/series b/patches/series index d3370af12fde..ad79ed9ecff7 100644 --- a/patches/series +++ b/patches/series @@ -19,3 +19,4 @@ display-language.diff cli-window-open.diff getting-started.diff safari.diff +keepalive.diff diff --git a/src/node/update.ts b/src/node/update.ts index 520c1899e946..4e4a1babe501 100644 --- a/src/node/update.ts +++ b/src/node/update.ts @@ -105,6 +105,7 @@ export class UpdateProvider { logger.debug("Making request", field("uri", uri)) const isHttps = uri.startsWith("https") const agent = new ProxyAgent({ + keepAlive: true, getProxyForUrl: () => httpProxyUri || "", }) const httpx = isHttps ? https : http From c65b1f2870c2fe9b5dcfeedb1aa7b44f334954c3 Mon Sep 17 00:00:00 2001 From: Asher Date: Tue, 12 Mar 2024 09:41:21 -0800 Subject: [PATCH 013/497] Continue release drafting on Codecov failure --- .github/workflows/release.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 8ba38294568f..daff2605a92d 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -81,6 +81,7 @@ jobs: with: token: ${{ secrets.CODECOV_TOKEN }} if: success() + continue-on-error: true # NOTE@jsjoeio - we do this so we can strip out the v # i.e. v4.9.1 -> 4.9.1 From 760d1318e98945d05133c6121f99541ca7a39bf8 Mon Sep 17 00:00:00 2001 From: Olivier Benz Date: Tue, 12 Mar 2024 20:30:02 +0100 Subject: [PATCH 014/497] Update Code to 1.87.2 (#6721) --- lib/vscode | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/vscode b/lib/vscode index 1e790d77f816..863d2581ecda 160000 --- a/lib/vscode +++ b/lib/vscode @@ -1 +1 @@ -Subproject commit 1e790d77f81672c49be070e04474901747115651 +Subproject commit 863d2581ecda6849923a2118d93a088b0745d9d6 From 0e384d5442e779a6c07e8d01ea6cca632563f447 Mon Sep 17 00:00:00 2001 From: Asher Date: Thu, 14 Mar 2024 11:46:40 -0800 Subject: [PATCH 015/497] Tweak issue templates - Remove the redundant title prefix. - Remove outdated assignees. - Improve reproduction step description (trying to get folks to submit more specific/detailed reproductions). - Render logs with shell (not sure if this actually changes anything). - Use dropdowns for testing in VS Code and Codespaces. I think the existing checkboxes are still confusing so hopefully this sorts it. --- .github/ISSUE_TEMPLATE/bug-report.yml | 50 ++++++++++++++++------- .github/ISSUE_TEMPLATE/doc.md | 2 - .github/ISSUE_TEMPLATE/feature-request.md | 2 - 3 files changed, 35 insertions(+), 19 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index a3679305bbd0..bf538c93b10c 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yml +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -1,6 +1,5 @@ name: Bug report description: File a bug report -title: "[Bug]: " labels: ["bug", "triage"] body: - type: checkboxes @@ -10,6 +9,7 @@ body: options: - label: I have searched the existing issues required: true + - type: textarea attributes: label: OS/Web Information @@ -28,55 +28,74 @@ body: - `code-server --version`: validations: required: true + - type: textarea attributes: label: Steps to Reproduce description: | - 1. open code-server - 2. install extension - 3. run command + Please describe exactly how to reproduce the bug. For example: + 1. Open code-server in Firefox + 2. Install extension `foo.bar` from the extensions sidebar + 3. Run command `foo.bar.baz` value: | 1. 2. 3. validations: required: true + - type: textarea attributes: label: Expected description: What should happen? validations: required: true + - type: textarea attributes: label: Actual description: What actually happens? validations: required: true + - type: textarea id: logs attributes: label: Logs description: Run code-server with the --verbose flag and then paste any relevant logs from the server, from the browser console and/or the browser network tab. For issues with installation, include installation logs (i.e. output of `yarn global add code-server`). + render: shell + - type: textarea attributes: label: Screenshot/Video description: Please include a screenshot, gif or screen recording of your issue. validations: required: false - - type: checkboxes + + - type: dropdown attributes: - label: Does this issue happen in VS Code or GitHub Codespaces? - description: Please try reproducing this issue in VS Code and GitHub Codespaces. If the bug reproduces in either VS Code or GitHub Codespaces, please submit the issue upstream instead (https://github.com/microsoft/vscode). + label: Does this bug reproduce in native VS Code? + description: Please try reproducing this issue in native VS Code, if possible. If the bug reproduces in native VS Code, please submit the issue upstream instead (https://github.com/microsoft/vscode). options: - - label: I tested this in native VS Code. - required: false - - label: This does not happen in native VS Code. - required: false - - label: I tested this in GitHub Codespaces. - required: false - - label: This does not happen in GitHub Codespaces. - required: false + - Yes, this is also broken in native VS Code + - No, this works as expected in native VS Code + - This cannot be tested in native VS Code + - I did not test native VS Code + validations: + required: true + + - type: dropdown + attributes: + label: Does this bug reproduce in GitHub Codespaces? + description: Please try reproducing this issue in GitHub Codespaces, if possible. If the bug reproduces in GitHub Codespaces, please submit the issue upstream instead (https://github.com/microsoft/vscode). + options: + - Yes, this is also broken in GitHub Codespaces + - No, this works as expected in GitHub Codespaces + - This cannot be tested in GitHub Codespaces + - I did not test GitHub Codespaces + validations: + required: true + - type: checkboxes attributes: label: Are you accessing code-server over a secure context? @@ -84,6 +103,7 @@ body: options: - label: I am using a secure context. required: false + - type: textarea attributes: label: Notes diff --git a/.github/ISSUE_TEMPLATE/doc.md b/.github/ISSUE_TEMPLATE/doc.md index 510e479f4c2b..75240e7f7631 100644 --- a/.github/ISSUE_TEMPLATE/doc.md +++ b/.github/ISSUE_TEMPLATE/doc.md @@ -1,9 +1,7 @@ --- name: Documentation improvement about: Suggest a documentation improvement -title: "[Docs]: " labels: "docs" -assignees: "@jsjoeio" --- ## What is your suggestion? diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md index 2f05a4f8b617..89837e3441e6 100644 --- a/.github/ISSUE_TEMPLATE/feature-request.md +++ b/.github/ISSUE_TEMPLATE/feature-request.md @@ -1,9 +1,7 @@ --- name: Feature request about: Suggest an idea to improve code-server -title: "[Feat]: " labels: enhancement -assignees: "" --- ## What is your suggestion? From 66364429e321fd8b2a51d1212631753ffcca4862 Mon Sep 17 00:00:00 2001 From: Asher Date: Thu, 14 Mar 2024 11:48:24 -0800 Subject: [PATCH 016/497] Release 4.22.1 --- CHANGELOG.md | 19 ++++++++++++++----- ci/helm-chart/Chart.yaml | 4 ++-- ci/helm-chart/values.yaml | 2 +- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 529854b43303..40bc8303279c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,7 +22,16 @@ Code v99.99.999 ## Unreleased -## [4.22.0](https://github.com/coder/code-server/releases/tag/v4.22.0) - 2021-03-03 +## [4.22.1](https://github.com/coder/code-server/releases/tag/v4.22.1) - 2024-03-14 + +Code v1.87.2 + +## Changed + +- Updated to Code 1.87.2. +- Enable keep-alive for proxy agent. + +## [4.22.0](https://github.com/coder/code-server/releases/tag/v4.22.0) - 2024-03-03 Code v1.87.0 @@ -30,7 +39,7 @@ Code v1.87.0 - Updated to Code 1.87.0. -## [4.21.2](https://github.com/coder/code-server/releases/tag/v4.21.2) - 2021-02-28 +## [4.21.2](https://github.com/coder/code-server/releases/tag/v4.21.2) - 2024-02-28 Code v1.86.2 @@ -38,7 +47,7 @@ Code v1.86.2 - Updated to Code 1.86.2. -## [4.21.1](https://github.com/coder/code-server/releases/tag/v4.21.1) - 2021-02-09 +## [4.21.1](https://github.com/coder/code-server/releases/tag/v4.21.1) - 2024-02-09 Code v1.86.1 @@ -51,7 +60,7 @@ Code v1.86.1 - Docker images for Fedora and openSUSE. -## [4.21.0](https://github.com/coder/code-server/releases/tag/v4.21.0) - 2021-02-05 +## [4.21.0](https://github.com/coder/code-server/releases/tag/v4.21.0) - 2024-02-05 Code v1.86.0 @@ -59,7 +68,7 @@ Code v1.86.0 - Updated to Code 1.86.0. -## [4.20.1](https://github.com/coder/code-server/releases/tag/v4.20.1) - 2021-01-22 +## [4.20.1](https://github.com/coder/code-server/releases/tag/v4.20.1) - 2024-01-22 Code v1.85.2 diff --git a/ci/helm-chart/Chart.yaml b/ci/helm-chart/Chart.yaml index e524e00db61a..a72b5c8cad7f 100644 --- a/ci/helm-chart/Chart.yaml +++ b/ci/helm-chart/Chart.yaml @@ -15,9 +15,9 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 3.18.0 +version: 3.18.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 4.22.0 +appVersion: 4.22.1 diff --git a/ci/helm-chart/values.yaml b/ci/helm-chart/values.yaml index 5bdef0e29077..71d38f2bf5e0 100644 --- a/ci/helm-chart/values.yaml +++ b/ci/helm-chart/values.yaml @@ -6,7 +6,7 @@ replicaCount: 1 image: repository: codercom/code-server - tag: '4.22.0' + tag: '4.22.1' pullPolicy: Always # Specifies one or more secrets to be used when pulling images from a From 45e96ec3b02bf8b6e3e698b09325324eb8c622bc Mon Sep 17 00:00:00 2001 From: Asher Date: Thu, 14 Mar 2024 12:19:13 -0800 Subject: [PATCH 017/497] Shorten bug dropdown descriptions --- .github/ISSUE_TEMPLATE/bug-report.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index bf538c93b10c..38ea630d6ecf 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yml +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -75,7 +75,7 @@ body: - type: dropdown attributes: label: Does this bug reproduce in native VS Code? - description: Please try reproducing this issue in native VS Code, if possible. If the bug reproduces in native VS Code, please submit the issue upstream instead (https://github.com/microsoft/vscode). + description: If the bug reproduces in native VS Code, submit the issue upstream instead (https://github.com/microsoft/vscode). options: - Yes, this is also broken in native VS Code - No, this works as expected in native VS Code @@ -87,7 +87,7 @@ body: - type: dropdown attributes: label: Does this bug reproduce in GitHub Codespaces? - description: Please try reproducing this issue in GitHub Codespaces, if possible. If the bug reproduces in GitHub Codespaces, please submit the issue upstream instead (https://github.com/microsoft/vscode). + description: If the bug reproduces in GitHub Codespaces, submit the issue upstream instead (https://github.com/microsoft/vscode). options: - Yes, this is also broken in GitHub Codespaces - No, this works as expected in GitHub Codespaces From 0cca7c67a4aba0e8ce199df0fdc59b64fc659fbc Mon Sep 17 00:00:00 2001 From: Olivier Benz Date: Sat, 6 Apr 2024 00:20:28 +0200 Subject: [PATCH 018/497] Update Code to 1.88.0 (#6745) --- lib/vscode | 2 +- patches/base-path.diff | 16 ++++++------ patches/cli-window-open.diff | 2 +- patches/disable-builtin-ext-update.diff | 2 +- patches/display-language.diff | 24 ++++++++--------- patches/external-file-actions.diff | 22 ++++++++-------- patches/getting-started.diff | 20 +++++++-------- patches/integration.diff | 2 +- patches/local-storage.diff | 6 ++--- patches/logout.diff | 4 +-- patches/marketplace.diff | 34 +++++++++++-------------- patches/proxy-uri.diff | 8 +++--- patches/service-worker.diff | 2 +- patches/sourcemaps.diff | 2 +- patches/telemetry.diff | 2 +- patches/update-check.diff | 4 +-- patches/webview.diff | 12 ++++----- 17 files changed, 80 insertions(+), 84 deletions(-) diff --git a/lib/vscode b/lib/vscode index 863d2581ecda..5c3e652f63e7 160000 --- a/lib/vscode +++ b/lib/vscode @@ -1 +1 @@ -Subproject commit 863d2581ecda6849923a2118d93a088b0745d9d6 +Subproject commit 5c3e652f63e798a5ac2f31ffd0d863669328dc4c diff --git a/patches/base-path.diff b/patches/base-path.diff index 4efa53693e4d..807af6677f72 100644 --- a/patches/base-path.diff +++ b/patches/base-path.diff @@ -10,7 +10,7 @@ Index: code-server/lib/vscode/src/vs/base/common/network.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/base/common/network.ts +++ code-server/lib/vscode/src/vs/base/common/network.ts -@@ -194,7 +194,9 @@ class RemoteAuthoritiesImpl { +@@ -198,7 +198,9 @@ class RemoteAuthoritiesImpl { return URI.from({ scheme: platform.isWeb ? this._preferredWebSchema : Schemas.vscodeRemoteResource, authority: `${host}:${port}`, @@ -111,7 +111,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -269,16 +269,15 @@ export class WebClientServer { +@@ -270,16 +270,15 @@ export class WebClientServer { return void res.end(); } @@ -133,7 +133,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts ); if (!remoteAuthority) { return serveError(req, res, 400, `Bad request.`); -@@ -305,8 +304,12 @@ export class WebClientServer { +@@ -306,8 +305,12 @@ export class WebClientServer { scopes: [['user:email'], ['repo']] } : undefined; @@ -146,7 +146,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts embedderIdentifier: 'server-distro', extensionsGallery: this._webExtensionResourceUrlTemplate ? { ...this._productService.extensionsGallery, -@@ -341,8 +344,10 @@ export class WebClientServer { +@@ -343,8 +346,10 @@ export class WebClientServer { const values: { [key: string]: string } = { WORKBENCH_WEB_CONFIGURATION: asJSON(workbenchWebConfiguration), WORKBENCH_AUTH_SESSION: authSessionInfo ? asJSON(authSessionInfo) : '', @@ -159,7 +159,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts }; if (useTestResolver) { -@@ -369,7 +374,7 @@ export class WebClientServer { +@@ -371,7 +376,7 @@ export class WebClientServer { 'default-src \'self\';', 'img-src \'self\' https: data: blob:;', 'media-src \'self\';', @@ -168,7 +168,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts 'child-src \'self\';', `frame-src 'self' https://*.vscode-cdn.net data:;`, 'worker-src \'self\' data: blob:;', -@@ -442,3 +447,70 @@ export class WebClientServer { +@@ -444,3 +449,70 @@ export class WebClientServer { return void res.end(data); } } @@ -303,10 +303,10 @@ Index: code-server/lib/vscode/src/vs/platform/extensionResourceLoader/common/ext import { TelemetryLevel } from 'vs/platform/telemetry/common/telemetry'; import { getTelemetryLevel, supportsTelemetry } from 'vs/platform/telemetry/common/telemetryUtils'; -import { RemoteAuthorities } from 'vs/base/common/network'; - import { getRemoteServerRootPath } from 'vs/platform/remote/common/remoteHosts'; import { TargetPlatform } from 'vs/platform/extensions/common/extensions'; -@@ -102,7 +101,7 @@ export abstract class AbstractExtensionR + const WEB_EXTENSION_RESOURCE_END_POINT_SEGMENT = '/web-extension-resource/'; +@@ -99,7 +98,7 @@ export abstract class AbstractExtensionR : version, path: 'extension' })); diff --git a/patches/cli-window-open.diff b/patches/cli-window-open.diff index e6d4040ef3f4..8da64b2a5d70 100644 --- a/patches/cli-window-open.diff +++ b/patches/cli-window-open.diff @@ -17,7 +17,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/terminal/browser/remoteTe =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/contrib/terminal/browser/remoteTerminalBackend.ts +++ code-server/lib/vscode/src/vs/workbench/contrib/terminal/browser/remoteTerminalBackend.ts -@@ -104,10 +104,14 @@ class RemoteTerminalBackend extends Base +@@ -106,10 +106,14 @@ class RemoteTerminalBackend extends Base } const reqId = e.reqId; const commandId = e.commandId; diff --git a/patches/disable-builtin-ext-update.diff b/patches/disable-builtin-ext-update.diff index 743c66649dd4..e29a6ad59267 100644 --- a/patches/disable-builtin-ext-update.diff +++ b/patches/disable-builtin-ext-update.diff @@ -7,7 +7,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts +++ code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts -@@ -248,6 +248,10 @@ export class Extension implements IExten +@@ -283,6 +283,10 @@ export class Extension implements IExten if (this.type === ExtensionType.System && this.productService.quality === 'stable') { return false; } diff --git a/patches/display-language.diff b/patches/display-language.diff index 909d84b825b2..df2b04008ddf 100644 --- a/patches/display-language.diff +++ b/patches/display-language.diff @@ -53,7 +53,7 @@ Index: code-server/lib/vscode/src/vs/base/common/platform.ts export const LANGUAGE_DEFAULT = 'en'; let _isWindows = false; -@@ -111,17 +109,21 @@ else if (typeof navigator === 'object' & +@@ -112,17 +110,21 @@ else if (typeof navigator === 'object' & _isMobile = _userAgent?.indexOf('Mobi') >= 0; _isWeb = true; @@ -218,9 +218,9 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts import { isString } from 'vs/base/common/types'; +import { getLocaleFromConfig, getNLSConfiguration } from 'vs/server/node/remoteLanguagePacks'; import { CharCode } from 'vs/base/common/charCode'; - import { getRemoteServerRootPath } from 'vs/platform/remote/common/remoteHosts'; import { IExtensionManifest } from 'vs/platform/extensions/common/extensions'; -@@ -345,6 +346,8 @@ export class WebClientServer { + +@@ -347,6 +348,8 @@ export class WebClientServer { callbackRoute: this._callbackRoute }; @@ -229,7 +229,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts const nlsBaseUrl = this._productService.extensionsGallery?.nlsBaseUrl; const values: { [key: string]: string } = { WORKBENCH_WEB_CONFIGURATION: asJSON(workbenchWebConfiguration), -@@ -353,6 +356,7 @@ export class WebClientServer { +@@ -355,6 +358,7 @@ export class WebClientServer { WORKBENCH_NLS_BASE_URL: vscodeBase + (nlsBaseUrl ? `${nlsBaseUrl}${!nlsBaseUrl.endsWith('/') ? '/' : ''}${this._productService.commit}/${this._productService.version}/` : ''), BASE: base, VS_BASE: vscodeBase, @@ -249,7 +249,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts /* ----- server setup ----- */ -@@ -102,6 +103,7 @@ export interface ServerParsedArgs { +@@ -103,6 +104,7 @@ export interface ServerParsedArgs { 'auth'?: string 'disable-file-downloads'?: boolean; 'disable-file-uploads'?: boolean; @@ -261,7 +261,7 @@ Index: code-server/lib/vscode/src/vs/workbench/workbench.web.main.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/workbench.web.main.ts +++ code-server/lib/vscode/src/vs/workbench/workbench.web.main.ts -@@ -50,7 +50,7 @@ import 'vs/workbench/services/dialogs/br +@@ -52,7 +52,7 @@ import 'vs/workbench/services/dialogs/br import 'vs/workbench/services/host/browser/browserHostService'; import 'vs/workbench/services/lifecycle/browser/lifecycleService'; import 'vs/workbench/services/clipboard/browser/clipboardService'; @@ -270,7 +270,7 @@ Index: code-server/lib/vscode/src/vs/workbench/workbench.web.main.ts import 'vs/workbench/services/path/browser/pathService'; import 'vs/workbench/services/themes/browser/browserHostColorSchemeService'; import 'vs/workbench/services/encryption/browser/encryptionService'; -@@ -116,8 +116,9 @@ registerSingleton(ILanguagePackService, +@@ -118,8 +118,9 @@ registerSingleton(ILanguagePackService, // Logs import 'vs/workbench/contrib/logs/browser/logs.contribution'; @@ -348,7 +348,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts +++ code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts -@@ -340,9 +340,6 @@ export class InstallAction extends Exten +@@ -342,9 +342,6 @@ export class InstallAction extends Exten if (this.extension.isBuiltin) { return; } @@ -358,7 +358,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens if (this.extension.state === ExtensionState.Uninstalled && await this.extensionsWorkbenchService.canInstall(this.extension)) { this.enabled = this.options.installPreReleaseVersion ? this.extension.hasPreReleaseVersion : this.extension.hasReleaseVersion; this.updateLabel(); -@@ -610,7 +607,7 @@ export abstract class InstallInOtherServ +@@ -615,7 +612,7 @@ export abstract class InstallInOtherServ } if (isLanguagePackExtension(this.extension.local.manifest)) { @@ -367,7 +367,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens } // Prefers to run on UI -@@ -1782,17 +1779,6 @@ export class SetLanguageAction extends E +@@ -1843,17 +1840,6 @@ export class SetLanguageAction extends E update(): void { this.enabled = false; this.class = SetLanguageAction.DisabledClass; @@ -385,7 +385,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens } override async run(): Promise { -@@ -1809,7 +1795,6 @@ export class ClearLanguageAction extends +@@ -1870,7 +1856,6 @@ export class ClearLanguageAction extends private static readonly DisabledClass = `${ClearLanguageAction.EnabledClass} disabled`; constructor( @@ -393,7 +393,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens @ILocaleService private readonly localeService: ILocaleService, ) { super(ClearLanguageAction.ID, ClearLanguageAction.TITLE.value, ClearLanguageAction.DisabledClass, false); -@@ -1819,17 +1804,6 @@ export class ClearLanguageAction extends +@@ -1880,17 +1865,6 @@ export class ClearLanguageAction extends update(): void { this.enabled = false; this.class = ClearLanguageAction.DisabledClass; diff --git a/patches/external-file-actions.diff b/patches/external-file-actions.diff index 97323f8a4cc3..768d74a05cbb 100644 --- a/patches/external-file-actions.diff +++ b/patches/external-file-actions.diff @@ -27,7 +27,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/web.api.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/browser/web.api.ts +++ code-server/lib/vscode/src/vs/workbench/browser/web.api.ts -@@ -282,6 +282,16 @@ export interface IWorkbenchConstructionO +@@ -289,6 +289,16 @@ export interface IWorkbenchConstructionO */ readonly userDataPath?: string @@ -99,7 +99,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts /* ----- server setup ----- */ -@@ -98,6 +100,8 @@ export interface ServerParsedArgs { +@@ -99,6 +101,8 @@ export interface ServerParsedArgs { /* ----- code-server ----- */ 'disable-update-check'?: boolean; 'auth'?: string @@ -112,8 +112,8 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -332,6 +332,8 @@ export class WebClientServer { - remoteAuthority, +@@ -334,6 +334,8 @@ export class WebClientServer { + serverBasePath: this._basePath, webviewEndpoint: vscodeBase + this._staticRoute + '/out/vs/workbench/contrib/webview/browser/pre', userDataPath: this._environmentService.userDataPath, + isEnabledFileDownloads: !this._environmentService.args['disable-file-downloads'], @@ -129,8 +129,8 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/contextkeys.ts import { Disposable } from 'vs/base/common/lifecycle'; import { IContextKeyService, IContextKey, setConstant as setConstantContextKey } from 'vs/platform/contextkey/common/contextkey'; import { InputFocusedContext, IsMacContext, IsLinuxContext, IsWindowsContext, IsWebContext, IsMacNativeContext, IsDevelopmentContext, IsIOSContext, ProductQualityContext, IsMobileContext } from 'vs/platform/contextkey/common/contextkeys'; --import { SplitEditorsVertically, InEditorZenModeContext, ActiveEditorCanRevertContext, ActiveEditorGroupLockedContext, ActiveEditorCanSplitInGroupContext, SideBySideEditorActiveContext, AuxiliaryBarVisibleContext, SideBarVisibleContext, PanelAlignmentContext, PanelMaximizedContext, PanelVisibleContext, ActiveEditorContext, EditorsVisibleContext, TextCompareEditorVisibleContext, TextCompareEditorActiveContext, ActiveEditorGroupEmptyContext, EmbedderIdentifierContext, EditorTabsVisibleContext, IsMainEditorCenteredLayoutContext, ActiveEditorGroupIndexContext, ActiveEditorGroupLastContext, ActiveEditorReadonlyContext, MainEditorAreaVisibleContext, ActiveEditorAvailableEditorIdsContext, DirtyWorkingCopiesContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, IsMainWindowFullscreenContext, OpenFolderWorkspaceSupportContext, RemoteNameContext, VirtualWorkspaceContext, WorkbenchStateContext, WorkspaceFolderCountContext, PanelPositionContext, TemporaryWorkspaceContext, ActiveEditorCanToggleReadonlyContext, applyAvailableEditorIds, TitleBarVisibleContext, TitleBarStyleContext, MultipleEditorGroupsContext, IsAuxiliaryWindowFocusedContext, ActiveCompareEditorOriginalWriteableContext } from 'vs/workbench/common/contextkeys'; -+import { SplitEditorsVertically, InEditorZenModeContext, ActiveEditorCanRevertContext, ActiveEditorGroupLockedContext, ActiveEditorCanSplitInGroupContext, SideBySideEditorActiveContext, AuxiliaryBarVisibleContext, SideBarVisibleContext, PanelAlignmentContext, PanelMaximizedContext, PanelVisibleContext, ActiveEditorContext, EditorsVisibleContext, TextCompareEditorVisibleContext, TextCompareEditorActiveContext, ActiveEditorGroupEmptyContext, EmbedderIdentifierContext, EditorTabsVisibleContext, IsMainEditorCenteredLayoutContext, ActiveEditorGroupIndexContext, ActiveEditorGroupLastContext, ActiveEditorReadonlyContext, MainEditorAreaVisibleContext, ActiveEditorAvailableEditorIdsContext, DirtyWorkingCopiesContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, IsMainWindowFullscreenContext, OpenFolderWorkspaceSupportContext, RemoteNameContext, VirtualWorkspaceContext, WorkbenchStateContext, WorkspaceFolderCountContext, PanelPositionContext, TemporaryWorkspaceContext, ActiveEditorCanToggleReadonlyContext, applyAvailableEditorIds, TitleBarVisibleContext, TitleBarStyleContext, MultipleEditorGroupsContext, IsAuxiliaryWindowFocusedContext, ActiveCompareEditorOriginalWriteableContext, IsEnabledFileDownloads, IsEnabledFileUploads } from 'vs/workbench/common/contextkeys'; +-import { SplitEditorsVertically, InEditorZenModeContext, ActiveEditorCanRevertContext, ActiveEditorGroupLockedContext, ActiveEditorCanSplitInGroupContext, SideBySideEditorActiveContext, AuxiliaryBarVisibleContext, SideBarVisibleContext, PanelAlignmentContext, PanelMaximizedContext, PanelVisibleContext, ActiveEditorContext, EditorsVisibleContext, TextCompareEditorVisibleContext, TextCompareEditorActiveContext, ActiveEditorGroupEmptyContext, EmbedderIdentifierContext, EditorTabsVisibleContext, IsMainEditorCenteredLayoutContext, ActiveEditorGroupIndexContext, ActiveEditorGroupLastContext, ActiveEditorReadonlyContext, MainEditorAreaVisibleContext, ActiveEditorAvailableEditorIdsContext, DirtyWorkingCopiesContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, IsMainWindowFullscreenContext, OpenFolderWorkspaceSupportContext, RemoteNameContext, VirtualWorkspaceContext, WorkbenchStateContext, WorkspaceFolderCountContext, PanelPositionContext, TemporaryWorkspaceContext, ActiveEditorCanToggleReadonlyContext, applyAvailableEditorIds, TitleBarVisibleContext, TitleBarStyleContext, MultipleEditorGroupsContext, IsAuxiliaryWindowFocusedContext, ActiveCompareEditorCanSwapContext } from 'vs/workbench/common/contextkeys'; ++import { SplitEditorsVertically, InEditorZenModeContext, ActiveEditorCanRevertContext, ActiveEditorGroupLockedContext, ActiveEditorCanSplitInGroupContext, SideBySideEditorActiveContext, AuxiliaryBarVisibleContext, SideBarVisibleContext, PanelAlignmentContext, PanelMaximizedContext, PanelVisibleContext, ActiveEditorContext, EditorsVisibleContext, TextCompareEditorVisibleContext, TextCompareEditorActiveContext, ActiveEditorGroupEmptyContext, EmbedderIdentifierContext, EditorTabsVisibleContext, IsMainEditorCenteredLayoutContext, ActiveEditorGroupIndexContext, ActiveEditorGroupLastContext, ActiveEditorReadonlyContext, MainEditorAreaVisibleContext, ActiveEditorAvailableEditorIdsContext, DirtyWorkingCopiesContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, IsMainWindowFullscreenContext, OpenFolderWorkspaceSupportContext, RemoteNameContext, VirtualWorkspaceContext, WorkbenchStateContext, WorkspaceFolderCountContext, PanelPositionContext, TemporaryWorkspaceContext, ActiveEditorCanToggleReadonlyContext, applyAvailableEditorIds, TitleBarVisibleContext, TitleBarStyleContext, MultipleEditorGroupsContext, IsAuxiliaryWindowFocusedContext, ActiveCompareEditorCanSwapContext, IsEnabledFileDownloads, IsEnabledFileUploads } from 'vs/workbench/common/contextkeys'; import { TEXT_DIFF_EDITOR_ID, EditorInputCapabilities, SIDE_BY_SIDE_EDITOR_ID, EditorResourceAccessor, SideBySideEditor } from 'vs/workbench/common/editor'; import { trackFocus, addDisposableListener, EventType, onDidRegisterWindow, getActiveWindow } from 'vs/base/browser/dom'; import { preferredSideBySideGroupDirection, GroupDirection, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService'; @@ -140,7 +140,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/contextkeys.ts import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { WorkbenchState, IWorkspaceContextService, isTemporaryWorkspace } from 'vs/platform/workspace/common/workspace'; import { IWorkbenchLayoutService, Parts, positionToString } from 'vs/workbench/services/layout/browser/layoutService'; -@@ -87,7 +87,7 @@ export class WorkbenchContextKeysHandler +@@ -88,7 +88,7 @@ export class WorkbenchContextKeysHandler @IContextKeyService private readonly contextKeyService: IContextKeyService, @IWorkspaceContextService private readonly contextService: IWorkspaceContextService, @IConfigurationService private readonly configurationService: IConfigurationService, @@ -149,7 +149,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/contextkeys.ts @IProductService private readonly productService: IProductService, @IEditorService private readonly editorService: IEditorService, @IEditorResolverService private readonly editorResolverService: IEditorResolverService, -@@ -224,6 +224,10 @@ export class WorkbenchContextKeysHandler +@@ -225,6 +225,10 @@ export class WorkbenchContextKeysHandler this.auxiliaryBarVisibleContext = AuxiliaryBarVisibleContext.bindTo(this.contextKeyService); this.auxiliaryBarVisibleContext.set(this.layoutService.isVisible(Parts.AUXILIARYBAR_PART)); @@ -287,10 +287,10 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/files/browser/views/explo import { mainWindow } from 'vs/base/browser/window'; import { IExplorerFileContribution, explorerFileContribRegistry } from 'vs/workbench/contrib/files/browser/explorerFileContrib'; +import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService'; + import { IHoverWidget } from 'vs/base/browser/ui/hover/updatableHoverWidget'; export class ExplorerDelegate implements IListVirtualDelegate { - -@@ -1079,7 +1080,8 @@ export class FileDragAndDrop implements +@@ -1080,7 +1081,8 @@ export class FileDragAndDrop implements @IConfigurationService private configurationService: IConfigurationService, @IInstantiationService private instantiationService: IInstantiationService, @IWorkspaceEditingService private workspaceEditingService: IWorkspaceEditingService, @@ -300,7 +300,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/files/browser/views/explo ) { const updateDropEnablement = (e: IConfigurationChangeEvent | undefined) => { if (!e || e.affectsConfiguration('explorer.enableDragAndDrop')) { -@@ -1304,15 +1306,17 @@ export class FileDragAndDrop implements +@@ -1305,15 +1307,17 @@ export class FileDragAndDrop implements // External file DND (Import/Upload file) if (data instanceof NativeDragAndDropData) { diff --git a/patches/getting-started.diff b/patches/getting-started.diff index a42cb629664b..9ff002403310 100644 --- a/patches/getting-started.diff +++ b/patches/getting-started.diff @@ -14,8 +14,8 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/welcomeGettingStarted/bro * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ --import { $, Dimension, addDisposableListener, append, clearNode, getWindow, reset } from 'vs/base/browser/dom'; -+import { $, Dimension, addDisposableListener, append, clearNode, getWindow, reset, prepend } from 'vs/base/browser/dom'; +-import { $, Dimension, addDisposableListener, append, clearNode, reset } from 'vs/base/browser/dom'; ++import { $, Dimension, addDisposableListener, append, clearNode, reset, prepend } from 'vs/base/browser/dom'; import { renderFormattedText } from 'vs/base/browser/formattedTextRenderer'; import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent'; import { Button } from 'vs/base/browser/ui/button/button'; @@ -28,7 +28,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/welcomeGettingStarted/bro import { IEditorOpenContext, IEditorSerializer } from 'vs/workbench/common/editor'; import { IWebviewElement, IWebviewService } from 'vs/workbench/contrib/webview/browser/webview'; import 'vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedColors'; -@@ -801,6 +801,72 @@ export class GettingStartedPage extends +@@ -813,6 +813,72 @@ export class GettingStartedPage extends $('p.subtitle.description', {}, localize({ key: 'gettingStarted.editingEvolved', comment: ['Shown as subtitle on the Welcome page.'] }, "Editing evolved")) ); @@ -101,7 +101,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/welcomeGettingStarted/bro const leftColumn = $('.categories-column.categories-column-left', {},); const rightColumn = $('.categories-column.categories-column-right', {},); -@@ -837,6 +903,9 @@ export class GettingStartedPage extends +@@ -884,6 +950,9 @@ export class GettingStartedPage extends recentList.setLimit(5); reset(leftColumn, startList.getDomElement(), recentList.getDomElement()); } @@ -135,7 +135,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/web.api.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/browser/web.api.ts +++ code-server/lib/vscode/src/vs/workbench/browser/web.api.ts -@@ -292,6 +292,11 @@ export interface IWorkbenchConstructionO +@@ -299,6 +299,11 @@ export interface IWorkbenchConstructionO */ readonly isEnabledFileUploads?: boolean @@ -189,7 +189,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts /* ----- server setup ----- */ -@@ -104,6 +105,7 @@ export interface ServerParsedArgs { +@@ -105,6 +106,7 @@ export interface ServerParsedArgs { 'disable-file-downloads'?: boolean; 'disable-file-uploads'?: boolean; 'locale'?: string @@ -201,7 +201,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -336,6 +336,7 @@ export class WebClientServer { +@@ -338,6 +338,7 @@ export class WebClientServer { userDataPath: this._environmentService.userDataPath, isEnabledFileDownloads: !this._environmentService.args['disable-file-downloads'], isEnabledFileUploads: !this._environmentService.args['disable-file-uploads'], @@ -217,12 +217,12 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/contextkeys.ts import { Disposable } from 'vs/base/common/lifecycle'; import { IContextKeyService, IContextKey, setConstant as setConstantContextKey } from 'vs/platform/contextkey/common/contextkey'; import { InputFocusedContext, IsMacContext, IsLinuxContext, IsWindowsContext, IsWebContext, IsMacNativeContext, IsDevelopmentContext, IsIOSContext, ProductQualityContext, IsMobileContext } from 'vs/platform/contextkey/common/contextkeys'; --import { SplitEditorsVertically, InEditorZenModeContext, ActiveEditorCanRevertContext, ActiveEditorGroupLockedContext, ActiveEditorCanSplitInGroupContext, SideBySideEditorActiveContext, AuxiliaryBarVisibleContext, SideBarVisibleContext, PanelAlignmentContext, PanelMaximizedContext, PanelVisibleContext, ActiveEditorContext, EditorsVisibleContext, TextCompareEditorVisibleContext, TextCompareEditorActiveContext, ActiveEditorGroupEmptyContext, EmbedderIdentifierContext, EditorTabsVisibleContext, IsMainEditorCenteredLayoutContext, ActiveEditorGroupIndexContext, ActiveEditorGroupLastContext, ActiveEditorReadonlyContext, MainEditorAreaVisibleContext, ActiveEditorAvailableEditorIdsContext, DirtyWorkingCopiesContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, IsMainWindowFullscreenContext, OpenFolderWorkspaceSupportContext, RemoteNameContext, VirtualWorkspaceContext, WorkbenchStateContext, WorkspaceFolderCountContext, PanelPositionContext, TemporaryWorkspaceContext, ActiveEditorCanToggleReadonlyContext, applyAvailableEditorIds, TitleBarVisibleContext, TitleBarStyleContext, MultipleEditorGroupsContext, IsAuxiliaryWindowFocusedContext, ActiveCompareEditorOriginalWriteableContext, IsEnabledFileDownloads, IsEnabledFileUploads } from 'vs/workbench/common/contextkeys'; -+import { SplitEditorsVertically, InEditorZenModeContext, ActiveEditorCanRevertContext, ActiveEditorGroupLockedContext, ActiveEditorCanSplitInGroupContext, SideBySideEditorActiveContext, AuxiliaryBarVisibleContext, SideBarVisibleContext, PanelAlignmentContext, PanelMaximizedContext, PanelVisibleContext, ActiveEditorContext, EditorsVisibleContext, TextCompareEditorVisibleContext, TextCompareEditorActiveContext, ActiveEditorGroupEmptyContext, EmbedderIdentifierContext, EditorTabsVisibleContext, IsMainEditorCenteredLayoutContext, ActiveEditorGroupIndexContext, ActiveEditorGroupLastContext, ActiveEditorReadonlyContext, MainEditorAreaVisibleContext, ActiveEditorAvailableEditorIdsContext, DirtyWorkingCopiesContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, IsMainWindowFullscreenContext, OpenFolderWorkspaceSupportContext, RemoteNameContext, VirtualWorkspaceContext, WorkbenchStateContext, WorkspaceFolderCountContext, PanelPositionContext, TemporaryWorkspaceContext, ActiveEditorCanToggleReadonlyContext, applyAvailableEditorIds, TitleBarVisibleContext, TitleBarStyleContext, MultipleEditorGroupsContext, IsAuxiliaryWindowFocusedContext, ActiveCompareEditorOriginalWriteableContext, IsEnabledFileDownloads, IsEnabledFileUploads, IsEnabledCoderGettingStarted, } from 'vs/workbench/common/contextkeys'; +-import { SplitEditorsVertically, InEditorZenModeContext, ActiveEditorCanRevertContext, ActiveEditorGroupLockedContext, ActiveEditorCanSplitInGroupContext, SideBySideEditorActiveContext, AuxiliaryBarVisibleContext, SideBarVisibleContext, PanelAlignmentContext, PanelMaximizedContext, PanelVisibleContext, ActiveEditorContext, EditorsVisibleContext, TextCompareEditorVisibleContext, TextCompareEditorActiveContext, ActiveEditorGroupEmptyContext, EmbedderIdentifierContext, EditorTabsVisibleContext, IsMainEditorCenteredLayoutContext, ActiveEditorGroupIndexContext, ActiveEditorGroupLastContext, ActiveEditorReadonlyContext, MainEditorAreaVisibleContext, ActiveEditorAvailableEditorIdsContext, DirtyWorkingCopiesContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, IsMainWindowFullscreenContext, OpenFolderWorkspaceSupportContext, RemoteNameContext, VirtualWorkspaceContext, WorkbenchStateContext, WorkspaceFolderCountContext, PanelPositionContext, TemporaryWorkspaceContext, ActiveEditorCanToggleReadonlyContext, applyAvailableEditorIds, TitleBarVisibleContext, TitleBarStyleContext, MultipleEditorGroupsContext, IsAuxiliaryWindowFocusedContext, ActiveCompareEditorCanSwapContext, IsEnabledFileDownloads, IsEnabledFileUploads } from 'vs/workbench/common/contextkeys'; ++import { SplitEditorsVertically, InEditorZenModeContext, ActiveEditorCanRevertContext, ActiveEditorGroupLockedContext, ActiveEditorCanSplitInGroupContext, SideBySideEditorActiveContext, AuxiliaryBarVisibleContext, SideBarVisibleContext, PanelAlignmentContext, PanelMaximizedContext, PanelVisibleContext, ActiveEditorContext, EditorsVisibleContext, TextCompareEditorVisibleContext, TextCompareEditorActiveContext, ActiveEditorGroupEmptyContext, EmbedderIdentifierContext, EditorTabsVisibleContext, IsMainEditorCenteredLayoutContext, ActiveEditorGroupIndexContext, ActiveEditorGroupLastContext, ActiveEditorReadonlyContext, MainEditorAreaVisibleContext, ActiveEditorAvailableEditorIdsContext, DirtyWorkingCopiesContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, IsMainWindowFullscreenContext, OpenFolderWorkspaceSupportContext, RemoteNameContext, VirtualWorkspaceContext, WorkbenchStateContext, WorkspaceFolderCountContext, PanelPositionContext, TemporaryWorkspaceContext, ActiveEditorCanToggleReadonlyContext, applyAvailableEditorIds, TitleBarVisibleContext, TitleBarStyleContext, MultipleEditorGroupsContext, IsAuxiliaryWindowFocusedContext, ActiveCompareEditorCanSwapContext, IsEnabledFileDownloads, IsEnabledFileUploads, IsEnabledCoderGettingStarted, } from 'vs/workbench/common/contextkeys'; import { TEXT_DIFF_EDITOR_ID, EditorInputCapabilities, SIDE_BY_SIDE_EDITOR_ID, EditorResourceAccessor, SideBySideEditor } from 'vs/workbench/common/editor'; import { trackFocus, addDisposableListener, EventType, onDidRegisterWindow, getActiveWindow } from 'vs/base/browser/dom'; import { preferredSideBySideGroupDirection, GroupDirection, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService'; -@@ -227,6 +227,7 @@ export class WorkbenchContextKeysHandler +@@ -228,6 +228,7 @@ export class WorkbenchContextKeysHandler // code-server IsEnabledFileDownloads.bindTo(this.contextKeyService).set(this.environmentService.isEnabledFileDownloads ?? true) IsEnabledFileUploads.bindTo(this.contextKeyService).set(this.environmentService.isEnabledFileUploads ?? true) diff --git a/patches/integration.diff b/patches/integration.diff index 35a8a17d95b5..d151d79e21dc 100644 --- a/patches/integration.diff +++ b/patches/integration.diff @@ -264,7 +264,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -306,6 +306,7 @@ export class WebClientServer { +@@ -307,6 +307,7 @@ export class WebClientServer { } : undefined; const productConfiguration = >{ diff --git a/patches/local-storage.diff b/patches/local-storage.diff index 60b3011718c4..44d567b5950b 100644 --- a/patches/local-storage.diff +++ b/patches/local-storage.diff @@ -18,9 +18,9 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -327,6 +327,7 @@ export class WebClientServer { - const workbenchWebConfiguration = { +@@ -329,6 +329,7 @@ export class WebClientServer { remoteAuthority, + serverBasePath: this._basePath, webviewEndpoint: vscodeBase + this._staticRoute + '/out/vs/workbench/contrib/webview/browser/pre', + userDataPath: this._environmentService.userDataPath, _wrapWebWorkerExtHostInIframe, @@ -30,7 +30,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/web.api.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/browser/web.api.ts +++ code-server/lib/vscode/src/vs/workbench/browser/web.api.ts -@@ -277,6 +277,11 @@ export interface IWorkbenchConstructionO +@@ -284,6 +284,11 @@ export interface IWorkbenchConstructionO */ readonly configurationDefaults?: Record; diff --git a/patches/logout.diff b/patches/logout.diff index 560a0b381f10..a86cd992717c 100644 --- a/patches/logout.diff +++ b/patches/logout.diff @@ -28,7 +28,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts /* ----- server setup ----- */ -@@ -96,6 +97,7 @@ export const serverOptions: OptionDescri +@@ -97,6 +98,7 @@ export const serverOptions: OptionDescri export interface ServerParsedArgs { /* ----- code-server ----- */ 'disable-update-check'?: boolean; @@ -40,7 +40,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -311,6 +311,7 @@ export class WebClientServer { +@@ -312,6 +312,7 @@ export class WebClientServer { codeServerVersion: this._productService.codeServerVersion, rootEndpoint: base, updateEndpoint: !this._environmentService.args['disable-update-check'] ? base + '/update/check' : undefined, diff --git a/patches/marketplace.diff b/patches/marketplace.diff index 073cbb9aa6ef..9f5c9f52dba5 100644 --- a/patches/marketplace.diff +++ b/patches/marketplace.diff @@ -40,8 +40,8 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -113,7 +113,7 @@ export class WebClientServer { - const serverRootPath = getRemoteServerRootPath(_productService); +@@ -114,7 +114,7 @@ export class WebClientServer { + this._staticRoute = `${serverRootPath}/static`; this._callbackRoute = `${serverRootPath}/callback`; - this._webExtensionRoute = `${serverRootPath}/web-extension-resource`; @@ -49,7 +49,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts } /** -@@ -311,14 +311,7 @@ export class WebClientServer { +@@ -312,14 +312,7 @@ export class WebClientServer { codeServerVersion: this._productService.codeServerVersion, rootEndpoint: base, embedderIdentifier: 'server-distro', @@ -69,20 +69,16 @@ Index: code-server/lib/vscode/src/vs/platform/extensionResourceLoader/common/ext =================================================================== --- code-server.orig/lib/vscode/src/vs/platform/extensionResourceLoader/common/extensionResourceLoader.ts +++ code-server/lib/vscode/src/vs/platform/extensionResourceLoader/common/extensionResourceLoader.ts -@@ -16,7 +16,6 @@ import { getServiceMachineId } from 'vs/ - import { IStorageService } from 'vs/platform/storage/common/storage'; - import { TelemetryLevel } from 'vs/platform/telemetry/common/telemetry'; - import { getTelemetryLevel, supportsTelemetry } from 'vs/platform/telemetry/common/telemetryUtils'; --import { getRemoteServerRootPath } from 'vs/platform/remote/common/remoteHosts'; - import { TargetPlatform } from 'vs/platform/extensions/common/extensions'; +@@ -140,9 +140,9 @@ export abstract class AbstractExtensionR + } - const WEB_EXTENSION_RESOURCE_END_POINT = 'web-extension-resource'; -@@ -77,7 +76,7 @@ export abstract class AbstractExtensionR - private readonly _environmentService: IEnvironmentService, - private readonly _configurationService: IConfigurationService, - ) { -- this._webExtensionResourceEndPoint = `${getRemoteServerRootPath(_productService)}/${WEB_EXTENSION_RESOURCE_END_POINT}/`; -+ this._webExtensionResourceEndPoint = `/${WEB_EXTENSION_RESOURCE_END_POINT}/`; - if (_productService.extensionsGallery) { - this._extensionGalleryResourceUrlTemplate = _productService.extensionsGallery.resourceUrlTemplate; - this._extensionGalleryAuthority = this._extensionGalleryResourceUrlTemplate ? this._getExtensionGalleryAuthority(URI.parse(this._extensionGalleryResourceUrlTemplate)) : undefined; + protected _isWebExtensionResourceEndPoint(uri: URI): boolean { +- const uriPath = uri.path, serverRootPath = RemoteAuthorities.getServerRootPath(); +- // test if the path starts with the server root path followed by the web extension resource end point segment +- return uriPath.startsWith(serverRootPath) && uriPath.startsWith(WEB_EXTENSION_RESOURCE_END_POINT_SEGMENT, serverRootPath.length); ++ const uriPath = uri.path; ++ // test if the path starts with the web extension resource end point segment ++ return uriPath.startsWith(WEB_EXTENSION_RESOURCE_END_POINT_SEGMENT); + } + + } diff --git a/patches/proxy-uri.diff b/patches/proxy-uri.diff index 358cdc6cc08a..eb05cf12c9b5 100644 --- a/patches/proxy-uri.diff +++ b/patches/proxy-uri.diff @@ -42,16 +42,16 @@ Index: code-server/lib/vscode/src/vs/platform/remote/browser/remoteAuthorityReso =================================================================== --- code-server.orig/lib/vscode/src/vs/platform/remote/browser/remoteAuthorityResolverService.ts +++ code-server/lib/vscode/src/vs/platform/remote/browser/remoteAuthorityResolverService.ts -@@ -34,7 +34,7 @@ export class RemoteAuthorityResolverServ - isWorkbenchOptionsBasedResolution: boolean, +@@ -35,7 +35,7 @@ export class RemoteAuthorityResolverServ connectionToken: Promise | string | undefined, resourceUriProvider: ((uri: URI) => URI) | undefined, + serverBasePath: string | undefined, - @IProductService productService: IProductService, + @IProductService private readonly productService: IProductService, @ILogService private readonly _logService: ILogService, ) { super(); -@@ -85,9 +85,14 @@ export class RemoteAuthorityResolverServ +@@ -86,9 +86,14 @@ export class RemoteAuthorityResolverServ const connectionToken = await Promise.resolve(this._connectionTokens.get(authority) || this._connectionToken); performance.mark(`code/didResolveConnectionToken/${authorityPrefix}`); this._logService.info(`Resolved connection token (${authorityPrefix}) after ${sw.elapsed()} ms`); @@ -71,7 +71,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -312,6 +312,7 @@ export class WebClientServer { +@@ -313,6 +313,7 @@ export class WebClientServer { rootEndpoint: base, updateEndpoint: !this._environmentService.args['disable-update-check'] ? base + '/update/check' : undefined, logoutEndpoint: this._environmentService.args['auth'] && this._environmentService.args['auth'] !== "none" ? base + '/logout' : undefined, diff --git a/patches/service-worker.diff b/patches/service-worker.diff index 2da74097dce8..6da55abc4c0a 100644 --- a/patches/service-worker.diff +++ b/patches/service-worker.diff @@ -54,7 +54,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -313,6 +313,10 @@ export class WebClientServer { +@@ -314,6 +314,10 @@ export class WebClientServer { updateEndpoint: !this._environmentService.args['disable-update-check'] ? base + '/update/check' : undefined, logoutEndpoint: this._environmentService.args['auth'] && this._environmentService.args['auth'] !== "none" ? base + '/logout' : undefined, proxyEndpointTemplate: process.env.VSCODE_PROXY_URI ?? base + '/proxy/{{port}}/', diff --git a/patches/sourcemaps.diff b/patches/sourcemaps.diff index 95f4019fdeb7..366566f17a8d 100644 --- a/patches/sourcemaps.diff +++ b/patches/sourcemaps.diff @@ -32,7 +32,7 @@ Index: code-server/lib/vscode/build/gulpfile.reh.js let version = packageJson.version; const quality = product.quality; -@@ -433,7 +432,7 @@ function tweakProductForServerWeb(produc +@@ -439,7 +438,7 @@ function tweakProductForServerWeb(produc const minifyTask = task.define(`minify-vscode-${type}`, task.series( optimizeTask, util.rimraf(`out-vscode-${type}-min`), diff --git a/patches/telemetry.diff b/patches/telemetry.diff index c7f8a709a39d..eaa284bc9f2c 100644 --- a/patches/telemetry.diff +++ b/patches/telemetry.diff @@ -90,7 +90,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -317,6 +317,7 @@ export class WebClientServer { +@@ -318,6 +318,7 @@ export class WebClientServer { scope: vscodeBase + '/', path: base + '/_static/out/browser/serviceWorker.js', }, diff --git a/patches/update-check.diff b/patches/update-check.diff index 0152c16c9eec..e67d6a7a12e9 100644 --- a/patches/update-check.diff +++ b/patches/update-check.diff @@ -105,7 +105,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -310,6 +310,7 @@ export class WebClientServer { +@@ -311,6 +311,7 @@ export class WebClientServer { const productConfiguration = >{ codeServerVersion: this._productService.codeServerVersion, rootEndpoint: base, @@ -126,7 +126,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts /* ----- server setup ----- */ -@@ -92,6 +94,8 @@ export const serverOptions: OptionDescri +@@ -93,6 +95,8 @@ export const serverOptions: OptionDescri }; export interface ServerParsedArgs { diff --git a/patches/webview.diff b/patches/webview.diff index 068a55b23487..4c324ce25147 100644 --- a/patches/webview.diff +++ b/patches/webview.diff @@ -54,10 +54,10 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -323,6 +323,7 @@ export class WebClientServer { - +@@ -325,6 +325,7 @@ export class WebClientServer { const workbenchWebConfiguration = { remoteAuthority, + serverBasePath: this._basePath, + webviewEndpoint: vscodeBase + this._staticRoute + '/out/vs/workbench/contrib/webview/browser/pre', _wrapWebWorkerExtHostInIframe, developmentOptions: { enableSmokeTestDriver: this._environmentService.args['enable-smoke-test-driver'] ? true : undefined, logLevel: this._logService.getLevel() }, @@ -70,12 +70,12 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index -+ content="default-src 'none'; script-src 'sha256-GMHk6lNeQWxwh8HIKzVGfpEl6cvmfTYJeAVaOdbHfSc=' 'self'; frame-src 'self'; style-src 'unsafe-inline';"> +- content="default-src 'none'; script-src 'sha256-bQPwjO6bLiyf6v9eDVtAI67LrfonA1w49aFkRXBy4/g=' 'self'; frame-src 'self'; style-src 'unsafe-inline';"> ++ content="default-src 'none'; script-src 'sha256-R3BsSkqy7qFbvWSmwr7WqT1eg6Sq4zSe0uIlrUQ4EKE=' 'self'; frame-src 'self'; style-src 'unsafe-inline';"> Date: Sat, 6 Apr 2024 03:51:01 +0530 Subject: [PATCH 019/497] Update Node to 18.18.2 (#6676) --- .node-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.node-version b/.node-version index 4a1f488b6c3b..87ec8842b158 100644 --- a/.node-version +++ b/.node-version @@ -1 +1 @@ -18.17.1 +18.18.2 From 1c5bfeeb99743a98507a0b9c837b8f735994c341 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Apr 2024 14:21:27 -0800 Subject: [PATCH 020/497] chore: bump tj-actions/changed-files from 42 to 44 (#6741) Bumps [tj-actions/changed-files](https://github.com/tj-actions/changed-files) from 42 to 44. - [Release notes](https://github.com/tj-actions/changed-files/releases) - [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md) - [Commits](https://github.com/tj-actions/changed-files/compare/v42...v44) --- updated-dependencies: - dependency-name: tj-actions/changed-files dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 9832f8fdf988..ea64fda88658 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -45,7 +45,7 @@ jobs: - name: Get changed files id: changed-files - uses: tj-actions/changed-files@v42 + uses: tj-actions/changed-files@v44 with: files: | docs/** @@ -76,7 +76,7 @@ jobs: - name: Get changed files id: changed-files - uses: tj-actions/changed-files@v42 + uses: tj-actions/changed-files@v44 with: files: | ci/helm-chart/** @@ -107,7 +107,7 @@ jobs: - name: Get changed files id: changed-files - uses: tj-actions/changed-files@v42 + uses: tj-actions/changed-files@v44 with: files: | **/*.ts @@ -163,7 +163,7 @@ jobs: - name: Get changed files id: changed-files - uses: tj-actions/changed-files@v42 + uses: tj-actions/changed-files@v44 with: files: | **/*.ts From 1abb2ee567d8081d9e8935e1193b2e31f0d8e834 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Apr 2024 14:21:48 -0800 Subject: [PATCH 021/497] chore: bump softprops/action-gh-release from 1 to 2 (#6740) Bumps [softprops/action-gh-release](https://github.com/softprops/action-gh-release) from 1 to 2. - [Release notes](https://github.com/softprops/action-gh-release/releases) - [Changelog](https://github.com/softprops/action-gh-release/blob/master/CHANGELOG.md) - [Commits](https://github.com/softprops/action-gh-release/compare/v1...v2) --- updated-dependencies: - dependency-name: softprops/action-gh-release dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/release.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index daff2605a92d..e84713f39e03 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -95,7 +95,7 @@ jobs: VERSION: ${{ env.VERSION }} run: yarn package - - uses: softprops/action-gh-release@v1 + - uses: softprops/action-gh-release@v2 with: draft: true discussion_category_name: "📣 Announcements" @@ -191,7 +191,7 @@ jobs: VERSION: ${{ env.VERSION }} run: npm run package ${npm_config_arch} - - uses: softprops/action-gh-release@v1 + - uses: softprops/action-gh-release@v2 with: draft: true discussion_category_name: "📣 Announcements" @@ -253,7 +253,7 @@ jobs: VERSION: ${{ env.VERSION }} run: yarn package - - uses: softprops/action-gh-release@v1 + - uses: softprops/action-gh-release@v2 with: draft: true discussion_category_name: "📣 Announcements" @@ -270,7 +270,7 @@ jobs: with: name: npm-release-package - - uses: softprops/action-gh-release@v1 + - uses: softprops/action-gh-release@v2 with: draft: true discussion_category_name: "📣 Announcements" From 93f9dfcb1d5579c22467f72da07073437d8284c8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Apr 2024 14:22:07 -0800 Subject: [PATCH 022/497] chore: bump i18next from 23.8.2 to 23.10.1 (#6738) Bumps [i18next](https://github.com/i18next/i18next) from 23.8.2 to 23.10.1. - [Release notes](https://github.com/i18next/i18next/releases) - [Changelog](https://github.com/i18next/i18next/blob/master/CHANGELOG.md) - [Commits](https://github.com/i18next/i18next/compare/v23.8.2...v23.10.1) --- updated-dependencies: - dependency-name: i18next dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 22c3d77ca92c..318aff909e91 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1849,9 +1849,9 @@ https-proxy-agent@^7.0.2, https-proxy-agent@^7.0.3: debug "4" i18next@^23.5.1: - version "23.8.2" - resolved "https://registry.yarnpkg.com/i18next/-/i18next-23.8.2.tgz#f3ff6ea929e0927d9717f0ed195ae46d05919900" - integrity sha512-Z84zyEangrlERm0ZugVy4bIt485e/H8VecGUZkZWrH7BDePG6jT73QdL9EA1tRTTVVMpry/MgWIP1FjEn0DRXA== + version "23.10.1" + resolved "https://registry.yarnpkg.com/i18next/-/i18next-23.10.1.tgz#217ce93b75edbe559ac42be00a20566b53937df6" + integrity sha512-NDiIzFbcs3O9PXpfhkjyf7WdqFn5Vq6mhzhtkXzj51aOcNuPNcTwuYNuXCpHsanZGHlHKL35G7huoFeVic1hng== dependencies: "@babel/runtime" "^7.23.2" From 71780f6f00ebf611fa6b3a8d49f0cab3041fdc62 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Apr 2024 14:22:30 -0800 Subject: [PATCH 023/497] chore: bump typescript from 5.3.3 to 5.4.3 (#6736) Bumps [typescript](https://github.com/Microsoft/TypeScript) from 5.3.3 to 5.4.3. - [Release notes](https://github.com/Microsoft/TypeScript/releases) - [Changelog](https://github.com/microsoft/TypeScript/blob/main/azure-pipelines.release.yml) - [Commits](https://github.com/Microsoft/TypeScript/compare/v5.3.3...v5.4.3) --- updated-dependencies: - dependency-name: typescript dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 318aff909e91..3d7edac140f6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3387,9 +3387,9 @@ typed-array-length@^1.0.4: is-typed-array "^1.1.9" typescript@^5.2.2: - version "5.3.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.3.tgz#b3ce6ba258e72e6305ba66f5c9b452aaee3ffe37" - integrity sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw== + version "5.4.3" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.3.tgz#5c6fedd4c87bee01cd7a528a30145521f8e0feff" + integrity sha512-KrPd3PKaCLr78MalgiwJnA25Nm8HAmdwN3mYUYZgG/wizIo9EainNVQI9/yDavtVFRN2h3k8uf3GLHuhDMgEHg== unbox-primitive@^1.0.2: version "1.0.2" From 30d343c0bd10587de6d59ce72a1f37dd1a9d91d8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Apr 2024 14:22:50 -0800 Subject: [PATCH 024/497] chore: bump follow-redirects from 1.15.4 to 1.15.6 (#6725) Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.4 to 1.15.6. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.15.4...v1.15.6) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 3d7edac140f6..228fdc205e9c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1524,9 +1524,9 @@ flatted@^3.2.7: integrity sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ== follow-redirects@^1.0.0: - version "1.15.4" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.4.tgz#cdc7d308bf6493126b17ea2191ea0ccf3e535adf" - integrity sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw== + version "1.15.6" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b" + integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA== for-each@^0.3.3: version "0.3.3" From ebd79ed958ca862c019de5952b271ffcde802d7f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Apr 2024 14:24:18 -0800 Subject: [PATCH 025/497] chore: bump aquasecurity/trivy-action from 0.18.0 to 0.19.0 (#6739) Bumps [aquasecurity/trivy-action](https://github.com/aquasecurity/trivy-action) from 0.18.0 to 0.19.0. - [Release notes](https://github.com/aquasecurity/trivy-action/releases) - [Commits](https://github.com/aquasecurity/trivy-action/compare/062f2592684a31eb3aa050cc61e7ca1451cecd3d...d710430a6722f083d3b36b8339ff66b32f22ee55) --- updated-dependencies: - dependency-name: aquasecurity/trivy-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/security.yaml | 2 +- .github/workflows/trivy-docker.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/security.yaml b/.github/workflows/security.yaml index 864287fb5b41..f381cf3330b2 100644 --- a/.github/workflows/security.yaml +++ b/.github/workflows/security.yaml @@ -55,7 +55,7 @@ jobs: fetch-depth: 0 - name: Run Trivy vulnerability scanner in repo mode - uses: aquasecurity/trivy-action@062f2592684a31eb3aa050cc61e7ca1451cecd3d + uses: aquasecurity/trivy-action@d710430a6722f083d3b36b8339ff66b32f22ee55 with: scan-type: "fs" scan-ref: "." diff --git a/.github/workflows/trivy-docker.yaml b/.github/workflows/trivy-docker.yaml index a15cd26a3eda..9b26df3f13bd 100644 --- a/.github/workflows/trivy-docker.yaml +++ b/.github/workflows/trivy-docker.yaml @@ -51,7 +51,7 @@ jobs: uses: actions/checkout@v4 - name: Run Trivy vulnerability scanner in image mode - uses: aquasecurity/trivy-action@062f2592684a31eb3aa050cc61e7ca1451cecd3d + uses: aquasecurity/trivy-action@d710430a6722f083d3b36b8339ff66b32f22ee55 with: image-ref: "docker.io/codercom/code-server:latest" ignore-unfixed: true From bec6ab2678e82358bd6eefde4eff76612e6eb2b9 Mon Sep 17 00:00:00 2001 From: Asher Date: Fri, 5 Apr 2024 16:31:58 -0800 Subject: [PATCH 026/497] Fix masking exit code Addresses the part of #6367 that we can fix. --- src/node/main.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/node/main.ts b/src/node/main.ts index 4ae3ce5e503e..4a53de9d84cc 100644 --- a/src/node/main.ts +++ b/src/node/main.ts @@ -52,12 +52,17 @@ export const runCodeCli = async (args: DefaultedArgs): Promise => { try { await spawnCli(await toCodeArgs(args)) + // Rather than have the caller handle errors and exit, spawnCli will exit + // itself. Additionally, it does this on a timeout set to 0. So, try + // waiting for VS Code to exit before giving up and doing it ourselves. + await new Promise((r) => setTimeout(r, 1000)) + logger.warn("Code never exited") + process.exit(0) } catch (error: any) { + // spawnCli catches all errors, but just in case that changes. logger.error("Got error from Code", error) process.exit(1) } - - process.exit(0) } export const openInExistingInstance = async (args: DefaultedArgs, socketPath: string): Promise => { From 73e615da4e78fa28b71331e4c31913099aa887b4 Mon Sep 17 00:00:00 2001 From: Asher Date: Fri, 5 Apr 2024 17:22:51 -0800 Subject: [PATCH 027/497] Fix extension installation test This throws now that the exit is non-zero. --- test/integration/installExtension.test.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/test/integration/installExtension.test.ts b/test/integration/installExtension.test.ts index 3c4432b73925..5986c964e912 100644 --- a/test/integration/installExtension.test.ts +++ b/test/integration/installExtension.test.ts @@ -13,9 +13,10 @@ describe("--install-extension", () => { }) it("should use EXTENSIONS_GALLERY when set", async () => { const extName = "author.extension" - const { stderr } = await runCodeServerCommand([...setupFlags, "--install-extension", extName], { - EXTENSIONS_GALLERY: "{}", - }) - expect(stderr).toMatch("No extension gallery service configured") + await expect( + runCodeServerCommand([...setupFlags, "--install-extension", extName], { + EXTENSIONS_GALLERY: "{}", + }), + ).rejects.toThrow("No extension gallery service configured") }) }) From deebb213451febe11701356a83304853a0fac18a Mon Sep 17 00:00:00 2001 From: Asher Date: Mon, 8 Apr 2024 13:22:32 -0800 Subject: [PATCH 028/497] Release 4.23.0 --- CHANGELOG.md | 15 +++++++++++++++ ci/helm-chart/Chart.yaml | 4 ++-- ci/helm-chart/values.yaml | 2 +- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 40bc8303279c..f2fe64bd9fe1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,21 @@ Code v99.99.999 ## Unreleased +## [4.23.0](https://github.com/coder/code-server/releases/tag/v4.23.0) - 2024-04-08 + +Code v1.88.0 + +## Changed + +- Updated to Code 1.88.0. +- Updated Node to 18.18.2. + +## Fixed + +- Fix masking the exit code when failing to install extensions on the command + line outside the integrated terminal. Installing extensions inside the + integrated terminal still masks the exit code and is an upstream bug. + ## [4.22.1](https://github.com/coder/code-server/releases/tag/v4.22.1) - 2024-03-14 Code v1.87.2 diff --git a/ci/helm-chart/Chart.yaml b/ci/helm-chart/Chart.yaml index a72b5c8cad7f..f95e4648c464 100644 --- a/ci/helm-chart/Chart.yaml +++ b/ci/helm-chart/Chart.yaml @@ -15,9 +15,9 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 3.18.1 +version: 3.19.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 4.22.1 +appVersion: 4.23.0 diff --git a/ci/helm-chart/values.yaml b/ci/helm-chart/values.yaml index 71d38f2bf5e0..98b9c78b20f1 100644 --- a/ci/helm-chart/values.yaml +++ b/ci/helm-chart/values.yaml @@ -6,7 +6,7 @@ replicaCount: 1 image: repository: codercom/code-server - tag: '4.22.1' + tag: '4.23.0' pullPolicy: Always # Specifies one or more secrets to be used when pulling images from a From 9a28bc29dbddb6886dfe03dc1c31320249a901ce Mon Sep 17 00:00:00 2001 From: Olivier Benz Date: Tue, 16 Apr 2024 01:00:21 +0200 Subject: [PATCH 029/497] Update Code to 1.88.1 (#6754) * Update Code to 1.88.1 * Install node-gyp --------- Co-authored-by: Asher --- .github/workflows/build.yaml | 5 +++++ lib/vscode | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index ea64fda88658..b29eacde89d8 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -229,6 +229,11 @@ jobs: with: node-version-file: .node-version + # node-gyp is missing in (at least) npm 9.8.1. + # TODO: Remove once we update to npm>=10? + - name: Install node-gyp + run: npm install -g node-gyp + - name: Fetch dependencies from cache id: cache-node-modules uses: actions/cache@v4 diff --git a/lib/vscode b/lib/vscode index 5c3e652f63e7..e170252f7626 160000 --- a/lib/vscode +++ b/lib/vscode @@ -1 +1 @@ -Subproject commit 5c3e652f63e798a5ac2f31ffd0d863669328dc4c +Subproject commit e170252f762678dec6ca2cc69aba1570769a5d39 From 4bc9956537f5f381bfff74ba23e920f5520ec847 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Apr 2024 16:25:04 -0800 Subject: [PATCH 030/497] chore: bump tar from 6.1.11 to 6.2.1 in /test (#6752) Bumps [tar](https://github.com/isaacs/node-tar) from 6.1.11 to 6.2.1. - [Release notes](https://github.com/isaacs/node-tar/releases) - [Changelog](https://github.com/isaacs/node-tar/blob/main/CHANGELOG.md) - [Commits](https://github.com/isaacs/node-tar/compare/v6.1.11...v6.2.1) --- updated-dependencies: - dependency-name: tar dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- test/yarn.lock | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/test/yarn.lock b/test/yarn.lock index 263d023163c2..8fdcafaa82be 100644 --- a/test/yarn.lock +++ b/test/yarn.lock @@ -2626,6 +2626,11 @@ minipass@^3.0.0: dependencies: yallist "^4.0.0" +minipass@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d" + integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ== + minizlib@^2.1.1: version "2.1.2" resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" @@ -3293,13 +3298,13 @@ symbol-tree@^3.2.4: integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== tar@^6.1.11, tar@^6.1.9: - version "6.1.11" - resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621" - integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA== + version "6.2.1" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.1.tgz#717549c541bc3c2af15751bea94b1dd068d4b03a" + integrity sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A== dependencies: chownr "^2.0.0" fs-minipass "^2.0.0" - minipass "^3.0.0" + minipass "^5.0.0" minizlib "^2.1.1" mkdirp "^1.0.3" yallist "^4.0.0" From f81fe3030a1020a8de503c123215f0d941d9c177 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Apr 2024 16:25:27 -0800 Subject: [PATCH 031/497] chore: bump tar from 6.2.0 to 6.2.1 (#6753) Bumps [tar](https://github.com/isaacs/node-tar) from 6.2.0 to 6.2.1. - [Release notes](https://github.com/isaacs/node-tar/releases) - [Changelog](https://github.com/isaacs/node-tar/blob/main/CHANGELOG.md) - [Commits](https://github.com/isaacs/node-tar/compare/v6.2.0...v6.2.1) --- updated-dependencies: - dependency-name: tar dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 228fdc205e9c..213440515687 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3240,9 +3240,9 @@ tapable@^2.2.0: integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ== tar@^6.1.11: - version "6.2.0" - resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.0.tgz#b14ce49a79cb1cd23bc9b016302dea5474493f73" - integrity sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ== + version "6.2.1" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.1.tgz#717549c541bc3c2af15751bea94b1dd068d4b03a" + integrity sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A== dependencies: chownr "^2.0.0" fs-minipass "^2.0.0" From 3eb9cf7a088fe59666a50df10a828b5cd199d442 Mon Sep 17 00:00:00 2001 From: Asher Date: Mon, 15 Apr 2024 16:32:52 -0800 Subject: [PATCH 032/497] Update express and qs It does not appear we have to pin qs anymore. --- package.json | 10 +- yarn.lock | 408 +++++++++++++++++++++++++++++---------------------- 2 files changed, 238 insertions(+), 180 deletions(-) diff --git a/package.json b/package.json index 73e3e5da752f..6f9a77b9e8e3 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ "compression": "^1.7.4", "cookie-parser": "^1.4.6", "env-paths": "^2.2.1", - "express": "5.0.0-alpha.8", + "express": "5.0.0-beta.3", "http-proxy": "^1.18.1", "httpolyglot": "^0.1.2", "i18next": "^23.5.1", @@ -79,7 +79,7 @@ "limiter": "^2.1.0", "pem": "^1.14.8", "proxy-agent": "^6.3.1", - "qs": "6.9.7", + "qs": "6.12.1", "rotating-file-stream": "^3.1.1", "safe-buffer": "^5.2.1", "safe-compare": "^1.1.4", @@ -88,11 +88,7 @@ "xdg-basedir": "^4.0.0" }, "resolutions": { - "@types/node": "^18.0.0", - "qs": "6.9.7" - }, - "overrides": { - "qs": "6.9.7" + "@types/node": "^18.0.0" }, "bin": { "code-server": "out/node/entry.js" diff --git a/yarn.lock b/yarn.lock index 213440515687..05da0278c415 100644 --- a/yarn.lock +++ b/yarn.lock @@ -463,7 +463,7 @@ abbrev@1: resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== -accepts@~1.3.5, accepts@~1.3.7: +accepts@~1.3.5, accepts@~1.3.8: version "1.3.8" resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e" integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw== @@ -569,10 +569,10 @@ array-buffer-byte-length@^1.0.0: call-bind "^1.0.2" is-array-buffer "^3.0.1" -array-flatten@2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.1.tgz#426bb9da84090c1838d812c8150af20a8331e296" - integrity sha512-Ylfqm/V1V/VKGazsJeRDZ31wV9gdNeK3ZsvwbYBAVSNgH8o8CMLfdx/ofn9pnMVsvTMfvC3yfcBYzGpD1vxnlw== +array-flatten@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-3.0.0.tgz#6428ca2ee52c7b823192ec600fa3ed2f157cd541" + integrity sha512-zPMVc3ZYlGLNk4mpK1NzP2wg0ml9t7fUgDsayR5Y5rSzxQilzR9FGu/EH2jQOcKSAeAfWeylyW8juy3OkWRvNA== array-includes@^3.1.7: version "3.1.7" @@ -675,21 +675,22 @@ basic-ftp@^5.0.2: resolved "https://registry.yarnpkg.com/basic-ftp/-/basic-ftp-5.0.3.tgz#b14c0fe8111ce001ec913686434fe0c2fb461228" integrity sha512-QHX8HLlncOLpy54mh+k/sWIFd0ThmRqwe9ZjELybGZK+tZ8rUb9VO0saKJUROTbE+KhzDUT7xziGpGrW8Kmd+g== -body-parser@1.19.0: - version "1.19.0" - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a" - integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw== +body-parser@2.0.0-beta.2: + version "2.0.0-beta.2" + resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-2.0.0-beta.2.tgz#46081eb83ab83e436c2bce8fa71464b2385d61fb" + integrity sha512-oxdqeGYQcO5ovwwkC1A89R0Mf0v3+7smTVh0chGfzDeiK37bg5bYNtXDy3Nmzn6CShoIYk5+nHTyBoSZIWwnCA== dependencies: - bytes "3.1.0" - content-type "~1.0.4" - debug "2.6.9" - depd "~1.1.2" - http-errors "1.7.2" - iconv-lite "0.4.24" - on-finished "~2.3.0" - qs "6.7.0" - raw-body "2.4.0" - type-is "~1.6.17" + bytes "3.1.2" + content-type "~1.0.5" + debug "3.1.0" + destroy "1.2.0" + http-errors "2.0.0" + iconv-lite "0.5.2" + on-finished "2.4.1" + qs "6.11.0" + raw-body "3.0.0-beta.1" + type-is "~1.6.18" + unpipe "1.0.0" brace-expansion@^1.1.7: version "1.1.11" @@ -736,10 +737,10 @@ bytes@3.0.0: resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" integrity sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw== -bytes@3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" - integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg== +bytes@3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5" + integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg== call-bind@^1.0.0, call-bind@^1.0.2: version "1.0.2" @@ -749,6 +750,17 @@ call-bind@^1.0.0, call-bind@^1.0.2: function-bind "^1.1.1" get-intrinsic "^1.0.2" +call-bind@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.7.tgz#06016599c40c56498c18769d2730be242b6fa3b9" + integrity sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w== + dependencies: + es-define-property "^1.0.0" + es-errors "^1.3.0" + function-bind "^1.1.2" + get-intrinsic "^1.2.4" + set-function-length "^1.2.1" + callsites@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" @@ -848,14 +860,14 @@ console-control-strings@^1.0.0, console-control-strings@^1.1.0: resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ== -content-disposition@0.5.3: - version "0.5.3" - resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd" - integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g== +content-disposition@0.5.4: + version "0.5.4" + resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe" + integrity sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ== dependencies: - safe-buffer "5.1.2" + safe-buffer "5.2.1" -content-type@~1.0.4: +content-type@~1.0.4, content-type@~1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918" integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA== @@ -873,16 +885,16 @@ cookie-signature@1.0.6: resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ== -cookie@0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba" - integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg== - cookie@0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1" integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA== +cookie@0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.6.0.tgz#2798b04b071b0ecbff0dbb62a505a8efa4e19051" + integrity sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw== + create-require@^1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333" @@ -949,6 +961,15 @@ define-data-property@^1.0.1: gopd "^1.0.1" has-property-descriptors "^1.0.0" +define-data-property@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.4.tgz#894dc141bb7d3060ae4366f6a0107e68fbe48c5e" + integrity sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A== + dependencies: + es-define-property "^1.0.0" + es-errors "^1.3.0" + gopd "^1.0.1" + define-properties@^1.1.3, define-properties@^1.1.4, define-properties@^1.2.0: version "1.2.1" resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.1.tgz#10781cc616eb951a80a034bafcaa7377f6af2b6c" @@ -972,15 +993,15 @@ delegates@^1.0.0: resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ== -depd@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" - integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ== +depd@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df" + integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== -destroy@~1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" - integrity sha512-3NdhDuEXnfun/z7x9GOElY49LoqVHoGScmOKwmxhsS8N5Y+Z8KyPPDnaSzqWgYt/ji4mqwfTS34Htrk0zPIXVg== +destroy@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015" + integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg== detect-libc@^2.0.0: version "2.0.2" @@ -1148,6 +1169,18 @@ es-abstract@^1.22.1: unbox-primitive "^1.0.2" which-typed-array "^1.1.11" +es-define-property@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.0.tgz#c7faefbdff8b2696cf5f46921edfb77cc4ba3845" + integrity sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ== + dependencies: + get-intrinsic "^1.2.4" + +es-errors@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f" + integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw== + es-set-tostringtag@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz#338d502f6f674301d710b80c8592de8a15f09cd8" @@ -1387,39 +1420,41 @@ eventemitter3@^4.0.0: resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw== -express@5.0.0-alpha.8: - version "5.0.0-alpha.8" - resolved "https://registry.yarnpkg.com/express/-/express-5.0.0-alpha.8.tgz#b9dd3a568eab791e3391db47f9e6ab91e61b13fe" - integrity sha512-PL8wTLgaNOiq7GpXt187/yWHkrNSfbr4H0yy+V0fpqJt5wpUzBi9DprAkwGKBFOqWHylJ8EyPy34V5u9YArfng== +express@5.0.0-beta.3: + version "5.0.0-beta.3" + resolved "https://registry.yarnpkg.com/express/-/express-5.0.0-beta.3.tgz#be38300eaafadee3de6ce756aaa34f52c0472da6" + integrity sha512-e7Qizw4gMBVe1Ky2oNi5C1h6oS8aWDcY2yYxvRMy5aMc6t2aqobuHpQRfR3LRC9NAW/c6081SeGWMGBorLXePg== dependencies: - accepts "~1.3.7" - array-flatten "2.1.1" - body-parser "1.19.0" - content-disposition "0.5.3" + accepts "~1.3.8" + array-flatten "3.0.0" + body-parser "2.0.0-beta.2" + content-disposition "0.5.4" content-type "~1.0.4" - cookie "0.4.0" + cookie "0.6.0" cookie-signature "1.0.6" debug "3.1.0" - depd "~1.1.2" + depd "2.0.0" encodeurl "~1.0.2" escape-html "~1.0.3" etag "~1.8.1" - finalhandler "~1.1.2" + finalhandler "1.2.0" fresh "0.5.2" + http-errors "2.0.0" merge-descriptors "1.0.1" methods "~1.1.2" - on-finished "~2.3.0" + mime-types "~2.1.34" + on-finished "2.4.1" parseurl "~1.3.3" path-is-absolute "1.0.1" - proxy-addr "~2.0.5" - qs "6.7.0" + proxy-addr "~2.0.7" + qs "6.11.0" range-parser "~1.2.1" - router "2.0.0-alpha.1" - safe-buffer "5.1.2" - send "0.17.1" - serve-static "1.14.1" - setprototypeof "1.1.1" - statuses "~1.5.0" + router "2.0.0-beta.2" + safe-buffer "5.2.1" + send "1.0.0-beta.2" + serve-static "2.0.0-beta.2" + setprototypeof "1.2.0" + statuses "2.0.1" type-is "~1.6.18" utils-merge "1.0.1" vary "~1.1.2" @@ -1488,17 +1523,17 @@ fill-range@^7.0.1: dependencies: to-regex-range "^5.0.1" -finalhandler@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" - integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA== +finalhandler@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.2.0.tgz#7d23fe5731b207b4640e4fcd00aec1f9207a7b32" + integrity sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg== dependencies: debug "2.6.9" encodeurl "~1.0.2" escape-html "~1.0.3" - on-finished "~2.3.0" + on-finished "2.4.1" parseurl "~1.3.3" - statuses "~1.5.0" + statuses "2.0.1" unpipe "~1.0.0" find-up@^5.0.0: @@ -1631,6 +1666,17 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@ has-proto "^1.0.1" has-symbols "^1.0.3" +get-intrinsic@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.4.tgz#e385f5a4b5227d449c3eabbad05494ef0abbeadd" + integrity sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ== + dependencies: + es-errors "^1.3.0" + function-bind "^1.1.2" + has-proto "^1.0.1" + has-symbols "^1.0.3" + hasown "^2.0.0" + get-symbol-description@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6" @@ -1742,6 +1788,13 @@ has-property-descriptors@^1.0.0: dependencies: get-intrinsic "^1.1.1" +has-property-descriptors@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz#963ed7d071dc7bf5f084c5bfbe0d1b6222586854" + integrity sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg== + dependencies: + es-define-property "^1.0.0" + has-proto@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.1.tgz#1885c1305538958aff469fef37937c22795408e0" @@ -1788,27 +1841,16 @@ htmlparser2@^7.2.0: domutils "^2.8.0" entities "^3.0.1" -http-errors@1.7.2: - version "1.7.2" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f" - integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg== - dependencies: - depd "~1.1.2" - inherits "2.0.3" - setprototypeof "1.1.1" - statuses ">= 1.5.0 < 2" - toidentifier "1.0.0" - -http-errors@~1.7.2: - version "1.7.3" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06" - integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw== +http-errors@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3" + integrity sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ== dependencies: - depd "~1.1.2" + depd "2.0.0" inherits "2.0.4" - setprototypeof "1.1.1" - statuses ">= 1.5.0 < 2" - toidentifier "1.0.0" + setprototypeof "1.2.0" + statuses "2.0.1" + toidentifier "1.0.1" http-proxy-agent@^7.0.0, http-proxy-agent@^7.0.1: version "7.0.2" @@ -1855,10 +1897,10 @@ i18next@^23.5.1: dependencies: "@babel/runtime" "^7.23.2" -iconv-lite@0.4.24: - version "0.4.24" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" - integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== +iconv-lite@0.5.2: + version "0.5.2" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.5.2.tgz#af6d628dccfb463b7364d97f715e4b74b8c8c2b8" + integrity sha512-kERHXvpSaB4aU3eANwidg79K8FlrN77m8G9V+0vOR3HYaRifrlwMEpT7ZBJqLSEIHnEgJTHcWK82wwLwwKwtag== dependencies: safer-buffer ">= 2.1.2 < 3" @@ -1893,11 +1935,6 @@ inherits@2, inherits@2.0.4, inherits@^2.0.3: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== -inherits@2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" - integrity sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw== - internal-slot@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.5.tgz#f2a2ee21f668f8627a4667f309dc0f4fb6674986" @@ -2042,6 +2079,11 @@ is-plain-obj@^2.0.0: resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287" integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA== +is-promise@4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-4.0.0.tgz#42ff9f84206c1991d26debf520dd5c01042dd2f3" + integrity sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ== + is-regex@^1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" @@ -2431,11 +2473,6 @@ mime-types@~2.1.24, mime-types@~2.1.34: dependencies: mime-db "1.52.0" -mime@1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" - integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== - minimatch@9.0.3: version "9.0.3" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825" @@ -2485,17 +2522,12 @@ ms@2.0.0: resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A== -ms@2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a" - integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg== - ms@2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== -ms@^2.1.1: +ms@2.1.3, ms@^2.1.1: version "2.1.3" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== @@ -2559,6 +2591,11 @@ object-inspect@^1.12.3, object-inspect@^1.9.0: resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.3.tgz#ba62dffd67ee256c8c086dfae69e016cd1f198b9" integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g== +object-inspect@^1.13.1: + version "1.13.1" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.1.tgz#b96c6109324ccfef6b12216a956ca4dc2ff94bc2" + integrity sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ== + object-keys@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" @@ -2602,10 +2639,10 @@ object.values@^1.1.7: define-properties "^1.2.0" es-abstract "^1.22.1" -on-finished@~2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" - integrity sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww== +on-finished@2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f" + integrity sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg== dependencies: ee-first "1.1.1" @@ -2694,7 +2731,7 @@ parse-entities@^2.0.0: is-decimal "^1.0.0" is-hexadecimal "^1.0.0" -parseurl@~1.3.2, parseurl@~1.3.3: +parseurl@~1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== @@ -2719,10 +2756,10 @@ path-parse@^1.0.7: resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== -path-to-regexp@0.1.7: - version "0.1.7" - resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" - integrity sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ== +path-to-regexp@3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-3.2.0.tgz#fa7877ecbc495c601907562222453c43cc204a5f" + integrity sha512-jczvQbCUS7XmS7o+y1aEO9OBVFeZBQ1MDSEqmO7xSoPgOPoowY/SxLpZ6Vh97/8qHZOteiCKb7gkG9gA2ZUxJA== path-type@^4.0.0: version "4.0.0" @@ -2776,7 +2813,7 @@ prettier@^3.0.3: resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.2.4.tgz#4723cadeac2ce7c9227de758e5ff9b14e075f283" integrity sha512-FWu1oLHKCrtpO1ypU6J0SbK2d9Ckwysq6bHj/uaCP26DxrPpppCLQRGVuqAxSTvhF00AcvDRyYrLNW7ocBhFFQ== -proxy-addr@~2.0.5: +proxy-addr@~2.0.7: version "2.0.7" resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg== @@ -2808,10 +2845,19 @@ punycode@^2.1.0: resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f" integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA== -qs@6.7.0, qs@6.9.7: - version "6.9.7" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.7.tgz#4610846871485e1e048f44ae3b94033f0e675afe" - integrity sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw== +qs@6.11.0: + version "6.11.0" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a" + integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q== + dependencies: + side-channel "^1.0.4" + +qs@6.12.1: + version "6.12.1" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.12.1.tgz#39422111ca7cbdb70425541cba20c7d7b216599a" + integrity sha512-zWmv4RSuB9r2mYQw3zxQuHWeU+42aKi1wWig/j4ele4ygELZ7PEO6MM7rim9oAQH2A5MWfsAVf/jPvTPgCbvUQ== + dependencies: + side-channel "^1.0.6" queue-microtask@^1.2.2: version "1.2.3" @@ -2823,14 +2869,14 @@ range-parser@~1.2.1: resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== -raw-body@2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332" - integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q== +raw-body@3.0.0-beta.1: + version "3.0.0-beta.1" + resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-3.0.0-beta.1.tgz#b202356e7adb97dd5f35604aac992a6ccce3bbfd" + integrity sha512-XlSTHr67bCjSo5aOfAnN3x507zGvi3unF65BW57limYkc2ws/XB0mLUtJvvP7JGFeSPsYrlCv1ZrPGh0cwDxPQ== dependencies: - bytes "3.1.0" - http-errors "1.7.2" - iconv-lite "0.4.24" + bytes "3.1.2" + http-errors "2.0.0" + iconv-lite "0.5.2" unpipe "1.0.0" readable-stream@^3.6.0: @@ -2943,17 +2989,17 @@ rotating-file-stream@^3.1.1: resolved "https://registry.yarnpkg.com/rotating-file-stream/-/rotating-file-stream-3.2.1.tgz#1d0a536d75884eedc3a677f5b0871fdc69f97d22" integrity sha512-n2B18CJb+n2VA5Tdle+1NP2toEcRv68CjAOBjHmwcyswNwMVsrN3gVRZ9ymH3sapaiGY8jc9OhhV5b6I5rAeiA== -router@2.0.0-alpha.1: - version "2.0.0-alpha.1" - resolved "https://registry.yarnpkg.com/router/-/router-2.0.0-alpha.1.tgz#9188213b972215e03ef830e0ac77837870085f6d" - integrity sha512-fz/T/qLkJM6RTtbqGqA1+uZ88ejqJoPyKeJAeXPYjebA7HzV/UyflH4gXWqW/Y6SERnp4kDwNARjqy6se3PcOw== +router@2.0.0-beta.2: + version "2.0.0-beta.2" + resolved "https://registry.yarnpkg.com/router/-/router-2.0.0-beta.2.tgz#c8da30dea93ecb628d28116b63ad83f5021b07af" + integrity sha512-ascmzrv4IAB64SpWzFwYOA+jz6PaUbrzHLPsQrPjQ3uQTL2qlhwY9S2sRvvBMgUISQptQG457jcWWcWqtwrbag== dependencies: - array-flatten "2.1.1" - debug "3.1.0" + array-flatten "3.0.0" + is-promise "4.0.0" methods "~1.1.2" - parseurl "~1.3.2" - path-to-regexp "0.1.7" - setprototypeof "1.1.0" + parseurl "~1.3.3" + path-to-regexp "3.2.0" + setprototypeof "1.2.0" utils-merge "1.0.1" run-parallel@^1.1.9: @@ -2978,7 +3024,7 @@ safe-buffer@5.1.2: resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== -safe-buffer@^5.2.1, safe-buffer@~5.2.0: +safe-buffer@5.2.1, safe-buffer@^5.2.1, safe-buffer@~5.2.0: version "5.2.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== @@ -3016,40 +3062,51 @@ semver@^7.0.0, semver@^7.3.5, semver@^7.5.4: dependencies: lru-cache "^6.0.0" -send@0.17.1: - version "0.17.1" - resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8" - integrity sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg== +send@1.0.0-beta.2, send@^1.0.0-beta.2: + version "1.0.0-beta.2" + resolved "https://registry.yarnpkg.com/send/-/send-1.0.0-beta.2.tgz#1b6d727648acd1564d4095cd7f618b7b9474ce3e" + integrity sha512-k1yHu/FNK745PULKdsGpQ+bVSXYNwSk+bWnYzbxGZbt5obZc0JKDVANsCRuJD1X/EG15JtP9eZpwxkhUxIYEcg== dependencies: - debug "2.6.9" - depd "~1.1.2" - destroy "~1.0.4" + debug "3.1.0" + destroy "1.2.0" encodeurl "~1.0.2" escape-html "~1.0.3" etag "~1.8.1" fresh "0.5.2" - http-errors "~1.7.2" - mime "1.6.0" - ms "2.1.1" - on-finished "~2.3.0" + http-errors "2.0.0" + mime-types "~2.1.34" + ms "2.1.3" + on-finished "2.4.1" range-parser "~1.2.1" - statuses "~1.5.0" + statuses "2.0.1" -serve-static@1.14.1: - version "1.14.1" - resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9" - integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg== +serve-static@2.0.0-beta.2: + version "2.0.0-beta.2" + resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-2.0.0-beta.2.tgz#9c0ca60e21a6332d18ade72db7cf7a96b27db474" + integrity sha512-Ge718g4UJjzYoXFEGLY/VLSuTHp0kQcUV65QA98J8d3XREsVIHu53GBh9NWjDy4u2xwsSwRzu9nu7Q+b4o6Xyw== dependencies: encodeurl "~1.0.2" escape-html "~1.0.3" parseurl "~1.3.3" - send "0.17.1" + send "^1.0.0-beta.2" set-blocking@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw== +set-function-length@^1.2.1: + version "1.2.2" + resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.2.tgz#aac72314198eaed975cf77b2c3b6b880695e5449" + integrity sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg== + dependencies: + define-data-property "^1.1.4" + es-errors "^1.3.0" + function-bind "^1.1.2" + get-intrinsic "^1.2.4" + gopd "^1.0.1" + has-property-descriptors "^1.0.2" + set-function-name@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.1.tgz#12ce38b7954310b9f61faa12701620a0c882793a" @@ -3059,15 +3116,10 @@ set-function-name@^2.0.0: functions-have-names "^1.2.3" has-property-descriptors "^1.0.0" -setprototypeof@1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656" - integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ== - -setprototypeof@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683" - integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw== +setprototypeof@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" + integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw== sh-syntax@^0.4.1: version "0.4.1" @@ -3097,6 +3149,16 @@ side-channel@^1.0.4: get-intrinsic "^1.0.2" object-inspect "^1.9.0" +side-channel@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.6.tgz#abd25fb7cd24baf45466406b1096b7831c9215f2" + integrity sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA== + dependencies: + call-bind "^1.0.7" + es-errors "^1.3.0" + get-intrinsic "^1.2.4" + object-inspect "^1.13.1" + signal-exit@^3.0.0: version "3.0.7" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" @@ -3141,10 +3203,10 @@ split@^1.0.1: dependencies: through "2" -"statuses@>= 1.5.0 < 2", statuses@~1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" - integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA== +statuses@2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63" + integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ== stream-combiner@^0.2.2: version "0.2.2" @@ -3268,10 +3330,10 @@ to-regex-range@^5.0.1: dependencies: is-number "^7.0.0" -toidentifier@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" - integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw== +toidentifier@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35" + integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA== tr46@~0.0.3: version "0.0.3" @@ -3339,7 +3401,7 @@ type-fest@^0.20.2: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== -type-is@~1.6.17, type-is@~1.6.18: +type-is@~1.6.18: version "1.6.18" resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g== From 417c1f36cb17322bdb4bcfc83d424269d45c36a3 Mon Sep 17 00:00:00 2001 From: Asher Date: Mon, 15 Apr 2024 16:37:01 -0800 Subject: [PATCH 033/497] Release 4.23.1 --- CHANGELOG.md | 8 ++++++++ ci/helm-chart/Chart.yaml | 4 ++-- ci/helm-chart/values.yaml | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f2fe64bd9fe1..8e4fd418229e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,14 @@ Code v99.99.999 ## Unreleased +## [4.23.1](https://github.com/coder/code-server/releases/tag/v4.23.1) - 2024-04-15 + +Code v1.88.1 + +## Changed + +- Updated to Code 1.88.1. + ## [4.23.0](https://github.com/coder/code-server/releases/tag/v4.23.0) - 2024-04-08 Code v1.88.0 diff --git a/ci/helm-chart/Chart.yaml b/ci/helm-chart/Chart.yaml index f95e4648c464..fcdf1a1a7371 100644 --- a/ci/helm-chart/Chart.yaml +++ b/ci/helm-chart/Chart.yaml @@ -15,9 +15,9 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 3.19.0 +version: 3.19.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 4.23.0 +appVersion: 4.23.1 diff --git a/ci/helm-chart/values.yaml b/ci/helm-chart/values.yaml index 98b9c78b20f1..ebac62746d9d 100644 --- a/ci/helm-chart/values.yaml +++ b/ci/helm-chart/values.yaml @@ -6,7 +6,7 @@ replicaCount: 1 image: repository: codercom/code-server - tag: '4.23.0' + tag: '4.23.1' pullPolicy: Always # Specifies one or more secrets to be used when pulling images from a From b8d830b826faff8bb564ac99b3e1145bfae943dd Mon Sep 17 00:00:00 2001 From: Asher Date: Tue, 16 Apr 2024 09:50:36 -0800 Subject: [PATCH 034/497] Update path syntax for Express It seems that * matches a literal * now, so we have to use a regular expression. Parentheses around a parameter no longer works (it causes it to match on the parameter name literally) and I am not sure why we had it anyway as it had no effect previously. Matching with a leading / does not appear to work either, but we do not need the leading / anyway since the proxy logic was changed to use the whole path. Consequently it will never be / anymore from what I can tell but I left that check in just in case. I turned it into a named parameter as well, because that seems better. --- src/node/routes/domainProxy.ts | 4 ++-- src/node/routes/index.ts | 8 ++++---- src/node/routes/pathProxy.ts | 2 +- src/node/routes/vscode.ts | 4 ++-- test/unit/node/proxy.test.ts | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/node/routes/domainProxy.ts b/src/node/routes/domainProxy.ts index 8f0537acc483..fc0f91daddf8 100644 --- a/src/node/routes/domainProxy.ts +++ b/src/node/routes/domainProxy.ts @@ -53,7 +53,7 @@ const maybeProxy = (req: Request): string | undefined => { return undefined } -router.all("*", async (req, res, next) => { +router.all(/.*/, async (req, res, next) => { const port = maybeProxy(req) if (!port) { return next() @@ -97,7 +97,7 @@ router.all("*", async (req, res, next) => { export const wsRouter = WsRouter() -wsRouter.ws("*", async (req, _, next) => { +wsRouter.ws(/.*/, async (req, _, next) => { const port = maybeProxy(req) if (!port) { return next() diff --git a/src/node/routes/index.ts b/src/node/routes/index.ts index a235c4252118..9c494a546432 100644 --- a/src/node/routes/index.ts +++ b/src/node/routes/index.ts @@ -109,21 +109,21 @@ export const register = async (app: App, args: DefaultedArgs): Promise { + app.router.all("/proxy/:port/:path(.*)?", async (req, res) => { await pathProxy.proxy(req, res) }) - app.wsRouter.get("/proxy/(:port)(/*)?", async (req) => { + app.wsRouter.get("/proxy/:port/:path(.*)?", async (req) => { await pathProxy.wsProxy(req as pluginapi.WebsocketRequest) }) // These two routes pass through the path directly. // So the proxied app must be aware it is running // under /absproxy// - app.router.all("/absproxy/(:port)(/*)?", async (req, res) => { + app.router.all("/absproxy/:port/:path(.*)?", async (req, res) => { await pathProxy.proxy(req, res, { passthroughPath: true, }) }) - app.wsRouter.get("/absproxy/(:port)(/*)?", async (req) => { + app.wsRouter.get("/absproxy/:port/:path(.*)?", async (req) => { await pathProxy.wsProxy(req as pluginapi.WebsocketRequest, { passthroughPath: true, }) diff --git a/src/node/routes/pathProxy.ts b/src/node/routes/pathProxy.ts index a2281eab035f..7f69bcf9eb17 100644 --- a/src/node/routes/pathProxy.ts +++ b/src/node/routes/pathProxy.ts @@ -22,7 +22,7 @@ export async function proxy( if (!(await authenticated(req))) { // If visiting the root (/:port only) redirect to the login page. - if (!req.params[0] || req.params[0] === "/") { + if (!req.params.path || req.params.path === "/") { const to = self(req) return redirect(req, res, "login", { to: to !== "/" ? to : undefined, diff --git a/src/node/routes/vscode.ts b/src/node/routes/vscode.ts index b9ee2c13ba7b..c4f2808a58a8 100644 --- a/src/node/routes/vscode.ts +++ b/src/node/routes/vscode.ts @@ -205,8 +205,8 @@ export class CodeServerRouteWrapper { this.router.get("/", this.ensureCodeServerLoaded, this.$root) this.router.get("/manifest.json", this.manifest) this.router.post("/mint-key", this.mintKey) - this.router.all("*", ensureAuthenticated, this.ensureCodeServerLoaded, this.$proxyRequest) - this._wsRouterWrapper.ws("*", ensureOrigin, ensureAuthenticated, this.ensureCodeServerLoaded, this.$proxyWebsocket) + this.router.all(/.*/, ensureAuthenticated, this.ensureCodeServerLoaded, this.$proxyRequest) + this._wsRouterWrapper.ws(/.*/, ensureOrigin, ensureAuthenticated, this.ensureCodeServerLoaded, this.$proxyWebsocket) } dispose() { diff --git a/test/unit/node/proxy.test.ts b/test/unit/node/proxy.test.ts index fc347ff8326d..9e8017e37700 100644 --- a/test/unit/node/proxy.test.ts +++ b/test/unit/node/proxy.test.ts @@ -199,7 +199,7 @@ describe("proxy", () => { }) it("should proxy non-ASCII", async () => { - e.get("*", (req, res) => { + e.get(/.*/, (req, res) => { res.json("ほげ") }) codeServer = await integration.setup(["--auth=none"], "") @@ -211,7 +211,7 @@ describe("proxy", () => { it("should not double-encode query variables", async () => { const spy = jest.fn() - e.get("*", (req, res) => { + e.get(/.*/, (req, res) => { spy([req.originalUrl, req.query]) res.end() }) From 323a1f3234c902159ae4e8ac74e276076c67cd59 Mon Sep 17 00:00:00 2001 From: Asher Date: Tue, 16 Apr 2024 10:46:25 -0800 Subject: [PATCH 035/497] Only require unsafe-perm if you are root Remove it from the docs, as the error message should be sufficient and it seems weird to recommend unsafe-perm by default. --- ci/build/npm-postinstall.sh | 37 ++++++++++++++++++++++++++----------- docs/android.md | 2 +- docs/npm.md | 8 ++++---- docs/termux.md | 2 +- 4 files changed, 32 insertions(+), 17 deletions(-) diff --git a/ci/build/npm-postinstall.sh b/ci/build/npm-postinstall.sh index 0dac63b3ee48..0f99a044950d 100755 --- a/ci/build/npm-postinstall.sh +++ b/ci/build/npm-postinstall.sh @@ -51,6 +51,18 @@ symlink_bin_script() { cd "$oldpwd" } +command_exists() { + if [ ! "$1" ]; then return 1; fi + command -v "$@" > /dev/null +} + +is_root() { + if command_exists id && [ "$(id -u)" = 0 ]; then + return 0 + fi + return 1 +} + OS="$(os)" main() { @@ -75,17 +87,20 @@ main() { exit 1 fi - case "${npm_config_user_agent-}" in npm*) - # We are running under npm. - if [ "${npm_config_unsafe_perm-}" != "true" ]; then - echo "Please pass --unsafe-perm to npm to install code-server" - echo "Otherwise the postinstall script does not have permissions to run" - echo "See https://docs.npmjs.com/misc/config#unsafe-perm" - echo "See https://stackoverflow.com/questions/49084929/npm-sudo-global-installation-unsafe-perm" - exit 1 - fi - ;; - esac + # Under npm, if we are running as root, we need --unsafe-perm otherwise + # post-install scripts will not have sufficient permissions to do their thing. + if is_root; then + case "${npm_config_user_agent-}" in npm*) + if [ "${npm_config_unsafe_perm-}" != "true" ]; then + echo "Please pass --unsafe-perm to npm to install code-server" + echo "Otherwise post-install scripts will not have permissions to run" + echo "See https://docs.npmjs.com/misc/config#unsafe-perm" + echo "See https://stackoverflow.com/questions/49084929/npm-sudo-global-installation-unsafe-perm" + exit 1 + fi + ;; + esac + fi if ! vscode_install; then echo "You may not have the required dependencies to build the native modules." diff --git a/docs/android.md b/docs/android.md index 9479276e0928..8107be873da8 100644 --- a/docs/android.md +++ b/docs/android.md @@ -18,7 +18,7 @@ nvm install 18 nvm use 18 ``` -8. Install code-server globally on device with: `npm install --global code-server --unsafe-perm` +8. Install code-server globally on device with: `npm install --global code-server` 9. Run code-server with `code-server` 10. Access on localhost:8080 in your browser diff --git a/docs/npm.md b/docs/npm.md index 12064e3b0883..4f3341249f98 100644 --- a/docs/npm.md +++ b/docs/npm.md @@ -92,7 +92,7 @@ Installing code-server requires all of the [prerequisites for VS Code developmen Next, install code-server with: ```bash -npm install --global code-server --unsafe-perm +npm install --global code-server code-server # Now visit http://127.0.0.1:8080. Your password is in ~/.config/code-server/config.yaml ``` @@ -112,7 +112,7 @@ For help and additional troubleshooting, see [#1397](https://github.com/coder/co After adding the dependencies for your OS, install the code-server package globally: ```bash -npm install --global code-server --unsafe-perm +npm install --global code-server code-server # Now visit http://127.0.0.1:8080. Your password is in ~/.config/code-server/config.yaml ``` @@ -144,8 +144,8 @@ To debug installation issues, install with `npm`: ```shell # Uninstall -npm uninstall --global --unsafe-perm code-server > /dev/null 2>&1 +npm uninstall --global code-server > /dev/null 2>&1 # Install with logging -npm install --loglevel verbose --global --unsafe-perm code-server +npm install --loglevel verbose --global code-server ``` diff --git a/docs/termux.md b/docs/termux.md index 491f16a4ab63..d6ea8c7bbb53 100644 --- a/docs/termux.md +++ b/docs/termux.md @@ -70,7 +70,7 @@ code-server --auth none 7. If already installed then use the following command for upgradation. ``` -npm update --global code-server --unsafe-perm +npm update --global code-server ``` ## Upgrade From 3d8d544f89f9ee1254d3374d8e9267f4ee4d75d8 Mon Sep 17 00:00:00 2001 From: Asher Date: Tue, 16 Apr 2024 11:00:33 -0800 Subject: [PATCH 036/497] Refactor VS Code routes to match others --- src/node/routes/index.ts | 10 +- src/node/routes/vscode.ts | 335 ++++++++++++++++++-------------------- 2 files changed, 163 insertions(+), 182 deletions(-) diff --git a/src/node/routes/index.ts b/src/node/routes/index.ts index 9c494a546432..1be3988ca3ad 100644 --- a/src/node/routes/index.ts +++ b/src/node/routes/index.ts @@ -25,7 +25,7 @@ import * as login from "./login" import * as logout from "./logout" import * as pathProxy from "./pathProxy" import * as update from "./update" -import { CodeServerRouteWrapper } from "./vscode" +import * as vscode from "./vscode" /** * Register all routes and middleware. @@ -170,12 +170,10 @@ export const register = async (app: App, args: DefaultedArgs): Promise { @@ -188,6 +186,6 @@ export const register = async (app: App, args: DefaultedArgs): Promise { heart.dispose() pluginApi?.dispose() - vsServerRouteHandler.dispose() + vscode.dispose() } } diff --git a/src/node/routes/vscode.ts b/src/node/routes/vscode.ts index c4f2808a58a8..b8f88a0fc665 100644 --- a/src/node/routes/vscode.ts +++ b/src/node/routes/vscode.ts @@ -14,203 +14,186 @@ import { SocketProxyProvider } from "../socket" import { isFile, loadAMDModule } from "../util" import { Router as WsRouter } from "../wsRouter" +export const router = express.Router() + +export const wsRouter = WsRouter() + /** - * This is the API of Code's web client server. code-server delegates requests - * to Code here. + * The API of VS Code's web client server. code-server delegates requests to VS + * Code here. + * + * @see ../../../lib/vscode/src/vs/server/node/server.main.ts:72 */ -export interface IServerAPI { +export interface IVSCodeServerAPI { handleRequest(req: http.IncomingMessage, res: http.ServerResponse): Promise handleUpgrade(req: http.IncomingMessage, socket: net.Socket): void handleServerError(err: Error): void dispose(): void } -// Types for ../../../lib/vscode/src/vs/server/node/server.main.ts:72. -export type CreateServer = (address: string | net.AddressInfo | null, args: CodeArgs) => Promise - -export class CodeServerRouteWrapper { - /** Assigned in `ensureCodeServerLoaded` */ - private _codeServerMain!: IServerAPI - private _wsRouterWrapper = WsRouter() - private _socketProxyProvider = new SocketProxyProvider() - public router = express.Router() - private mintKeyPromise: Promise | undefined +// See ../../../lib/vscode/src/vs/server/node/server.main.ts:72. +export type CreateServer = (address: string | net.AddressInfo | null, args: CodeArgs) => Promise - public get wsRouter() { - return this._wsRouterWrapper.router - } +// The VS Code server is dynamically loaded in when a request is made to this +// router by `ensureCodeServerLoaded`. +let vscodeServer: IVSCodeServerAPI | undefined - //#region Route Handlers - - private manifest: express.Handler = async (req, res, next) => { - const appName = req.args["app-name"] || "code-server" - res.writeHead(200, { "Content-Type": "application/manifest+json" }) - - return res.end( - replaceTemplates( - req, - JSON.stringify( - { - name: appName, - short_name: appName, - start_url: ".", - display: "fullscreen", - display_override: ["window-controls-overlay"], - description: "Run Code on a remote server.", - icons: [192, 512].map((size) => ({ - src: `{{BASE}}/_static/src/browser/media/pwa-icon-${size}.png`, - type: "image/png", - sizes: `${size}x${size}`, - })), - }, - null, - 2, - ), - ), - ) +/** + * Ensure the VS Code server is loaded. + */ +export const ensureVSCodeLoaded = async ( + req: express.Request, + _: express.Response, + next: express.NextFunction, +): Promise => { + if (vscodeServer) { + return next() } - - private mintKey: express.Handler = async (req, res, next) => { - if (!this.mintKeyPromise) { - this.mintKeyPromise = new Promise(async (resolve) => { - const keyPath = path.join(req.args["user-data-dir"], "serve-web-key-half") - logger.debug(`Reading server web key half from ${keyPath}`) - try { - resolve(await fs.readFile(keyPath)) - return - } catch (error: any) { - if (error.code !== "ENOENT") { - logError(logger, `read ${keyPath}`, error) - } - } - // VS Code wants 256 bits. - const key = crypto.randomBytes(32) - try { - await fs.writeFile(keyPath, key) - } catch (error: any) { - logError(logger, `write ${keyPath}`, error) - } - resolve(key) - }) + // See ../../../lib/vscode/src/vs/server/node/server.main.ts:72. + const createVSServer = await loadAMDModule("vs/server/node/server.main", "createServer") + try { + vscodeServer = await createVSServer(null, { + ...(await toCodeArgs(req.args)), + "without-connection-token": true, + }) + } catch (error) { + logError(logger, "CodeServerRouteWrapper", error) + if (isDevMode) { + return next(new Error((error instanceof Error ? error.message : error) + " (VS Code may still be compiling)")) } - const key = await this.mintKeyPromise - res.end(key) + return next(error) } + return next() +} - private $root: express.Handler = async (req, res, next) => { - const isAuthenticated = await authenticated(req) - const NO_FOLDER_OR_WORKSPACE_QUERY = !req.query.folder && !req.query.workspace - // Ew means the workspace was closed so clear the last folder/workspace. - const FOLDER_OR_WORKSPACE_WAS_CLOSED = req.query.ew - - if (!isAuthenticated) { - const to = self(req) - return redirect(req, res, "login", { - to: to !== "/" ? to : undefined, - }) - } - - if (NO_FOLDER_OR_WORKSPACE_QUERY && !FOLDER_OR_WORKSPACE_WAS_CLOSED) { - const settings = await req.settings.read() - const lastOpened = settings.query || {} - // This flag disables the last opened behavior - const IGNORE_LAST_OPENED = req.args["ignore-last-opened"] - const HAS_LAST_OPENED_FOLDER_OR_WORKSPACE = lastOpened.folder || lastOpened.workspace - const HAS_FOLDER_OR_WORKSPACE_FROM_CLI = req.args._.length > 0 - const to = self(req) - - let folder = undefined - let workspace = undefined - - // Redirect to the last folder/workspace if nothing else is opened. - if (HAS_LAST_OPENED_FOLDER_OR_WORKSPACE && !IGNORE_LAST_OPENED) { - folder = lastOpened.folder - workspace = lastOpened.workspace - } else if (HAS_FOLDER_OR_WORKSPACE_FROM_CLI) { - const lastEntry = path.resolve(req.args._[req.args._.length - 1]) - const entryIsFile = await isFile(lastEntry) - const IS_WORKSPACE_FILE = entryIsFile && path.extname(lastEntry) === ".code-workspace" - - if (IS_WORKSPACE_FILE) { - workspace = lastEntry - } else if (!entryIsFile) { - folder = lastEntry - } - } - - if (folder || workspace) { - return redirect(req, res, to, { - folder, - workspace, - }) - } - } - - // Store the query parameters so we can use them on the next load. This - // also allows users to create functionality around query parameters. - await req.settings.write({ query: req.query }) - - next() - } - - private $proxyRequest: express.Handler = async (req, res, next) => { - this._codeServerMain.handleRequest(req, res) - } - - private $proxyWebsocket = async (req: WebsocketRequest) => { - const wrappedSocket = await this._socketProxyProvider.createProxy(req.ws) - // This should actually accept a duplex stream but it seems Code has not - // been updated to match the Node 16 types so cast for now. There does not - // appear to be any code specific to sockets so this should be fine. - this._codeServerMain.handleUpgrade(req, wrappedSocket as net.Socket) - - req.ws.resume() +router.get("/", ensureVSCodeLoaded, async (req, res, next) => { + const isAuthenticated = await authenticated(req) + const NO_FOLDER_OR_WORKSPACE_QUERY = !req.query.folder && !req.query.workspace + // Ew means the workspace was closed so clear the last folder/workspace. + const FOLDER_OR_WORKSPACE_WAS_CLOSED = req.query.ew + + if (!isAuthenticated) { + const to = self(req) + return redirect(req, res, "login", { + to: to !== "/" ? to : undefined, + }) } - //#endregion - - /** - * Fetches a code server instance asynchronously to avoid an initial memory overhead. - */ - private ensureCodeServerLoaded: express.Handler = async (req, _res, next) => { - if (this._codeServerMain) { - // Already loaded... - return next() + if (NO_FOLDER_OR_WORKSPACE_QUERY && !FOLDER_OR_WORKSPACE_WAS_CLOSED) { + const settings = await req.settings.read() + const lastOpened = settings.query || {} + // This flag disables the last opened behavior + const IGNORE_LAST_OPENED = req.args["ignore-last-opened"] + const HAS_LAST_OPENED_FOLDER_OR_WORKSPACE = lastOpened.folder || lastOpened.workspace + const HAS_FOLDER_OR_WORKSPACE_FROM_CLI = req.args._.length > 0 + const to = self(req) + + let folder = undefined + let workspace = undefined + + // Redirect to the last folder/workspace if nothing else is opened. + if (HAS_LAST_OPENED_FOLDER_OR_WORKSPACE && !IGNORE_LAST_OPENED) { + folder = lastOpened.folder + workspace = lastOpened.workspace + } else if (HAS_FOLDER_OR_WORKSPACE_FROM_CLI) { + const lastEntry = path.resolve(req.args._[req.args._.length - 1]) + const entryIsFile = await isFile(lastEntry) + const IS_WORKSPACE_FILE = entryIsFile && path.extname(lastEntry) === ".code-workspace" + + if (IS_WORKSPACE_FILE) { + workspace = lastEntry + } else if (!entryIsFile) { + folder = lastEntry + } } - // Create the server... - - const { args } = req - - // See ../../../lib/vscode/src/vs/server/node/server.main.ts:72. - const createVSServer = await loadAMDModule("vs/server/node/server.main", "createServer") - - try { - this._codeServerMain = await createVSServer(null, { - ...(await toCodeArgs(args)), - "without-connection-token": true, + if (folder || workspace) { + return redirect(req, res, to, { + folder, + workspace, }) - } catch (error) { - logError(logger, "CodeServerRouteWrapper", error) - if (isDevMode) { - return next(new Error((error instanceof Error ? error.message : error) + " (VS Code may still be compiling)")) - } - return next(error) } - - return next() - } - - constructor() { - this.router.get("/", this.ensureCodeServerLoaded, this.$root) - this.router.get("/manifest.json", this.manifest) - this.router.post("/mint-key", this.mintKey) - this.router.all(/.*/, ensureAuthenticated, this.ensureCodeServerLoaded, this.$proxyRequest) - this._wsRouterWrapper.ws(/.*/, ensureOrigin, ensureAuthenticated, this.ensureCodeServerLoaded, this.$proxyWebsocket) } - dispose() { - this._codeServerMain?.dispose() - this._socketProxyProvider.stop() + // Store the query parameters so we can use them on the next load. This + // also allows users to create functionality around query parameters. + await req.settings.write({ query: req.query }) + + next() +}) + +router.get("/manifest.json", async (req, res) => { + const appName = req.args["app-name"] || "code-server" + res.writeHead(200, { "Content-Type": "application/manifest+json" }) + + return res.end( + replaceTemplates( + req, + JSON.stringify( + { + name: appName, + short_name: appName, + start_url: ".", + display: "fullscreen", + display_override: ["window-controls-overlay"], + description: "Run Code on a remote server.", + icons: [192, 512].map((size) => ({ + src: `{{BASE}}/_static/src/browser/media/pwa-icon-${size}.png`, + type: "image/png", + sizes: `${size}x${size}`, + })), + }, + null, + 2, + ), + ), + ) +}) + +let mintKeyPromise: Promise | undefined +router.post("/mint-key", async (req, res) => { + if (!mintKeyPromise) { + mintKeyPromise = new Promise(async (resolve) => { + const keyPath = path.join(req.args["user-data-dir"], "serve-web-key-half") + logger.debug(`Reading server web key half from ${keyPath}`) + try { + resolve(await fs.readFile(keyPath)) + return + } catch (error: any) { + if (error.code !== "ENOENT") { + logError(logger, `read ${keyPath}`, error) + } + } + // VS Code wants 256 bits. + const key = crypto.randomBytes(32) + try { + await fs.writeFile(keyPath, key) + } catch (error: any) { + logError(logger, `write ${keyPath}`, error) + } + resolve(key) + }) } + const key = await mintKeyPromise + res.end(key) +}) + +router.all(/.*/, ensureAuthenticated, ensureVSCodeLoaded, async (req, res) => { + vscodeServer!.handleRequest(req, res) +}) + +const socketProxyProvider = new SocketProxyProvider() +wsRouter.ws(/.*/, ensureOrigin, ensureAuthenticated, ensureVSCodeLoaded, async (req: WebsocketRequest) => { + const wrappedSocket = await socketProxyProvider.createProxy(req.ws) + // This should actually accept a duplex stream but it seems Code has not + // been updated to match the Node 16 types so cast for now. There does not + // appear to be any code specific to sockets so this should be fine. + vscodeServer!.handleUpgrade(req, wrappedSocket as net.Socket) + + req.ws.resume() +}) + +export function dispose() { + vscodeServer?.dispose() + socketProxyProvider.stop() } From fb2afbd9d62532be3952118adafff3972c63f3bc Mon Sep 17 00:00:00 2001 From: Asher Date: Tue, 16 Apr 2024 11:13:36 -0800 Subject: [PATCH 037/497] Handle undefined body In the latest Express it seems the body is undefined when no data is passed (instead of being empty). --- src/node/http.ts | 4 +- src/node/routes/login.ts | 4 +- src/node/vscodeSocket.ts | 57 ++++++++++++++++------------- test/unit/node/routes/login.test.ts | 7 +--- 4 files changed, 37 insertions(+), 35 deletions(-) diff --git a/src/node/http.ts b/src/node/http.ts index 837e12acfc7d..e0fb3a4caf6b 100644 --- a/src/node/http.ts +++ b/src/node/http.ts @@ -319,8 +319,8 @@ export const getCookieOptions = (req: express.Request): express.CookieOptions => // URL of that page) and the relative path to the root as given to it by the // backend. Using these two we can determine the true absolute root. const url = new URL( - req.query.base || req.body.base || "/", - req.query.href || req.body.href || "http://" + (req.headers.host || "localhost"), + req.query.base || req.body?.base || "/", + req.query.href || req.body?.href || "http://" + (req.headers.host || "localhost"), ) return { domain: getCookieDomain(url.host, req.args["proxy-domain"]), diff --git a/src/node/routes/login.ts b/src/node/routes/login.ts index 73575e8acd71..29d51a59d13b 100644 --- a/src/node/routes/login.ts +++ b/src/node/routes/login.ts @@ -68,8 +68,8 @@ router.get("/", async (req, res) => { res.send(await getRoot(req)) }) -router.post<{}, string, { password: string; base?: string }, { to?: string }>("/", async (req, res) => { - const password = sanitizeString(req.body.password) +router.post<{}, string, { password?: string; base?: string } | undefined, { to?: string }>("/", async (req, res) => { + const password = sanitizeString(req.body?.password) const hashedPasswordFromArgs = req.args["hashed-password"] try { diff --git a/src/node/vscodeSocket.ts b/src/node/vscodeSocket.ts index 68625028bdb3..619a764b0851 100644 --- a/src/node/vscodeSocket.ts +++ b/src/node/vscodeSocket.ts @@ -20,11 +20,11 @@ export interface EditorSessionEntry { } interface DeleteSessionRequest { - socketPath: string + socketPath?: string } interface AddSessionRequest { - entry: EditorSessionEntry + entry?: EditorSessionEntry } interface GetSessionResponse { @@ -40,37 +40,42 @@ export async function makeEditorSessionManagerServer( // eslint-disable-next-line import/no-named-as-default-member router.use(express.json()) - router.get("/session", async (req, res) => { - const filePath = req.query.filePath as string - if (!filePath) { - res.status(HttpCode.BadRequest).send("filePath is required") - return - } - try { - const socketPath = await editorSessionManager.getConnectedSocketPath(filePath) - const response: GetSessionResponse = { socketPath } - res.json(response) - } catch (error: unknown) { - res.status(HttpCode.ServerError).send(error) - } - }) + router.get<{}, GetSessionResponse | string | unknown, undefined, { filePath?: string }>( + "/session", + async (req, res) => { + const filePath = req.query.filePath + if (!filePath) { + res.status(HttpCode.BadRequest).send("filePath is required") + return + } + try { + const socketPath = await editorSessionManager.getConnectedSocketPath(filePath) + const response: GetSessionResponse = { socketPath } + res.json(response) + } catch (error: unknown) { + res.status(HttpCode.ServerError).send(error) + } + }, + ) - router.post("/add-session", async (req, res) => { - const request = req.body as AddSessionRequest - if (!request.entry) { + router.post<{}, string, AddSessionRequest | undefined>("/add-session", async (req, res) => { + const entry = req.body?.entry + if (!entry) { res.status(400).send("entry is required") + return } - editorSessionManager.addSession(request.entry) - res.status(200).send() + editorSessionManager.addSession(entry) + res.status(200).send("session added") }) - router.post("/delete-session", async (req, res) => { - const request = req.body as DeleteSessionRequest - if (!request.socketPath) { + router.post<{}, string, DeleteSessionRequest | undefined>("/delete-session", async (req, res) => { + const socketPath = req.body?.socketPath + if (!socketPath) { res.status(400).send("socketPath is required") + return } - editorSessionManager.deleteSession(request.socketPath) - res.status(200).send() + editorSessionManager.deleteSession(socketPath) + res.status(200).send("session deleted") }) const server = http.createServer(router) diff --git a/test/unit/node/routes/login.test.ts b/test/unit/node/routes/login.test.ts index f2f38fedcf52..2835bad82354 100644 --- a/test/unit/node/routes/login.test.ts +++ b/test/unit/node/routes/login.test.ts @@ -68,13 +68,10 @@ describe("login", () => { } }) - it("should return HTML with 'Missing password' message", async () => { + it("should return 'Missing password' without body", async () => { const resp = await codeServer().fetch("/login", { method: "POST" }) - - expect(resp.status).toBe(200) - const htmlContent = await resp.text() - + expect(resp.status).toBe(200) expect(htmlContent).toContain("Missing password") }) From e6dd7fe228486c8393762c0b53def91689443050 Mon Sep 17 00:00:00 2001 From: Olivier Benz Date: Tue, 7 May 2024 00:14:53 +0200 Subject: [PATCH 038/497] Update Code to 1.89.0 (#6783) --- lib/vscode | 2 +- patches/base-path.diff | 2 +- patches/disable-builtin-ext-update.diff | 2 +- patches/external-file-actions.diff | 8 ++++---- patches/getting-started.diff | 8 ++++---- patches/integration.diff | 2 +- patches/local-storage.diff | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lib/vscode b/lib/vscode index e170252f7626..b58957e67ee1 160000 --- a/lib/vscode +++ b/lib/vscode @@ -1 +1 @@ -Subproject commit e170252f762678dec6ca2cc69aba1570769a5d39 +Subproject commit b58957e67ee1e712cebf466b995adf4c5307b2bd diff --git a/patches/base-path.diff b/patches/base-path.diff index 807af6677f72..49e219cfa89f 100644 --- a/patches/base-path.diff +++ b/patches/base-path.diff @@ -10,7 +10,7 @@ Index: code-server/lib/vscode/src/vs/base/common/network.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/base/common/network.ts +++ code-server/lib/vscode/src/vs/base/common/network.ts -@@ -198,7 +198,9 @@ class RemoteAuthoritiesImpl { +@@ -205,7 +205,9 @@ class RemoteAuthoritiesImpl { return URI.from({ scheme: platform.isWeb ? this._preferredWebSchema : Schemas.vscodeRemoteResource, authority: `${host}:${port}`, diff --git a/patches/disable-builtin-ext-update.diff b/patches/disable-builtin-ext-update.diff index e29a6ad59267..8c88d3263724 100644 --- a/patches/disable-builtin-ext-update.diff +++ b/patches/disable-builtin-ext-update.diff @@ -7,7 +7,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts +++ code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts -@@ -283,6 +283,10 @@ export class Extension implements IExten +@@ -284,6 +284,10 @@ export class Extension implements IExten if (this.type === ExtensionType.System && this.productService.quality === 'stable') { return false; } diff --git a/patches/external-file-actions.diff b/patches/external-file-actions.diff index 768d74a05cbb..46fa4cc03080 100644 --- a/patches/external-file-actions.diff +++ b/patches/external-file-actions.diff @@ -27,7 +27,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/web.api.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/browser/web.api.ts +++ code-server/lib/vscode/src/vs/workbench/browser/web.api.ts -@@ -289,6 +289,16 @@ export interface IWorkbenchConstructionO +@@ -303,6 +303,16 @@ export interface IWorkbenchConstructionO */ readonly userDataPath?: string @@ -173,7 +173,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/files/browser/fileActions import { IsWebContext } from 'vs/platform/contextkey/common/contextkeys'; import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation'; import { ThemeIcon } from 'vs/base/common/themables'; -@@ -550,13 +550,16 @@ MenuRegistry.appendMenuItem(MenuId.Explo +@@ -553,13 +553,16 @@ MenuRegistry.appendMenuItem(MenuId.Explo id: DOWNLOAD_COMMAND_ID, title: DOWNLOAD_LABEL }, @@ -197,7 +197,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/files/browser/fileActions ) })); -@@ -568,6 +571,7 @@ MenuRegistry.appendMenuItem(MenuId.Explo +@@ -571,6 +574,7 @@ MenuRegistry.appendMenuItem(MenuId.Explo title: UPLOAD_LABEL, }, when: ContextKeyExpr.and( @@ -287,7 +287,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/files/browser/views/explo import { mainWindow } from 'vs/base/browser/window'; import { IExplorerFileContribution, explorerFileContribRegistry } from 'vs/workbench/contrib/files/browser/explorerFileContrib'; +import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService'; - import { IHoverWidget } from 'vs/base/browser/ui/hover/updatableHoverWidget'; + import type { IHoverWidget } from 'vs/base/browser/ui/hover/hover'; export class ExplorerDelegate implements IListVirtualDelegate { @@ -1080,7 +1081,8 @@ export class FileDragAndDrop implements diff --git a/patches/getting-started.diff b/patches/getting-started.diff index 9ff002403310..e278c62b2aea 100644 --- a/patches/getting-started.diff +++ b/patches/getting-started.diff @@ -19,7 +19,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/welcomeGettingStarted/bro import { renderFormattedText } from 'vs/base/browser/formattedTextRenderer'; import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent'; import { Button } from 'vs/base/browser/ui/button/button'; -@@ -55,7 +55,7 @@ import { IRecentFolder, IRecentWorkspace +@@ -54,7 +54,7 @@ import { IRecentFolder, IRecentWorkspace import { OpenRecentAction } from 'vs/workbench/browser/actions/windowActions'; import { OpenFileFolderAction, OpenFolderAction, OpenFolderViaWorkspaceAction } from 'vs/workbench/browser/actions/workspaceActions'; import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane'; @@ -28,7 +28,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/welcomeGettingStarted/bro import { IEditorOpenContext, IEditorSerializer } from 'vs/workbench/common/editor'; import { IWebviewElement, IWebviewService } from 'vs/workbench/contrib/webview/browser/webview'; import 'vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedColors'; -@@ -813,6 +813,72 @@ export class GettingStartedPage extends +@@ -816,6 +816,72 @@ export class GettingStartedPage extends $('p.subtitle.description', {}, localize({ key: 'gettingStarted.editingEvolved', comment: ['Shown as subtitle on the Welcome page.'] }, "Editing evolved")) ); @@ -101,7 +101,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/welcomeGettingStarted/bro const leftColumn = $('.categories-column.categories-column-left', {},); const rightColumn = $('.categories-column.categories-column-right', {},); -@@ -884,6 +950,9 @@ export class GettingStartedPage extends +@@ -887,6 +953,9 @@ export class GettingStartedPage extends recentList.setLimit(5); reset(leftColumn, startList.getDomElement(), recentList.getDomElement()); } @@ -135,7 +135,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/web.api.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/browser/web.api.ts +++ code-server/lib/vscode/src/vs/workbench/browser/web.api.ts -@@ -299,6 +299,11 @@ export interface IWorkbenchConstructionO +@@ -313,6 +313,11 @@ export interface IWorkbenchConstructionO */ readonly isEnabledFileUploads?: boolean diff --git a/patches/integration.diff b/patches/integration.diff index d151d79e21dc..3c104cae2b3f 100644 --- a/patches/integration.diff +++ b/patches/integration.diff @@ -184,7 +184,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/web.main.ts import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { IProgressService } from 'vs/platform/progress/common/progress'; import { DelayedLogChannel } from 'vs/workbench/services/output/common/delayedLogChannel'; -@@ -130,6 +131,9 @@ export class BrowserMain extends Disposa +@@ -131,6 +132,9 @@ export class BrowserMain extends Disposa // Startup const instantiationService = workbench.startup(); diff --git a/patches/local-storage.diff b/patches/local-storage.diff index 44d567b5950b..9aca9be102a7 100644 --- a/patches/local-storage.diff +++ b/patches/local-storage.diff @@ -30,7 +30,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/web.api.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/browser/web.api.ts +++ code-server/lib/vscode/src/vs/workbench/browser/web.api.ts -@@ -284,6 +284,11 @@ export interface IWorkbenchConstructionO +@@ -298,6 +298,11 @@ export interface IWorkbenchConstructionO */ readonly configurationDefaults?: Record; From 1a7265b39245db475e415627ee56ca1e1e90238e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 May 2024 14:16:06 -0800 Subject: [PATCH 039/497] chore: bump azure/setup-helm from 3.5 to 4 (#6780) Bumps [azure/setup-helm](https://github.com/azure/setup-helm) from 3.5 to 4. - [Release notes](https://github.com/azure/setup-helm/releases) - [Changelog](https://github.com/Azure/setup-helm/blob/main/CHANGELOG.md) - [Commits](https://github.com/azure/setup-helm/compare/v3.5...v4) --- updated-dependencies: - dependency-name: azure/setup-helm dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index b29eacde89d8..bc777401a0cb 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -83,7 +83,7 @@ jobs: - name: Install helm if: steps.changed-files.outputs.any_changed == 'true' - uses: azure/setup-helm@v3.5 + uses: azure/setup-helm@v4 with: token: ${{ secrets.GITHUB_TOKEN }} From 2adb215d03bf19532724408f95e95a8267897264 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 May 2024 14:16:27 -0800 Subject: [PATCH 040/497] chore: bump robinraju/release-downloader from 1.9 to 1.10 (#6779) Bumps [robinraju/release-downloader](https://github.com/robinraju/release-downloader) from 1.9 to 1.10. - [Release notes](https://github.com/robinraju/release-downloader/releases) - [Commits](https://github.com/robinraju/release-downloader/compare/v1.9...v1.10) --- updated-dependencies: - dependency-name: robinraju/release-downloader dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/publish.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 684f1fbda635..0ec6126d9733 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -36,7 +36,7 @@ jobs: cache: "yarn" - name: Download npm package from release artifacts - uses: robinraju/release-downloader@v1.9 + uses: robinraju/release-downloader@v1.10 with: repository: "coder/code-server" tag: ${{ github.event.inputs.version || github.ref_name }} @@ -184,7 +184,7 @@ jobs: echo "VERSION=${TAG#v}" >> $GITHUB_ENV - name: Download deb artifacts - uses: robinraju/release-downloader@v1.9 + uses: robinraju/release-downloader@v1.10 with: repository: "coder/code-server" tag: v${{ env.VERSION }} @@ -192,7 +192,7 @@ jobs: out-file-path: "release-packages" - name: Download rpm artifacts - uses: robinraju/release-downloader@v1.9 + uses: robinraju/release-downloader@v1.10 with: repository: "coder/code-server" tag: v${{ env.VERSION }} From 6757907c8ba1840e9df3d91718e871de22c7602e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 May 2024 14:16:54 -0800 Subject: [PATCH 041/497] chore: bump i18next from 23.10.1 to 23.11.3 (#6778) Bumps [i18next](https://github.com/i18next/i18next) from 23.10.1 to 23.11.3. - [Release notes](https://github.com/i18next/i18next/releases) - [Changelog](https://github.com/i18next/i18next/blob/master/CHANGELOG.md) - [Commits](https://github.com/i18next/i18next/compare/v23.10.1...v23.11.3) --- updated-dependencies: - dependency-name: i18next dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 05da0278c415..18e929437085 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1891,9 +1891,9 @@ https-proxy-agent@^7.0.2, https-proxy-agent@^7.0.3: debug "4" i18next@^23.5.1: - version "23.10.1" - resolved "https://registry.yarnpkg.com/i18next/-/i18next-23.10.1.tgz#217ce93b75edbe559ac42be00a20566b53937df6" - integrity sha512-NDiIzFbcs3O9PXpfhkjyf7WdqFn5Vq6mhzhtkXzj51aOcNuPNcTwuYNuXCpHsanZGHlHKL35G7huoFeVic1hng== + version "23.11.3" + resolved "https://registry.yarnpkg.com/i18next/-/i18next-23.11.3.tgz#d269c9c15bae9d90ab291055cfc433089ca5f77b" + integrity sha512-Pq/aSKowir7JM0rj+Wa23Kb6KKDUGno/HjG+wRQu0PxoTbpQ4N89MAT0rFGvXmLkRLNMb1BbBOKGozl01dabzg== dependencies: "@babel/runtime" "^7.23.2" From ea815df22dc98720e8b8aca0db156d8cfddca31f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 May 2024 14:17:15 -0800 Subject: [PATCH 042/497] chore: bump semver and @types/semver (#6777) Bumps [semver](https://github.com/npm/node-semver) and [@types/semver](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/semver). These dependencies needed to be updated together. Updates `semver` from 7.5.4 to 7.6.0 - [Release notes](https://github.com/npm/node-semver/releases) - [Changelog](https://github.com/npm/node-semver/blob/main/CHANGELOG.md) - [Commits](https://github.com/npm/node-semver/compare/v7.5.4...v7.6.0) Updates `@types/semver` from 7.5.2 to 7.5.8 - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/semver) --- updated-dependencies: - dependency-name: semver dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: "@types/semver" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/yarn.lock b/yarn.lock index 18e929437085..176c92ff0dc3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -321,9 +321,9 @@ integrity sha512-1ri+LJhh0gRxIa37IpGytdaW7yDEHeJniBSMD1BmitS07R1j63brcYCzry+l0WJvGdEKQNQ7DYXO2epgborWPw== "@types/semver@^7.5.0", "@types/semver@^7.5.2": - version "7.5.2" - resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.2.tgz#31f6eec1ed7ec23f4f05608d3a2d381df041f564" - integrity sha512-7aqorHYgdNO4DM36stTiGO3DvKoex9TQRwsJU6vMaFGyqpBA1MNZkz+PG3gaNUPpTAOYhT1WR7M1JyA3fbS9Cw== + version "7.5.8" + resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.8.tgz#8268a8c57a3e4abd25c165ecd36237db7948a55e" + integrity sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ== "@types/send@*": version "0.17.1" @@ -3056,9 +3056,9 @@ semver@^6.0.0, semver@^6.3.1: integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== semver@^7.0.0, semver@^7.3.5, semver@^7.5.4: - version "7.5.4" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e" - integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== + version "7.6.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.0.tgz#1a46a4db4bffcccd97b743b5005c8325f23d4e2d" + integrity sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg== dependencies: lru-cache "^6.0.0" From 264e023ab83c639dfd2128807668a0c04cfbda05 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 May 2024 14:17:30 -0800 Subject: [PATCH 043/497] chore: bump eslint from 8.53.0 to 8.57.0 (#6776) Bumps [eslint](https://github.com/eslint/eslint) from 8.53.0 to 8.57.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v8.53.0...v8.57.0) --- updated-dependencies: - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/yarn.lock b/yarn.lock index 176c92ff0dc3..d7fe93af96c8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -38,10 +38,10 @@ resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.8.1.tgz#8c4bb756cc2aa7eaf13cfa5e69c83afb3260c20c" integrity sha512-PWiOzLIUAjN/w5K17PoF4n6sKBw0gqLHPhywmYHP4t1VFQQVYeb1yWsJwnMVEMl3tUHME7X/SJPZLmtG7XBDxQ== -"@eslint/eslintrc@^2.1.3": - version "2.1.3" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.3.tgz#797470a75fe0fbd5a53350ee715e85e87baff22d" - integrity sha512-yZzuIG+jnVu6hNSzFEN07e8BxF3uAzYtQb6uDkaYZLo6oYZDCq454c5kB8zxnzfCYyP4MIuyBn10L0DqwujTmA== +"@eslint/eslintrc@^2.1.4": + version "2.1.4" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.4.tgz#388a269f0f25c1b6adc317b5a2c55714894c70ad" + integrity sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ== dependencies: ajv "^6.12.4" debug "^4.3.2" @@ -53,18 +53,18 @@ minimatch "^3.1.2" strip-json-comments "^3.1.1" -"@eslint/js@8.53.0": - version "8.53.0" - resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.53.0.tgz#bea56f2ed2b5baea164348ff4d5a879f6f81f20d" - integrity sha512-Kn7K8dx/5U6+cT1yEhpX1w4PCSg0M+XyRILPgvwcEBjerFWCwQj5sbr3/VmxqV0JGHCBCzyd6LxypEuehypY1w== +"@eslint/js@8.57.0": + version "8.57.0" + resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.0.tgz#a5417ae8427873f1dd08b70b3574b453e67b5f7f" + integrity sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g== -"@humanwhocodes/config-array@^0.11.13": - version "0.11.13" - resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.13.tgz#075dc9684f40a531d9b26b0822153c1e832ee297" - integrity sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ== +"@humanwhocodes/config-array@^0.11.14": + version "0.11.14" + resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.14.tgz#d78e481a039f7566ecc9660b4ea7fe6b1fec442b" + integrity sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg== dependencies: - "@humanwhocodes/object-schema" "^2.0.1" - debug "^4.1.1" + "@humanwhocodes/object-schema" "^2.0.2" + debug "^4.3.1" minimatch "^3.0.5" "@humanwhocodes/module-importer@^1.0.1": @@ -72,10 +72,10 @@ resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c" integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA== -"@humanwhocodes/object-schema@^2.0.1": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz#e5211452df060fa8522b55c7b3c0c4d1981cb044" - integrity sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw== +"@humanwhocodes/object-schema@^2.0.2": + version "2.0.3" + resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz#4a2868d75d6d6963e423bcf90b7fd1be343409d3" + integrity sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA== "@jridgewell/resolve-uri@^3.0.3": version "3.1.1" @@ -933,7 +933,7 @@ debug@3.1.0: dependencies: ms "2.0.0" -debug@4, debug@^4.0.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.4: +debug@4, debug@^4.0.0, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4: version "4.3.4" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== @@ -1316,15 +1316,15 @@ eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4 integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag== eslint@^8.49.0: - version "8.53.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.53.0.tgz#14f2c8244298fcae1f46945459577413ba2697ce" - integrity sha512-N4VuiPjXDUa4xVeV/GC/RV3hQW9Nw+Y463lkWaKKXKYMvmRiRDAtfpuPFLN+E1/6ZhyR8J2ig+eVREnYgUsiag== + version "8.57.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.57.0.tgz#c786a6fd0e0b68941aaf624596fb987089195668" + integrity sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ== dependencies: "@eslint-community/eslint-utils" "^4.2.0" "@eslint-community/regexpp" "^4.6.1" - "@eslint/eslintrc" "^2.1.3" - "@eslint/js" "8.53.0" - "@humanwhocodes/config-array" "^0.11.13" + "@eslint/eslintrc" "^2.1.4" + "@eslint/js" "8.57.0" + "@humanwhocodes/config-array" "^0.11.14" "@humanwhocodes/module-importer" "^1.0.1" "@nodelib/fs.walk" "^1.2.8" "@ungap/structured-clone" "^1.2.0" From b8cdab2184998f47a7cff3623443ef74976678e9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 May 2024 14:17:49 -0800 Subject: [PATCH 044/497] chore: bump ws and @types/ws (#6775) Bumps [ws](https://github.com/websockets/ws) and [@types/ws](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/ws). These dependencies needed to be updated together. Updates `ws` from 8.14.2 to 8.17.0 - [Release notes](https://github.com/websockets/ws/releases) - [Commits](https://github.com/websockets/ws/compare/8.14.2...8.17.0) Updates `@types/ws` from 8.5.5 to 8.5.10 - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/ws) --- updated-dependencies: - dependency-name: ws dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: "@types/ws" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/yarn.lock b/yarn.lock index d7fe93af96c8..5d65eb3a9ac0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -353,9 +353,9 @@ integrity sha512-d0XxK3YTObnWVp6rZuev3c49+j4Lo8g4L1ZRm9z5L0xpoZycUPshHgczK5gsUMaZOstjVYYi09p5gYvUtfChYw== "@types/ws@^8.5.5": - version "8.5.5" - resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.5.tgz#af587964aa06682702ee6dcbc7be41a80e4b28eb" - integrity sha512-lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg== + version "8.5.10" + resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.10.tgz#4acfb517970853fa6574a3a6886791d04a396787" + integrity sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A== dependencies: "@types/node" "*" @@ -3629,9 +3629,9 @@ wrappy@1: integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== ws@^8.14.2: - version "8.14.2" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.14.2.tgz#6c249a806eb2db7a20d26d51e7709eab7b2e6c7f" - integrity sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g== + version "8.17.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.17.0.tgz#d145d18eca2ed25aaf791a183903f7be5e295fea" + integrity sha512-uJq6108EgZMAl20KagGkzCKfMEjxmKvZHG7Tlq0Z6nOky7YF7aq4mOx6xK8TJ/i1LeK4Qus7INktacctDgY8Ow== xdg-basedir@^4.0.0: version "4.0.0" From 4563517d90d1e049eb0665814f5bc9e5b8b8ccea Mon Sep 17 00:00:00 2001 From: Asher Date: Mon, 6 May 2024 15:53:53 -0800 Subject: [PATCH 045/497] Add isContainer property to telemetry --- patches/display-language.diff | 2 +- patches/telemetry.diff | 27 +++++++++++++++++++++++---- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/patches/display-language.diff b/patches/display-language.diff index df2b04008ddf..2a9a6f2b7c34 100644 --- a/patches/display-language.diff +++ b/patches/display-language.diff @@ -30,7 +30,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverServices.ts import { ProtocolConstants } from 'vs/base/parts/ipc/common/ipc.net'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { ConfigurationService } from 'vs/platform/configuration/common/configurationService'; -@@ -228,6 +228,9 @@ export async function setupServerService +@@ -239,6 +239,9 @@ export async function setupServerService const channel = new ExtensionManagementChannel(extensionManagementService, (ctx: RemoteAgentConnectionContext) => getUriTransformer(ctx.remoteAuthority)); socketServer.registerChannel('extensions', channel); diff --git a/patches/telemetry.diff b/patches/telemetry.diff index eaa284bc9f2c..15234f6d46ce 100644 --- a/patches/telemetry.diff +++ b/patches/telemetry.diff @@ -20,14 +20,29 @@ Index: code-server/lib/vscode/src/vs/server/node/serverServices.ts import { NullPolicyService } from 'vs/platform/policy/common/policy'; import { OneDataSystemAppender } from 'vs/platform/telemetry/node/1dsAppender'; import { LoggerService } from 'vs/platform/log/node/loggerService'; -@@ -149,7 +150,10 @@ export async function setupServerService +@@ -146,10 +147,25 @@ export async function setupServerService + const requestService = new RequestService(configurationService, environmentService, logService, loggerService); + services.set(IRequestService, requestService); + ++ let isContainer = undefined; ++ try { ++ await Promises.stat('/run/.containerenv'); ++ isContainer = true; ++ } catch (error) { /* Does not exist, probably. */ } ++ if (!isContainer) { ++ try { ++ const content = await Promises.readFile('/proc/self/cgroup', 'utf8') ++ isContainer = content.includes('docker'); ++ } catch (error) { /* Permission denied, probably. */ } ++ } ++ let oneDsAppender: ITelemetryAppender = NullAppender; const isInternal = isInternalTelemetry(productService, configurationService); if (supportsTelemetry(productService, environmentService)) { - if (!isLoggingOnly(productService, environmentService) && productService.aiConfig?.ariaKey) { + const telemetryEndpoint = process.env.CS_TELEMETRY_URL || "https://v1.telemetry.coder.com/track"; + if (telemetryEndpoint) { -+ oneDsAppender = new OneDataSystemAppender(requestService, false, eventPrefix, null, () => new TelemetryClient(telemetryEndpoint)); ++ oneDsAppender = new OneDataSystemAppender(requestService, false, eventPrefix, null, () => new TelemetryClient(telemetryEndpoint, isContainer)); + } else if (!isLoggingOnly(productService, environmentService) && productService.aiConfig?.ariaKey) { oneDsAppender = new OneDataSystemAppender(requestService, isInternal, eventPrefix, null, productService.aiConfig.ariaKey); disposables.add(toDisposable(() => oneDsAppender?.flush())); // Ensure the AI appender is disposed so that it flushes remaining data @@ -36,14 +51,16 @@ Index: code-server/lib/vscode/src/vs/server/node/telemetryClient.ts =================================================================== --- /dev/null +++ code-server/lib/vscode/src/vs/server/node/telemetryClient.ts -@@ -0,0 +1,49 @@ +@@ -0,0 +1,53 @@ +import { AppInsightsCore, IExtendedTelemetryItem, ITelemetryItem } from '@microsoft/1ds-core-js'; +import * as https from 'https'; +import * as http from 'http'; +import * as os from 'os'; + +export class TelemetryClient extends AppInsightsCore { -+ public constructor(private readonly endpoint: string) { ++ public constructor( ++ private readonly endpoint: string, ++ private readonly isContainer: Boolean | undefined) { + super(); + } + @@ -73,6 +90,8 @@ Index: code-server/lib/vscode/src/vs/server/node/telemetryClient.ts + options.properties['common.arch'] = os.arch(); + } catch (error) {} + ++ options.properties['common.isContainer'] = this.isContainer; ++ + try { + const request = (/^http:/.test(this.endpoint) ? http : https).request(this.endpoint, { + method: 'POST', From 7050002fb698bd7fba185d6b7dee3a83f35b0be2 Mon Sep 17 00:00:00 2001 From: Asher Date: Mon, 6 May 2024 16:31:33 -0800 Subject: [PATCH 046/497] Add missing semicolon --- patches/display-language.diff | 2 +- patches/external-file-actions.diff | 2 +- patches/logout.diff | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/patches/display-language.diff b/patches/display-language.diff index 2a9a6f2b7c34..94e8f23e02e4 100644 --- a/patches/display-language.diff +++ b/patches/display-language.diff @@ -250,7 +250,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts /* ----- server setup ----- */ @@ -103,6 +104,7 @@ export interface ServerParsedArgs { - 'auth'?: string + 'auth'?: string; 'disable-file-downloads'?: boolean; 'disable-file-uploads'?: boolean; + 'locale'?: string diff --git a/patches/external-file-actions.diff b/patches/external-file-actions.diff index 46fa4cc03080..bc9b6b913cba 100644 --- a/patches/external-file-actions.diff +++ b/patches/external-file-actions.diff @@ -102,7 +102,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts @@ -99,6 +101,8 @@ export interface ServerParsedArgs { /* ----- code-server ----- */ 'disable-update-check'?: boolean; - 'auth'?: string + 'auth'?: string; + 'disable-file-downloads'?: boolean; + 'disable-file-uploads'?: boolean; diff --git a/patches/logout.diff b/patches/logout.diff index a86cd992717c..558df0f6e740 100644 --- a/patches/logout.diff +++ b/patches/logout.diff @@ -32,7 +32,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts export interface ServerParsedArgs { /* ----- code-server ----- */ 'disable-update-check'?: boolean; -+ 'auth'?: string ++ 'auth'?: string; /* ----- server setup ----- */ From 125a972c8174283d69f769ea9ad84014fa1ef286 Mon Sep 17 00:00:00 2001 From: Asher Date: Mon, 6 May 2024 16:53:35 -0800 Subject: [PATCH 047/497] Do not add extra args in toCodeArgs It should only convert the args that are passed in. --- src/node/cli.ts | 11 ++++------- src/node/routes/vscode.ts | 4 ++++ test/unit/node/cli.test.ts | 2 -- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/node/cli.ts b/src/node/cli.ts index 7566bd9a00b3..fb24949f2f92 100644 --- a/src/node/cli.ts +++ b/src/node/cli.ts @@ -833,8 +833,8 @@ export interface CodeArgs extends UserProvidedCodeArgs { version: boolean "without-connection-token"?: boolean "without-browser-env-var"?: boolean - compatibility: string - log: string[] | undefined + compatibility?: string + log?: string[] } /** @@ -843,15 +843,12 @@ export interface CodeArgs extends UserProvidedCodeArgs { export type SpawnCodeCli = (args: CodeArgs) => Promise /** - * Convert our arguments to VS Code server arguments. + * Convert our arguments to equivalent VS Code server arguments. + * Does not add any extra arguments. */ export const toCodeArgs = async (args: DefaultedArgs): Promise => { return { ...args, - "accept-server-license-terms": true, - // This seems to be used to make the connection token flags optional (when - // set to 1.63) but we have always included them. - compatibility: "1.64", /** Type casting. */ help: !!args.help, version: !!args.version, diff --git a/src/node/routes/vscode.ts b/src/node/routes/vscode.ts index b8f88a0fc665..8893dc80ef4d 100644 --- a/src/node/routes/vscode.ts +++ b/src/node/routes/vscode.ts @@ -54,6 +54,10 @@ export const ensureVSCodeLoaded = async ( try { vscodeServer = await createVSServer(null, { ...(await toCodeArgs(req.args)), + "accept-server-license-terms": true, + // This seems to be used to make the connection token flags optional (when + // set to 1.63) but we have always included them. + compatibility: "1.64", "without-connection-token": true, }) } catch (error) { diff --git a/test/unit/node/cli.test.ts b/test/unit/node/cli.test.ts index 994697d2febb..02b60b839efb 100644 --- a/test/unit/node/cli.test.ts +++ b/test/unit/node/cli.test.ts @@ -912,8 +912,6 @@ cert: false`) describe("toCodeArgs", () => { const vscodeDefaults = { ...defaults, - "accept-server-license-terms": true, - compatibility: "1.64", help: false, port: "8080", version: false, From 2633bca30b5b9294ba12f426d547a3b22bba9671 Mon Sep 17 00:00:00 2001 From: Asher Date: Mon, 6 May 2024 16:58:07 -0800 Subject: [PATCH 048/497] Move telemetry endpoint to product service This will let us use it in the client. --- patches/display-language.diff | 6 +++--- patches/getting-started.diff | 2 +- patches/telemetry.diff | 31 +++++++++++++++++++++++++++++-- 3 files changed, 33 insertions(+), 6 deletions(-) diff --git a/patches/display-language.diff b/patches/display-language.diff index 94e8f23e02e4..6c802696a4bf 100644 --- a/patches/display-language.diff +++ b/patches/display-language.diff @@ -30,7 +30,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverServices.ts import { ProtocolConstants } from 'vs/base/parts/ipc/common/ipc.net'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { ConfigurationService } from 'vs/platform/configuration/common/configurationService'; -@@ -239,6 +239,9 @@ export async function setupServerService +@@ -240,6 +240,9 @@ export async function setupServerService const channel = new ExtensionManagementChannel(extensionManagementService, (ctx: RemoteAgentConnectionContext) => getUriTransformer(ctx.remoteAuthority)); socketServer.registerChannel('extensions', channel); @@ -220,7 +220,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts import { CharCode } from 'vs/base/common/charCode'; import { IExtensionManifest } from 'vs/platform/extensions/common/extensions'; -@@ -347,6 +348,8 @@ export class WebClientServer { +@@ -348,6 +349,8 @@ export class WebClientServer { callbackRoute: this._callbackRoute }; @@ -229,7 +229,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts const nlsBaseUrl = this._productService.extensionsGallery?.nlsBaseUrl; const values: { [key: string]: string } = { WORKBENCH_WEB_CONFIGURATION: asJSON(workbenchWebConfiguration), -@@ -355,6 +358,7 @@ export class WebClientServer { +@@ -356,6 +359,7 @@ export class WebClientServer { WORKBENCH_NLS_BASE_URL: vscodeBase + (nlsBaseUrl ? `${nlsBaseUrl}${!nlsBaseUrl.endsWith('/') ? '/' : ''}${this._productService.commit}/${this._productService.version}/` : ''), BASE: base, VS_BASE: vscodeBase, diff --git a/patches/getting-started.diff b/patches/getting-started.diff index e278c62b2aea..c2eb9002df13 100644 --- a/patches/getting-started.diff +++ b/patches/getting-started.diff @@ -201,7 +201,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -338,6 +338,7 @@ export class WebClientServer { +@@ -339,6 +339,7 @@ export class WebClientServer { userDataPath: this._environmentService.userDataPath, isEnabledFileDownloads: !this._environmentService.args['disable-file-downloads'], isEnabledFileUploads: !this._environmentService.args['disable-file-uploads'], diff --git a/patches/telemetry.diff b/patches/telemetry.diff index 15234f6d46ce..eac843a04b0d 100644 --- a/patches/telemetry.diff +++ b/patches/telemetry.diff @@ -40,7 +40,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverServices.ts const isInternal = isInternalTelemetry(productService, configurationService); if (supportsTelemetry(productService, environmentService)) { - if (!isLoggingOnly(productService, environmentService) && productService.aiConfig?.ariaKey) { -+ const telemetryEndpoint = process.env.CS_TELEMETRY_URL || "https://v1.telemetry.coder.com/track"; ++ const telemetryEndpoint = productService.telemetryEndpoint; + if (telemetryEndpoint) { + oneDsAppender = new OneDataSystemAppender(requestService, false, eventPrefix, null, () => new TelemetryClient(telemetryEndpoint, isContainer)); + } else if (!isLoggingOnly(productService, environmentService) && productService.aiConfig?.ariaKey) { @@ -109,11 +109,38 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -318,6 +318,7 @@ export class WebClientServer { +@@ -318,6 +318,8 @@ export class WebClientServer { scope: vscodeBase + '/', path: base + '/_static/out/browser/serviceWorker.js', }, + enableTelemetry: this._productService.enableTelemetry, ++ telemetryEndpoint: this._productService.telemetryEndpoint, embedderIdentifier: 'server-distro', extensionsGallery: this._productService.extensionsGallery, }; +Index: code-server/lib/vscode/src/vs/base/common/product.ts +=================================================================== +--- code-server.orig/lib/vscode/src/vs/base/common/product.ts ++++ code-server/lib/vscode/src/vs/base/common/product.ts +@@ -64,6 +64,7 @@ export interface IProductConfiguration { + readonly path: string; + readonly scope: string; + } ++ readonly telemetryEndpoint?: string + + readonly version: string; + readonly date?: string; +Index: code-server/lib/vscode/src/vs/platform/product/common/product.ts +=================================================================== +--- code-server.orig/lib/vscode/src/vs/platform/product/common/product.ts ++++ code-server/lib/vscode/src/vs/platform/product/common/product.ts +@@ -55,7 +55,8 @@ else if (globalThis._VSCODE_PRODUCT_JSON + resourceUrlTemplate: "https://open-vsx.org/vscode/asset/{publisher}/{name}/{version}/Microsoft.VisualStudio.Code.WebResources/{path}", + controlUrl: "", + recommendationsUrl: "", +- }) ++ }), ++ telemetryEndpoint: env.CS_TELEMETRY_URL || product.telemetryEndpoint || "https://v1.telemetry.coder.com/track", + }); + } + From 97653152dd12f2310f877830a6e9786bb7cf1a39 Mon Sep 17 00:00:00 2001 From: Asher Date: Mon, 6 May 2024 19:27:34 -0800 Subject: [PATCH 049/497] Flush telemetry appender on dispose --- patches/telemetry.diff | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/patches/telemetry.diff b/patches/telemetry.diff index eac843a04b0d..ea762317c63c 100644 --- a/patches/telemetry.diff +++ b/patches/telemetry.diff @@ -20,7 +20,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverServices.ts import { NullPolicyService } from 'vs/platform/policy/common/policy'; import { OneDataSystemAppender } from 'vs/platform/telemetry/node/1dsAppender'; import { LoggerService } from 'vs/platform/log/node/loggerService'; -@@ -146,10 +147,25 @@ export async function setupServerService +@@ -146,11 +147,23 @@ export async function setupServerService const requestService = new RequestService(configurationService, environmentService, logService, loggerService); services.set(IRequestService, requestService); @@ -40,13 +40,12 @@ Index: code-server/lib/vscode/src/vs/server/node/serverServices.ts const isInternal = isInternalTelemetry(productService, configurationService); if (supportsTelemetry(productService, environmentService)) { - if (!isLoggingOnly(productService, environmentService) && productService.aiConfig?.ariaKey) { -+ const telemetryEndpoint = productService.telemetryEndpoint; -+ if (telemetryEndpoint) { -+ oneDsAppender = new OneDataSystemAppender(requestService, false, eventPrefix, null, () => new TelemetryClient(telemetryEndpoint, isContainer)); -+ } else if (!isLoggingOnly(productService, environmentService) && productService.aiConfig?.ariaKey) { - oneDsAppender = new OneDataSystemAppender(requestService, isInternal, eventPrefix, null, productService.aiConfig.ariaKey); +- oneDsAppender = new OneDataSystemAppender(requestService, isInternal, eventPrefix, null, productService.aiConfig.ariaKey); ++ if (!isLoggingOnly(productService, environmentService) && productService.telemetryEndpoint) { ++ oneDsAppender = new OneDataSystemAppender(requestService, isInternal, eventPrefix, null, () => new TelemetryClient(productService.telemetryEndpoint!, isContainer)); disposables.add(toDisposable(() => oneDsAppender?.flush())); // Ensure the AI appender is disposed so that it flushes remaining data } + Index: code-server/lib/vscode/src/vs/server/node/telemetryClient.ts =================================================================== --- /dev/null From 0f4791b816c184b612df3bdcfc4e1f9f1a13daca Mon Sep 17 00:00:00 2001 From: Asher Date: Tue, 7 May 2024 11:33:03 -0800 Subject: [PATCH 050/497] Add remote machine ID to telemetry --- patches/telemetry.diff | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/patches/telemetry.diff b/patches/telemetry.diff index ea762317c63c..11ebed2f41f7 100644 --- a/patches/telemetry.diff +++ b/patches/telemetry.diff @@ -42,7 +42,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverServices.ts - if (!isLoggingOnly(productService, environmentService) && productService.aiConfig?.ariaKey) { - oneDsAppender = new OneDataSystemAppender(requestService, isInternal, eventPrefix, null, productService.aiConfig.ariaKey); + if (!isLoggingOnly(productService, environmentService) && productService.telemetryEndpoint) { -+ oneDsAppender = new OneDataSystemAppender(requestService, isInternal, eventPrefix, null, () => new TelemetryClient(productService.telemetryEndpoint!, isContainer)); ++ oneDsAppender = new OneDataSystemAppender(requestService, isInternal, eventPrefix, null, () => new TelemetryClient(productService.telemetryEndpoint!, machineId, isContainer)); disposables.add(toDisposable(() => oneDsAppender?.flush())); // Ensure the AI appender is disposed so that it flushes remaining data } @@ -50,7 +50,7 @@ Index: code-server/lib/vscode/src/vs/server/node/telemetryClient.ts =================================================================== --- /dev/null +++ code-server/lib/vscode/src/vs/server/node/telemetryClient.ts -@@ -0,0 +1,53 @@ +@@ -0,0 +1,55 @@ +import { AppInsightsCore, IExtendedTelemetryItem, ITelemetryItem } from '@microsoft/1ds-core-js'; +import * as https from 'https'; +import * as http from 'http'; @@ -59,6 +59,7 @@ Index: code-server/lib/vscode/src/vs/server/node/telemetryClient.ts +export class TelemetryClient extends AppInsightsCore { + public constructor( + private readonly endpoint: string, ++ private readonly machineId: string, + private readonly isContainer: Boolean | undefined) { + super(); + } @@ -89,6 +90,7 @@ Index: code-server/lib/vscode/src/vs/server/node/telemetryClient.ts + options.properties['common.arch'] = os.arch(); + } catch (error) {} + ++ options.properties['common.remoteMachineId'] = this.machineId; + options.properties['common.isContainer'] = this.isContainer; + + try { From ab4b36f573c6d336dd79efa7859ed922fa00f81b Mon Sep 17 00:00:00 2001 From: Asher Date: Tue, 7 May 2024 11:57:02 -0800 Subject: [PATCH 051/497] Fix setuptools install on macOS This is erroring now with "This environment is externally managed". --- .github/workflows/release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index e84713f39e03..90f08eae4cab 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -222,7 +222,7 @@ jobs: # next update Node we can probably remove this. For now, install # setuptools since it contains distutils. - name: Install Python utilities - run: python3 -m pip install setuptools + run: brew install python-setuptools - name: Download npm package uses: actions/download-artifact@v4 From effc6e95b4ad1c5ac5f9083ec06663ba4a2e005c Mon Sep 17 00:00:00 2001 From: Olivier Benz Date: Mon, 13 May 2024 20:41:25 +0200 Subject: [PATCH 052/497] Update Code to 1.89.1 (#6796) --- lib/vscode | 2 +- patches/display-language.diff | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/vscode b/lib/vscode index b58957e67ee1..dc96b837cf6b 160000 --- a/lib/vscode +++ b/lib/vscode @@ -1 +1 @@ -Subproject commit b58957e67ee1e712cebf466b995adf4c5307b2bd +Subproject commit dc96b837cf6bb4af9cd736aa3af08cf8279f7685 diff --git a/patches/display-language.diff b/patches/display-language.diff index 6c802696a4bf..f36e8b1ba30d 100644 --- a/patches/display-language.diff +++ b/patches/display-language.diff @@ -30,7 +30,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverServices.ts import { ProtocolConstants } from 'vs/base/parts/ipc/common/ipc.net'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { ConfigurationService } from 'vs/platform/configuration/common/configurationService'; -@@ -240,6 +240,9 @@ export async function setupServerService +@@ -237,6 +237,9 @@ export async function setupServerService const channel = new ExtensionManagementChannel(extensionManagementService, (ctx: RemoteAgentConnectionContext) => getUriTransformer(ctx.remoteAuthority)); socketServer.registerChannel('extensions', channel); From 3b6ad479a685192b797edd81f92428b258c97bdf Mon Sep 17 00:00:00 2001 From: Asher Date: Tue, 14 May 2024 10:16:33 -0800 Subject: [PATCH 053/497] Release v4.89.1 and v4.89.0 --- CHANGELOG.md | 16 ++++++++++++++++ ci/helm-chart/Chart.yaml | 4 ++-- ci/helm-chart/values.yaml | 2 +- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8e4fd418229e..5a0e9cfb932e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,22 @@ Code v99.99.999 ## Unreleased +## [4.89.1](https://github.com/coder/code-server/releases/tag/v4.89.1) - 2024-04-14 + +Code v1.89.1 + +## Changed + +- Updated to Code 1.89.1. + +## [4.89.0](https://github.com/coder/code-server/releases/tag/v4.89.0) - 2024-04-08 + +Code v1.89.0 + +## Changed + +- Updated to Code 1.89.0. + ## [4.23.1](https://github.com/coder/code-server/releases/tag/v4.23.1) - 2024-04-15 Code v1.88.1 diff --git a/ci/helm-chart/Chart.yaml b/ci/helm-chart/Chart.yaml index fcdf1a1a7371..3f4687efa222 100644 --- a/ci/helm-chart/Chart.yaml +++ b/ci/helm-chart/Chart.yaml @@ -15,9 +15,9 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 3.19.1 +version: 3.20.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 4.23.1 +appVersion: 4.89.1 diff --git a/ci/helm-chart/values.yaml b/ci/helm-chart/values.yaml index ebac62746d9d..ddfbff079dfd 100644 --- a/ci/helm-chart/values.yaml +++ b/ci/helm-chart/values.yaml @@ -6,7 +6,7 @@ replicaCount: 1 image: repository: codercom/code-server - tag: '4.23.1' + tag: '4.89.1' pullPolicy: Always # Specifies one or more secrets to be used when pulling images from a From efc6edf5366ec53b91a0d75aedde2379fe7dc820 Mon Sep 17 00:00:00 2001 From: Simon Merschjohann Date: Tue, 21 May 2024 20:39:36 +0200 Subject: [PATCH 054/497] Support copying to clipboard from CLI (#6807) Use --stdin-to-clipboard or -c to pass stdin to clipboard --- patches/clipboard.diff | 136 +++++++++++++++++++++++++++++++++++++++++ patches/series | 1 + 2 files changed, 137 insertions(+) create mode 100644 patches/clipboard.diff diff --git a/patches/clipboard.diff b/patches/clipboard.diff new file mode 100644 index 000000000000..df775c2edc4e --- /dev/null +++ b/patches/clipboard.diff @@ -0,0 +1,136 @@ +Index: code-server/lib/vscode/src/vs/workbench/api/browser/mainThreadCLICommands.ts +=================================================================== +--- code-server.orig/lib/vscode/src/vs/workbench/api/browser/mainThreadCLICommands.ts ++++ code-server/lib/vscode/src/vs/workbench/api/browser/mainThreadCLICommands.ts +@@ -8,6 +8,7 @@ import { isWeb } from 'vs/base/common/pl + import { isString } from 'vs/base/common/types'; + import { URI, UriComponents } from 'vs/base/common/uri'; + import { localize } from 'vs/nls'; ++import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService'; + import { CommandsRegistry, ICommandService } from 'vs/platform/commands/common/commands'; + import { IExtensionGalleryService, IExtensionManagementService } from 'vs/platform/extensionManagement/common/extensionManagement'; + import { ExtensionManagementCLI } from 'vs/platform/extensionManagement/common/extensionManagementCLI'; +@@ -89,6 +90,11 @@ CommandsRegistry.registerCommand('_remot + return lines.join('\n'); + }); + ++CommandsRegistry.registerCommand('_remoteCLI.setClipboard', function (accessor: ServicesAccessor, content: string) { ++ const clipboardService = accessor.get(IClipboardService); ++ clipboardService.writeText(content); ++}) ++ + class RemoteExtensionManagementCLI extends ExtensionManagementCLI { + + private _location: string | undefined; +Index: code-server/lib/vscode/src/vs/workbench/api/node/extHostCLIServer.ts +=================================================================== +--- code-server.orig/lib/vscode/src/vs/workbench/api/node/extHostCLIServer.ts ++++ code-server/lib/vscode/src/vs/workbench/api/node/extHostCLIServer.ts +@@ -43,7 +43,12 @@ export interface ExtensionManagementPipe + force?: boolean; + } + +-export type PipeCommand = OpenCommandPipeArgs | StatusPipeArgs | OpenExternalCommandPipeArgs | ExtensionManagementPipeArgs; ++export interface ClipboardPipeArgs { ++ type: 'clipboard'; ++ content: string; ++} ++ ++export type PipeCommand = OpenCommandPipeArgs | StatusPipeArgs | OpenExternalCommandPipeArgs | ExtensionManagementPipeArgs | ClipboardPipeArgs; + + export interface ICommandsExecuter { + executeCommand(id: string, ...args: any[]): Promise; +@@ -105,6 +110,9 @@ export class CLIServerBase { + case 'extensionManagement': + returnObj = await this.manageExtensions(data); + break; ++ case 'clipboard': ++ returnObj = await this.clipboard(data); ++ break; + default: + sendResponse(404, `Unknown message type: ${data.type}`); + break; +@@ -172,6 +180,10 @@ export class CLIServerBase { + return await this._commands.executeCommand('_remoteCLI.getSystemStatus'); + } + ++ private async clipboard(data: ClipboardPipeArgs): Promise { ++ return await this._commands.executeCommand('_remoteCLI.setClipboard', data.content); ++ } ++ + dispose(): void { + this._server.close(); + +Index: code-server/lib/vscode/src/vs/workbench/contrib/terminal/browser/remoteTerminalBackend.ts +=================================================================== +--- code-server.orig/lib/vscode/src/vs/workbench/contrib/terminal/browser/remoteTerminalBackend.ts ++++ code-server/lib/vscode/src/vs/workbench/contrib/terminal/browser/remoteTerminalBackend.ts +@@ -97,7 +97,7 @@ class RemoteTerminalBackend extends Base + } + }); + +- const allowedCommands = ['_remoteCLI.openExternal', '_remoteCLI.windowOpen', '_remoteCLI.getSystemStatus', '_remoteCLI.manageExtensions']; ++ const allowedCommands = ['_remoteCLI.openExternal', '_remoteCLI.windowOpen', '_remoteCLI.getSystemStatus', '_remoteCLI.manageExtensions', '_remoteCLI.setClipboard']; + this._remoteTerminalChannel.onExecuteCommand(async e => { + // Ensure this request for for this window + const pty = this._ptys.get(e.persistentProcessId); +Index: code-server/lib/vscode/src/vs/platform/environment/common/argv.ts +=================================================================== +--- code-server.orig/lib/vscode/src/vs/platform/environment/common/argv.ts ++++ code-server/lib/vscode/src/vs/platform/environment/common/argv.ts +@@ -119,6 +119,7 @@ export interface NativeParsedArgs { + sandbox?: boolean; + + 'enable-coi'?: boolean; ++ 'stdin-to-clipboard'?: boolean; + + // chromium command line args: https://electronjs.org/docs/all#supported-chrome-command-line-switches + 'no-proxy-server'?: boolean; +Index: code-server/lib/vscode/src/vs/platform/environment/node/argv.ts +=================================================================== +--- code-server.orig/lib/vscode/src/vs/platform/environment/node/argv.ts ++++ code-server/lib/vscode/src/vs/platform/environment/node/argv.ts +@@ -90,6 +90,7 @@ export const OPTIONS: OptionDescriptions + 'user-data-dir': { type: 'string', cat: 'o', args: 'dir', description: localize('userDataDir', "Specifies the directory that user data is kept in. Can be used to open multiple distinct instances of Code.") }, + 'profile': { type: 'string', 'cat': 'o', args: 'profileName', description: localize('profileName', "Opens the provided folder or workspace with the given profile and associates the profile with the workspace. If the profile does not exist, a new empty one is created.") }, + 'help': { type: 'boolean', cat: 'o', alias: 'h', description: localize('help', "Print usage.") }, ++ 'stdin-to-clipboard': { type: 'boolean', cat: 'o', alias: 'c', description: localize('clipboard', "copies the STDIN to the clipboard") }, + + 'extensions-dir': { type: 'string', deprecates: ['extensionHomePath'], cat: 'e', args: 'dir', description: localize('extensionHomePath', "Set the root path for extensions.") }, + 'extensions-download-dir': { type: 'string' }, +Index: code-server/lib/vscode/src/vs/server/node/server.cli.ts +=================================================================== +--- code-server.orig/lib/vscode/src/vs/server/node/server.cli.ts ++++ code-server/lib/vscode/src/vs/server/node/server.cli.ts +@@ -76,6 +76,7 @@ const isSupportedForPipe = (optionId: ke + case 'verbose': + case 'remote': + case 'locate-shell-integration-path': ++ case 'stdin-to-clipboard': + return true; + default: + return false; +@@ -293,6 +294,23 @@ export async function main(desc: Product + } + } + } else { ++ if (parsedArgs['stdin-to-clipboard']) { ++ if(!hasStdinWithoutTty()) { ++ console.error("stdin has a tty."); ++ return; ++ } ++ const fs = require("fs"); ++ const stdinBuffer = fs.readFileSync(0); // STDIN_FILENO = 0 ++ const clipboardContent = stdinBuffer.toString(); ++ sendToPipe({ ++ type: 'clipboard', ++ content: clipboardContent ++ }, verbose).catch(e => { ++ console.error('Error when requesting status:', e); ++ }); ++ return; ++ } ++ + if (parsedArgs.status) { + sendToPipe({ + type: 'status' diff --git a/patches/series b/patches/series index ad79ed9ecff7..e5d456fda9ad 100644 --- a/patches/series +++ b/patches/series @@ -20,3 +20,4 @@ cli-window-open.diff getting-started.diff safari.diff keepalive.diff +clipboard.diff From 4ff509d8db3e01590130a4a1b4217cb934e0c660 Mon Sep 17 00:00:00 2001 From: XiaoZhang Date: Thu, 23 May 2024 02:52:42 +0800 Subject: [PATCH 055/497] Allow emptyDir type volume mounts (#6803) --- ci/helm-chart/templates/deployment.yaml | 5 ++++- ci/helm-chart/values.yaml | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ci/helm-chart/templates/deployment.yaml b/ci/helm-chart/templates/deployment.yaml index f88304fc2346..e1925ee47922 100644 --- a/ci/helm-chart/templates/deployment.yaml +++ b/ci/helm-chart/templates/deployment.yaml @@ -177,9 +177,12 @@ spec: {{- if .existingClaim }} persistentVolumeClaim: claimName: {{ .existingClaim }} - {{- else }} + {{- else if .hostPath }} hostPath: path: {{ .hostPath }} type: Directory + {{- else }} + emptyDir: + {{- toYaml .emptyDir | nindent 10 }} {{- end }} {{- end }} diff --git a/ci/helm-chart/values.yaml b/ci/helm-chart/values.yaml index ddfbff079dfd..b4e6816258a4 100644 --- a/ci/helm-chart/values.yaml +++ b/ci/helm-chart/values.yaml @@ -190,6 +190,7 @@ extraVolumeMounts: [] # readOnly: true # existingClaim: volume-claim # hostPath: "" + # emptyDir: {} extraConfigmapMounts: [] # - name: certs-configmap From 095c072a43e6abf4eee163d81af9115d7000c4ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Wi=C5=9Bniewski?= Date: Fri, 24 May 2024 22:02:32 +0200 Subject: [PATCH 056/497] Add Ubuntu Noble image (#6812) --- ci/release-image/docker-bake.hcl | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/ci/release-image/docker-bake.hcl b/ci/release-image/docker-bake.hcl index 90d228862c81..182f12791ec1 100644 --- a/ci/release-image/docker-bake.hcl +++ b/ci/release-image/docker-bake.hcl @@ -18,6 +18,7 @@ group "default" { targets = [ "code-server-debian-12", "code-server-ubuntu-focal", + "code-server-ubuntu-noble", "code-server-fedora-39", "code-server-opensuse-tumbleweed", ] @@ -69,6 +70,17 @@ target "code-server-ubuntu-focal" { platforms = ["linux/amd64", "linux/arm64"] } +target "code-server-ubuntu-noble" { + dockerfile = "ci/release-image/Dockerfile" + tags = concat( + gen_tags_for_docker_and_ghcr("noble"), + ) + args = { + BASE = "ubuntu:noble" + } + platforms = ["linux/amd64", "linux/arm64"] +} + target "code-server-fedora-39" { dockerfile = "ci/release-image/Dockerfile.fedora" tags = concat( From 479eb5bfa5db98c5c6d5f0a521458b607466f18d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Jun 2024 10:44:33 -0800 Subject: [PATCH 057/497] chore: bump @typescript-eslint/eslint-plugin from 6.21.0 to 7.0.0 (#6818) Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 6.21.0 to 7.0.0. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v7.0.0/packages/eslint-plugin) --- updated-dependencies: - dependency-name: "@typescript-eslint/eslint-plugin" dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 77 ++++++++++++++++++++++++++++++++++++++-------------- 2 files changed, 57 insertions(+), 22 deletions(-) diff --git a/package.json b/package.json index 6f9a77b9e8e3..1876caf3a83e 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "@types/semver": "^7.5.2", "@types/trusted-types": "^2.0.4", "@types/ws": "^8.5.5", - "@typescript-eslint/eslint-plugin": "^6.7.2", + "@typescript-eslint/eslint-plugin": "^7.0.0", "@typescript-eslint/parser": "^6.7.2", "audit-ci": "^6.6.1", "doctoc": "^2.2.1", diff --git a/yarn.lock b/yarn.lock index 5d65eb3a9ac0..59a19c5eb415 100644 --- a/yarn.lock +++ b/yarn.lock @@ -359,16 +359,16 @@ dependencies: "@types/node" "*" -"@typescript-eslint/eslint-plugin@^6.7.2": - version "6.21.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.21.0.tgz#30830c1ca81fd5f3c2714e524c4303e0194f9cd3" - integrity sha512-oy9+hTPCUFpngkEZUSzbf9MxI65wbKFoQYsgPdILTfbUldp5ovUuphZVe4i30emU9M/kP+T64Di0mxl7dSw3MA== +"@typescript-eslint/eslint-plugin@^7.0.0": + version "7.0.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.0.0.tgz#62cda0d35bbf601683c6e58cf5d04f0275caca4e" + integrity sha512-M72SJ0DkcQVmmsbqlzc6EJgb/3Oz2Wdm6AyESB4YkGgCxP8u5jt5jn4/OBMPK3HLOxcttZq5xbBBU7e2By4SZQ== dependencies: "@eslint-community/regexpp" "^4.5.1" - "@typescript-eslint/scope-manager" "6.21.0" - "@typescript-eslint/type-utils" "6.21.0" - "@typescript-eslint/utils" "6.21.0" - "@typescript-eslint/visitor-keys" "6.21.0" + "@typescript-eslint/scope-manager" "7.0.0" + "@typescript-eslint/type-utils" "7.0.0" + "@typescript-eslint/utils" "7.0.0" + "@typescript-eslint/visitor-keys" "7.0.0" debug "^4.3.4" graphemer "^1.4.0" ignore "^5.2.4" @@ -395,13 +395,21 @@ "@typescript-eslint/types" "6.21.0" "@typescript-eslint/visitor-keys" "6.21.0" -"@typescript-eslint/type-utils@6.21.0": - version "6.21.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.21.0.tgz#6473281cfed4dacabe8004e8521cee0bd9d4c01e" - integrity sha512-rZQI7wHfao8qMX3Rd3xqeYSMCL3SoiSQLBATSiVKARdFGCYSRvmViieZjqc58jKgs8Y8i9YvVVhRbHSTA4VBag== +"@typescript-eslint/scope-manager@7.0.0": + version "7.0.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.0.0.tgz#15ea9abad2b56fc8f5c0b516775f41c86c5c8685" + integrity sha512-IxTStwhNDPO07CCrYuAqjuJ3Xf5MrMaNgbAZPxFXAUpAtwqFxiuItxUaVtP/SJQeCdJjwDGh9/lMOluAndkKeg== dependencies: - "@typescript-eslint/typescript-estree" "6.21.0" - "@typescript-eslint/utils" "6.21.0" + "@typescript-eslint/types" "7.0.0" + "@typescript-eslint/visitor-keys" "7.0.0" + +"@typescript-eslint/type-utils@7.0.0": + version "7.0.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-7.0.0.tgz#a4c7ae114414e09dbbd3c823b5924793f7483252" + integrity sha512-FIM8HPxj1P2G7qfrpiXvbHeHypgo2mFpFGoh5I73ZlqmJOsloSa1x0ZyXCer43++P1doxCgNqIOLqmZR6SOT8g== + dependencies: + "@typescript-eslint/typescript-estree" "7.0.0" + "@typescript-eslint/utils" "7.0.0" debug "^4.3.4" ts-api-utils "^1.0.1" @@ -410,6 +418,11 @@ resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.21.0.tgz#205724c5123a8fef7ecd195075fa6e85bac3436d" integrity sha512-1kFmZ1rOm5epu9NZEZm1kckCDGj5UJEf7P1kliH4LKu/RkwpsfqqGmY2OOcUs18lSlQBKLDYBOGxRVtrMN5lpg== +"@typescript-eslint/types@7.0.0": + version "7.0.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.0.0.tgz#2e5889c7fe3c873fc6dc6420aa77775f17cd5dc6" + integrity sha512-9ZIJDqagK1TTs4W9IyeB2sH/s1fFhN9958ycW8NRTg1vXGzzH5PQNzq6KbsbVGMT+oyyfa17DfchHDidcmf5cg== + "@typescript-eslint/typescript-estree@6.21.0": version "6.21.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.21.0.tgz#c47ae7901db3b8bddc3ecd73daff2d0895688c46" @@ -424,17 +437,31 @@ semver "^7.5.4" ts-api-utils "^1.0.1" -"@typescript-eslint/utils@6.21.0": - version "6.21.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.21.0.tgz#4714e7a6b39e773c1c8e97ec587f520840cd8134" - integrity sha512-NfWVaC8HP9T8cbKQxHcsJBY5YE1O33+jpMwN45qzWWaPDZgLIbo12toGMWnmhvCpd3sIxkpDw3Wv1B3dYrbDQQ== +"@typescript-eslint/typescript-estree@7.0.0": + version "7.0.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.0.0.tgz#7ce66f2ce068517f034f73fba9029300302fdae9" + integrity sha512-JzsOzhJJm74aQ3c9um/aDryHgSHfaX8SHFIu9x4Gpik/+qxLvxUylhTsO9abcNu39JIdhY2LgYrFxTii3IajLA== + dependencies: + "@typescript-eslint/types" "7.0.0" + "@typescript-eslint/visitor-keys" "7.0.0" + debug "^4.3.4" + globby "^11.1.0" + is-glob "^4.0.3" + minimatch "9.0.3" + semver "^7.5.4" + ts-api-utils "^1.0.1" + +"@typescript-eslint/utils@7.0.0": + version "7.0.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.0.0.tgz#e43710af746c6ae08484f7afc68abc0212782c7e" + integrity sha512-kuPZcPAdGcDBAyqDn/JVeJVhySvpkxzfXjJq1X1BFSTYo1TTuo4iyb937u457q4K0In84p6u2VHQGaFnv7VYqg== dependencies: "@eslint-community/eslint-utils" "^4.4.0" "@types/json-schema" "^7.0.12" "@types/semver" "^7.5.0" - "@typescript-eslint/scope-manager" "6.21.0" - "@typescript-eslint/types" "6.21.0" - "@typescript-eslint/typescript-estree" "6.21.0" + "@typescript-eslint/scope-manager" "7.0.0" + "@typescript-eslint/types" "7.0.0" + "@typescript-eslint/typescript-estree" "7.0.0" semver "^7.5.4" "@typescript-eslint/visitor-keys@6.21.0": @@ -445,6 +472,14 @@ "@typescript-eslint/types" "6.21.0" eslint-visitor-keys "^3.4.1" +"@typescript-eslint/visitor-keys@7.0.0": + version "7.0.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.0.0.tgz#83cdadd193ee735fe9ea541f6a2b4d76dfe62081" + integrity sha512-JZP0uw59PRHp7sHQl3aF/lFgwOW2rgNVnXUksj1d932PMita9wFBd3621vHQRDvHwPsSY9FMAAHVc8gTvLYY4w== + dependencies: + "@typescript-eslint/types" "7.0.0" + eslint-visitor-keys "^3.4.1" + "@ungap/structured-clone@^1.2.0": version "1.2.0" resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406" From fc47b4f1c5be9a62a5324df62170744f23cc2a61 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Jun 2024 10:44:54 -0800 Subject: [PATCH 058/497] chore: bump aquasecurity/trivy-action from 0.19.0 to 0.21.0 (#6819) Bumps [aquasecurity/trivy-action](https://github.com/aquasecurity/trivy-action) from 0.19.0 to 0.21.0. - [Release notes](https://github.com/aquasecurity/trivy-action/releases) - [Commits](https://github.com/aquasecurity/trivy-action/compare/d710430a6722f083d3b36b8339ff66b32f22ee55...fd25fed6972e341ff0007ddb61f77e88103953c2) --- updated-dependencies: - dependency-name: aquasecurity/trivy-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/security.yaml | 2 +- .github/workflows/trivy-docker.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/security.yaml b/.github/workflows/security.yaml index f381cf3330b2..e0f1878e118e 100644 --- a/.github/workflows/security.yaml +++ b/.github/workflows/security.yaml @@ -55,7 +55,7 @@ jobs: fetch-depth: 0 - name: Run Trivy vulnerability scanner in repo mode - uses: aquasecurity/trivy-action@d710430a6722f083d3b36b8339ff66b32f22ee55 + uses: aquasecurity/trivy-action@fd25fed6972e341ff0007ddb61f77e88103953c2 with: scan-type: "fs" scan-ref: "." diff --git a/.github/workflows/trivy-docker.yaml b/.github/workflows/trivy-docker.yaml index 9b26df3f13bd..13c98468ea0a 100644 --- a/.github/workflows/trivy-docker.yaml +++ b/.github/workflows/trivy-docker.yaml @@ -51,7 +51,7 @@ jobs: uses: actions/checkout@v4 - name: Run Trivy vulnerability scanner in image mode - uses: aquasecurity/trivy-action@d710430a6722f083d3b36b8339ff66b32f22ee55 + uses: aquasecurity/trivy-action@fd25fed6972e341ff0007ddb61f77e88103953c2 with: image-ref: "docker.io/codercom/code-server:latest" ignore-unfixed: true From 6d9530aa6b84514b8b54700d88cbcc66c70b789f Mon Sep 17 00:00:00 2001 From: Olivier Benz Date: Fri, 7 Jun 2024 01:02:13 +0200 Subject: [PATCH 059/497] Update Code to 1.90.0 (#6824) Additionally: - Update Node to 20.11.1 - Update documentation - Disable extension signature verification This works around an issue where the Open VSX is not returning the expected zip. Verification is skipped later anyway because @vscode/vsce-sign is missing in the OSS version. --- .node-version | 2 +- ci/build/npm-postinstall.sh | 4 ++-- docs/CONTRIBUTING.md | 2 +- docs/android.md | 2 +- docs/npm.md | 4 ++-- docs/termux.md | 2 +- flake.lock | 17 +++++++------- flake.nix | 2 +- lib/vscode | 2 +- package.json | 6 ++--- patches/base-path.diff | 6 ++--- patches/disable-builtin-ext-update.diff | 2 +- patches/display-language.diff | 14 +++++------ patches/external-file-actions.diff | 31 ++++++++++++------------- patches/getting-started.diff | 8 +++---- patches/integration.diff | 4 ++-- patches/logout.diff | 2 +- patches/marketplace.diff | 21 ++++++++++++++--- patches/proxy-uri.diff | 2 +- patches/service-worker.diff | 2 +- patches/telemetry.diff | 4 ++-- patches/update-check.diff | 4 ++-- yarn.lock | 8 +++---- 23 files changed, 82 insertions(+), 69 deletions(-) diff --git a/.node-version b/.node-version index 87ec8842b158..2dbbe00e679a 100644 --- a/.node-version +++ b/.node-version @@ -1 +1 @@ -18.18.2 +20.11.1 diff --git a/ci/build/npm-postinstall.sh b/ci/build/npm-postinstall.sh index 0f99a044950d..5db03fc454b3 100755 --- a/ci/build/npm-postinstall.sh +++ b/ci/build/npm-postinstall.sh @@ -76,8 +76,8 @@ main() { echo "USE AT YOUR OWN RISK!" fi - if [ "$major_node_version" -ne "${FORCE_NODE_VERSION:-18}" ]; then - echo "ERROR: code-server currently requires node v18." + if [ "$major_node_version" -ne "${FORCE_NODE_VERSION:-20}" ]; then + echo "ERROR: code-server currently requires node v20." if [ -n "$FORCE_NODE_VERSION" ]; then echo "However, you have overrided the version check to use v$FORCE_NODE_VERSION." fi diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index fcd75569790e..79da7cbca49b 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -37,7 +37,7 @@ for [VS Code](https://github.com/Microsoft/vscode/wiki/How-to-Contribute#prerequisites). Here is what is needed: -- `node` v18.x +- `node` v20.x - `git` v2.x or greater - [`git-lfs`](https://git-lfs.github.com) - [`yarn`](https://classic.yarnpkg.com/en/) diff --git a/docs/android.md b/docs/android.md index 8107be873da8..00909f975415 100644 --- a/docs/android.md +++ b/docs/android.md @@ -11,7 +11,7 @@ curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.0/install.sh | bash ``` 6. Exit the terminal using `exit` and then reopen the terminal -7. Install and use Node.js 18: +7. Install and use Node.js 20: ```shell nvm install 18 diff --git a/docs/npm.md b/docs/npm.md index 4f3341249f98..46fa5d02f505 100644 --- a/docs/npm.md +++ b/docs/npm.md @@ -30,7 +30,7 @@ includes installing instructions based on your operating system. ## Node.js version We use the same major version of Node.js shipped with Code's remote, which is -currently `18.x`. VS Code also [lists Node.js +currently `20.x`. VS Code also [lists Node.js requirements](https://github.com/microsoft/vscode/wiki/How-to-Contribute#prerequisites). Using other versions of Node.js [may lead to unexpected @@ -79,7 +79,7 @@ Proceed to [installing](#installing) ## FreeBSD ```sh -pkg install -y git python npm-node18 pkgconf +pkg install -y git python npm-node20 pkgconf pkg install -y libinotify ``` diff --git a/docs/termux.md b/docs/termux.md index d6ea8c7bbb53..84dcec0765e4 100644 --- a/docs/termux.md +++ b/docs/termux.md @@ -57,7 +57,7 @@ npm config set python python3 node -v ``` -you will get Node version `v18` +you will get Node version `v20` 5. Now install code-server following our guide on [installing with npm](./npm.md) diff --git a/flake.lock b/flake.lock index 3c0f64a8fd2a..2cda53a3bebd 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -20,12 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1683594133, - "narHash": "sha256-iUhLhEAgOCnexSGDsYT2ouydis09uDoNzM7UC685XGE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "8d447c5626cfefb9b129d5b30103344377fe09bc", - "type": "github" + "lastModified": 1716137900, + "narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=", + "path": "/nix/store/r8nhgnkxacbnf4kv8kdi8b6ks3k9b16i-source", + "rev": "6c0b7a92c30122196a761b440ac0d46d3d9954f1", + "type": "path" }, "original": { "id": "nixpkgs", diff --git a/flake.nix b/flake.nix index 74f39215e72b..07c2e8411199 100644 --- a/flake.nix +++ b/flake.nix @@ -7,7 +7,7 @@ flake-utils.lib.eachDefaultSystem (system: let pkgs = nixpkgs.legacyPackages.${system}; - nodejs = pkgs.nodejs-18_x; + nodejs = pkgs.nodejs_20; yarn' = pkgs.yarn.override { inherit nodejs; }; in { devShells.default = pkgs.mkShell { diff --git a/lib/vscode b/lib/vscode index dc96b837cf6b..89de5a8d4d62 160000 --- a/lib/vscode +++ b/lib/vscode @@ -1 +1 @@ -Subproject commit dc96b837cf6bb4af9cd736aa3af08cf8279f7685 +Subproject commit 89de5a8d4d6205e5b11647eb6a74844ca23d2573 diff --git a/package.json b/package.json index 1876caf3a83e..250efd0db510 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "@types/express": "^4.17.17", "@types/http-proxy": "1.17.7", "@types/js-yaml": "^4.0.6", - "@types/node": "^18.0.0", + "@types/node": "20.x", "@types/pem": "^1.14.1", "@types/proxy-from-env": "^1.0.1", "@types/safe-compare": "^1.1.0", @@ -88,7 +88,7 @@ "xdg-basedir": "^4.0.0" }, "resolutions": { - "@types/node": "^18.0.0" + "@types/node": "20.x" }, "bin": { "code-server": "out/node/entry.js" @@ -103,7 +103,7 @@ "remote-development" ], "engines": { - "node": "18" + "node": "20" }, "jest": { "transform": { diff --git a/patches/base-path.diff b/patches/base-path.diff index 49e219cfa89f..6705ec088da0 100644 --- a/patches/base-path.diff +++ b/patches/base-path.diff @@ -10,7 +10,7 @@ Index: code-server/lib/vscode/src/vs/base/common/network.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/base/common/network.ts +++ code-server/lib/vscode/src/vs/base/common/network.ts -@@ -205,7 +205,9 @@ class RemoteAuthoritiesImpl { +@@ -212,7 +212,9 @@ class RemoteAuthoritiesImpl { return URI.from({ scheme: platform.isWeb ? this._preferredWebSchema : Schemas.vscodeRemoteResource, authority: `${host}:${port}`, @@ -140,11 +140,11 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts + const base = relativeRoot(getOriginalUrl(req)) + const vscodeBase = relativePath(getOriginalUrl(req)) + - const productConfiguration = >{ + const productConfiguration = { codeServerVersion: this._productService.codeServerVersion, + rootEndpoint: base, embedderIdentifier: 'server-distro', - extensionsGallery: this._webExtensionResourceUrlTemplate ? { + extensionsGallery: this._webExtensionResourceUrlTemplate && this._productService.extensionsGallery ? { ...this._productService.extensionsGallery, @@ -343,8 +346,10 @@ export class WebClientServer { const values: { [key: string]: string } = { diff --git a/patches/disable-builtin-ext-update.diff b/patches/disable-builtin-ext-update.diff index 8c88d3263724..c251a49a2af7 100644 --- a/patches/disable-builtin-ext-update.diff +++ b/patches/disable-builtin-ext-update.diff @@ -7,7 +7,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts +++ code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts -@@ -284,6 +284,10 @@ export class Extension implements IExten +@@ -285,6 +285,10 @@ export class Extension implements IExten if (this.type === ExtensionType.System && this.productService.quality === 'stable') { return false; } diff --git a/patches/display-language.diff b/patches/display-language.diff index f36e8b1ba30d..c64efe8c592b 100644 --- a/patches/display-language.diff +++ b/patches/display-language.diff @@ -23,14 +23,14 @@ Index: code-server/lib/vscode/src/vs/server/node/serverServices.ts +++ code-server/lib/vscode/src/vs/server/node/serverServices.ts @@ -11,7 +11,7 @@ import * as path from 'vs/base/common/pa import { IURITransformer } from 'vs/base/common/uriIpc'; - import { getMachineId, getSqmMachineId } from 'vs/base/node/id'; + import { getMachineId, getSqmMachineId, getdevDeviceId } from 'vs/base/node/id'; import { Promises } from 'vs/base/node/pfs'; -import { ClientConnectionEvent, IMessagePassingProtocol, IPCServer, StaticRouter } from 'vs/base/parts/ipc/common/ipc'; +import { ClientConnectionEvent, IMessagePassingProtocol, IPCServer, ProxyChannel, StaticRouter } from 'vs/base/parts/ipc/common/ipc'; import { ProtocolConstants } from 'vs/base/parts/ipc/common/ipc.net'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { ConfigurationService } from 'vs/platform/configuration/common/configurationService'; -@@ -237,6 +237,9 @@ export async function setupServerService +@@ -238,6 +238,9 @@ export async function setupServerService const channel = new ExtensionManagementChannel(extensionManagementService, (ctx: RemoteAgentConnectionContext) => getUriTransformer(ctx.remoteAuthority)); socketServer.registerChannel('extensions', channel); @@ -348,7 +348,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts +++ code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts -@@ -342,9 +342,6 @@ export class InstallAction extends Exten +@@ -341,9 +341,6 @@ export class InstallAction extends Exten if (this.extension.isBuiltin) { return; } @@ -358,7 +358,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens if (this.extension.state === ExtensionState.Uninstalled && await this.extensionsWorkbenchService.canInstall(this.extension)) { this.enabled = this.options.installPreReleaseVersion ? this.extension.hasPreReleaseVersion : this.extension.hasReleaseVersion; this.updateLabel(); -@@ -615,7 +612,7 @@ export abstract class InstallInOtherServ +@@ -614,7 +611,7 @@ export abstract class InstallInOtherServ } if (isLanguagePackExtension(this.extension.local.manifest)) { @@ -367,7 +367,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens } // Prefers to run on UI -@@ -1843,17 +1840,6 @@ export class SetLanguageAction extends E +@@ -1848,17 +1845,6 @@ export class SetLanguageAction extends E update(): void { this.enabled = false; this.class = SetLanguageAction.DisabledClass; @@ -385,7 +385,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens } override async run(): Promise { -@@ -1870,7 +1856,6 @@ export class ClearLanguageAction extends +@@ -1875,7 +1861,6 @@ export class ClearLanguageAction extends private static readonly DisabledClass = `${ClearLanguageAction.EnabledClass} disabled`; constructor( @@ -393,7 +393,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens @ILocaleService private readonly localeService: ILocaleService, ) { super(ClearLanguageAction.ID, ClearLanguageAction.TITLE.value, ClearLanguageAction.DisabledClass, false); -@@ -1880,17 +1865,6 @@ export class ClearLanguageAction extends +@@ -1885,17 +1870,6 @@ export class ClearLanguageAction extends update(): void { this.enabled = false; this.class = ClearLanguageAction.DisabledClass; diff --git a/patches/external-file-actions.diff b/patches/external-file-actions.diff index bc9b6b913cba..2f84d7ca6b52 100644 --- a/patches/external-file-actions.diff +++ b/patches/external-file-actions.diff @@ -125,31 +125,30 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/contextkeys.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/browser/contextkeys.ts +++ code-server/lib/vscode/src/vs/workbench/browser/contextkeys.ts -@@ -7,12 +7,12 @@ import { Event } from 'vs/base/common/ev +@@ -7,11 +7,11 @@ import { Event } from 'vs/base/common/ev import { Disposable } from 'vs/base/common/lifecycle'; import { IContextKeyService, IContextKey, setConstant as setConstantContextKey } from 'vs/platform/contextkey/common/contextkey'; import { InputFocusedContext, IsMacContext, IsLinuxContext, IsWindowsContext, IsWebContext, IsMacNativeContext, IsDevelopmentContext, IsIOSContext, ProductQualityContext, IsMobileContext } from 'vs/platform/contextkey/common/contextkeys'; --import { SplitEditorsVertically, InEditorZenModeContext, ActiveEditorCanRevertContext, ActiveEditorGroupLockedContext, ActiveEditorCanSplitInGroupContext, SideBySideEditorActiveContext, AuxiliaryBarVisibleContext, SideBarVisibleContext, PanelAlignmentContext, PanelMaximizedContext, PanelVisibleContext, ActiveEditorContext, EditorsVisibleContext, TextCompareEditorVisibleContext, TextCompareEditorActiveContext, ActiveEditorGroupEmptyContext, EmbedderIdentifierContext, EditorTabsVisibleContext, IsMainEditorCenteredLayoutContext, ActiveEditorGroupIndexContext, ActiveEditorGroupLastContext, ActiveEditorReadonlyContext, MainEditorAreaVisibleContext, ActiveEditorAvailableEditorIdsContext, DirtyWorkingCopiesContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, IsMainWindowFullscreenContext, OpenFolderWorkspaceSupportContext, RemoteNameContext, VirtualWorkspaceContext, WorkbenchStateContext, WorkspaceFolderCountContext, PanelPositionContext, TemporaryWorkspaceContext, ActiveEditorCanToggleReadonlyContext, applyAvailableEditorIds, TitleBarVisibleContext, TitleBarStyleContext, MultipleEditorGroupsContext, IsAuxiliaryWindowFocusedContext, ActiveCompareEditorCanSwapContext } from 'vs/workbench/common/contextkeys'; -+import { SplitEditorsVertically, InEditorZenModeContext, ActiveEditorCanRevertContext, ActiveEditorGroupLockedContext, ActiveEditorCanSplitInGroupContext, SideBySideEditorActiveContext, AuxiliaryBarVisibleContext, SideBarVisibleContext, PanelAlignmentContext, PanelMaximizedContext, PanelVisibleContext, ActiveEditorContext, EditorsVisibleContext, TextCompareEditorVisibleContext, TextCompareEditorActiveContext, ActiveEditorGroupEmptyContext, EmbedderIdentifierContext, EditorTabsVisibleContext, IsMainEditorCenteredLayoutContext, ActiveEditorGroupIndexContext, ActiveEditorGroupLastContext, ActiveEditorReadonlyContext, MainEditorAreaVisibleContext, ActiveEditorAvailableEditorIdsContext, DirtyWorkingCopiesContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, IsMainWindowFullscreenContext, OpenFolderWorkspaceSupportContext, RemoteNameContext, VirtualWorkspaceContext, WorkbenchStateContext, WorkspaceFolderCountContext, PanelPositionContext, TemporaryWorkspaceContext, ActiveEditorCanToggleReadonlyContext, applyAvailableEditorIds, TitleBarVisibleContext, TitleBarStyleContext, MultipleEditorGroupsContext, IsAuxiliaryWindowFocusedContext, ActiveCompareEditorCanSwapContext, IsEnabledFileDownloads, IsEnabledFileUploads } from 'vs/workbench/common/contextkeys'; - import { TEXT_DIFF_EDITOR_ID, EditorInputCapabilities, SIDE_BY_SIDE_EDITOR_ID, EditorResourceAccessor, SideBySideEditor } from 'vs/workbench/common/editor'; +-import { SplitEditorsVertically, InEditorZenModeContext, AuxiliaryBarVisibleContext, SideBarVisibleContext, PanelAlignmentContext, PanelMaximizedContext, PanelVisibleContext, EmbedderIdentifierContext, EditorTabsVisibleContext, IsMainEditorCenteredLayoutContext, MainEditorAreaVisibleContext, DirtyWorkingCopiesContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, IsMainWindowFullscreenContext, OpenFolderWorkspaceSupportContext, RemoteNameContext, VirtualWorkspaceContext, WorkbenchStateContext, WorkspaceFolderCountContext, PanelPositionContext, TemporaryWorkspaceContext, TitleBarVisibleContext, TitleBarStyleContext, IsAuxiliaryWindowFocusedContext, ActiveEditorGroupEmptyContext, ActiveEditorGroupIndexContext, ActiveEditorGroupLastContext, ActiveEditorGroupLockedContext, MultipleEditorGroupsContext, EditorsVisibleContext } from 'vs/workbench/common/contextkeys'; ++import { SplitEditorsVertically, InEditorZenModeContext, AuxiliaryBarVisibleContext, SideBarVisibleContext, PanelAlignmentContext, PanelMaximizedContext, PanelVisibleContext, EmbedderIdentifierContext, EditorTabsVisibleContext, IsMainEditorCenteredLayoutContext, MainEditorAreaVisibleContext, DirtyWorkingCopiesContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, IsMainWindowFullscreenContext, OpenFolderWorkspaceSupportContext, RemoteNameContext, VirtualWorkspaceContext, WorkbenchStateContext, WorkspaceFolderCountContext, PanelPositionContext, TemporaryWorkspaceContext, TitleBarVisibleContext, TitleBarStyleContext, IsAuxiliaryWindowFocusedContext, ActiveEditorGroupEmptyContext, ActiveEditorGroupIndexContext, ActiveEditorGroupLastContext, ActiveEditorGroupLockedContext, MultipleEditorGroupsContext, EditorsVisibleContext, IsEnabledFileDownloads, IsEnabledFileUploads } from 'vs/workbench/common/contextkeys'; import { trackFocus, addDisposableListener, EventType, onDidRegisterWindow, getActiveWindow } from 'vs/base/browser/dom'; import { preferredSideBySideGroupDirection, GroupDirection, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; -import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService'; +import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService'; - import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { WorkbenchState, IWorkspaceContextService, isTemporaryWorkspace } from 'vs/platform/workspace/common/workspace'; import { IWorkbenchLayoutService, Parts, positionToString } from 'vs/workbench/services/layout/browser/layoutService'; -@@ -88,7 +88,7 @@ export class WorkbenchContextKeysHandler + import { getRemoteName } from 'vs/platform/remote/common/remoteHosts'; +@@ -70,7 +70,7 @@ export class WorkbenchContextKeysHandler @IContextKeyService private readonly contextKeyService: IContextKeyService, @IWorkspaceContextService private readonly contextService: IWorkspaceContextService, @IConfigurationService private readonly configurationService: IConfigurationService, - @IWorkbenchEnvironmentService private readonly environmentService: IWorkbenchEnvironmentService, + @IBrowserWorkbenchEnvironmentService private readonly environmentService: IBrowserWorkbenchEnvironmentService, @IProductService private readonly productService: IProductService, + @IEditorGroupsService private readonly editorGroupService: IEditorGroupsService, @IEditorService private readonly editorService: IEditorService, - @IEditorResolverService private readonly editorResolverService: IEditorResolverService, -@@ -225,6 +225,10 @@ export class WorkbenchContextKeysHandler +@@ -197,6 +197,10 @@ export class WorkbenchContextKeysHandler this.auxiliaryBarVisibleContext = AuxiliaryBarVisibleContext.bindTo(this.contextKeyService); this.auxiliaryBarVisibleContext.set(this.layoutService.isVisible(Parts.AUXILIARYBAR_PART)); @@ -168,12 +167,12 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/files/browser/fileActions import { AutoSaveAfterShortDelayContext } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService'; import { WorkbenchListDoubleSelection } from 'vs/platform/list/browser/listService'; import { Schemas } from 'vs/base/common/network'; --import { DirtyWorkingCopiesContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, WorkbenchStateContext, WorkspaceFolderCountContext, SidebarFocusContext, ActiveEditorCanRevertContext, ActiveEditorContext, ResourceContextKey, ActiveEditorAvailableEditorIdsContext } from 'vs/workbench/common/contextkeys'; -+import { DirtyWorkingCopiesContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, WorkbenchStateContext, WorkspaceFolderCountContext, SidebarFocusContext, ActiveEditorCanRevertContext, ActiveEditorContext, ResourceContextKey, ActiveEditorAvailableEditorIdsContext, IsEnabledFileDownloads, IsEnabledFileUploads } from 'vs/workbench/common/contextkeys'; +-import { DirtyWorkingCopiesContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, WorkbenchStateContext, WorkspaceFolderCountContext, SidebarFocusContext, ActiveEditorCanRevertContext, ActiveEditorContext, ResourceContextKey, ActiveEditorAvailableEditorIdsContext, MultipleEditorsSelectedInGroupContext, TwoEditorsSelectedInGroupContext } from 'vs/workbench/common/contextkeys'; ++import { DirtyWorkingCopiesContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, WorkbenchStateContext, WorkspaceFolderCountContext, SidebarFocusContext, ActiveEditorCanRevertContext, ActiveEditorContext, ResourceContextKey, ActiveEditorAvailableEditorIdsContext, MultipleEditorsSelectedInGroupContext, TwoEditorsSelectedInGroupContext, IsEnabledFileDownloads, IsEnabledFileUploads } from 'vs/workbench/common/contextkeys'; import { IsWebContext } from 'vs/platform/contextkey/common/contextkeys'; import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation'; import { ThemeIcon } from 'vs/base/common/themables'; -@@ -553,13 +553,16 @@ MenuRegistry.appendMenuItem(MenuId.Explo +@@ -561,13 +561,16 @@ MenuRegistry.appendMenuItem(MenuId.Explo id: DOWNLOAD_COMMAND_ID, title: DOWNLOAD_LABEL }, @@ -197,7 +196,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/files/browser/fileActions ) })); -@@ -571,6 +574,7 @@ MenuRegistry.appendMenuItem(MenuId.Explo +@@ -579,6 +582,7 @@ MenuRegistry.appendMenuItem(MenuId.Explo title: UPLOAD_LABEL, }, when: ContextKeyExpr.and( @@ -282,15 +281,15 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/files/browser/views/explo =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/contrib/files/browser/views/explorerViewer.ts +++ code-server/lib/vscode/src/vs/workbench/contrib/files/browser/views/explorerViewer.ts -@@ -68,6 +68,7 @@ import { HoverPosition } from 'vs/base/b +@@ -65,6 +65,7 @@ import { timeout } from 'vs/base/common/ import { IFilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService'; import { mainWindow } from 'vs/base/browser/window'; import { IExplorerFileContribution, explorerFileContribRegistry } from 'vs/workbench/contrib/files/browser/explorerFileContrib'; +import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService'; - import type { IHoverWidget } from 'vs/base/browser/ui/hover/hover'; export class ExplorerDelegate implements IListVirtualDelegate { -@@ -1080,7 +1081,8 @@ export class FileDragAndDrop implements + +@@ -1001,7 +1002,8 @@ export class FileDragAndDrop implements @IConfigurationService private configurationService: IConfigurationService, @IInstantiationService private instantiationService: IInstantiationService, @IWorkspaceEditingService private workspaceEditingService: IWorkspaceEditingService, @@ -300,7 +299,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/files/browser/views/explo ) { const updateDropEnablement = (e: IConfigurationChangeEvent | undefined) => { if (!e || e.affectsConfiguration('explorer.enableDragAndDrop')) { -@@ -1305,15 +1307,17 @@ export class FileDragAndDrop implements +@@ -1226,15 +1228,17 @@ export class FileDragAndDrop implements // External file DND (Import/Upload file) if (data instanceof NativeDragAndDropData) { diff --git a/patches/getting-started.diff b/patches/getting-started.diff index c2eb9002df13..cb9568ef90a5 100644 --- a/patches/getting-started.diff +++ b/patches/getting-started.diff @@ -217,12 +217,12 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/contextkeys.ts import { Disposable } from 'vs/base/common/lifecycle'; import { IContextKeyService, IContextKey, setConstant as setConstantContextKey } from 'vs/platform/contextkey/common/contextkey'; import { InputFocusedContext, IsMacContext, IsLinuxContext, IsWindowsContext, IsWebContext, IsMacNativeContext, IsDevelopmentContext, IsIOSContext, ProductQualityContext, IsMobileContext } from 'vs/platform/contextkey/common/contextkeys'; --import { SplitEditorsVertically, InEditorZenModeContext, ActiveEditorCanRevertContext, ActiveEditorGroupLockedContext, ActiveEditorCanSplitInGroupContext, SideBySideEditorActiveContext, AuxiliaryBarVisibleContext, SideBarVisibleContext, PanelAlignmentContext, PanelMaximizedContext, PanelVisibleContext, ActiveEditorContext, EditorsVisibleContext, TextCompareEditorVisibleContext, TextCompareEditorActiveContext, ActiveEditorGroupEmptyContext, EmbedderIdentifierContext, EditorTabsVisibleContext, IsMainEditorCenteredLayoutContext, ActiveEditorGroupIndexContext, ActiveEditorGroupLastContext, ActiveEditorReadonlyContext, MainEditorAreaVisibleContext, ActiveEditorAvailableEditorIdsContext, DirtyWorkingCopiesContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, IsMainWindowFullscreenContext, OpenFolderWorkspaceSupportContext, RemoteNameContext, VirtualWorkspaceContext, WorkbenchStateContext, WorkspaceFolderCountContext, PanelPositionContext, TemporaryWorkspaceContext, ActiveEditorCanToggleReadonlyContext, applyAvailableEditorIds, TitleBarVisibleContext, TitleBarStyleContext, MultipleEditorGroupsContext, IsAuxiliaryWindowFocusedContext, ActiveCompareEditorCanSwapContext, IsEnabledFileDownloads, IsEnabledFileUploads } from 'vs/workbench/common/contextkeys'; -+import { SplitEditorsVertically, InEditorZenModeContext, ActiveEditorCanRevertContext, ActiveEditorGroupLockedContext, ActiveEditorCanSplitInGroupContext, SideBySideEditorActiveContext, AuxiliaryBarVisibleContext, SideBarVisibleContext, PanelAlignmentContext, PanelMaximizedContext, PanelVisibleContext, ActiveEditorContext, EditorsVisibleContext, TextCompareEditorVisibleContext, TextCompareEditorActiveContext, ActiveEditorGroupEmptyContext, EmbedderIdentifierContext, EditorTabsVisibleContext, IsMainEditorCenteredLayoutContext, ActiveEditorGroupIndexContext, ActiveEditorGroupLastContext, ActiveEditorReadonlyContext, MainEditorAreaVisibleContext, ActiveEditorAvailableEditorIdsContext, DirtyWorkingCopiesContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, IsMainWindowFullscreenContext, OpenFolderWorkspaceSupportContext, RemoteNameContext, VirtualWorkspaceContext, WorkbenchStateContext, WorkspaceFolderCountContext, PanelPositionContext, TemporaryWorkspaceContext, ActiveEditorCanToggleReadonlyContext, applyAvailableEditorIds, TitleBarVisibleContext, TitleBarStyleContext, MultipleEditorGroupsContext, IsAuxiliaryWindowFocusedContext, ActiveCompareEditorCanSwapContext, IsEnabledFileDownloads, IsEnabledFileUploads, IsEnabledCoderGettingStarted, } from 'vs/workbench/common/contextkeys'; - import { TEXT_DIFF_EDITOR_ID, EditorInputCapabilities, SIDE_BY_SIDE_EDITOR_ID, EditorResourceAccessor, SideBySideEditor } from 'vs/workbench/common/editor'; +-import { SplitEditorsVertically, InEditorZenModeContext, AuxiliaryBarVisibleContext, SideBarVisibleContext, PanelAlignmentContext, PanelMaximizedContext, PanelVisibleContext, EmbedderIdentifierContext, EditorTabsVisibleContext, IsMainEditorCenteredLayoutContext, MainEditorAreaVisibleContext, DirtyWorkingCopiesContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, IsMainWindowFullscreenContext, OpenFolderWorkspaceSupportContext, RemoteNameContext, VirtualWorkspaceContext, WorkbenchStateContext, WorkspaceFolderCountContext, PanelPositionContext, TemporaryWorkspaceContext, TitleBarVisibleContext, TitleBarStyleContext, IsAuxiliaryWindowFocusedContext, ActiveEditorGroupEmptyContext, ActiveEditorGroupIndexContext, ActiveEditorGroupLastContext, ActiveEditorGroupLockedContext, MultipleEditorGroupsContext, EditorsVisibleContext, IsEnabledFileDownloads, IsEnabledFileUploads } from 'vs/workbench/common/contextkeys'; ++import { SplitEditorsVertically, InEditorZenModeContext, AuxiliaryBarVisibleContext, SideBarVisibleContext, PanelAlignmentContext, PanelMaximizedContext, PanelVisibleContext, EmbedderIdentifierContext, EditorTabsVisibleContext, IsMainEditorCenteredLayoutContext, MainEditorAreaVisibleContext, DirtyWorkingCopiesContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, IsMainWindowFullscreenContext, OpenFolderWorkspaceSupportContext, RemoteNameContext, VirtualWorkspaceContext, WorkbenchStateContext, WorkspaceFolderCountContext, PanelPositionContext, TemporaryWorkspaceContext, TitleBarVisibleContext, TitleBarStyleContext, IsAuxiliaryWindowFocusedContext, ActiveEditorGroupEmptyContext, ActiveEditorGroupIndexContext, ActiveEditorGroupLastContext, ActiveEditorGroupLockedContext, MultipleEditorGroupsContext, EditorsVisibleContext, IsEnabledFileDownloads, IsEnabledFileUploads, IsEnabledCoderGettingStarted, } from 'vs/workbench/common/contextkeys'; import { trackFocus, addDisposableListener, EventType, onDidRegisterWindow, getActiveWindow } from 'vs/base/browser/dom'; import { preferredSideBySideGroupDirection, GroupDirection, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService'; -@@ -228,6 +228,7 @@ export class WorkbenchContextKeysHandler + import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; +@@ -200,6 +200,7 @@ export class WorkbenchContextKeysHandler // code-server IsEnabledFileDownloads.bindTo(this.contextKeyService).set(this.environmentService.isEnabledFileDownloads ?? true) IsEnabledFileUploads.bindTo(this.contextKeyService).set(this.environmentService.isEnabledFileUploads ?? true) diff --git a/patches/integration.diff b/patches/integration.diff index 3c104cae2b3f..b3ed7bcaa51a 100644 --- a/patches/integration.diff +++ b/patches/integration.diff @@ -267,8 +267,8 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts @@ -307,6 +307,7 @@ export class WebClientServer { } : undefined; - const productConfiguration = >{ + const productConfiguration = { + codeServerVersion: this._productService.codeServerVersion, embedderIdentifier: 'server-distro', - extensionsGallery: this._webExtensionResourceUrlTemplate ? { + extensionsGallery: this._webExtensionResourceUrlTemplate && this._productService.extensionsGallery ? { ...this._productService.extensionsGallery, diff --git a/patches/logout.diff b/patches/logout.diff index 558df0f6e740..6840d198f8e7 100644 --- a/patches/logout.diff +++ b/patches/logout.diff @@ -47,7 +47,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts + logoutEndpoint: this._environmentService.args['auth'] && this._environmentService.args['auth'] !== "none" ? base + '/logout' : undefined, embedderIdentifier: 'server-distro', extensionsGallery: this._productService.extensionsGallery, - }; + } satisfies Partial; Index: code-server/lib/vscode/src/vs/workbench/browser/client.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/browser/client.ts diff --git a/patches/marketplace.diff b/patches/marketplace.diff index 9f5c9f52dba5..a887091a292b 100644 --- a/patches/marketplace.diff +++ b/patches/marketplace.diff @@ -53,16 +53,16 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts codeServerVersion: this._productService.codeServerVersion, rootEndpoint: base, embedderIdentifier: 'server-distro', -- extensionsGallery: this._webExtensionResourceUrlTemplate ? { +- extensionsGallery: this._webExtensionResourceUrlTemplate && this._productService.extensionsGallery ? { - ...this._productService.extensionsGallery, -- 'resourceUrlTemplate': this._webExtensionResourceUrlTemplate.with({ +- resourceUrlTemplate: this._webExtensionResourceUrlTemplate.with({ - scheme: 'http', - authority: remoteAuthority, - path: `${this._webExtensionRoute}/${this._webExtensionResourceUrlTemplate.authority}${this._webExtensionResourceUrlTemplate.path}` - }).toString(true) - } : undefined + extensionsGallery: this._productService.extensionsGallery, - }; + } satisfies Partial; if (!this._environmentService.isBuilt) { Index: code-server/lib/vscode/src/vs/platform/extensionResourceLoader/common/extensionResourceLoader.ts @@ -82,3 +82,18 @@ Index: code-server/lib/vscode/src/vs/platform/extensionResourceLoader/common/ext } } +Index: code-server/lib/vscode/src/vs/platform/extensionManagement/node/extensionDownloader.ts +=================================================================== +--- code-server.orig/lib/vscode/src/vs/platform/extensionManagement/node/extensionDownloader.ts ++++ code-server/lib/vscode/src/vs/platform/extensionManagement/node/extensionDownloader.ts +@@ -114,7 +114,10 @@ export class ExtensionsDownloader extend + return false; + } + ++ return false ++ // @ts-expect-error + const value = this.configurationService.getValue('extensions.verifySignature'); ++ // @ts-expect-error + return isBoolean(value) ? value : true; + } + diff --git a/patches/proxy-uri.diff b/patches/proxy-uri.diff index eb05cf12c9b5..cd3177537106 100644 --- a/patches/proxy-uri.diff +++ b/patches/proxy-uri.diff @@ -78,7 +78,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts + proxyEndpointTemplate: process.env.VSCODE_PROXY_URI ?? base + '/proxy/{{port}}/', embedderIdentifier: 'server-distro', extensionsGallery: this._productService.extensionsGallery, - }; + } satisfies Partial; Index: code-server/lib/vscode/src/vs/workbench/contrib/terminal/common/terminalEnvironment.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/contrib/terminal/common/terminalEnvironment.ts diff --git a/patches/service-worker.diff b/patches/service-worker.diff index 6da55abc4c0a..f60cfa5fcfa5 100644 --- a/patches/service-worker.diff +++ b/patches/service-worker.diff @@ -64,4 +64,4 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts + }, embedderIdentifier: 'server-distro', extensionsGallery: this._productService.extensionsGallery, - }; + } satisfies Partial; diff --git a/patches/telemetry.diff b/patches/telemetry.diff index 11ebed2f41f7..52d2e2287bf6 100644 --- a/patches/telemetry.diff +++ b/patches/telemetry.diff @@ -20,7 +20,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverServices.ts import { NullPolicyService } from 'vs/platform/policy/common/policy'; import { OneDataSystemAppender } from 'vs/platform/telemetry/node/1dsAppender'; import { LoggerService } from 'vs/platform/log/node/loggerService'; -@@ -146,11 +147,23 @@ export async function setupServerService +@@ -147,11 +148,23 @@ export async function setupServerService const requestService = new RequestService(configurationService, environmentService, logService, loggerService); services.set(IRequestService, requestService); @@ -118,7 +118,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts + telemetryEndpoint: this._productService.telemetryEndpoint, embedderIdentifier: 'server-distro', extensionsGallery: this._productService.extensionsGallery, - }; + } satisfies Partial; Index: code-server/lib/vscode/src/vs/base/common/product.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/base/common/product.ts diff --git a/patches/update-check.diff b/patches/update-check.diff index e67d6a7a12e9..ef9c53ad985b 100644 --- a/patches/update-check.diff +++ b/patches/update-check.diff @@ -106,13 +106,13 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts @@ -311,6 +311,7 @@ export class WebClientServer { - const productConfiguration = >{ + const productConfiguration = { codeServerVersion: this._productService.codeServerVersion, rootEndpoint: base, + updateEndpoint: !this._environmentService.args['disable-update-check'] ? base + '/update/check' : undefined, embedderIdentifier: 'server-distro', extensionsGallery: this._productService.extensionsGallery, - }; + } satisfies Partial; Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/serverEnvironmentService.ts diff --git a/yarn.lock b/yarn.lock index 59a19c5eb415..031a54774f90 100644 --- a/yarn.lock +++ b/yarn.lock @@ -284,10 +284,10 @@ resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a" integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw== -"@types/node@*", "@types/node@^18.0.0": - version "18.19.4" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.4.tgz#89672e84f11a2c19543d694dac00ab8d7bc20ddb" - integrity sha512-xNzlUhzoHotIsnFoXmJB+yWmBvFZgKCI9TtPIEdYIMM1KWfwuY8zh7wvc1u1OAXlC7dlf6mZVx/s+Y5KfFz19A== +"@types/node@*", "@types/node@20.x": + version "20.14.2" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.14.2.tgz#a5f4d2bcb4b6a87bffcaa717718c5a0f208f4a18" + integrity sha512-xyu6WAMVwv6AKFLB+e/7ySZVr/0zLCzOa7rSpq6jNwpqOrUbcACDWC+53d4n2QHOnDou0fbIsg8wZu/sxrnI4Q== dependencies: undici-types "~5.26.4" From 3b467dec95d049cb2a4138300154eee2487d3db0 Mon Sep 17 00:00:00 2001 From: Asher Date: Thu, 6 Jun 2024 15:05:12 -0800 Subject: [PATCH 060/497] Update changelog for 1.90.0 --- CHANGELOG.md | 19 +++++++++++++++++++ install.sh | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5a0e9cfb932e..0df29ba4e3a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,25 @@ Code v99.99.999 ## Unreleased +Code v1.90.0 + +## Changed + +- Updated to Code 1.90.0. +- Updated Node to 20.11.1. + +## Added + +- Send contents to the clipboard in the integrated terminal by piping to + `code-server --stdin-to-clipboard` or `code-server -c`. + + You may want to make this an alias: + + ``` + alias xclip="code-server --stdin-to-clipboard" + echo -n "hello world" | xclip + ``` + ## [4.89.1](https://github.com/coder/code-server/releases/tag/v4.89.1) - 2024-04-14 Code v1.89.1 diff --git a/install.sh b/install.sh index 5cbd8222b6c7..0a17cd9d2bb9 100755 --- a/install.sh +++ b/install.sh @@ -441,7 +441,7 @@ install_npm() { return fi echoerr "Please install npm to install code-server!" - echoerr "You will need at least node v18 and a few C dependencies." + echoerr "You will need at least node v20 and a few C dependencies." echoerr "See the docs https://coder.com/docs/code-server/latest/install#npm" exit 1 From 1bd2b9cf08600f79e797f2a61845708e6d6ee280 Mon Sep 17 00:00:00 2001 From: Asher Date: Sat, 8 Jun 2024 21:07:24 -0700 Subject: [PATCH 061/497] Fix segfault in CI (#6830) Setting DISABLE_V8_COMPILE_CACHE=1 seems to fix it. --- .github/workflows/build.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index bc777401a0cb..1a60a945b039 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -206,6 +206,7 @@ jobs: timeout-minutes: 60 env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} + DISABLE_V8_COMPILE_CACHE: 1 steps: - name: Checkout repo uses: actions/checkout@v4 From 0c802ba1652296c79d26ff3e990578e67e6734b1 Mon Sep 17 00:00:00 2001 From: Asher Date: Sat, 8 Jun 2024 21:07:51 -0700 Subject: [PATCH 062/497] Remove node-gyp install (#6831) Seems to install fine without it now. --- .github/workflows/build.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 1a60a945b039..ce483c40beb3 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -230,11 +230,6 @@ jobs: with: node-version-file: .node-version - # node-gyp is missing in (at least) npm 9.8.1. - # TODO: Remove once we update to npm>=10? - - name: Install node-gyp - run: npm install -g node-gyp - - name: Fetch dependencies from cache id: cache-node-modules uses: actions/cache@v4 From 9da9f2029caa121d6e4957771537de989b83c256 Mon Sep 17 00:00:00 2001 From: Asher Date: Wed, 12 Jun 2024 13:03:51 -0800 Subject: [PATCH 063/497] v4.90.0 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0df29ba4e3a9..36da6411954e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,8 @@ Code v99.99.999 ## Unreleased +## [4.90.0](https://github.com/coder/code-server/releases/tag/v4.90.0) - 2024-06-11 + Code v1.90.0 ## Changed From e7ca9cd6ac53d0f533742ea61420faf4a8434360 Mon Sep 17 00:00:00 2001 From: Asher Date: Wed, 12 Jun 2024 13:05:41 -0800 Subject: [PATCH 064/497] Fix changelog heading indentation --- CHANGELOG.md | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 36da6411954e..54225db3fbc9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,12 +26,12 @@ Code v99.99.999 Code v1.90.0 -## Changed +### Changed - Updated to Code 1.90.0. - Updated Node to 20.11.1. -## Added +### Added - Send contents to the clipboard in the integrated terminal by piping to `code-server --stdin-to-clipboard` or `code-server -c`. @@ -47,7 +47,7 @@ Code v1.90.0 Code v1.89.1 -## Changed +### Changed - Updated to Code 1.89.1. @@ -55,7 +55,7 @@ Code v1.89.1 Code v1.89.0 -## Changed +### Changed - Updated to Code 1.89.0. @@ -63,7 +63,7 @@ Code v1.89.0 Code v1.88.1 -## Changed +### Changed - Updated to Code 1.88.1. @@ -71,12 +71,12 @@ Code v1.88.1 Code v1.88.0 -## Changed +### Changed - Updated to Code 1.88.0. - Updated Node to 18.18.2. -## Fixed +### Fixed - Fix masking the exit code when failing to install extensions on the command line outside the integrated terminal. Installing extensions inside the @@ -86,7 +86,7 @@ Code v1.88.0 Code v1.87.2 -## Changed +### Changed - Updated to Code 1.87.2. - Enable keep-alive for proxy agent. @@ -95,7 +95,7 @@ Code v1.87.2 Code v1.87.0 -## Changed +### Changed - Updated to Code 1.87.0. @@ -103,7 +103,7 @@ Code v1.87.0 Code v1.86.2 -## Changed +### Changed - Updated to Code 1.86.2. @@ -111,12 +111,12 @@ Code v1.86.2 Code v1.86.1 -## Changed +### Changed - Updated to Code 1.86.1. - Updated to Node 18.17.1. -## Added +### Added - Docker images for Fedora and openSUSE. @@ -124,7 +124,7 @@ Code v1.86.1 Code v1.86.0 -## Changed +### Changed - Updated to Code 1.86.0. @@ -132,11 +132,11 @@ Code v1.86.0 Code v1.85.2 -## Changed +### Changed - Updated to Code 1.85.2. -## Fixed +### Fixed - Query variables are no longer double-encoded when going over the path proxy. From a73549539bb205169189158532c32d0fc44b104e Mon Sep 17 00:00:00 2001 From: Asher Date: Wed, 12 Jun 2024 15:09:45 -0800 Subject: [PATCH 065/497] Cache unchanging telemetry data Might make sense to cache the rest as well, and evict from the cache periodically. For now this is enough to fix a hang I often see in our deployment of Coder. Might only be surfacing now because new telemetry calls were added to startup. --- CHANGELOG.md | 7 +++++ patches/telemetry.diff | 60 ++++++++++++++++++++++++++---------------- 2 files changed, 45 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 54225db3fbc9..73961f68008a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,13 @@ Code v99.99.999 ## Unreleased +Code v1.90.0 + +### Fixed + +- Cache a call to get CPU information used in telemetry that could result in a + lack responsiveness if it was particularly slow. + ## [4.90.0](https://github.com/coder/code-server/releases/tag/v4.90.0) - 2024-06-11 Code v1.90.0 diff --git a/patches/telemetry.diff b/patches/telemetry.diff index 52d2e2287bf6..50ce7a7eab10 100644 --- a/patches/telemetry.diff +++ b/patches/telemetry.diff @@ -50,50 +50,66 @@ Index: code-server/lib/vscode/src/vs/server/node/telemetryClient.ts =================================================================== --- /dev/null +++ code-server/lib/vscode/src/vs/server/node/telemetryClient.ts -@@ -0,0 +1,55 @@ +@@ -0,0 +1,71 @@ +import { AppInsightsCore, IExtendedTelemetryItem, ITelemetryItem } from '@microsoft/1ds-core-js'; +import * as https from 'https'; +import * as http from 'http'; +import * as os from 'os'; + ++interface SystemInfo { ++ measurements: Record; ++ properties: Record; ++} ++ +export class TelemetryClient extends AppInsightsCore { ++ private readonly systemInfo: SystemInfo = { ++ measurements: {}, ++ properties: {}, ++ }; ++ + public constructor( + private readonly endpoint: string, -+ private readonly machineId: string, -+ private readonly isContainer: Boolean | undefined) { ++ machineId: string, ++ isContainer: boolean | undefined) { + super(); ++ ++ // os.cpus() can take a very long time sometimes (personally I see 1-2 ++ // seconds in a Coder workspace). This adds up significantly, especially ++ // when many telemetry requests are sent during startup, which can cause ++ // connection timeouts. Try to cache as much as we can. ++ try { ++ const cpus = os.cpus(); ++ this.systemInfo.measurements.cores = cpus.length; ++ this.systemInfo.properties['common.cpuModel'] = cpus[0].model; ++ } catch (error) {} ++ ++ try { ++ this.systemInfo.properties['common.shell'] = os.userInfo().shell; ++ this.systemInfo.properties['common.release'] = os.release(); ++ this.systemInfo.properties['common.arch'] = os.arch(); ++ } catch (error) {} ++ ++ this.systemInfo.properties['common.remoteMachineId'] = machineId; ++ this.systemInfo.properties['common.isContainer'] = isContainer; + } + + public override track(item: IExtendedTelemetryItem | ITelemetryItem): void { + const options = item.baseData || {} -+ if (!options.properties) { -+ options.properties = {}; ++ options.measurements = { ++ ...(options.measurements || {}), ++ ...this.systemInfo.measurements, + } -+ if (!options.measurements) { -+ options.measurements = {}; ++ options.properties = { ++ ...(options.properties || {}), ++ ...this.systemInfo.properties, + } + + try { -+ const cpus = os.cpus(); -+ options.measurements.cores = cpus.length; -+ options.properties['common.cpuModel'] = cpus[0].model; -+ } catch (error) {} -+ -+ try { + options.measurements.memoryFree = os.freemem(); + options.measurements.memoryTotal = os.totalmem(); + } catch (error) {} + + try { -+ options.properties['common.shell'] = os.userInfo().shell; -+ options.properties['common.release'] = os.release(); -+ options.properties['common.arch'] = os.arch(); -+ } catch (error) {} -+ -+ options.properties['common.remoteMachineId'] = this.machineId; -+ options.properties['common.isContainer'] = this.isContainer; -+ -+ try { + const request = (/^http:/.test(this.endpoint) ? http : https).request(this.endpoint, { + method: 'POST', + headers: { From dce1d6e172cc5f935b9732e7dee4b7a992529eda Mon Sep 17 00:00:00 2001 From: Olivier Benz Date: Fri, 14 Jun 2024 21:31:58 +0200 Subject: [PATCH 066/497] Update Code to 1.90.1 (#6840) --- lib/vscode | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/vscode b/lib/vscode index 89de5a8d4d62..611f9bfce64f 160000 --- a/lib/vscode +++ b/lib/vscode @@ -1 +1 @@ -Subproject commit 89de5a8d4d6205e5b11647eb6a74844ca23d2573 +Subproject commit 611f9bfce64f25108829dd295f54a6894e87339d From ed069310a485e22d87315a5d5ba0d960f747151b Mon Sep 17 00:00:00 2001 From: Asher Date: Mon, 17 Jun 2024 10:41:35 -0800 Subject: [PATCH 067/497] v4.90.2 --- CHANGELOG.md | 10 ++++++++++ ci/helm-chart/Chart.yaml | 4 ++-- ci/helm-chart/values.yaml | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 73961f68008a..4c0b9c2f03d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,16 @@ Code v99.99.999 ## Unreleased +## [4.90.2](https://github.com/coder/code-server/releases/tag/v4.90.2) - 2024-06-14 + +Code v1.90.1 + +### Changed + +- Updated to Code 1.90.1. + +## [4.90.1](https://github.com/coder/code-server/releases/tag/v4.90.1) - 2024-06-12 + Code v1.90.0 ### Fixed diff --git a/ci/helm-chart/Chart.yaml b/ci/helm-chart/Chart.yaml index 3f4687efa222..08c806b6afe2 100644 --- a/ci/helm-chart/Chart.yaml +++ b/ci/helm-chart/Chart.yaml @@ -15,9 +15,9 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 3.20.0 +version: 3.21.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 4.89.1 +appVersion: 4.90.2 diff --git a/ci/helm-chart/values.yaml b/ci/helm-chart/values.yaml index b4e6816258a4..87babfa70a70 100644 --- a/ci/helm-chart/values.yaml +++ b/ci/helm-chart/values.yaml @@ -6,7 +6,7 @@ replicaCount: 1 image: repository: codercom/code-server - tag: '4.89.1' + tag: '4.90.2' pullPolicy: Always # Specifies one or more secrets to be used when pulling images from a From d449729e18ed7d6cb00d36d2edf4dc31357774a2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Jun 2024 10:43:23 -0800 Subject: [PATCH 068/497] chore: bump braces from 3.0.2 to 3.0.3 in /test (#6844) Bumps [braces](https://github.com/micromatch/braces) from 3.0.2 to 3.0.3. - [Changelog](https://github.com/micromatch/braces/blob/master/CHANGELOG.md) - [Commits](https://github.com/micromatch/braces/compare/3.0.2...3.0.3) --- updated-dependencies: - dependency-name: braces dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- test/yarn.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/test/yarn.lock b/test/yarn.lock index 8fdcafaa82be..483c17855b60 100644 --- a/test/yarn.lock +++ b/test/yarn.lock @@ -1198,11 +1198,11 @@ brace-expansion@^1.1.7: concat-map "0.0.1" braces@^3.0.1: - version "3.0.2" - resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" - integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== + version "3.0.3" + resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789" + integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA== dependencies: - fill-range "^7.0.1" + fill-range "^7.1.1" browser-process-hrtime@^1.0.0: version "1.0.0" @@ -1668,10 +1668,10 @@ fd-slicer@~1.1.0: dependencies: pend "~1.2.0" -fill-range@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" - integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== +fill-range@^7.1.1: + version "7.1.1" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292" + integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg== dependencies: to-regex-range "^5.0.1" From c26ac35b25b09e9d58e6716f2aae41d8d1dfbb6c Mon Sep 17 00:00:00 2001 From: Olivier Benz Date: Fri, 21 Jun 2024 00:14:21 +0200 Subject: [PATCH 069/497] Update Code to 1.90.2 (#6853) --- lib/vscode | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/vscode b/lib/vscode index 611f9bfce64f..5437499feb04 160000 --- a/lib/vscode +++ b/lib/vscode @@ -1 +1 @@ -Subproject commit 611f9bfce64f25108829dd295f54a6894e87339d +Subproject commit 5437499feb04f7a586f677b155b039bc2b3669eb From d431c9cd9d52c318230668f67593aae30b53fdf2 Mon Sep 17 00:00:00 2001 From: Asher Date: Fri, 21 Jun 2024 09:45:23 -0800 Subject: [PATCH 070/497] Fix log file path The first argument is a file name, not a path. When the log gets rotated it prepends the date which ends up creating a path in the current working directory. --- src/node/wrapper.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/node/wrapper.ts b/src/node/wrapper.ts index 4b84198f3724..607512e2c9fb 100644 --- a/src/node/wrapper.ts +++ b/src/node/wrapper.ts @@ -248,9 +248,10 @@ export class ParentProcess extends Process { const opts = { size: "10M", maxFiles: 10, + path: path.join(paths.data, "coder-logs"), } - this.logStdoutStream = rfs.createStream(path.join(paths.data, "coder-logs", "code-server-stdout.log"), opts) - this.logStderrStream = rfs.createStream(path.join(paths.data, "coder-logs", "code-server-stderr.log"), opts) + this.logStdoutStream = rfs.createStream("code-server-stdout.log", opts) + this.logStderrStream = rfs.createStream("code-server-stderr.log", opts) this.onDispose(() => this.disposeChild()) From 26c763485b9101fcae2ce56fc0903f0e2d48abe3 Mon Sep 17 00:00:00 2001 From: Asher Date: Fri, 21 Jun 2024 09:51:50 -0800 Subject: [PATCH 071/497] Update JSON parse error matcher Looks like this text changed? --- test/unit/node/settings.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unit/node/settings.test.ts b/test/unit/node/settings.test.ts index 68bf51784fbd..59c6f46a50bc 100644 --- a/test/unit/node/settings.test.ts +++ b/test/unit/node/settings.test.ts @@ -29,7 +29,7 @@ describe("settings", () => { const settings = new SettingsProvider(pathToMockSettingsFile) await settings.read() // This happens when we can't parse a JSON (usually error in file) - expect(logger.warn).toHaveBeenCalledWith("Unexpected token t in JSON at position 29") + expect(logger.warn).toHaveBeenCalledWith(expect.stringMatching(/Unexpected token/)) }) }) describe("with invalid settings file path", () => { From c7d88abf9f57d0576f913b9365532f0e2b885c0c Mon Sep 17 00:00:00 2001 From: Asher Date: Fri, 21 Jun 2024 11:01:16 -0800 Subject: [PATCH 072/497] v4.90.3 --- CHANGELOG.md | 15 +++++++++++++++ ci/helm-chart/Chart.yaml | 4 ++-- ci/helm-chart/values.yaml | 2 +- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4c0b9c2f03d8..09e90fa09d34 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,21 @@ Code v99.99.999 ## Unreleased +## [4.90.3](https://github.com/coder/code-server/releases/tag/v4.90.3) - 2024-06-21 + +Code v1.90.2 + +### Changed + +- Updated to Code 1.90.2. + +### Fixed + +- When the log gets rotated it will no longer incorrectly be moved to a new + directory created in the current working directory named with a date. + Instead, the file itself is prepended with the date and kept in the same + directory, as originally intended. + ## [4.90.2](https://github.com/coder/code-server/releases/tag/v4.90.2) - 2024-06-14 Code v1.90.1 diff --git a/ci/helm-chart/Chart.yaml b/ci/helm-chart/Chart.yaml index 08c806b6afe2..97ca8d81741f 100644 --- a/ci/helm-chart/Chart.yaml +++ b/ci/helm-chart/Chart.yaml @@ -15,9 +15,9 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 3.21.0 +version: 3.21.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 4.90.2 +appVersion: 4.90.3 diff --git a/ci/helm-chart/values.yaml b/ci/helm-chart/values.yaml index 87babfa70a70..0e899556b800 100644 --- a/ci/helm-chart/values.yaml +++ b/ci/helm-chart/values.yaml @@ -6,7 +6,7 @@ replicaCount: 1 image: repository: codercom/code-server - tag: '4.90.2' + tag: '4.90.3' pullPolicy: Always # Specifies one or more secrets to be used when pulling images from a From 603e467f3815999b0a26600222c399b325593faf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 13:27:36 -0800 Subject: [PATCH 073/497] chore: bump ws from 8.17.0 to 8.17.1 (#6851) Bumps [ws](https://github.com/websockets/ws) from 8.17.0 to 8.17.1. - [Release notes](https://github.com/websockets/ws/releases) - [Commits](https://github.com/websockets/ws/compare/8.17.0...8.17.1) --- updated-dependencies: - dependency-name: ws dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 031a54774f90..dc5f202d862e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3664,9 +3664,9 @@ wrappy@1: integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== ws@^8.14.2: - version "8.17.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.17.0.tgz#d145d18eca2ed25aaf791a183903f7be5e295fea" - integrity sha512-uJq6108EgZMAl20KagGkzCKfMEjxmKvZHG7Tlq0Z6nOky7YF7aq4mOx6xK8TJ/i1LeK4Qus7INktacctDgY8Ow== + version "8.17.1" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.17.1.tgz#9293da530bb548febc95371d90f9c878727d919b" + integrity sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ== xdg-basedir@^4.0.0: version "4.0.0" From 93f31e6a74a43e39bd45fb4477dbda54f8c440d8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 13:27:58 -0800 Subject: [PATCH 074/497] chore: bump ws from 7.5.6 to 7.5.10 in /test (#6845) Bumps [ws](https://github.com/websockets/ws) from 7.5.6 to 7.5.10. - [Release notes](https://github.com/websockets/ws/releases) - [Commits](https://github.com/websockets/ws/compare/7.5.6...7.5.10) --- updated-dependencies: - dependency-name: ws dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- test/yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/yarn.lock b/test/yarn.lock index 483c17855b60..8644bd54d75a 100644 --- a/test/yarn.lock +++ b/test/yarn.lock @@ -3544,9 +3544,9 @@ write-file-atomic@^3.0.0: typedarray-to-buffer "^3.1.5" ws@^7.4.6: - version "7.5.6" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.6.tgz#e59fc509fb15ddfb65487ee9765c5a51dec5fe7b" - integrity sha512-6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA== + version "7.5.10" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.10.tgz#58b5c20dc281633f6c19113f39b349bd8bd558d9" + integrity sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ== wtfnode@^0.9.1: version "0.9.1" From 250281d0717753147470243b1d582690d0dfa9eb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 13:28:34 -0800 Subject: [PATCH 075/497] chore: bump braces from 3.0.2 to 3.0.3 (#6843) Bumps [braces](https://github.com/micromatch/braces) from 3.0.2 to 3.0.3. - [Changelog](https://github.com/micromatch/braces/blob/master/CHANGELOG.md) - [Commits](https://github.com/micromatch/braces/compare/3.0.2...3.0.3) --- updated-dependencies: - dependency-name: braces dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/yarn.lock b/yarn.lock index dc5f202d862e..3433ec6c879a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -743,11 +743,11 @@ brace-expansion@^2.0.1: balanced-match "^1.0.0" braces@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" - integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== + version "3.0.3" + resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789" + integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA== dependencies: - fill-range "^7.0.1" + fill-range "^7.1.1" buffer-alloc-unsafe@^1.1.0: version "1.1.0" @@ -1551,10 +1551,10 @@ file-entry-cache@^6.0.1: dependencies: flat-cache "^3.0.4" -fill-range@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" - integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== +fill-range@^7.1.1: + version "7.1.1" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292" + integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg== dependencies: to-regex-range "^5.0.1" From 6514ba4bf3e094f92d0fc0898693c80b3759a3a6 Mon Sep 17 00:00:00 2001 From: Asher Date: Wed, 3 Jul 2024 13:30:33 -0800 Subject: [PATCH 076/497] Update contributing docs --- docs/CONTRIBUTING.md | 135 +++++++++++++++---------------- docs/MAINTAINING.md | 185 ++++++++++--------------------------------- 2 files changed, 103 insertions(+), 217 deletions(-) diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index 79da7cbca49b..5f1e010ac35f 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -5,8 +5,6 @@ - [Requirements](#requirements) - [Linux-specific requirements](#linux-specific-requirements) -- [Creating pull requests](#creating-pull-requests) - - [Commits and commit history](#commits-and-commit-history) - [Development workflow](#development-workflow) - [Version updates to Code](#version-updates-to-code) - [Patching Code](#patching-code) @@ -28,13 +26,10 @@ -- [Detailed CI and build process docs](../ci) - ## Requirements The prerequisites for contributing to code-server are almost the same as those -for [VS -Code](https://github.com/Microsoft/vscode/wiki/How-to-Contribute#prerequisites). +for [VS Code](https://github.com/Microsoft/vscode/wiki/How-to-Contribute#prerequisites). Here is what is needed: - `node` v20.x @@ -60,30 +55,15 @@ Here is what is needed: ### Linux-specific requirements -If you're developing code-server on Linux, make sure you have installed or install the following dependencies: +If you're developing code-server on Linux, make sure you have installed or +install the following dependencies: ```shell sudo apt-get install build-essential g++ libx11-dev libxkbfile-dev libsecret-1-dev libkrb5-dev python-is-python3 ``` -These are required by Code. See [their Wiki](https://github.com/microsoft/vscode/wiki/How-to-Contribute#prerequisites) for more information. - -## Creating pull requests - -Please create a [GitHub Issue](https://github.com/coder/code-server/issues) that -includes context for issues that you see. You can skip this if the proposed fix -is minor. - -In your pull requests (PR), link to the issue that the PR solves. - -Please ensure that the base of your PR is the **main** branch. - -### Commits and commit history - -We prefer a clean commit history. This means you should squash all fixups and -fixup-type commits before asking for a review (e.g., clean up, squash, then force -push). If you need help with this, feel free to leave a comment in your PR, and -we'll guide you. +These are required by Code. See [their Wiki](https://github.com/microsoft/vscode/wiki/How-to-Contribute#prerequisites) +for more information. ## Development workflow @@ -99,55 +79,62 @@ need to apply them with `quilt`. If you pull down changes that update the `vscode` submodule you will need to run `git submodule update --init` and re-apply the patches. -### Version updates to Code +When you make a change that affects people deploying the marketplace please +update the changelog as part of your PR. -1. Update the `lib/vscode` submodule to the desired upstream version branch. - 1. `cd lib/vscode && git checkout release/1.66 && cd ../..` - 2. `git add lib && git commit -m "chore: update Code"` -2. Apply the patches (`quilt push -a`) or restore your stashed changes. At this - stage you may need to resolve conflicts. For example use `quilt push -f`, - manually apply the rejected portions, then `quilt refresh`. -3. From the code-server **project root**, run `yarn install`. -4. Test code-server locally to make sure everything works. -5. Check the Node.js version that's used by Electron (which is shipped with VS - Code. If necessary, update your version of Node.js to match. -6. Commit the updated submodule and patches to `code-server`. -7. Open a PR. +Note that building code-server takes a very, very long time, and loading it in +the browser in development mode also takes a very, very long time. -Tip: if you're certain all patches are applied correctly and you simply need to -refresh, you can use this trick: +Display language (Spanish, etc) support only works in a full build; it will not +work in development mode. -```shell -while quilt push; do quilt refresh; done -``` +Generally we prefer that PRs be squashed into `main` but you can rebase or merge +if it is important to keep the individual commits (make sure to clean up the +commits first if you are doing this). + +### Version updates to Code -[Source](https://raphaelhertzog.com/2012/08/08/how-to-use-quilt-to-manage-patches-in-debian-packages/) +1. Remove any patches with `quilt pop -a`. +2. Update the `lib/vscode` submodule to the desired upstream version branch. + 1. `cd lib/vscode && git checkout release/1.66 && cd ../..` + 2. `git add lib && git commit -m "chore: update to Code "` +3. Apply the patches one at a time (`quilt push`). If the application succeeds + but the lines changed, update the patch with `quilt refresh`. If there are + conflicts, then force apply with `quilt push -f`, manually add back the + rejected code, then run `quilt refresh`. +4. From the code-server **project root**, run `yarn install`. +5. Check the Node.js version that's used by Electron (which is shipped with VS + Code. If necessary, update our version of Node.js to match. ### Patching Code -0. You can go through the patch stack with `quilt push` and `quilt pop`. -1. Create a new patch (`quilt new {name}.diff`) or use an existing patch. -1. Add the file(s) you are patching (`quilt add [-P patch] {file}`). A file +1. You can go through the patch stack with `quilt push` and `quilt pop`. +2. Create a new patch (`quilt new {name}.diff`) or use an existing patch. +3. Add the file(s) you are patching (`quilt add [-P patch] {file}`). A file **must** be added before you make changes to it. -1. Make your changes. Patches do not need to be independent of each other but +4. Make your changes. Patches do not need to be independent of each other but each patch must result in a working code-server without any broken in-between states otherwise they are difficult to test and modify. -1. Add your changes to the patch (`quilt refresh`) -1. Add a comment in the patch about the reason for the patch and how to +5. Add your changes to the patch (`quilt refresh`) +6. Add a comment in the patch about the reason for the patch and how to reproduce the behavior it fixes or adds. Every patch should have an e2e test as well. ### Build -You can build as follows: +You can build a full production as follows: ```shell +git submodule update --init +quilt push -a +yarn install yarn build -yarn build:vscode +VERSION=0.0.0 yarn build:vscode yarn release ``` -_NOTE: this does not keep `node_modules`. If you want them to be kept, use `KEEP_MODULES=1 yarn release` (if you're testing in Coder, you'll want to do this)_ +This does not keep `node_modules`. If you want them to be kept, use +`KEEP_MODULES=1 yarn release` Run your build: @@ -158,7 +145,7 @@ npm install --omit=dev # Skip if you used KEEP_MODULES=1 node . ``` -Build the release packages (make sure that you run `yarn release` first): +Then, to build the release package: ```shell yarn release:standalone @@ -167,7 +154,7 @@ yarn package ``` > On Linux, the currently running distro will become the minimum supported -> version. In our GitHub Actions CI, we use CentOS 7 for maximum compatibility. +> version. In our GitHub Actions CI, we use CentOS 8 for maximum compatibility. > If you need your builds to support older distros, run the build commands > inside a Docker container with all the build requirements installed. @@ -181,9 +168,9 @@ writing, we do this for the following platforms/architectures: - Linux arm7l (.tar.gz) - Linux armhf.deb - Linux armhf.rpm -- macOS amd64 (Intel-based) +- macOS arm64.tar.gz -Currently, these are compiled in CI using the `yarn release-standalone` command +Currently, these are compiled in CI using the `yarn release:standalone` command in the `release.yaml` workflow. We then upload them to the draft release and distribute via GitHub Releases. @@ -191,17 +178,22 @@ distribute via GitHub Releases. #### I see "Forbidden access" when I load code-server in the browser -This means your patches didn't apply correctly. We have a patch to remove the auth from vanilla Code because we use our own. +This means your patches didn't apply correctly. We have a patch to remove the +auth from vanilla Code because we use our own. -Try popping off the patches with `quilt pop -a` and reapplying with `quilt push -a`. +Try popping off the patches with `quilt pop -a` and reapplying with `quilt push +-a`. #### "Can only have one anonymous define call per script" -Code might be trying to use a dev or prod HTML in the wrong context. You can try re-running code-server and setting `VSCODE_DEV=1`. +Code might be trying to use a dev or prod HTML in the wrong context. You can try +re-running code-server and setting `VSCODE_DEV=1`. ### Help -If you get stuck or need help, you can always start a new GitHub Discussion [here](https://github.com/coder/code-server/discussions). One of the maintainers will respond and help you out. +If you get stuck or need help, you can always start a new GitHub Discussion +[here](https://github.com/coder/code-server/discussions). One of the maintainers +will respond and help you out. ## Test @@ -219,7 +211,9 @@ Our unit tests are written in TypeScript and run using These live under [test/unit](../test/unit). -We use unit tests for functions and things that can be tested in isolation. The file structure is modeled closely after `/src` so it's easy for people to know where test files should live. +We use unit tests for functions and things that can be tested in isolation. The +file structure is modeled closely after `/src` so it's easy for people to know +where test files should live. ### Script tests @@ -227,12 +221,14 @@ Our script tests are written in bash and run using [bats](https://github.com/bat These tests live under `test/scripts`. -We use these to test anything related to our scripts (most of which live under `ci`). +We use these to test anything related to our scripts (most of which live under +`ci`). ### Integration tests -These are a work in progress. We build code-server and run tests with `yarn test:integration`, which ensures that code-server builds work on their respective -platforms. +These are a work in progress. We build code-server and run tests with `yarn +test:integration`, which ensures that code-server builds work on their +respective platforms. Our integration tests look at components that rely on one another. For example, testing the CLI requires us to build and package code-server. @@ -253,15 +249,10 @@ Take a look at `codeServer.test.ts` to see how you would use it (see We also have a model where you can create helpers to use within tests. See [models/CodeServer.ts](../test/e2e/models/CodeServer.ts) for an example. -Generally speaking, e2e means testing code-server while running in the browser -and interacting with it in a way that's similar to how a user would interact -with it. When running these tests with `yarn test:e2e`, you must have -code-server running locally. In CI, this is taken care of for you. - ## Structure -The `code-server` script serves as an HTTP API for login and starting a remote -Code process. +code-server essentially serves as an HTTP API for logging in and starting a +remote Code process. The CLI code is in [src/node](../src/node) and the HTTP routes are implemented in [src/node/routes](../src/node/routes). diff --git a/docs/MAINTAINING.md b/docs/MAINTAINING.md index cabe7869672c..2cfd945a8640 100644 --- a/docs/MAINTAINING.md +++ b/docs/MAINTAINING.md @@ -3,24 +3,13 @@ # Maintaining -- [Team](#team) - - [Onboarding](#onboarding) - - [Offboarding](#offboarding) -- [Workflow](#workflow) - - [Milestones](#milestones) - - [Triage](#triage) -- [Versioning](#versioning) -- [Pull requests](#pull-requests) - - [Merge strategies](#merge-strategies) - - [Changelog](#changelog) -- [Releases](#releases) - - [Publishing a release](#publishing-a-release) +- [Releasing](#releasing) - [Release Candidates](#release-candidates) - [AUR](#aur) - [Docker](#docker) - [Homebrew](#homebrew) + - [nixpkgs](#nixpkgs) - [npm](#npm) -- [Syncing with upstream Code](#syncing-with-upstream-code) - [Testing](#testing) - [Documentation](#documentation) - [Troubleshooting](#troubleshooting) @@ -28,131 +17,30 @@ -This document is meant to serve current and future maintainers of code-server, -as well as share our workflow for maintaining the project. +We keep code-server up to date with VS Code releases (there are usually two or +three a month) but we are not generally actively developing code-server aside +from fixing regressions. -## Team +Most of the work is keeping on top of issues and discussions. -Current maintainers: +## Releasing -- @code-asher -- @jsjoeio - -Occasionally, other Coder employees may step in time to time to assist with code-server. - -### Onboarding - -To onboard a new maintainer to the project, please make sure to do the following: - -- [ ] Add to [coder/code-server](https://github.com/orgs/coder/teams/code-server) -- [ ] Add as Admin under [Repository Settings > Access](https://github.com/coder/code-server/settings/access) -- [ ] Add to [npm Coder org](https://www.npmjs.com/org/coder) -- [ ] Add as [AUR maintainer](https://aur.archlinux.org/packages/code-server/) (talk to Colin) -- [ ] Introduce to community via Discussion (see [example](https://github.com/coder/code-server/discussions/3955)) - -### Offboarding - -Very similar to Onboarding but Remove maintainer from all teams and revoke access. Please also do the following: - -- [ ] Write farewell post via Discussion (see [example](https://github.com/coder/code-server/discussions/3933)) - -## Workflow - -The workflow used by code-server maintainers aims to be easy to understood by -the community and easy enough for new maintainers to jump in and start -contributing on day one. - -### Milestones - -We operate mainly using -[milestones](https://github.com/coder/code-server/milestones). This was heavily -inspired by our friends over at [vscode](https://github.com/microsoft/vscode). - -Here are the milestones we use and how we use them: - -- "Backlog" -> Work not yet planned for a specific release. -- "On Deck" -> Work under consideration for upcoming milestones. -- "Backlog Candidates" -> Work that is not yet accepted for the backlog. We wait - for the community to weigh in. -- "" -> Work to be done for said month. - -With this flow, any un-assigned issues are essentially in triage state. Once -triaged, issues are either "Backlog" or "Backlog Candidates". They will -eventually move to "On Deck" (or be closed). Lastly, they will end up on a -version milestone where they will be worked on. - -### Triage - -We use the following process for triaging GitHub issues: - -1. Create an issue -1. Add appropriate labels to the issue (including "needs-investigation" if we - should look into it further) -1. Add the issue to a milestone - 1. If it should be fixed soon, add to version milestone or "On Deck" - 2. If not urgent, add to "Backlog" - 3. Otherwise, add to "Backlog Candidate" for future consideration - -## Versioning - -`` - -The code-server project follows traditional [semantic -versioning](https://semver.org/), with the objective of minimizing major changes -that break backward compatibility. We increment the patch level for all -releases, except when the upstream Visual Studio Code project increments its -minor version or we change the plugin API in a backward-compatible manner. In -those cases, we increment the minor version rather than the patch level. - -## Pull requests - -Ideally, every PR should fix an issue. If it doesn't, make sure it's associated -with a version milestone. - -If a PR does fix an issue, don't add it to the version milestone. Otherwise, the -version milestone will have duplicate information: the issue and the PR fixing -the issue. - -### Merge strategies - -For most things, we recommend the **squash and merge** strategy. There -may be times where **creating a merge commit** makes sense as well. Use your -best judgment. If you're unsure, you can always discuss in the PR with the team. - -### Changelog - -To save time when creating a new release for code-server, we keep a running -changelog at `CHANGELOG.md`. - -If either the author or reviewer of a PR believes the change should be mentioned -in the changelog, then it should be added. - -If there is not a **Next Version** when you modify `CHANGELOG.md`, please add it -using the template you see near the top of the changelog. - -When writing your changelog item, ask yourself: - -1. How do these changes affect code-server users? -2. What actions do they need to take (if any)? - -If you need inspiration, we suggest looking at the [Emacs -changelog](https://github.com/emacs-mirror/emacs/blob/master/etc/NEWS). - -## Releases - -### Publishing a release - -1. Go to GitHub Actions > Draft release > Run workflow on the commit you want to +1. Check that the changelog lists all the important changes. +2. Make sure the changelog entry lists the current version of VS Code. +3. Update the changelog with the release date. +4. Go to GitHub Actions > Draft release > Run workflow on the commit you want to release. Make sure CI has finished the build workflow on that commit or this - will fail. -2. CI will automatically grab the build artifact on that commit, inject the - version into the `package.json`, put together platform-specific packages, and - upload those packages to a draft release. -3. Summarize the major changes in the `CHANGELOG.md`. -4. Copy the relevant changelog section to the release then publish it. -5. CI will automatically publish the NPM package, Docker image, and update - Homebrew using the published release assets. -6. Bump the chart version in `Chart.yaml` and merge in the changelog updates. + will fail. For the version we match VS Code's minor and patch version. The + patch number may become temporarily out of sync if we need to put out a + patch, but if we make our own minor change then we will not release it until + the next minor VS Code release. +5. CI will automatically grab the build artifact on that commit (which is why CI + has to have completed), inject the provided version into the `package.json`, + put together platform-specific packages, and upload those packages to a draft + release. +6. Update the resulting draft release with the changelog contents. +7. Publish the draft release after validating it. +8. Bump the Helm chart version once the Docker images have published. #### Release Candidates @@ -186,37 +74,44 @@ This is currently automated with the release process (but may fail occasionally) brew bump-formula-pr --version="${VERSION}" code-server --no-browse --no-audit ``` +#### nixpkgs + +We publish code-server in nixpkgs but it must be updated manually. + #### npm We publish code-server as a npm package [here](https://www.npmjs.com/package/code-server/v/latest). This is currently automated with the release process. -## Syncing with upstream Code - -Refer to the [contributing docs](https://coder.com/docs/code-server/latest/CONTRIBUTING#version-updates-to-code) for information on how to update Code within code-server. - ## Testing Our testing structure is laid out under our [Contributing docs](https://coder.com/docs/code-server/latest/CONTRIBUTING#test). -We hope to eventually hit 100% test coverage with our unit tests, and maybe one day our scripts (coverage not tracked currently). - If you're ever looking to add more tests, here are a few ways to get started: -- run `yarn test:unit` and look at the coverage chart. You'll see all the uncovered lines. This is a good place to start. -- look at `test/scripts` to see which scripts are tested. We can always use more tests there. +- run `yarn test:unit` and look at the coverage chart. You'll see all the + uncovered lines. This is a good place to start. +- look at `test/scripts` to see which scripts are tested. We can always use more + tests there. - look at `test/e2e`. We can always use more end-to-end tests. -Otherwise, talk to a current maintainer and ask which part of the codebase is lacking most when it comes to tests. +Otherwise, talk to a current maintainer and ask which part of the codebase is +lacking most when it comes to tests. ## Documentation ### Troubleshooting -Our docs are hosted on [Vercel](https://vercel.com/). Vercel only shows logs in realtime, which means you need to have the logs open in one tab and reproduce your error in another tab. Since our logs are private to Coder the organization, you can only follow these steps if you're a Coder employee. Ask a maintainer for help if you need it. +Our docs are hosted on [Vercel](https://vercel.com/). Vercel only shows logs in +realtime, which means you need to have the logs open in one tab and reproduce +your error in another tab. Since our logs are private to Coder the organization, +you can only follow these steps if you're a Coder employee. Ask a maintainer for +help if you need it. -Taking a real scenario, let's say you wanted to troubleshoot [this docs change](https://github.com/coder/code-server/pull/4042). Here is how you would do it: +Taking a real scenario, let's say you wanted to troubleshoot [this docs +change](https://github.com/coder/code-server/pull/4042). Here is how you would +do it: 1. Go to https://vercel.com/codercom/codercom 2. Click "View Function Logs" From 090e0fad76152d6a0c10903a3bbf8a83d09e93d0 Mon Sep 17 00:00:00 2001 From: Asher Date: Mon, 8 Jul 2024 22:10:34 +0000 Subject: [PATCH 077/497] Update to Code 1.91.0 (#6885) --- CHANGELOG.md | 8 ++++++++ lib/vscode | 2 +- patches/disable-builtin-ext-update.diff | 2 +- patches/display-language.diff | 16 ++++++++-------- patches/getting-started.diff | 4 ++-- patches/proposed-api.diff | 2 +- patches/sourcemaps.diff | 8 ++++---- patches/store-socket.diff | 4 ++-- patches/webview.diff | 12 ++++++------ 9 files changed, 33 insertions(+), 25 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 09e90fa09d34..17da5c769d1c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,14 @@ Code v99.99.999 ## Unreleased +## [4.91.0](https://github.com/coder/code-server/releases/tag/v4.91.0) - 2024-07-08 + +Code v1.91.0 + +### Changed + +- Updated to Code 1.91.0. + ## [4.90.3](https://github.com/coder/code-server/releases/tag/v4.90.3) - 2024-06-21 Code v1.90.2 diff --git a/lib/vscode b/lib/vscode index 5437499feb04..ea1445cc7016 160000 --- a/lib/vscode +++ b/lib/vscode @@ -1 +1 @@ -Subproject commit 5437499feb04f7a586f677b155b039bc2b3669eb +Subproject commit ea1445cc7016315d0f5728f8e8b12a45dc0a7286 diff --git a/patches/disable-builtin-ext-update.diff b/patches/disable-builtin-ext-update.diff index c251a49a2af7..d1f844868f5d 100644 --- a/patches/disable-builtin-ext-update.diff +++ b/patches/disable-builtin-ext-update.diff @@ -7,7 +7,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts +++ code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts -@@ -285,6 +285,10 @@ export class Extension implements IExten +@@ -287,6 +287,10 @@ export class Extension implements IExten if (this.type === ExtensionType.System && this.productService.quality === 'stable') { return false; } diff --git a/patches/display-language.diff b/patches/display-language.diff index c64efe8c592b..0a223c746201 100644 --- a/patches/display-language.diff +++ b/patches/display-language.diff @@ -348,17 +348,17 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts +++ code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts -@@ -341,9 +341,6 @@ export class InstallAction extends Exten +@@ -411,9 +411,6 @@ export class InstallAction extends Exten if (this.extension.isBuiltin) { return; } - if (this.extensionsWorkbenchService.canSetLanguage(this.extension)) { - return; - } - if (this.extension.state === ExtensionState.Uninstalled && await this.extensionsWorkbenchService.canInstall(this.extension)) { - this.enabled = this.options.installPreReleaseVersion ? this.extension.hasPreReleaseVersion : this.extension.hasReleaseVersion; - this.updateLabel(); -@@ -614,7 +611,7 @@ export abstract class InstallInOtherServ + if (this.extension.state !== ExtensionState.Uninstalled) { + return; + } +@@ -695,7 +692,7 @@ export abstract class InstallInOtherServ } if (isLanguagePackExtension(this.extension.local.manifest)) { @@ -367,7 +367,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens } // Prefers to run on UI -@@ -1848,17 +1845,6 @@ export class SetLanguageAction extends E +@@ -1928,17 +1925,6 @@ export class SetLanguageAction extends E update(): void { this.enabled = false; this.class = SetLanguageAction.DisabledClass; @@ -385,7 +385,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens } override async run(): Promise { -@@ -1875,7 +1861,6 @@ export class ClearLanguageAction extends +@@ -1955,7 +1941,6 @@ export class ClearLanguageAction extends private static readonly DisabledClass = `${ClearLanguageAction.EnabledClass} disabled`; constructor( @@ -393,7 +393,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens @ILocaleService private readonly localeService: ILocaleService, ) { super(ClearLanguageAction.ID, ClearLanguageAction.TITLE.value, ClearLanguageAction.DisabledClass, false); -@@ -1885,17 +1870,6 @@ export class ClearLanguageAction extends +@@ -1965,17 +1950,6 @@ export class ClearLanguageAction extends update(): void { this.enabled = false; this.class = ClearLanguageAction.DisabledClass; diff --git a/patches/getting-started.diff b/patches/getting-started.diff index cb9568ef90a5..302052693008 100644 --- a/patches/getting-started.diff +++ b/patches/getting-started.diff @@ -28,7 +28,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/welcomeGettingStarted/bro import { IEditorOpenContext, IEditorSerializer } from 'vs/workbench/common/editor'; import { IWebviewElement, IWebviewService } from 'vs/workbench/contrib/webview/browser/webview'; import 'vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedColors'; -@@ -816,6 +816,72 @@ export class GettingStartedPage extends +@@ -804,6 +804,72 @@ export class GettingStartedPage extends $('p.subtitle.description', {}, localize({ key: 'gettingStarted.editingEvolved', comment: ['Shown as subtitle on the Welcome page.'] }, "Editing evolved")) ); @@ -101,7 +101,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/welcomeGettingStarted/bro const leftColumn = $('.categories-column.categories-column-left', {},); const rightColumn = $('.categories-column.categories-column-right', {},); -@@ -887,6 +953,9 @@ export class GettingStartedPage extends +@@ -839,6 +905,9 @@ export class GettingStartedPage extends recentList.setLimit(5); reset(leftColumn, startList.getDomElement(), recentList.getDomElement()); } diff --git a/patches/proposed-api.diff b/patches/proposed-api.diff index f81bccbff2a4..78eda7572758 100644 --- a/patches/proposed-api.diff +++ b/patches/proposed-api.diff @@ -26,7 +26,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/extensions/common/extens =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/services/extensions/common/extensionsProposedApi.ts +++ code-server/lib/vscode/src/vs/workbench/services/extensions/common/extensionsProposedApi.ts -@@ -24,7 +24,7 @@ export class ExtensionsProposedApi { +@@ -31,7 +31,7 @@ export class ExtensionsProposedApi { this._envEnabledExtensions = new Set((_environmentService.extensionEnabledProposedApi ?? []).map(id => ExtensionIdentifier.toKey(id))); diff --git a/patches/sourcemaps.diff b/patches/sourcemaps.diff index 366566f17a8d..04787784b2f5 100644 --- a/patches/sourcemaps.diff +++ b/patches/sourcemaps.diff @@ -10,7 +10,7 @@ Index: code-server/lib/vscode/build/gulpfile.reh.js =================================================================== --- code-server.orig/lib/vscode/build/gulpfile.reh.js +++ code-server/lib/vscode/build/gulpfile.reh.js -@@ -236,8 +236,7 @@ function packageTask(type, platform, arc +@@ -237,8 +237,7 @@ function packageTask(type, platform, arc const src = gulp.src(sourceFolderName + '/**', { base: '.' }) .pipe(rename(function (path) { path.dirname = path.dirname.replace(new RegExp('^' + sourceFolderName), 'out'); })) @@ -20,7 +20,7 @@ Index: code-server/lib/vscode/build/gulpfile.reh.js const workspaceExtensionPoints = ['debuggers', 'jsonValidation']; const isUIExtension = (manifest) => { -@@ -276,9 +275,9 @@ function packageTask(type, platform, arc +@@ -277,9 +276,9 @@ function packageTask(type, platform, arc .map(name => `.build/extensions/${name}/**`); const extensions = gulp.src(extensionPaths, { base: '.build', dot: true }); @@ -32,11 +32,11 @@ Index: code-server/lib/vscode/build/gulpfile.reh.js let version = packageJson.version; const quality = product.quality; -@@ -439,7 +438,7 @@ function tweakProductForServerWeb(produc +@@ -440,7 +439,7 @@ function tweakProductForServerWeb(produc const minifyTask = task.define(`minify-vscode-${type}`, task.series( optimizeTask, util.rimraf(`out-vscode-${type}-min`), -- optimize.minifyTask(`out-vscode-${type}`, `https://ticino.blob.core.windows.net/sourcemaps/${commit}/core`) +- optimize.minifyTask(`out-vscode-${type}`, `https://main.vscode-cdn.net/sourcemaps/${commit}/core`) + optimize.minifyTask(`out-vscode-${type}`, ``) )); gulp.task(minifyTask); diff --git a/patches/store-socket.diff b/patches/store-socket.diff index e91a3bcae027..236aae276199 100644 --- a/patches/store-socket.diff +++ b/patches/store-socket.diff @@ -94,10 +94,10 @@ Index: code-server/lib/vscode/src/vs/workbench/api/node/extensionHostProcess.ts *--------------------------------------------------------------------------------------------*/ +import * as _http from 'http'; + import minimist from 'minimist'; import * as nativeWatchdog from 'native-watchdog'; import * as net from 'net'; - import * as minimist from 'minimist'; -@@ -418,7 +419,28 @@ async function startExtensionHostProcess +@@ -421,7 +422,28 @@ async function startExtensionHostProcess ); // rewrite onTerminate-function to be a proper shutdown diff --git a/patches/webview.diff b/patches/webview.diff index 4c324ce25147..2616db81fb48 100644 --- a/patches/webview.diff +++ b/patches/webview.diff @@ -66,16 +66,16 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index.html +++ code-server/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index.html -@@ -5,7 +5,7 @@ - +@@ -6,7 +6,7 @@ -+ content="default-src 'none'; script-src 'sha256-R3BsSkqy7qFbvWSmwr7WqT1eg6Sq4zSe0uIlrUQ4EKE=' 'self'; frame-src 'self'; style-src 'unsafe-inline';"> + +- content="default-src 'none'; script-src 'sha256-ikaxwm2UFoiIKkEZTEU4mnSxpYf3lmsrhy5KqqJZfek=' 'self'; frame-src 'self'; style-src 'unsafe-inline';"> ++ content="default-src 'none'; script-src 'sha256-ytymamOof3TtOHdw4JlwzF1Z5E8nGRH8AmlcwgCHTFQ=' 'self'; frame-src 'self'; style-src 'unsafe-inline';"> + - Date: Mon, 8 Jul 2024 17:48:56 -0800 Subject: [PATCH 078/497] Remove display language test It is not working. I test this manually anyway so for now just remove the test, but I think maybe we have to watch for code-server to extract the language files, and then reload the page, or maybe we have to install the language from the UI. Ideally we can drop our patch in the future anyway... --- test/e2e/displayLang.test.ts | 19 ---------- .../package.json | 38 ------------------- .../translations/main.i18n.json | 15 -------- 3 files changed, 72 deletions(-) delete mode 100644 test/e2e/displayLang.test.ts delete mode 100644 test/e2e/extensions/ms-ceintl.vscode-language-pack-es-1.70.0/package.json delete mode 100644 test/e2e/extensions/ms-ceintl.vscode-language-pack-es-1.70.0/translations/main.i18n.json diff --git a/test/e2e/displayLang.test.ts b/test/e2e/displayLang.test.ts deleted file mode 100644 index e71e8a31993f..000000000000 --- a/test/e2e/displayLang.test.ts +++ /dev/null @@ -1,19 +0,0 @@ -import * as path from "path" -import { describe, test, expect } from "./baseFixture" - -// Given a code-server environment with Spanish Language Pack extension installed -// and a languagepacks.json in the data-dir -describe( - "--locale es", - ["--disable-workspace-trust", "--extensions-dir", path.join(__dirname, "./extensions"), "--locale", "es"], - {}, - () => { - test("should load code-server in Spanish", async ({ codeServerPage }) => { - // When - const visible = await codeServerPage.page.isVisible("text=Explorador") - - // Then - expect(visible).toBe(true) - }) - }, -) diff --git a/test/e2e/extensions/ms-ceintl.vscode-language-pack-es-1.70.0/package.json b/test/e2e/extensions/ms-ceintl.vscode-language-pack-es-1.70.0/package.json deleted file mode 100644 index 2b69924413dc..000000000000 --- a/test/e2e/extensions/ms-ceintl.vscode-language-pack-es-1.70.0/package.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "name": "vscode-language-pack-es", - "displayName": "Spanish Language Pack for Visual Studio Code", - "description": "Language pack extension for Spanish", - "version": "1.70.0", - "publisher": "MS-CEINTL", - "repository": { - "type": "git", - "url": "https://github.com/Microsoft/vscode-loc" - }, - "engines": { - "vscode": "^1.70.0" - }, - "categories": [ - "Language Packs" - ], - "contributes": { - "localizations": [ - { - "languageId": "es", - "languageName": "Spanish", - "localizedLanguageName": "español", - "translations": [ - { - "id": "vscode", - "path": "./translations/main.i18n.json" - } - ] - } - ] - }, - "__metadata": { - "id": "47e020a1-33db-4cc0-a1b4-42f97781749a", - "publisherDisplayName": "MS-CEINTL", - "publisherId": "0b0882c3-aee3-4d7c-b5f9-872f9be0a115", - "isPreReleaseVersion": false - } -} diff --git a/test/e2e/extensions/ms-ceintl.vscode-language-pack-es-1.70.0/translations/main.i18n.json b/test/e2e/extensions/ms-ceintl.vscode-language-pack-es-1.70.0/translations/main.i18n.json deleted file mode 100644 index e0f43689c75b..000000000000 --- a/test/e2e/extensions/ms-ceintl.vscode-language-pack-es-1.70.0/translations/main.i18n.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "": [ - "--------------------------------------------------------------------------------------------", - "Copyright (c) Microsoft Corporation. All rights reserved.", - "Licensed under the MIT License. See License.txt in the project root for license information.", - "--------------------------------------------------------------------------------------------", - "Do not edit this file. It is machine generated." - ], - "version": "1.0.0", - "contents": { - "vs/workbench/contrib/files/browser/explorerViewlet": { - "explore": "Explorador" - } - } -} From 901191e0f96af661a4df7b7988b8f90e854c65b4 Mon Sep 17 00:00:00 2001 From: Asher Date: Mon, 8 Jul 2024 17:51:47 -0800 Subject: [PATCH 079/497] Update changelog --- CHANGELOG.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 17da5c769d1c..3bf76e5f758d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,8 +22,6 @@ Code v99.99.999 ## Unreleased -## [4.91.0](https://github.com/coder/code-server/releases/tag/v4.91.0) - 2024-07-08 - Code v1.91.0 ### Changed From fb3e3e1546d571e9973e86482bcd925c1918ec27 Mon Sep 17 00:00:00 2001 From: Asher Date: Tue, 9 Jul 2024 12:47:24 -0800 Subject: [PATCH 080/497] Log custom extensions gallery --- src/node/main.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/node/main.ts b/src/node/main.ts index 4a53de9d84cc..5a8b1a0af85d 100644 --- a/src/node/main.ts +++ b/src/node/main.ts @@ -164,6 +164,11 @@ export const runCodeServer = async ( logger.info(`Session server listening on ${sessionServerAddress.toString()}`) } + if (process.env.EXTENSIONS_GALLERY) { + logger.info("Using custom extensions gallery") + logger.debug(` - ${process.env.EXTENSIONS_GALLERY}`) + } + if (args.enable && args.enable.length > 0) { logger.info("Enabling the following experimental features:") args.enable.forEach((feature) => { From d83ba4b46f18cc82470db88769239fc65b2155d3 Mon Sep 17 00:00:00 2001 From: Asher Date: Tue, 9 Jul 2024 23:23:16 -0800 Subject: [PATCH 081/497] Release v4.91.0 --- CHANGELOG.md | 2 ++ ci/helm-chart/Chart.yaml | 4 ++-- ci/helm-chart/values.yaml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3bf76e5f758d..ef97088f8b14 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,8 @@ Code v99.99.999 ## Unreleased +## [4.91.0](https://github.com/coder/code-server/releases/tag/v4.91.0) - 2024-07-10 + Code v1.91.0 ### Changed diff --git a/ci/helm-chart/Chart.yaml b/ci/helm-chart/Chart.yaml index 97ca8d81741f..9eccb70608b9 100644 --- a/ci/helm-chart/Chart.yaml +++ b/ci/helm-chart/Chart.yaml @@ -15,9 +15,9 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 3.21.1 +version: 3.22.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 4.90.3 +appVersion: 4.91.0 diff --git a/ci/helm-chart/values.yaml b/ci/helm-chart/values.yaml index 0e899556b800..af34fbaf6dab 100644 --- a/ci/helm-chart/values.yaml +++ b/ci/helm-chart/values.yaml @@ -6,7 +6,7 @@ replicaCount: 1 image: repository: codercom/code-server - tag: '4.90.3' + tag: '4.91.0' pullPolicy: Always # Specifies one or more secrets to be used when pulling images from a From 3031f8599c0da844d18569dca252cecbd054f676 Mon Sep 17 00:00:00 2001 From: Muhammad Atif Ali Date: Wed, 10 Jul 2024 21:39:03 +0300 Subject: [PATCH 082/497] ci: updates actionlint to 1.7.1 version (#6887) --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index ce483c40beb3..41b8aba49ee8 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -147,7 +147,7 @@ jobs: uses: actions/checkout@v4 - name: Check workflow files run: | - bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/7fdc9630cc360ea1a469eed64ac6d78caeda1234/scripts/download-actionlint.bash) + bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash) 1.7.1 ./actionlint -color -shellcheck= -ignore "set-output" shell: bash From c86c4e8bb6f738990de117ce2183f3dbdb2643c2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 19:26:02 +0000 Subject: [PATCH 083/497] chore: bump dawidd6/action-download-artifact from 3 to 6 (#6876) Bumps [dawidd6/action-download-artifact](https://github.com/dawidd6/action-download-artifact) from 3 to 6. - [Release notes](https://github.com/dawidd6/action-download-artifact/releases) - [Commits](https://github.com/dawidd6/action-download-artifact/compare/v3...v6) --- updated-dependencies: - dependency-name: dawidd6/action-download-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 90f08eae4cab..630f0ba43c38 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -282,7 +282,7 @@ jobs: timeout-minutes: 15 steps: - name: Download artifacts - uses: dawidd6/action-download-artifact@v3 + uses: dawidd6/action-download-artifact@v6 id: download with: branch: ${{ github.ref }} From 97bcc3b9347d77849fa3d405d106b624d8689719 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 13:08:52 -0800 Subject: [PATCH 084/497] chore: bump robinraju/release-downloader from 1.10 to 1.11 (#6875) Bumps [robinraju/release-downloader](https://github.com/robinraju/release-downloader) from 1.10 to 1.11. - [Release notes](https://github.com/robinraju/release-downloader/releases) - [Commits](https://github.com/robinraju/release-downloader/compare/v1.10...v1.11) --- updated-dependencies: - dependency-name: robinraju/release-downloader dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/publish.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 0ec6126d9733..b959b2c35127 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -36,7 +36,7 @@ jobs: cache: "yarn" - name: Download npm package from release artifacts - uses: robinraju/release-downloader@v1.10 + uses: robinraju/release-downloader@v1.11 with: repository: "coder/code-server" tag: ${{ github.event.inputs.version || github.ref_name }} @@ -184,7 +184,7 @@ jobs: echo "VERSION=${TAG#v}" >> $GITHUB_ENV - name: Download deb artifacts - uses: robinraju/release-downloader@v1.10 + uses: robinraju/release-downloader@v1.11 with: repository: "coder/code-server" tag: v${{ env.VERSION }} @@ -192,7 +192,7 @@ jobs: out-file-path: "release-packages" - name: Download rpm artifacts - uses: robinraju/release-downloader@v1.10 + uses: robinraju/release-downloader@v1.11 with: repository: "coder/code-server" tag: v${{ env.VERSION }} From 2e098a2b901f8603e70613b1af62c5a0875f5894 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 13:09:11 -0800 Subject: [PATCH 085/497] chore: bump typescript from 5.4.3 to 5.5.2 (#6873) Bumps [typescript](https://github.com/Microsoft/TypeScript) from 5.4.3 to 5.5.2. - [Release notes](https://github.com/Microsoft/TypeScript/releases) - [Changelog](https://github.com/microsoft/TypeScript/blob/main/azure-pipelines.release.yml) - [Commits](https://github.com/Microsoft/TypeScript/compare/v5.4.3...v5.5.2) --- updated-dependencies: - dependency-name: typescript dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 3433ec6c879a..9b90d0b39899 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3484,9 +3484,9 @@ typed-array-length@^1.0.4: is-typed-array "^1.1.9" typescript@^5.2.2: - version "5.4.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.3.tgz#5c6fedd4c87bee01cd7a528a30145521f8e0feff" - integrity sha512-KrPd3PKaCLr78MalgiwJnA25Nm8HAmdwN3mYUYZgG/wizIo9EainNVQI9/yDavtVFRN2h3k8uf3GLHuhDMgEHg== + version "5.5.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.2.tgz#c26f023cb0054e657ce04f72583ea2d85f8d0507" + integrity sha512-NcRtPEOsPFFWjobJEtfihkLCZCXZt/os3zf8nTxjVH3RvTSxjrCamJpbExGvYOF+tFHc3pA65qpdwPbzjohhew== unbox-primitive@^1.0.2: version "1.0.2" From 8accfcc8ecdeda3697fe2832e84c2458b43df6b7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 13:09:41 -0800 Subject: [PATCH 086/497] chore: bump prettier from 3.2.4 to 3.3.2 (#6878) Bumps [prettier](https://github.com/prettier/prettier) from 3.2.4 to 3.3.2. - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md) - [Commits](https://github.com/prettier/prettier/compare/3.2.4...3.3.2) --- updated-dependencies: - dependency-name: prettier dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 9b90d0b39899..db3176e9d15a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2844,9 +2844,9 @@ prettier-plugin-sh@^0.14.0: sh-syntax "^0.4.1" prettier@^3.0.3: - version "3.2.4" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.2.4.tgz#4723cadeac2ce7c9227de758e5ff9b14e075f283" - integrity sha512-FWu1oLHKCrtpO1ypU6J0SbK2d9Ckwysq6bHj/uaCP26DxrPpppCLQRGVuqAxSTvhF00AcvDRyYrLNW7ocBhFFQ== + version "3.3.2" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.3.2.tgz#03ff86dc7c835f2d2559ee76876a3914cec4a90a" + integrity sha512-rAVeHYMcv8ATV5d508CFdn+8/pHPpXeIid1DdrPwXnaAdH7cqjVbpJaT5eq4yRAFU/lsbwYwSF/n5iNrdJHPQA== proxy-addr@~2.0.7: version "2.0.7" From 2b33ca8a3f5b453a571a2d0d1f8ddeb08655613c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 13:10:01 -0800 Subject: [PATCH 087/497] chore: bump aquasecurity/trivy-action from 0.21.0 to 0.24.0 (#6894) Bumps [aquasecurity/trivy-action](https://github.com/aquasecurity/trivy-action) from 0.21.0 to 0.24.0. - [Release notes](https://github.com/aquasecurity/trivy-action/releases) - [Commits](https://github.com/aquasecurity/trivy-action/compare/fd25fed6972e341ff0007ddb61f77e88103953c2...6e7b7d1fd3e4fef0c5fa8cce1229c54b2c9bd0d8) --- updated-dependencies: - dependency-name: aquasecurity/trivy-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/security.yaml | 2 +- .github/workflows/trivy-docker.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/security.yaml b/.github/workflows/security.yaml index e0f1878e118e..45d4186815cc 100644 --- a/.github/workflows/security.yaml +++ b/.github/workflows/security.yaml @@ -55,7 +55,7 @@ jobs: fetch-depth: 0 - name: Run Trivy vulnerability scanner in repo mode - uses: aquasecurity/trivy-action@fd25fed6972e341ff0007ddb61f77e88103953c2 + uses: aquasecurity/trivy-action@6e7b7d1fd3e4fef0c5fa8cce1229c54b2c9bd0d8 with: scan-type: "fs" scan-ref: "." diff --git a/.github/workflows/trivy-docker.yaml b/.github/workflows/trivy-docker.yaml index 13c98468ea0a..db73b8c23240 100644 --- a/.github/workflows/trivy-docker.yaml +++ b/.github/workflows/trivy-docker.yaml @@ -51,7 +51,7 @@ jobs: uses: actions/checkout@v4 - name: Run Trivy vulnerability scanner in image mode - uses: aquasecurity/trivy-action@fd25fed6972e341ff0007ddb61f77e88103953c2 + uses: aquasecurity/trivy-action@6e7b7d1fd3e4fef0c5fa8cce1229c54b2c9bd0d8 with: image-ref: "docker.io/codercom/code-server:latest" ignore-unfixed: true From a9eb923790de016554eb2ba50ec263201a9467a8 Mon Sep 17 00:00:00 2001 From: Asher Date: Wed, 10 Jul 2024 13:15:15 -0800 Subject: [PATCH 088/497] Remove unused audit-ci dependency There is a `yarn ci` script which was using audit-ci but this does not appear to be called anywhere. The security worflow uses `yarn audit` and `npm audit` which seem fine enough anyway. --- .github/workflows/security.yaml | 2 +- ci/README.md | 2 - ci/dev/audit.sh | 12 --- ci/dev/ci.sh | 13 --- docs/SECURITY.md | 6 +- package.json | 3 - yarn.lock | 158 +------------------------------- 7 files changed, 8 insertions(+), 188 deletions(-) delete mode 100755 ci/dev/audit.sh delete mode 100755 ci/dev/ci.sh diff --git a/.github/workflows/security.yaml b/.github/workflows/security.yaml index 45d4186815cc..2c617cc371ae 100644 --- a/.github/workflows/security.yaml +++ b/.github/workflows/security.yaml @@ -19,7 +19,7 @@ concurrency: cancel-in-progress: ${{ github.event_name == 'pull_request' }} jobs: - audit-ci: + audit: name: Audit node modules runs-on: ubuntu-latest timeout-minutes: 15 diff --git a/ci/README.md b/ci/README.md index 4869d65a276b..5f11717a8ecf 100644 --- a/ci/README.md +++ b/ci/README.md @@ -24,8 +24,6 @@ This directory contains scripts used for the development of code-server. - Runs unit tests. - [./ci/dev/test-e2e.sh](./dev/test-e2e.sh) (`yarn test:e2e`) - Runs end-to-end tests. -- [./ci/dev/ci.sh](./dev/ci.sh) (`yarn ci`) - - Runs `yarn fmt`, `yarn lint` and `yarn test`. - [./ci/dev/watch.ts](./dev/watch.ts) (`yarn watch`) - Starts a process to build and launch code-server and restart on any code changes. - Example usage in [./docs/CONTRIBUTING.md](../docs/CONTRIBUTING.md). diff --git a/ci/dev/audit.sh b/ci/dev/audit.sh deleted file mode 100755 index 0142eac2a906..000000000000 --- a/ci/dev/audit.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash -set -euo pipefail - -main() { - cd "$(dirname "$0")/../.." - - # Prevents integration with moderate or higher vulnerabilities - # Docs: https://github.com/IBM/audit-ci#options - yarn audit-ci --moderate -} - -main "$@" diff --git a/ci/dev/ci.sh b/ci/dev/ci.sh deleted file mode 100755 index daf4ecc69414..000000000000 --- a/ci/dev/ci.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash -set -euo pipefail - -main() { - cd "$(dirname "$0")/../.." - - yarn fmt - yarn lint - yarn _audit - yarn test:unit -} - -main "$@" diff --git a/docs/SECURITY.md b/docs/SECURITY.md index 0b4062ef0749..c2ed7542a616 100644 --- a/docs/SECURITY.md +++ b/docs/SECURITY.md @@ -17,10 +17,8 @@ We use the following tools to help us stay on top of vulnerability mitigation. - Comprehensive vulnerability scanner that runs on PRs into the default branch and scans both our container image and repository code (see `trivy-scan-repo` and `trivy-scan-image` jobs in `build.yaml`) -- [`audit-ci`](https://github.com/IBM/audit-ci) - - Audits npm and Yarn dependencies in CI (see `Audit for vulnerabilities` step - in `build.yaml`) on PRs into the default branch and fails CI if moderate or - higher vulnerabilities (see the `audit.sh` script) are present. +- `yarn audit` and `npm audit` + - Audits Yarn/NPM dependencies. ## Supported Versions diff --git a/package.json b/package.json index 250efd0db510..366a4d39fbbe 100644 --- a/package.json +++ b/package.json @@ -27,12 +27,10 @@ "postinstall": "./ci/dev/postinstall.sh", "publish:npm": "./ci/steps/publish-npm.sh", "publish:docker": "./ci/steps/docker-buildx-push.sh", - "_audit": "./ci/dev/audit.sh", "fmt": "yarn prettier && ./ci/dev/doctoc.sh", "lint:scripts": "./ci/dev/lint-scripts.sh", "lint:ts": "eslint --max-warnings=0 --fix $(git ls-files '*.ts' '*.js' | grep -v 'lib/vscode')", "test": "echo 'Run yarn test:unit or yarn test:e2e' && exit 1", - "ci": "./ci/dev/ci.sh", "watch": "VSCODE_DEV=1 VSCODE_IPC_HOOK_CLI= NODE_OPTIONS='--max_old_space_size=32384 --trace-warnings' ts-node ./ci/dev/watch.ts", "icons": "./ci/dev/gen_icons.sh" }, @@ -53,7 +51,6 @@ "@types/ws": "^8.5.5", "@typescript-eslint/eslint-plugin": "^7.0.0", "@typescript-eslint/parser": "^6.7.2", - "audit-ci": "^6.6.1", "doctoc": "^2.2.1", "eslint": "^8.49.0", "eslint-config-prettier": "^9.0.0", diff --git a/yarn.lock b/yarn.lock index db3176e9d15a..e6fbfd3d09f9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -485,14 +485,6 @@ resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406" integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ== -JSONStream@^1.3.5: - version "1.3.5" - resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0" - integrity sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ== - dependencies: - jsonparse "^1.2.0" - through ">=2.2.7 <3" - abbrev@1: version "1.1.1" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" @@ -557,7 +549,7 @@ ansi-regex@^5.0.1: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== -ansi-styles@^4.0.0, ansi-styles@^4.1.0: +ansi-styles@^4.1.0: version "4.3.0" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== @@ -676,20 +668,6 @@ ast-types@^0.13.4: dependencies: tslib "^2.0.1" -audit-ci@^6.6.1: - version "6.6.1" - resolved "https://registry.yarnpkg.com/audit-ci/-/audit-ci-6.6.1.tgz#7c53808f6f94adbe60baf1d7c24f53c626619453" - integrity sha512-zqZEoYfEC4QwX5yBkDNa0h7YhZC63HWtKtP19BVq+RS0dxRBInfmHogxe4VUeOzoADQjuTLZUI7zp3Pjyl+a5g== - dependencies: - JSONStream "^1.3.5" - cross-spawn "^7.0.3" - escape-string-regexp "^4.0.0" - event-stream "4.0.1" - jju "^1.4.0" - readline-transform "1.0.0" - semver "^7.0.0" - yargs "^17.0.0" - available-typed-arrays@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7" @@ -839,15 +817,6 @@ chownr@^2.0.0: resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece" integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ== -cliui@^8.0.1: - version "8.0.1" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa" - integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ== - dependencies: - string-width "^4.2.0" - strip-ansi "^6.0.1" - wrap-ansi "^7.0.0" - color-convert@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" @@ -935,7 +904,7 @@ create-require@^1.1.0: resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333" integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ== -cross-spawn@^7.0.2, cross-spawn@^7.0.3: +cross-spawn@^7.0.2: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== @@ -1111,11 +1080,6 @@ domutils@^2.8.0: domelementtype "^2.2.0" domhandler "^4.2.0" -duplexer@^0.1.1, duplexer@~0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6" - integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg== - ee-first@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" @@ -1246,11 +1210,6 @@ es6-promisify@^7.0.0: resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-7.0.0.tgz#9a710008dd6a4ab75a89e280bad787bfb749927b" integrity sha512-ginqzK3J90Rd4/Yz7qRrqUeIpe3TwSXTPPZtPne7tGBPeAaQiU8qt4fpKApnxHcq1AwtUdHVg5P77x/yrggG8Q== -escalade@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" - integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== - escape-html@~1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" @@ -1437,19 +1396,6 @@ etag@~1.8.1: resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg== -event-stream@4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/event-stream/-/event-stream-4.0.1.tgz#4092808ec995d0dd75ea4580c1df6a74db2cde65" - integrity sha512-qACXdu/9VHPBzcyhdOWR5/IahhGMf0roTeZJfzz077GwylcDd90yOHLouhmv7GJ5XzPi6ekaQWd8AvPP2nOvpA== - dependencies: - duplexer "^0.1.1" - from "^0.1.7" - map-stream "0.0.7" - pause-stream "^0.0.11" - split "^1.0.1" - stream-combiner "^0.2.2" - through "^2.3.8" - eventemitter3@^4.0.0: version "4.0.7" resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" @@ -1620,11 +1566,6 @@ fresh@0.5.2: resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q== -from@^0.1.7: - version "0.1.7" - resolved "https://registry.yarnpkg.com/from/-/from-0.1.7.tgz#83c60afc58b9c56997007ed1a768b3ab303a44fe" - integrity sha512-twe20eF1OxVxp/ML/kq2p1uc6KvFK/+vs8WjEbeKmV2He22MKm7YF2ANIt+EOqhJ5L3K/SuuPhk0hWQDjOM23g== - fs-extra@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" @@ -1686,11 +1627,6 @@ gauge@^3.0.0: strip-ansi "^6.0.1" wide-align "^1.1.2" -get-caller-file@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" - integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== - get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0, get-intrinsic@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.1.tgz#d295644fed4505fc9cde952c37ee12b477a83d82" @@ -2172,11 +2108,6 @@ isexe@^2.0.0: resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw== -jju@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/jju/-/jju-1.4.0.tgz#a3abe2718af241a2b2904f84a625970f389ae32a" - integrity sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA== - js-yaml@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" @@ -2213,11 +2144,6 @@ jsonfile@^4.0.0: optionalDependencies: graceful-fs "^4.1.6" -jsonparse@^1.2.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280" - integrity sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg== - just-performance@4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/just-performance/-/just-performance-4.3.0.tgz#cc2bc8c9227f09e97b6b1df4cd0de2df7ae16db1" @@ -2286,11 +2212,6 @@ make-error@^1.1.1: resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2" integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw== -map-stream@0.0.7: - version "0.0.7" - resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.0.7.tgz#8a1f07896d82b10926bd3744a2420009f88974a8" - integrity sha512-C0X0KQmGm3N2ftbTGBhSyuydQ+vV1LC3f3zPvT3RXHXNZrvfPZcoXp/N5DOa8vedX/rTMm2CjTtivFg2STJMRQ== - markdown-table@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/markdown-table/-/markdown-table-2.0.0.tgz#194a90ced26d31fe753d8b9434430214c011865b" @@ -2801,13 +2722,6 @@ path-type@^4.0.0: resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== -pause-stream@^0.0.11: - version "0.0.11" - resolved "https://registry.yarnpkg.com/pause-stream/-/pause-stream-0.0.11.tgz#fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445" - integrity sha512-e3FBlXLmN/D1S+zHzanP4E/4Z60oFAa3O051qt1pxa7DEJWKAyil6upYVXCWadEnuoqa4Pkc9oUx9zsxYeRv8A== - dependencies: - through "~2.3" - pem@^1.14.8: version "1.14.8" resolved "https://registry.yarnpkg.com/pem/-/pem-1.14.8.tgz#9c414bee991b138a24617f423059e809d01aa720" @@ -2923,11 +2837,6 @@ readable-stream@^3.6.0: string_decoder "^1.1.1" util-deprecate "^1.0.1" -readline-transform@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/readline-transform/-/readline-transform-1.0.0.tgz#3157f97428acaec0f05a5c1ff2c3120f4e6d904b" - integrity sha512-7KA6+N9IGat52d83dvxnApAWN+MtVb1MiVuMR/cf1O4kYsJG+g/Aav0AHcHKsb6StinayfPLne0+fMX2sOzAKg== - regenerator-runtime@^0.14.0: version "0.14.0" resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz#5e19d68eb12d486f797e15a3c6a918f7cec5eb45" @@ -2978,11 +2887,6 @@ repeat-string@^1.0.0: resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" integrity sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w== -require-directory@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" - integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q== - requires-port@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" @@ -3090,7 +2994,7 @@ semver@^6.0.0, semver@^6.3.1: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== -semver@^7.0.0, semver@^7.3.5, semver@^7.5.4: +semver@^7.3.5, semver@^7.5.4: version "7.6.0" resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.0.tgz#1a46a4db4bffcccd97b743b5005c8325f23d4e2d" integrity sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg== @@ -3231,27 +3135,12 @@ source-map@~0.6.1: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== -split@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/split/-/split-1.0.1.tgz#605bd9be303aa59fb35f9229fbea0ddec9ea07d9" - integrity sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg== - dependencies: - through "2" - statuses@2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63" integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ== -stream-combiner@^0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.2.2.tgz#aec8cbac177b56b6f4fa479ced8c1912cee52858" - integrity sha512-6yHMqgLYDzQDcAkL+tjJDC5nSNuNIx0vZtRZeiPh7Saef7VHX9H5Ijn9l2VIol2zaNYlYEX6KyuT/237A58qEQ== - dependencies: - duplexer "~0.1.1" - through "~2.3.4" - -"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: +"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -3294,7 +3183,7 @@ string_decoder@^1.1.1: dependencies: safe-buffer "~5.2.0" -strip-ansi@^6.0.0, strip-ansi@^6.0.1: +strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -3353,11 +3242,6 @@ text-table@^0.2.0: resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw== -through@2, "through@>=2.2.7 <3", through@^2.3.8, through@~2.3, through@~2.3.4: - version "2.3.8" - resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" - integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg== - to-regex-range@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" @@ -3649,15 +3533,6 @@ wide-align@^1.1.2: dependencies: string-width "^1.0.2 || 2 || 3 || 4" -wrap-ansi@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" @@ -3673,34 +3548,11 @@ xdg-basedir@^4.0.0: resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13" integrity sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q== -y18n@^5.0.5: - version "5.0.8" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" - integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== - yallist@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== -yargs-parser@^21.1.1: - version "21.1.1" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35" - integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== - -yargs@^17.0.0: - version "17.7.2" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269" - integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w== - dependencies: - cliui "^8.0.1" - escalade "^3.1.1" - get-caller-file "^2.0.5" - require-directory "^2.1.1" - string-width "^4.2.3" - y18n "^5.0.5" - yargs-parser "^21.1.1" - yn@3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" From 6a140706642578ea8bd290254457f25d77499956 Mon Sep 17 00:00:00 2001 From: Asher Date: Thu, 11 Jul 2024 11:49:56 -0800 Subject: [PATCH 089/497] Add faq entry about web views Closes #5671. --- docs/FAQ.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/docs/FAQ.md b/docs/FAQ.md index f300d410eea4..c46c003b8800 100644 --- a/docs/FAQ.md +++ b/docs/FAQ.md @@ -37,6 +37,7 @@ - [How do I hide the coder/coder promotion in Help: Getting Started?](#how-do-i-hide-the-codercoder-promotion-in-help-getting-started) - [How do I disable the proxy?](#how-do-i-disable-the-proxy) - [How do I disable file download?](#how-do-i-disable-file-download) +- [Why do web views not work?](#why-do-web-views-not-work) @@ -487,3 +488,22 @@ when using the option. ## How do I disable file download? You can pass the flag `--disable-file-downloads` to `code-server` + +## Why do web views not work? + +Web views rely on service workers, and service workers are only available in a +secure context, so most likely the answer is that you are using an insecure +context (for example an IP address). + +If this happens, in the browser log you will see something like: + +> Error loading webview: Error: Could not register service workers: SecurityError: Failed to register a ServiceWorker for scope with script: An SSL certificate error occurred when fetching the script.. + +To fix this, you must either: + +- Access over localhost/127.0.0.1 which is always considered secure. +- Use a domain with a real certificate (for example with Let's Encrypt). +- Use a trusted self-signed certificate with [mkcert](https://mkcert.dev) (or + create and trust a certificate manually). +- Disable security if your browser allows it. For example, in Chromium see + `chrome://flags/#unsafely-treat-insecure-origin-as-secure` From 37a72ce63b6b4e8d5b22dd727326e81ceef581c0 Mon Sep 17 00:00:00 2001 From: Asher Date: Fri, 12 Jul 2024 14:48:55 -0800 Subject: [PATCH 090/497] Enforce yarn version Closes https://github.com/coder/code-server/issues/6695. --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 366a4d39fbbe..9c85b3ee2c33 100644 --- a/package.json +++ b/package.json @@ -100,7 +100,8 @@ "remote-development" ], "engines": { - "node": "20" + "node": "20", + "yarn": "1" }, "jest": { "transform": { From f2c326147de9975c5ab91369c37dc8c9d9163619 Mon Sep 17 00:00:00 2001 From: Asher Date: Fri, 12 Jul 2024 15:01:30 -0800 Subject: [PATCH 091/497] Fix login page assets over proxy domain --- src/node/routes/domainProxy.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/node/routes/domainProxy.ts b/src/node/routes/domainProxy.ts index fc0f91daddf8..0a9bb4a324f7 100644 --- a/src/node/routes/domainProxy.ts +++ b/src/node/routes/domainProxy.ts @@ -65,7 +65,7 @@ router.all(/.*/, async (req, res, next) => { const isAuthenticated = await authenticated(req) if (!isAuthenticated) { // Let the assets through since they're used on the login page. - if (req.path.startsWith("/static/") && req.method === "GET") { + if (req.path.startsWith("/_static/") && req.method === "GET") { return next() } From d9812a5970bde37601adf9ba90f6b3d03b0e6f10 Mon Sep 17 00:00:00 2001 From: Asher Date: Fri, 12 Jul 2024 16:23:29 -0800 Subject: [PATCH 092/497] Use version in npm install Closes #4832. --- install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install.sh b/install.sh index 0a17cd9d2bb9..fd44adb2abe6 100755 --- a/install.sh +++ b/install.sh @@ -424,7 +424,7 @@ install_standalone() { } install_npm() { - echoh "Installing latest from npm." + echoh "Installing v$VERSION from npm." echoh NPM_PATH="${YARN_PATH-npm}" @@ -436,7 +436,7 @@ install_npm() { fi echoh "Installing with npm." echoh - "$sh_c" "$NPM_PATH" install -g code-server --unsafe-perm + "$sh_c" "$NPM_PATH" install -g "code-server@$VERSION" --unsafe-perm NPM_BIN_DIR="\$($NPM_PATH bin -g)" echo_npm_postinstall return fi From 6467c60166a53c758113bf9754d01e4e918654c9 Mon Sep 17 00:00:00 2001 From: Asher Date: Fri, 12 Jul 2024 17:02:40 -0800 Subject: [PATCH 093/497] Remove section about VS Code Remote It has nothing to do with code-server and will not connect to or use code-server in any way. Closes #5613. --- docs/guide.md | 93 --------------------------------------------------- 1 file changed, 93 deletions(-) diff --git a/docs/guide.md b/docs/guide.md index 5bf2fc9dac68..6d164c694dea 100644 --- a/docs/guide.md +++ b/docs/guide.md @@ -20,9 +20,6 @@ - [Proxying to a Vue app](#proxying-to-a-vue-app) - [Proxying to an Angular app](#proxying-to-an-angular-app) - [Proxying to a Svelte app](#proxying-to-a-svelte-app) -- [SSH into code-server on VS Code](#ssh-into-code-server-on-vs-code) - - [Option 1: cloudflared tunnel](#option-1-cloudflared-tunnel) - - [Option 2: ngrok tunnel](#option-2-ngrok-tunnel) @@ -435,93 +432,3 @@ const config = { 3. Access app at `/absproxy/5173/` e.g. `http://localhost:8080/absproxy/5173/ For additional context, see [this Github Issue](https://github.com/sveltejs/kit/issues/2958) - -## SSH into code-server on VS Code - -[![SSH](https://img.shields.io/badge/SSH-363636?style=for-the-badge&logo=GNU+Bash&logoColor=ffffff)](https://ohmyz.sh/) [![Terminal](https://img.shields.io/badge/Terminal-2E2E2E?style=for-the-badge&logo=Windows+Terminal&logoColor=ffffff)](https://img.shields.io/badge/Terminal-2E2E2E?style=for-the-badge&logo=Windows+Terminal&logoColor=ffffff) [![Visual Studio Code](https://img.shields.io/badge/Visual_Studio_Code-007ACC?style=for-the-badge&logo=Visual+Studio+Code&logoColor=ffffff)](vscode:extension/ms-vscode-remote.remote-ssh) - -Follow these steps where code-server is running: - -1. Install `openssh-server`, `wget`, and `unzip`. - -```bash -# example for Debian and Ubuntu operating systems -sudo apt update -sudo apt install wget unzip openssh-server -``` - -2. Start the SSH server and set the password for your user, if you haven't already. If you use [deploy-code-server](https://github.com/coder/deploy-code-server), - -```bash -sudo service ssh start -sudo passwd {user} # replace user with your code-server user -``` - -### Option 1: cloudflared tunnel - -[![Cloudflared](https://img.shields.io/badge/Cloudflared-E4863B?style=for-the-badge&logo=cloudflare&logoColor=ffffff)](https://github.com/cloudflare/cloudflared) - -1. Install [cloudflared](https://github.com/cloudflare/cloudflared#installing-cloudflared) on your local computer and remote server -2. Then go to `~/.ssh/config` and add the following on your local computer: - -```shell -Host *.trycloudflare.com -HostName %h -User user -Port 22 -ProxyCommand "cloudflared location" access ssh --hostname %h -``` - -3. Run `cloudflared tunnel --url ssh://localhost:22` on the remote server - -4. Finally on VS Code or any IDE that supports SSH, run `ssh user@https://your-link.trycloudflare.com` or `ssh user@your-link.trycloudflare.com` - -### Option 2: ngrok tunnel - -[![Ngrok](https://img.shields.io/badge/Ngrok-1F1E37?style=for-the-badge&logo=ngrok&logoColor=ffffff)](https://ngrok.com/) - -1. Make a new account for ngrok [here](https://dashboard.ngrok.com/login) - -2. Now, get the ngrok binary with `wget` and unzip it with `unzip`: - -```bash -wget "https://bin.equinox.io/c/4VmDzA7iaHb/ngrok-stable-linux-amd64.zip" -unzip "ngrok-stable-linux-amd64.zip" -``` - -5. Then, go to [dashboard.ngrok.com](https://dashboard.ngrok.com) and go to the `Your Authtoken` section. -6. Copy the Authtoken shown there. -7. Now, go to the folder where you unzipped ngrok and store the Authtoken from the ngrok Dashboard. - -```bash -./ngrok authtoken YOUR_AUTHTOKEN # replace YOUR_AUTHTOKEN with the ngrok authtoken. -``` - -8. Now, forward port 22, which is the SSH port with this command: - -```bash -./ngrok tcp 22 -``` - -Now, you get a screen in the terminal like this: - -```console -ngrok by @inconshreveable(Ctrl+C to quit) - -Session Status online -Account {Your name} (Plan: Free) -Version 2.3.40 -Region United States (us) -Web Interface http://127.0.0.1:4040 -Forwarding tcp://0.tcp.ngrok.io:19028 -> localhost:22 -``` - -In this case, copy the forwarded link `0.tcp.ngrok.io` and remember the port number `19028`. Type this on your local Visual Studio Code: - -```bash -ssh user@0.tcp.ngrok.io -p 19028 -``` - -The port redirects you to the default SSH port 22, and you can then successfully connect to code-server by entering the password you set for the user. - -Note: the port and the url provided by ngrok will change each time you run it so modify as needed. From 1962f48b7f71772dc2c060dbaa5a6b4c0792a549 Mon Sep 17 00:00:00 2001 From: Olivier Benz Date: Mon, 15 Jul 2024 19:57:32 +0200 Subject: [PATCH 094/497] Update Code to 1.91.1 (#6900) --- lib/vscode | 2 +- patches/webview.diff | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/vscode b/lib/vscode index ea1445cc7016..f1e16e1e6214 160000 --- a/lib/vscode +++ b/lib/vscode @@ -1 +1 @@ -Subproject commit ea1445cc7016315d0f5728f8e8b12a45dc0a7286 +Subproject commit f1e16e1e6214d7c44d078b1f0607b2388f29d729 diff --git a/patches/webview.diff b/patches/webview.diff index 2616db81fb48..c115e550855d 100644 --- a/patches/webview.diff +++ b/patches/webview.diff @@ -70,8 +70,8 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index -+ content="default-src 'none'; script-src 'sha256-ytymamOof3TtOHdw4JlwzF1Z5E8nGRH8AmlcwgCHTFQ=' 'self'; frame-src 'self'; style-src 'unsafe-inline';"> +- content="default-src 'none'; script-src 'sha256-dvxt5dlghGbz8hrqqochfoKEaHIMZ+yJVRvjJnGopzs=' 'self'; frame-src 'self'; style-src 'unsafe-inline';"> ++ content="default-src 'none'; script-src 'sha256-gzcLnrLeKQp7L5f+d7tdtNmK8h1NxVu1TdCfnv9uU+o=' 'self'; frame-src 'self'; style-src 'unsafe-inline';"> From 0f9436e7b966f1bfa8dc68cab3c8e73d0f0a3d2c Mon Sep 17 00:00:00 2001 From: Asher Date: Fri, 19 Jul 2024 10:49:26 -0800 Subject: [PATCH 095/497] Remove Ranger for now - We have a labeling bot that is marking issues as upstream (so far correctly) now Ranger is closing them right away and it felt too aggressive to me. - It keeps posting its comment twice. Not sure how to fix that. --- .github/ranger.yml | 29 ----------------------------- 1 file changed, 29 deletions(-) delete mode 100644 .github/ranger.yml diff --git a/.github/ranger.yml b/.github/ranger.yml deleted file mode 100644 index 4a7044e4d5e4..000000000000 --- a/.github/ranger.yml +++ /dev/null @@ -1,29 +0,0 @@ -# Configuration for the repo ranger bot -# See docs: https://www.notion.so/Documentation-8d7627bb1f3c42b7b1820e8d6f157a57#9879d1374fab4d1f9c607c230fd5123d -default: - close: - # Default time to wait before closing the label. Can either be a number in milliseconds - # or a string specified by the `ms` package (https://www.npmjs.com/package/ms) - delay: "2 days" - - # Default comment to post when an issue is first marked with a closing label - comment: "⚠️ This issue has been marked $LABEL and will be closed in $DELAY." - -labels: - duplicate: close - wontfix: close - "squash when passing": merge - "rebase when passing": merge - "merge when passing": merge - "new contributor": - action: comment - delay: 5s - message: "Thanks for making your first contribution! :slightly_smiling_face:" - "upstream:vscode": - action: close - delay: 5s - comment: > - This issue has been marked as 'upstream:vscode'. - Please file this upstream: [link to open issue](https://github.com/microsoft/vscode/issues/new/choose) - - This issue will automatically close in $DELAY. From 31bc0c6b1a19fcfd3d2e7ac7e44601d65c3d0679 Mon Sep 17 00:00:00 2001 From: Asher Date: Thu, 25 Jul 2024 09:16:15 -0800 Subject: [PATCH 096/497] Fix dangling links in standalone release The fix will now run both to the GitHub and npm release instead of only for the npm releases. Closes #5157. --- ci/build/build-packages.sh | 5 ----- ci/build/build-standalone-release.sh | 4 ++++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ci/build/build-packages.sh b/ci/build/build-packages.sh index 1844dc7410fd..d9840d1c367d 100755 --- a/ci/build/build-packages.sh +++ b/ci/build/build-packages.sh @@ -50,11 +50,6 @@ release_nfpm() { export NFPM_ARCH - # Code deletes some files from the extension node_modules directory which - # leaves broken symlinks in the corresponding .bin directory. nfpm will fail - # on these broken symlinks so clean them up. - rm -fr "./release-standalone/lib/vscode/extensions/node_modules/.bin" - PKG_FORMAT="deb" NFPM_ARCH="$(get_nfpm_arch $PKG_FORMAT "$ARCH")" nfpm_config="$(envsubst < ./ci/build/nfpm.yaml)" diff --git a/ci/build/build-standalone-release.sh b/ci/build/build-standalone-release.sh index aed25ee3f3fc..78e665de7a60 100755 --- a/ci/build/build-standalone-release.sh +++ b/ci/build/build-standalone-release.sh @@ -24,6 +24,10 @@ main() { pushd "$RELEASE_PATH" npm install --unsafe-perm --omit=dev + # Code deletes some files from the extension node_modules directory which + # leaves broken symlinks in the corresponding .bin directory. nfpm will fail + # on these broken symlinks so clean them up. + rm -fr "./lib/vscode/extensions/node_modules/.bin" popd } From 461d4cba59754c587db936bdff1cb6559da892f9 Mon Sep 17 00:00:00 2001 From: Asher Date: Thu, 1 Aug 2024 11:31:44 -0800 Subject: [PATCH 097/497] Update script tests Installing from npm now tells you the version. --- test/scripts/install.bats | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/scripts/install.bats b/test/scripts/install.bats index c9fd8c0fadaf..976069cd4443 100644 --- a/test/scripts/install.bats +++ b/test/scripts/install.bats @@ -26,14 +26,14 @@ function should-fallback-npm() { [ "$status" -eq 0 ] [ "${lines[1]}" = "No standalone releases for $2." ] [ "${lines[2]}" = "Falling back to installation from npm." ] - [ "${lines[3]}" = "Installing latest from npm." ] + [ "${lines[3]}" = "Installing v$VERSION from npm." ] [ "${lines[-6]}" = "npm package has been installed." ] } function should-use-npm() { YARN_PATH=true DISTRO=$1 ARCH=$2 OS=linux run "$SCRIPT" --dry-run [ "$status" -eq 0 ] - [ "${lines[1]}" = "Installing latest from npm." ] + [ "${lines[1]}" = "Installing v$VERSION from npm." ] [ "${lines[-6]}" = "npm package has been installed." ] } @@ -51,7 +51,7 @@ function should-fallback-npm-brew() { [ "${lines[2]}" = "Falling back to standalone installation." ] [ "${lines[3]}" = "No standalone releases for $1." ] [ "${lines[4]}" = "Falling back to installation from npm." ] - [ "${lines[5]}" = "Installing latest from npm." ] + [ "${lines[5]}" = "Installing v$VERSION from npm." ] [ "${lines[-6]}" = "npm package has been installed." ] } From 34c6751bf8ae4e343f908d8aee691a4778f1d3a2 Mon Sep 17 00:00:00 2001 From: Asher Date: Thu, 15 Aug 2024 21:33:21 -0800 Subject: [PATCH 098/497] Update VS Code to 1.92.2 (#6941) * Update VS Code to 1.92.2 * Use server-main.js to load VS Code It looks like the bootstrap files are now bundled so we can no longer require them. We could make them included again, but maybe it is better to go through the main entrypoint anyway because it includes some nls stuff which is maybe necessary. This also fixes what looks like a bug where we could create two servers if two requests came in. I am not sure what the practical consequences of that would be, but it will no longer do that. * Drop es2020 patch Unfortunately, VS Code will not load with this. It seems to be because `this` is being used in static properties, and it becomes `void 0` for some reason under the es2020 target. For example: static PREFIX_BY_CATEGORY = `${this.PREFIX}${this.SCOPE_PREFIX}`; becomes AbstractGotoSymbolQuickAccessProvider.PREFIX_BY_CATEGORY = `${(void 0).PREFIX}${(void 0).SCOPE_PREFIX}`; Which, obviously, will not work. Older versions of Safari (and maybe other browsers) are likely affected. * Fix display language * Update Playwright I think maybe because of the dropped es2020 patch that Webkit is now failing because it is too old. * Do not wait for networkidle in e2e tests I am not sure what is going on but some tests on Webkit are timing out and it seems the page is loaded but something is still trying to download. Not good, but for now try to at least get the tests passing. --- CHANGELOG.md | 13 + lib/vscode | 2 +- patches/base-path.diff | 44 ++- patches/clipboard.diff | 4 +- patches/disable-builtin-ext-update.diff | 2 +- patches/display-language.diff | 285 +++++++------- patches/external-file-actions.diff | 6 +- patches/getting-started.diff | 10 +- patches/integration.diff | 17 +- patches/keepalive.diff | 2 +- patches/local-storage.diff | 2 +- patches/logout.diff | 2 +- patches/marketplace.diff | 14 +- patches/proxy-uri.diff | 2 +- patches/safari.diff | 68 ---- patches/series | 3 +- patches/service-worker.diff | 2 +- patches/sourcemaps.diff | 6 +- patches/store-socket.diff | 6 +- patches/telemetry.diff | 18 +- patches/update-check.diff | 2 +- patches/webview.diff | 28 +- src/node/cli.ts | 5 - src/node/main.ts | 16 +- src/node/routes/vscode.ts | 69 +++- src/node/util.ts | 26 -- test/e2e/models/CodeServer.ts | 2 +- test/package.json | 4 +- test/yarn.lock | 496 ++---------------------- 29 files changed, 352 insertions(+), 804 deletions(-) delete mode 100644 patches/safari.diff diff --git a/CHANGELOG.md b/CHANGELOG.md index ef97088f8b14..5b0af9972bd4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,19 @@ Code v99.99.999 ## Unreleased +Code v1.92.1 + +### Breaking changes + +- Dropped a patch that changed the compile target from es2022 to es2020 because + it no longer works with the way VS Code uses static properties. This may break + older browsers, so those browsers will either have to be updated or use an + older version of code-server. + +### Changed + +- Updated to Code 1.92.1. + ## [4.91.0](https://github.com/coder/code-server/releases/tag/v4.91.0) - 2024-07-10 Code v1.91.0 diff --git a/lib/vscode b/lib/vscode index f1e16e1e6214..fee1edb8d6d7 160000 --- a/lib/vscode +++ b/lib/vscode @@ -1 +1 @@ -Subproject commit f1e16e1e6214d7c44d078b1f0607b2388f29d729 +Subproject commit fee1edb8d6d72a0ddff41e5f71a671c23ed924b9 diff --git a/patches/base-path.diff b/patches/base-path.diff index 6705ec088da0..05bfbbf4a3b8 100644 --- a/patches/base-path.diff +++ b/patches/base-path.diff @@ -86,10 +86,10 @@ Index: code-server/lib/vscode/src/vs/code/browser/workbench/workbench.html -@@ -38,7 +38,7 @@ - - +@@ -40,7 +40,7 @@ + + - + + + + - - ", } - const req = createRequest() + const req = await createRequest() const res = { status: jest.fn().mockReturnValue(this), send: jest.fn().mockReturnValue(this), @@ -20,9 +21,41 @@ describe("error page is rendered for text/html requests", () => { expect(res.status).toHaveBeenCalledWith(404) expect(res.send).toHaveBeenCalledWith(expect.not.stringContaining("" + html=${html##*$start_tag} + html=${html%%$end_tag*} + echo -n "$html" | openssl sha256 -binary | openssl base64 +} + +function update_csp() { + local -i exit_code=0 + # Move back to the webview patch so it can be refreshed. + quilt pop webview || exit_code=$? + case $exit_code in + # Successfully moved. + 0) ;; + # Already at the patch. + 2) ;; + # Some error. + *) return $exit_code ;; + esac + local file=lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index.html + local hash + hash=$(get-webview-script-hash "$file") + echo "Calculated hash as $hash" + # Use octothorpe as a delimiter since the hash may contain a slash. + sed -i.bak "s#script-src 'sha256-[^']\+'#script-src 'sha256-$hash'#" "$file" + quilt refresh + # Get patched back up. + quilt push -a +} + +function run() { + local -i failed=0 + rm -f .cache/checklist + while (( $# )) ; do + local name=$1 ; shift + local fn=$1 ; shift + # Only run if an earlier step has not failed. + if [[ $failed == 0 ]] ; then + echo "[+] $name..." + if $fn ; then + echo "- [X] $name" >> .cache/checklist + else + ((failed++)) + fi + fi + # For all failed steps, write out an empty checkbox. + if [[ $failed != 0 ]] ; then + echo "- [ ] $name" >> .cache/checklist + fi + done + if [[ $failed != 0 ]] ; then + return 1 + fi +} + +function add_changelog() { + local file=CHANGELOG.md + if grep "Code $VERSION" "$file" ; then + echo "Changelog for $VERSION already exists" + else + # TODO: This is not exactly robust. In particular, it needs to handle if + # there is already a "changed" section. + sed -i.bak "s/## Unreleased/## Unreleased\n\nCode v$VERSION\n\n### Changed\n\n- Update to Code $VERSION/" "$file" + fi +} + +function main() { + cd "$(dirname "${0}")/../.." + + source ./ci/lib.sh + + local target_node_version + target_node_version=$(grep target lib/vscode/remote/.npmrc | awk -F= '{print $2}' | tr -d '"') + + declare -a steps + # Removing patches only needs to be done locally; in CI we start from a fresh + # clone each time. + if [[ ! ${CI-} ]] ; then + steps+=("Remove patches" "remove_patches") + fi + + steps+=( + "Update VS Code to $VERSION" "update_vscode" + "Refresh VS Code patches" "refresh_patches" + "Set Node version to $target_node_version" "update_node" + "Update CSP webview hash" "update_csp" + "Add changelog note" "add_changelog" + ) + + run "${steps[@]}" + + # This step is always manual. + echo "- [ ] Verify changelog" >> .cache/checklist +} + +main "$@" From 58aedd0ebce7a3710851d15efb3ddf4dc48389c1 Mon Sep 17 00:00:00 2001 From: Olivier Benz Date: Thu, 7 May 2026 20:22:50 +0200 Subject: [PATCH 403/497] Update Code to 1.119.0 (#7787) --- lib/vscode | 2 +- patches/copilot.diff | 6 +++--- patches/display-language.diff | 2 +- patches/external-file-actions.diff | 4 ++-- patches/store-socket.diff | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/vscode b/lib/vscode index 034f571df509..8b640eef5a6c 160000 --- a/lib/vscode +++ b/lib/vscode @@ -1 +1 @@ -Subproject commit 034f571df509819cc10b0c8129f66ef77a542f0e +Subproject commit 8b640eef5a6c6089c029249d48efa5c99adf7d51 diff --git a/patches/copilot.diff b/patches/copilot.diff index d30f43d7301a..8db68a1b7a23 100644 --- a/patches/copilot.diff +++ b/patches/copilot.diff @@ -2,7 +2,7 @@ Index: code-server/lib/vscode/build/gulpfile.extensions.ts =================================================================== --- code-server.orig/lib/vscode/build/gulpfile.extensions.ts +++ code-server/lib/vscode/build/gulpfile.extensions.ts -@@ -293,6 +293,29 @@ export const compileCopilotExtensionBuil +@@ -294,6 +294,29 @@ export const compileCopilotExtensionBuil gulp.task(compileCopilotExtensionBuildTask); /** @@ -44,7 +44,7 @@ Index: code-server/lib/vscode/build/lib/extensions.ts import vzip from 'gulp-vinyl-zip'; import { createRequire } from 'module'; -@@ -482,6 +483,116 @@ export function packageCopilotExtensionS +@@ -487,6 +488,116 @@ export function packageCopilotExtensionS ).pipe(util2.setExecutableBit(['**/*.sh'])); } @@ -61,7 +61,7 @@ Index: code-server/lib/vscode/build/lib/extensions.ts + return es.readArray([]); + } + -+ const esbuildConfigFileName = '.esbuild.ts'; ++ const esbuildConfigFileName = '.esbuild.mts'; + const esbuildScript = path.join(extensionPath, esbuildConfigFileName); + if (!fs.existsSync(esbuildScript)) { + throw new Error(`Copilot esbuild script not found at ${esbuildScript}`); diff --git a/patches/display-language.diff b/patches/display-language.diff index e22e954ee575..db433fd9933e 100644 --- a/patches/display-language.diff +++ b/patches/display-language.diff @@ -32,7 +32,7 @@ Index: code-server/lib/vscode/src/vs/platform/environment/common/environmentServ =================================================================== --- code-server.orig/lib/vscode/src/vs/platform/environment/common/environmentService.ts +++ code-server/lib/vscode/src/vs/platform/environment/common/environmentService.ts -@@ -98,7 +98,7 @@ export abstract class AbstractNativeEnvi +@@ -112,7 +112,7 @@ export abstract class AbstractNativeEnvi return URI.file(join(vscodePortable, 'argv.json')); } diff --git a/patches/external-file-actions.diff b/patches/external-file-actions.diff index 6bc6ec39d65d..40d7b4c6d5fb 100644 --- a/patches/external-file-actions.diff +++ b/patches/external-file-actions.diff @@ -166,8 +166,8 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/files/browser/fileActions import { AutoSaveAfterShortDelayContext } from '../../../services/filesConfiguration/common/filesConfigurationService.js'; import { WorkbenchListDoubleSelection } from '../../../../platform/list/browser/listService.js'; import { Schemas } from '../../../../base/common/network.js'; --import { DirtyWorkingCopiesContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, WorkbenchStateContext, WorkspaceFolderCountContext, SidebarFocusContext, ActiveEditorCanRevertContext, ActiveEditorContext, ResourceContextKey, ActiveEditorAvailableEditorIdsContext, MultipleEditorsSelectedInGroupContext, TwoEditorsSelectedInGroupContext, SelectedEditorsInGroupFileOrUntitledResourceContextKey } from '../../../common/contextkeys.js'; -+import { IsEnabledFileDownloads, IsEnabledFileUploads, DirtyWorkingCopiesContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, WorkbenchStateContext, WorkspaceFolderCountContext, SidebarFocusContext, ActiveEditorCanRevertContext, ActiveEditorContext, ResourceContextKey, ActiveEditorAvailableEditorIdsContext, MultipleEditorsSelectedInGroupContext, TwoEditorsSelectedInGroupContext, SelectedEditorsInGroupFileOrUntitledResourceContextKey } from '../../../common/contextkeys.js'; +-import { DirtyWorkingCopiesContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, IsSessionsWindowContext, WorkbenchStateContext, WorkspaceFolderCountContext, SidebarFocusContext, ActiveEditorCanRevertContext, ActiveEditorContext, ResourceContextKey, ActiveEditorAvailableEditorIdsContext, MultipleEditorsSelectedInGroupContext, TwoEditorsSelectedInGroupContext, SelectedEditorsInGroupFileOrUntitledResourceContextKey } from '../../../common/contextkeys.js'; ++import { IsEnabledFileDownloads, IsEnabledFileUploads, DirtyWorkingCopiesContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, IsSessionsWindowContext, WorkbenchStateContext, WorkspaceFolderCountContext, SidebarFocusContext, ActiveEditorCanRevertContext, ActiveEditorContext, ResourceContextKey, ActiveEditorAvailableEditorIdsContext, MultipleEditorsSelectedInGroupContext, TwoEditorsSelectedInGroupContext, SelectedEditorsInGroupFileOrUntitledResourceContextKey } from '../../../common/contextkeys.js'; import { IsWebContext } from '../../../../platform/contextkey/common/contextkeys.js'; import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js'; import { ThemeIcon } from '../../../../base/common/themables.js'; diff --git a/patches/store-socket.diff b/patches/store-socket.diff index c2bca06c907f..ffbd9d15d37f 100644 --- a/patches/store-socket.diff +++ b/patches/store-socket.diff @@ -31,7 +31,7 @@ Index: code-server/lib/vscode/src/vs/workbench/api/node/extHostExtensionService. import { ExtHostDiskFileSystemProvider } from './extHostDiskFileSystemProvider.js'; import nodeModule from 'node:module'; import { assertType } from '../../../base/common/types.js'; -@@ -226,6 +228,52 @@ export class ExtHostExtensionService ext +@@ -175,6 +177,52 @@ export class ExtHostExtensionService ext performance.mark('code/extHost/didInitAPI'); From 0059d37db582570b8f2c5155ee886d377227f0d2 Mon Sep 17 00:00:00 2001 From: Asher Date: Thu, 7 May 2026 10:23:06 -0800 Subject: [PATCH 404/497] Reset cdrci aur repo when publishing I figure it is probably faster to keep it up to date than to merge larger and larger changes each time? --- .github/workflows/publish.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 75e652408531..143dfb4e3d89 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -70,11 +70,12 @@ jobs: token: ${{ secrets.HOMEBREW_GITHUB_API_TOKEN }} ref: "master" - - name: Merge in master + - name: Fetch and reset master run: | git remote add upstream https://github.com/coder/code-server-aur.git git fetch upstream - git merge upstream/master + git reset --hard upstream/master + git push --force - name: Configure git run: | From 9527b7879f6cad117e963d2056321d96d209a0a6 Mon Sep 17 00:00:00 2001 From: Asher Date: Thu, 7 May 2026 10:30:37 -0800 Subject: [PATCH 405/497] Pin GitHub actions --- .github/workflows/build.yaml | 54 ++++++++++++++--------------- .github/workflows/installer.yaml | 6 ++-- .github/workflows/publish.yaml | 8 ++--- .github/workflows/release.yaml | 10 +++--- .github/workflows/scripts.yaml | 4 +-- .github/workflows/security.yaml | 18 +++++----- .github/workflows/trivy-docker.yaml | 6 ++-- 7 files changed, 53 insertions(+), 53 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 53c822882a3a..def1c5c8201b 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -25,8 +25,8 @@ jobs: docs: ${{ steps.filter.outputs.docs }} helm: ${{ steps.filter.outputs.helm }} steps: - - uses: actions/checkout@v6 - - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3 + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + - uses: dorny/paths-filter@d1c1ffe0248fe513906c8e24db8ea791d46f8590 # v3 id: filter with: filters: | @@ -55,8 +55,8 @@ jobs: name: Run prettier check runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v6 - - uses: actions/setup-node@v6 + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6 with: node-version-file: .node-version cache: npm @@ -72,8 +72,8 @@ jobs: needs: changes if: needs.changes.outputs.docs == 'true' steps: - - uses: actions/checkout@v6 - - uses: actions/setup-node@v6 + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6 with: node-version-file: .node-version cache: npm @@ -89,7 +89,7 @@ jobs: needs: changes if: needs.changes.outputs.helm == 'true' steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 - uses: azure/setup-helm@dda3372f752e03dde6b3237bc9431cdc2f7a02a2 # v5.0.0 with: token: ${{ secrets.GITHUB_TOKEN }} @@ -103,8 +103,8 @@ jobs: needs: changes if: needs.changes.outputs.code == 'true' steps: - - uses: actions/checkout@v6 - - uses: actions/setup-node@v6 + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6 with: node-version-file: .node-version cache: npm @@ -121,7 +121,7 @@ jobs: if: needs.changes.outputs.ci == 'true' steps: - name: Checkout repo - uses: actions/checkout@v6 + uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 - name: Check workflow files run: | bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash) 1.7.9 @@ -134,8 +134,8 @@ jobs: needs: changes if: needs.changes.outputs.code == 'true' steps: - - uses: actions/checkout@v6 - - uses: actions/setup-node@v6 + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6 with: node-version-file: .node-version cache: npm @@ -144,7 +144,7 @@ jobs: test/package-lock.json - run: SKIP_SUBMODULE_DEPS=1 npm ci - run: npm run test:unit - - uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v5 + - uses: codecov/codecov-action@75cd11691c0faa626561e295848008c8a7dddffe # v5 if: success() with: token: ${{ secrets.CODECOV_TOKEN }} @@ -163,16 +163,16 @@ jobs: steps: - run: sudo apt update && sudo apt install -y libkrb5-dev - - uses: awalsh128/cache-apt-pkgs-action@acb598e5ddbc6f68a970c5da0688d2f3a9f04d05 # latest + - uses: awalsh128/cache-apt-pkgs-action@2c09a5e66da6c8016428a2172bd76e5e4f14bb17 # latest with: packages: quilt version: 1.0 - - uses: actions/checkout@v6 + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 with: submodules: true - run: quilt push -a - - uses: actions/setup-node@v6 + - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6 with: node-version-file: .node-version cache: npm @@ -191,7 +191,7 @@ jobs: # embedded into the code). Use VSCODE_CACHE_VERSION to force a rebuild. - name: Fetch prebuilt linux-x64 Code package from cache id: cache-vscode - uses: actions/cache@v4 + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4 with: path: lib/vscode-reh-web-linux-x64 key: vscode-linux-x64-package-${{ secrets.VSCODE_CACHE_VERSION }}-${{ steps.vscode-rev.outputs.rev }}-${{ hashFiles('patches/*.diff', 'ci/build/build-vscode.sh') }} @@ -205,7 +205,7 @@ jobs: # Push up an artifact containing the linux-x64 release. - run: KEEP_MODULES=1 npm run release - run: tar -czf package.tar.gz release - - uses: actions/upload-artifact@v7 + - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7 with: name: linux-x64-package path: ./package.tar.gz @@ -219,8 +219,8 @@ jobs: if: needs.changes.outputs.code == 'true' || needs.changes.outputs.deps == 'true' || needs.changes.outputs.ci == 'true' steps: - - uses: actions/checkout@v6 - - uses: actions/setup-node@v6 + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6 with: node-version-file: .node-version cache: npm @@ -233,13 +233,13 @@ jobs: ./test/node_modules/.bin/playwright install-deps ./test/node_modules/.bin/playwright install - - uses: actions/download-artifact@v8 + - uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8 with: name: linux-x64-package - run: tar -xzf package.tar.gz - run: CODE_SERVER_TEST_ENTRY=./release npm run test:e2e - - uses: actions/upload-artifact@v7 + - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7 if: always() with: name: failed-test-videos @@ -256,7 +256,7 @@ jobs: steps: - name: Cache Caddy - uses: actions/cache@v4 + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4 id: caddy-cache with: path: | @@ -269,8 +269,8 @@ jobs: mkdir -p ~/.cache/caddy tar -xzf caddy_2.5.2_linux_amd64.tar.gz --directory ~/.cache/caddy - - uses: actions/checkout@v6 - - uses: actions/setup-node@v6 + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6 with: node-version-file: .node-version cache: npm @@ -283,7 +283,7 @@ jobs: ./test/node_modules/.bin/playwright install-deps ./test/node_modules/.bin/playwright install - - uses: actions/download-artifact@v8 + - uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8 with: name: linux-x64-package - run: tar -xzf package.tar.gz @@ -292,7 +292,7 @@ jobs: - run: CODE_SERVER_TEST_ENTRY=./release npm run test:e2e:proxy - run: ~/.cache/caddy/caddy stop --config ./ci/Caddyfile if: always() - - uses: actions/upload-artifact@v7 + - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7 if: always() with: name: failed-test-videos-proxy diff --git a/.github/workflows/installer.yaml b/.github/workflows/installer.yaml index f89c5b31de1b..a77a5fd61919 100644 --- a/.github/workflows/installer.yaml +++ b/.github/workflows/installer.yaml @@ -30,7 +30,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repo - uses: actions/checkout@v6 + uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 - name: Install code-server run: ./install.sh @@ -44,7 +44,7 @@ jobs: container: "alpine:3.17" steps: - name: Checkout repo - uses: actions/checkout@v6 + uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 - name: Install curl run: apk add curl @@ -67,7 +67,7 @@ jobs: steps: - name: Checkout repo - uses: actions/checkout@v6 + uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 - name: Install code-server run: ./install.sh diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 143dfb4e3d89..a23c3f903e78 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -33,8 +33,8 @@ jobs: run: | echo "VERSION=${TAG#v}" >> $GITHUB_ENV - - uses: actions/checkout@v6 - - uses: actions/setup-node@v6 + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6 with: node-version-file: .node-version @@ -64,7 +64,7 @@ jobs: echo "VERSION=${TAG#v}" >> $GITHUB_ENV - name: Checkout code-server-aur repo - uses: actions/checkout@v6 + uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 with: repository: "cdrci/code-server-aur" token: ${{ secrets.HOMEBREW_GITHUB_API_TOKEN }} @@ -108,7 +108,7 @@ jobs: run: | echo "VERSION=${TAG#v}" >> $GITHUB_ENV - - uses: actions/checkout@v6 + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 - uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4.0.0 - uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0 diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 58055f37fa25..4054b08febd1 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -54,7 +54,7 @@ jobs: steps: - run: sudo apt update && sudo apt install -y libkrb5-dev - - uses: awalsh128/cache-apt-pkgs-action@acb598e5ddbc6f68a970c5da0688d2f3a9f04d05 # latest + - uses: awalsh128/cache-apt-pkgs-action@2c09a5e66da6c8016428a2172bd76e5e4f14bb17 # latest with: packages: quilt version: 1.0 @@ -68,11 +68,11 @@ jobs: run: | echo "VERSION=${TAG#v}" >> $GITHUB_ENV - - uses: actions/checkout@v6 + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 with: submodules: true - run: quilt push -a - - uses: actions/setup-node@v6 + - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6 with: node-version-file: .node-version cache: npm @@ -148,11 +148,11 @@ jobs: run: | echo "VERSION=${TAG#v}" >> $GITHUB_ENV - - uses: actions/checkout@v6 + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 with: submodules: true - run: quilt push -a - - uses: actions/setup-node@v6 + - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6 with: node-version-file: .node-version cache: npm diff --git a/.github/workflows/scripts.yaml b/.github/workflows/scripts.yaml index d6b2728ad66f..4ebef47ea875 100644 --- a/.github/workflows/scripts.yaml +++ b/.github/workflows/scripts.yaml @@ -41,7 +41,7 @@ jobs: container: "alpine:3.17" steps: - name: Checkout repo - uses: actions/checkout@v6 + uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 - name: Install test utilities run: apk add bats checkbashisms @@ -58,7 +58,7 @@ jobs: timeout-minutes: 5 steps: - name: Checkout repo - uses: actions/checkout@v6 + uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 - name: Install lint utilities run: sudo apt install shellcheck diff --git a/.github/workflows/security.yaml b/.github/workflows/security.yaml index 129ef3d174ed..f27584dcf251 100644 --- a/.github/workflows/security.yaml +++ b/.github/workflows/security.yaml @@ -25,12 +25,12 @@ jobs: timeout-minutes: 15 steps: - name: Checkout repo - uses: actions/checkout@v6 + uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 with: fetch-depth: 0 - name: Install Node.js - uses: actions/setup-node@v6 + uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6 with: node-version-file: .node-version @@ -46,12 +46,12 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Checkout repo - uses: actions/checkout@v6 + uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 with: fetch-depth: 0 - name: Run Trivy vulnerability scanner in repo mode - uses: aquasecurity/trivy-action@97e0b3872f55f89b95b2f65b3dbab56962816478 + uses: aquasecurity/trivy-action@97e0b3872f55f89b95b2f65b3dbab56962816478 # latest with: scan-type: "fs" scan-ref: "." @@ -62,7 +62,7 @@ jobs: severity: "HIGH,CRITICAL" - name: Upload Trivy scan results to GitHub Security tab - uses: github/codeql-action/upload-sarif@v4 + uses: github/codeql-action/upload-sarif@68bde559dea0fdcac2102bfdf6230c5f70eb485e # v4 with: sarif_file: "trivy-repo-results.sarif" @@ -76,17 +76,17 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v6 + uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v4 + uses: github/codeql-action/init@68bde559dea0fdcac2102bfdf6230c5f70eb485e # v4 with: config-file: ./.github/codeql-config.yml languages: javascript - name: Autobuild - uses: github/codeql-action/autobuild@v4 + uses: github/codeql-action/autobuild@68bde559dea0fdcac2102bfdf6230c5f70eb485e # v4 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v4 + uses: github/codeql-action/analyze@68bde559dea0fdcac2102bfdf6230c5f70eb485e # v4 diff --git a/.github/workflows/trivy-docker.yaml b/.github/workflows/trivy-docker.yaml index 350fe4a59989..b38bf8287468 100644 --- a/.github/workflows/trivy-docker.yaml +++ b/.github/workflows/trivy-docker.yaml @@ -48,10 +48,10 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v6 + uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 - name: Run Trivy vulnerability scanner in image mode - uses: aquasecurity/trivy-action@97e0b3872f55f89b95b2f65b3dbab56962816478 + uses: aquasecurity/trivy-action@97e0b3872f55f89b95b2f65b3dbab56962816478 # latest with: image-ref: "docker.io/codercom/code-server:latest" ignore-unfixed: true @@ -60,6 +60,6 @@ jobs: severity: "HIGH,CRITICAL" - name: Upload Trivy scan results to GitHub Security tab - uses: github/codeql-action/upload-sarif@v4 + uses: github/codeql-action/upload-sarif@68bde559dea0fdcac2102bfdf6230c5f70eb485e # v4 with: sarif_file: "trivy-image-results.sarif" From 58491f317f230c2aa85da9e3095c4626c00093fa Mon Sep 17 00:00:00 2001 From: Asher Date: Thu, 7 May 2026 10:42:07 -0800 Subject: [PATCH 406/497] Add workflow for updating VS Code For now it is manually triggered. --- .github/workflows/update.yaml | 36 +++++++++++++++++++++++++++++++++++ ci/build/update-vscode.sh | 17 ++++++++++------- 2 files changed, 46 insertions(+), 7 deletions(-) create mode 100644 .github/workflows/update.yaml diff --git a/.github/workflows/update.yaml b/.github/workflows/update.yaml new file mode 100644 index 000000000000..02aecb3faf44 --- /dev/null +++ b/.github/workflows/update.yaml @@ -0,0 +1,36 @@ +name: Update code-server + +on: + workflow_dispatch: + inputs: + version: + type: string + required: true + +jobs: + update: + runs-on: ubuntu-latest + env: + VERSION: ${{ inputs.version }} + GH_TOKEN: ${{ secrets.HOMEBREW_GITHUB_API_TOKEN }} + + steps: + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6 + with: + node-version-file: .node-version + + - run: ./ci/build/update-vscode.sh + + - name: Open PR + run: | + git config --global user.name cdrci + git config --global user.email opensource@coder.com + git checkout -b update/${{ env.VERSION }} + git add . + git commit -m "Update VS Code to ${{ env.VERSION }}" + git push -u origin $(git branch --show) + gh pr create --repo coder/code-server-aur \ + --title "Update VS Code to ${{ env.VERSION }}" \ + --body-file .cache/checklist \ + --draft diff --git a/ci/build/update-vscode.sh b/ci/build/update-vscode.sh index 0888a1630e56..e2c3b2bffbe8 100755 --- a/ci/build/update-vscode.sh +++ b/ci/build/update-vscode.sh @@ -17,10 +17,10 @@ function remove_patches() { function update_vscode() { pushd lib/vscode - if ! git checkout "$VERSION" ; then - echo "$VERSION does not exist locally, fetching..." + if ! git checkout "$target_vscode_version" ; then + echo "$target_vscode_version does not exist locally, fetching..." git fetch --all --prune - git checkout "$VERSION" + git checkout "$target_vscode_version" fi popd } @@ -110,12 +110,12 @@ function run() { function add_changelog() { local file=CHANGELOG.md - if grep "Code $VERSION" "$file" ; then - echo "Changelog for $VERSION already exists" + if grep "Code $target_vscode_version" "$file" ; then + echo "Changelog for $target_vscode_version already exists" else # TODO: This is not exactly robust. In particular, it needs to handle if # there is already a "changed" section. - sed -i.bak "s/## Unreleased/## Unreleased\n\nCode v$VERSION\n\n### Changed\n\n- Update to Code $VERSION/" "$file" + sed -i.bak "s/## Unreleased/## Unreleased\n\nCode v$target_vscode_version\n\n### Changed\n\n- Update to Code $target_vscode_version/" "$file" fi } @@ -127,6 +127,9 @@ function main() { local target_node_version target_node_version=$(grep target lib/vscode/remote/.npmrc | awk -F= '{print $2}' | tr -d '"') + local target_vscode_version + target_vscode_version="${VERSION#v}" + declare -a steps # Removing patches only needs to be done locally; in CI we start from a fresh # clone each time. @@ -135,7 +138,7 @@ function main() { fi steps+=( - "Update VS Code to $VERSION" "update_vscode" + "Update VS Code to $target_vscode_version" "update_vscode" "Refresh VS Code patches" "refresh_patches" "Set Node version to $target_node_version" "update_node" "Update CSP webview hash" "update_csp" From 3dbddaaadfb7347e92ef333428ad33377a754b56 Mon Sep 17 00:00:00 2001 From: Asher Date: Thu, 7 May 2026 11:06:03 -0800 Subject: [PATCH 407/497] Ignore .bak files from sed operations --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index ae15a5e43beb..7fea491b82ac 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,7 @@ node_modules .home coverage **/.DS_Store +*.bak # Code packages itself here. /lib/vscode-reh-web-* From bd41dca064db02921076ebaf329f947f507dc3bb Mon Sep 17 00:00:00 2001 From: Asher Date: Thu, 7 May 2026 11:20:19 -0800 Subject: [PATCH 408/497] Add 4.119.0 to the changelog --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 85c5a9564bb3..71ea8cbfc04c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,14 @@ Code v99.99.999 ## Unreleased +## [4.119.0](https://github.com/coder/code-server/releases/tag/v4.119.0) - 2026-05-07 + +Code v1.119.0 + +### Changed + +- Update to Code 1.119.0 + ## [4.118.0](https://github.com/coder/code-server/releases/tag/v4.118.0) - 2026-05-06 Code v1.118.0 From 62a552d896811314f4c37d2f504296b683e42d77 Mon Sep 17 00:00:00 2001 From: Asher Date: Thu, 7 May 2026 11:03:14 -0800 Subject: [PATCH 409/497] Check for updates on a schedule --- .github/workflows/update.yaml | 52 +++++++++++++++++++++++++++++------ ci/build/update-vscode.sh | 8 +++--- 2 files changed, 48 insertions(+), 12 deletions(-) diff --git a/.github/workflows/update.yaml b/.github/workflows/update.yaml index 02aecb3faf44..97878a4e5ad9 100644 --- a/.github/workflows/update.yaml +++ b/.github/workflows/update.yaml @@ -6,31 +6,67 @@ on: version: type: string required: true + schedule: + - cron: "23 * * * *" jobs: update: runs-on: ubuntu-latest env: - VERSION: ${{ inputs.version }} + TAG: ${{ inputs.version }} GH_TOKEN: ${{ secrets.HOMEBREW_GITHUB_API_TOKEN }} steps: + - name: Fetch latest tag + if: env.TAG == '' + run: | + tag=$(curl -fsSLI -o /dev/null -w "%{url_effective}" https://github.com/microsoft/vscode/releases/latest) + tag="${tag#https://github.com/microsoft/vscode/releases/tag/}" + echo "TAG=$tag" >> $GITHUB_ENV + + - name: Remove leading v from tag + run: | + echo "VERSION=${TAG#v}" >> $GITHUB_ENV + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 - - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6 with: - node-version-file: .node-version + submodules: true + + - name: Check current version + id: check + run: | + commit="$(git -C lib/vscode rev-parse HEAD)" + if [[ $(git -C lib/vscode ls-remote --tags | grep "$commit") == */"$VERSION" ]] ; then + echo "$VERSION update has already been merged into $(git rev-parse --abbrev-ref HEAD)" + echo done=true >> $GITHUB_OUTPUT + elif git ls-remote --exit-code --heads origin "update/$VERSION" ; then + echo "There is already a PR for updating to $VERSION" + echo done=true >> $GITHUB_OUTPUT + else + echo "$VERSION update has not started yet" + echo done=false >> $GITHUB_OUTPUT + fi + + - uses: awalsh128/cache-apt-pkgs-action@2c09a5e66da6c8016428a2172bd76e5e4f14bb17 # latest + if: steps.check.outputs.done == 'false' + with: + packages: quilt + version: 1.0 - run: ./ci/build/update-vscode.sh + if: steps.check.outputs.done == 'false' - name: Open PR + if: steps.check.outputs.done == 'false' run: | git config --global user.name cdrci git config --global user.email opensource@coder.com - git checkout -b update/${{ env.VERSION }} + git checkout -b "update/$VERSION" git add . - git commit -m "Update VS Code to ${{ env.VERSION }}" - git push -u origin $(git branch --show) - gh pr create --repo coder/code-server-aur \ - --title "Update VS Code to ${{ env.VERSION }}" \ + git commit -m "Update VS Code to $VERSION" + git push -u origin "$(git branch --show)" + gh pr create \ + --repo coder/code-server \ + --title "Update VS Code to $VERSION" \ --body-file .cache/checklist \ --draft diff --git a/ci/build/update-vscode.sh b/ci/build/update-vscode.sh index e2c3b2bffbe8..a0b290eb8869 100755 --- a/ci/build/update-vscode.sh +++ b/ci/build/update-vscode.sh @@ -42,7 +42,7 @@ function refresh_patches() { function update_node() { local node_version node_version=$(cat .node-version) - if [[ $node_version == $target_node_version ]] ; then + if [[ $node_version == "$target_node_version" ]] ; then echo "$node_version already matches $target_node_version" else echo "Updating from $node_version to $target_node_version..." @@ -52,11 +52,11 @@ function update_node() { function get-webview-script-hash() { local html - html=$(<$1) + html=$(<"$1") local start_tag='" - html=${html##*$start_tag} - html=${html%%$end_tag*} + html=${html##*"$start_tag"} + html=${html%%"$end_tag"*} echo -n "$html" | openssl sha256 -binary | openssl base64 } From 93ce398e28a15bd1e40d34e648cc73d13bb5fcf9 Mon Sep 17 00:00:00 2001 From: Asher Date: Fri, 8 May 2026 09:58:12 -0800 Subject: [PATCH 410/497] Make update cron run twice daily Every hour seems aggressive, typically I will only check for PRs once a day anyway. --- .github/workflows/update.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update.yaml b/.github/workflows/update.yaml index 97878a4e5ad9..08bcb1b61d43 100644 --- a/.github/workflows/update.yaml +++ b/.github/workflows/update.yaml @@ -7,7 +7,7 @@ on: type: string required: true schedule: - - cron: "23 * * * *" + - cron: "0 16,21 * * *" jobs: update: From 1605d68709611a373a495fb837e7c798b663f5ab Mon Sep 17 00:00:00 2001 From: Asher Date: Fri, 8 May 2026 10:50:20 -0800 Subject: [PATCH 411/497] Update contribution steps for updating You can now more easily run the update script to finish out an update and the documentation is updated to match. --- ci/build/update-vscode.sh | 102 ++++++++++++++++++++++++++------------ docs/CONTRIBUTING.md | 25 ++++++---- 2 files changed, 83 insertions(+), 44 deletions(-) diff --git a/ci/build/update-vscode.sh b/ci/build/update-vscode.sh index a0b290eb8869..7b4004cbfa57 100755 --- a/ci/build/update-vscode.sh +++ b/ci/build/update-vscode.sh @@ -2,13 +2,24 @@ set -Eeuo pipefail -function remove_patches() { +function quiet() { + "$@" >/dev/null +} + +function indent() { + local count=2 + local space + space=$(printf "%${count}s") + sed "s/^/$space| /g" +} + +function unapply_patches() { local -i exit_code=0 - quilt pop -af || exit_code=$? + quiet quilt pop -af || exit_code=$? case $exit_code in - # Sucessfully removed. + # Sucessfully unapplied. 0) ;; - # No more patches to remove. + # No more patches to unapply. 2) ;; # Some error. *) return $exit_code ;; @@ -17,7 +28,7 @@ function remove_patches() { function update_vscode() { pushd lib/vscode - if ! git checkout "$target_vscode_version" ; then + if ! git checkout 2>&1 "$target_vscode_version" ; then echo "$target_vscode_version does not exist locally, fetching..." git fetch --all --prune git checkout "$target_vscode_version" @@ -27,9 +38,8 @@ function update_vscode() { function refresh_patches() { local -i exit_code=0 - while quilt push ; ! (( exit_code=$? )) ; do + while quiet quilt push ; ! (( exit_code=$? )) ; do quilt refresh - echo # Extra new line for separation. done case $exit_code in # No more patches to apply. @@ -43,7 +53,7 @@ function update_node() { local node_version node_version=$(cat .node-version) if [[ $node_version == "$target_node_version" ]] ; then - echo "$node_version already matches $target_node_version" + echo "Already set to $target_node_version" else echo "Updating from $node_version to $target_node_version..." echo "$target_node_version" > .node-version @@ -61,17 +71,28 @@ function get-webview-script-hash() { } function update_csp() { - local -i exit_code=0 - # Move back to the webview patch so it can be refreshed. - quilt pop webview || exit_code=$? - case $exit_code in - # Successfully moved. - 0) ;; - # Already at the patch. - 2) ;; - # Some error. - *) return $exit_code ;; - esac + local current + current=$(quilt top 2>/dev/null || echo "") + local patch_action="" + echo "Currently at ${current:-base}" + if [[ $current != */webview.diff ]] ; then + echo "Moving to patches/webview.diff..." + local -i exit_code=0 + if quilt applied 2>/dev/null | grep --quiet webview.diff ; then + quiet quilt pop webview || exit_code=$? + patch_action=pop + else + quiet quilt push webview || exit_code=$? + patch_action=push + fi + case $exit_code in + # Successfully moved. + 0) ;; + # Some error. + *) return $exit_code ;; + esac + fi + local file=lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index.html local hash hash=$(get-webview-script-hash "$file") @@ -79,8 +100,14 @@ function update_csp() { # Use octothorpe as a delimiter since the hash may contain a slash. sed -i.bak "s#script-src 'sha256-[^']\+'#script-src 'sha256-$hash'#" "$file" quilt refresh - # Get patched back up. - quilt push -a + + if [[ $patch_action != "" ]] ; then + echo "Moving back to ${current:-base}..." + case $patch_action in + pop) quiet quilt push "$current" ;; + push) quiet quilt pop "${current:--a}" ;; + esac + fi } function run() { @@ -91,8 +118,8 @@ function run() { local fn=$1 ; shift # Only run if an earlier step has not failed. if [[ $failed == 0 ]] ; then - echo "[+] $name..." - if $fn ; then + echo "$name..." + if $fn | indent ; then echo "- [X] $name" >> .cache/checklist else ((failed++)) @@ -110,7 +137,7 @@ function run() { function add_changelog() { local file=CHANGELOG.md - if grep "Code $target_vscode_version" "$file" ; then + if grep --quiet "Code $target_vscode_version" "$file" ; then echo "Changelog for $target_vscode_version already exists" else # TODO: This is not exactly robust. In particular, it needs to handle if @@ -127,19 +154,28 @@ function main() { local target_node_version target_node_version=$(grep target lib/vscode/remote/.npmrc | awk -F= '{print $2}' | tr -d '"') - local target_vscode_version - target_vscode_version="${VERSION#v}" - declare -a steps - # Removing patches only needs to be done locally; in CI we start from a fresh - # clone each time. - if [[ ! ${CI-} ]] ; then - steps+=("Remove patches" "remove_patches") + + # If version is not set, assume we are already at the target version and the + # user is just trying to resolve conflics. + local target_vscode_version + if [[ ${VERSION-} ]] ; then + # Removing patches only needs to be done locally; in CI we start from a + # fresh clone each time. + if [[ ! ${CI-} ]] ; then + steps+=("Unapplying patches" "unapply_patches") + fi + target_vscode_version="${VERSION#v}" + steps+=( + "Update VS Code to $target_vscode_version" "update_vscode" + "Refresh VS Code patches" "refresh_patches" + ) + else + target_vscode_version="$(git -C lib/vscode describe --tags --exact-match)" + echo "Detected VS Code version $target_vscode_version" fi steps+=( - "Update VS Code to $target_vscode_version" "update_vscode" - "Refresh VS Code patches" "refresh_patches" "Set Node version to $target_node_version" "update_node" "Update CSP webview hash" "update_csp" "Add changelog note" "add_changelog" diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index 3a3705e6dc7b..a2087ff17672 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -93,17 +93,20 @@ commits first if you are doing this). ### Version updates to Code -1. Remove any patches with `quilt pop -a`. -2. Update the `lib/vscode` submodule to the desired upstream version branch. - 1. `cd lib/vscode && git checkout release/1.66 && cd ../..` - 2. `git add lib && git commit -m "chore: update to Code "` -3. Apply the patches one at a time (`quilt push`). If the application succeeds - but the lines changed, update the patch with `quilt refresh`. If there are - conflicts, then force apply with `quilt push -f`, manually add back the - rejected code, then run `quilt refresh`. -4. From the code-server **project root**, run `npm install`. -5. Check the Node.js version that's used by Electron (which is shipped with VS - Code. If necessary, update our version of Node.js to match. +PRs will be automatically created with updates to VS Code. If a patch cannot be +automatically resolved, it will be necessary to clone the branch, resolve the +conflicts manually, and finish the update. To do this: + +1. Apply as many patches as possible `quilt push -a`. +2. Once you hit a conflict, force apply with `quilt push -f`, manually add back + the rejected code, then run `quilt refresh`. +3. Once all patches have been resolved, run `./ci/build/update.sh` to finish the + update process. +4. Commit all changes, push them up to the branch, and update the checklist in + the PR description. + +Once the PR is ready, manually verify that the unreleased changelog section +contains all the changes going into this version before merging. ### Patching Code From 41c9ed499b10b5a2c00dfb585d8b511c9374880a Mon Sep 17 00:00:00 2001 From: Asher Date: Fri, 8 May 2026 11:57:44 -0800 Subject: [PATCH 412/497] Draft release when update branch is merged Not completely sure this is correct, but will debug with the next release. --- .github/workflows/release.yaml | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 4054b08febd1..dbcd1d398963 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -6,6 +6,11 @@ on: version: type: string required: true + pull_request_target: + types: + - closed + branches: + - "update/**" permissions: contents: write # For creating releases. @@ -21,6 +26,7 @@ jobs: package-linux: name: ${{ format('linux-{0}', matrix.vscode_arch) }} runs-on: ubuntu-22.04 + if: github.event_name == 'workflow_dispatch' || github.event.pull_request.merged == true strategy: matrix: @@ -39,7 +45,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} ELECTRON_SKIP_BINARY_DOWNLOAD: 1 PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1 - TAG: ${{ inputs.version || github.ref_name }} + TAG: ${{ inputs.version || github.event.pull_request.head.ref || github.ref_name }} # Set release package name. ARCH: ${{ matrix.package_arch }} # Cross-compile target. @@ -64,9 +70,10 @@ jobs: curl -sSfL https://github.com/goreleaser/nfpm/releases/download/v2.3.1/nfpm_2.3.1_`uname -s`_`uname -m`.tar.gz | tar -C ~/.local/bin -zxv nfpm echo "$HOME/.local/bin" >> $GITHUB_PATH - - name: Set version to tag without leading v + - name: Strip update/ and v from tag run: | - echo "VERSION=${TAG#v}" >> $GITHUB_ENV + version=${TAG#update/} + echo "VERSION=${version#v}" >> $GITHUB_ENV - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 with: @@ -118,6 +125,7 @@ jobs: package-macos: name: ${{ matrix.vscode_target }} runs-on: ${{ matrix.os }} + if: github.event_name == 'workflow_dispatch' || github.event.pull_request_merged == true strategy: matrix: include: @@ -144,9 +152,10 @@ jobs: curl -sSfL https://github.com/goreleaser/nfpm/releases/download/v2.3.1/nfpm_2.3.1_`uname -s`_`uname -m`.tar.gz | tar -C ~/.local/bin -zxv nfpm echo "$HOME/.local/bin" >> $GITHUB_PATH - - name: Set version to tag without leading v + - name: Strip update/ and v from tag run: | - echo "VERSION=${TAG#v}" >> $GITHUB_ENV + version=${TAG#update/} + echo "VERSION=${version#v}" >> $GITHUB_ENV - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 with: From 2fafe8771dd9ebc5d500066d01bf16770f2dba77 Mon Sep 17 00:00:00 2001 From: Asher Date: Fri, 8 May 2026 12:03:50 -0800 Subject: [PATCH 413/497] Set name and tag for release --- .github/workflows/release.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index dbcd1d398963..3fc0d7b96360 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -112,6 +112,8 @@ jobs: draft: true discussion_category_name: "📣 Announcements" files: package.tar.gz + tag_name: v${{ env.VERSION }} + name: v${{ env.VERSION }} # Platform-specific release. - run: KEEP_MODULES=1 npm run release @@ -121,6 +123,8 @@ jobs: draft: true discussion_category_name: "📣 Announcements" files: ./release-packages/* + tag_name: v${{ env.VERSION }} + name: v${{ env.VERSION }} package-macos: name: ${{ matrix.vscode_target }} @@ -181,3 +185,5 @@ jobs: draft: true discussion_category_name: "📣 Announcements" files: ./release-packages/* + tag_name: v${{ env.VERSION }} + name: v${{ env.VERSION }} From 89ca02c1f7970abb0b706d2e0fc15e3861a49b6d Mon Sep 17 00:00:00 2001 From: Asher Date: Fri, 8 May 2026 12:22:11 -0800 Subject: [PATCH 414/497] Add changelog notes to draft release --- .github/workflows/release.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 3fc0d7b96360..761b505e5703 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -106,6 +106,9 @@ jobs: if: ${{ matrix.vscode_arch == 'x64' }} - run: tar -czf package.tar.gz release if: ${{ matrix.vscode_arch == 'x64' }} + - run: | + sed "/^## Unreleased/,/^## / ! d" CHANGELOG.md | head -n -2 | tail -n +3 > .cache/release-notes + if: ${{ matrix.vscode_arch == 'x64' }} - uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844 # v1 if: ${{ matrix.vscode_arch == 'x64' }} with: @@ -114,6 +117,7 @@ jobs: files: package.tar.gz tag_name: v${{ env.VERSION }} name: v${{ env.VERSION }} + body: .cache/release-notes # Platform-specific release. - run: KEEP_MODULES=1 npm run release From 53d981a724a55e90f980dd8b147ba0028a956c24 Mon Sep 17 00:00:00 2001 From: Asher Date: Fri, 8 May 2026 12:51:22 -0800 Subject: [PATCH 415/497] Automatically generate helm/changelog PR --- .github/workflows/publish.yaml | 39 ++++++++++++++++++++++++---- ci/build/update-repo.sh | 46 ++++++++++++++++++++++++++++++++++ ci/build/update-vscode.sh | 38 +--------------------------- ci/lib.sh | 36 ++++++++++++++++++++++++++ 4 files changed, 117 insertions(+), 42 deletions(-) create mode 100755 ci/build/update-repo.sh diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index a23c3f903e78..b9925f4dd3b8 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -70,6 +70,11 @@ jobs: token: ${{ secrets.HOMEBREW_GITHUB_API_TOKEN }} ref: "master" + - name: Configure git + run: | + git config --global user.name cdrci + git config --global user.email opensource@coder.com + - name: Fetch and reset master run: | git remote add upstream https://github.com/coder/code-server-aur.git @@ -77,11 +82,6 @@ jobs: git reset --hard upstream/master git push --force - - name: Configure git - run: | - git config --global user.name cdrci - git config --global user.email opensource@coder.com - - name: Validate package uses: heyhusen/archlinux-package-action@c9f94059ccbebe8710d31d582f33ef4e84fe575c # v3.0.0 with: @@ -136,3 +136,32 @@ jobs: out-file-path: "release-packages" - run: npm run publish:docker + + repo: + runs-on: ubuntu-latest + env: + GH_TOKEN: ${{ secrets.HOMEBREW_GITHUB_API_TOKEN }} + TAG: ${{ inputs.version || github.ref_name }} + needs: docker + + steps: + - name: Set version to tag without leading v + run: | + echo "VERSION=${TAG#v}" >> $GITHUB_ENV + + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + + - run: ./ci/build/update-repo.sh + + - name: Open PR + run: | + git config --global user.name cdrci + git config --global user.email opensource@coder.com + git checkout -b "helm/$VERSION" + git add . + git commit -m "Update to $VERSION" + git push -u origin "$(git branch --show)" + gh pr create \ + --repo coder/code-server \ + --body-file .cache/checklist \ + --title "Update to $VERSION" diff --git a/ci/build/update-repo.sh b/ci/build/update-repo.sh new file mode 100755 index 000000000000..bc8bf522d50e --- /dev/null +++ b/ci/build/update-repo.sh @@ -0,0 +1,46 @@ +#!/usr/bin/env bash + +set -Eeuo pipefail + +function update_helm() { + local current + current=$(yq .version ci/helm-chart/Chart.yaml) + local next + next=$(semver "$current" -i minor) + echo "Bumping version from $current to $next..." + sed -i.bak "s/^version: $current\$/version: $next/" ci/helm-chart/Chart.yaml + + echo "Setting app version and image to $version..." + sed -i.bak "s/^appVersion: .\+\$/appVersion: $version/" ci/helm-chart/Chart.yaml + sed -i.bak "s/^ tag: .\+\$/ tag: '$version'/" ci/helm-chart/values.yaml +} + +function update_changelog() { + local date + date=$(printf '%(%Y-%m-%d)T\n' -1) + local link="https://github.com/coder/code-server/releases/tag/v$version" + sed -i.bak "s|## Unreleased|## Unreleased\n\n## [$version]($link) - $date|" CHANGELOG.md +} + +function main() { + cd "$(dirname "${0}")/../.." + + source ./ci/lib.sh + + local version=${VERSION:-$(git describe --tags)} + version="${version#v}" + + declare -a steps + + steps+=( + "Update Helm chart" "update_helm" + "Update changelog" "update_changelog" + ) + + run-steps "${steps[@]}" + + # This step is always manual. + echo "- [ ] https://github.com/coder/code-server-aur/pulls" >> .cache/checklist +} + +main "$@" diff --git a/ci/build/update-vscode.sh b/ci/build/update-vscode.sh index 7b4004cbfa57..828924b55979 100755 --- a/ci/build/update-vscode.sh +++ b/ci/build/update-vscode.sh @@ -2,17 +2,6 @@ set -Eeuo pipefail -function quiet() { - "$@" >/dev/null -} - -function indent() { - local count=2 - local space - space=$(printf "%${count}s") - sed "s/^/$space| /g" -} - function unapply_patches() { local -i exit_code=0 quiet quilt pop -af || exit_code=$? @@ -110,31 +99,6 @@ function update_csp() { fi } -function run() { - local -i failed=0 - rm -f .cache/checklist - while (( $# )) ; do - local name=$1 ; shift - local fn=$1 ; shift - # Only run if an earlier step has not failed. - if [[ $failed == 0 ]] ; then - echo "$name..." - if $fn | indent ; then - echo "- [X] $name" >> .cache/checklist - else - ((failed++)) - fi - fi - # For all failed steps, write out an empty checkbox. - if [[ $failed != 0 ]] ; then - echo "- [ ] $name" >> .cache/checklist - fi - done - if [[ $failed != 0 ]] ; then - return 1 - fi -} - function add_changelog() { local file=CHANGELOG.md if grep --quiet "Code $target_vscode_version" "$file" ; then @@ -181,7 +145,7 @@ function main() { "Add changelog note" "add_changelog" ) - run "${steps[@]}" + run-steps "${steps[@]}" # This step is always manual. echo "- [ ] Verify changelog" >> .cache/checklist diff --git a/ci/lib.sh b/ci/lib.sh index 71a875c6914b..d6de76ce522a 100755 --- a/ci/lib.sh +++ b/ci/lib.sh @@ -78,6 +78,42 @@ nodeArch() { echo "$cpu" } +run-steps() { + local -i failed=0 + rm -f .cache/checklist + while (( $# )) ; do + local name=$1 ; shift + local fn=$1 ; shift + # Only run if an earlier step has not failed. + if [[ $failed == 0 ]] ; then + echo "$name..." + if $fn | indent ; then + echo "- [X] $name" >> .cache/checklist + else + ((failed++)) + fi + fi + # For all failed steps, write out an empty checkbox. + if [[ $failed != 0 ]] ; then + echo "- [ ] $name" >> .cache/checklist + fi + done + if [[ $failed != 0 ]] ; then + return 1 + fi +} + +quiet() { + "$@" >/dev/null +} + +indent() { + local count=2 + local space + space=$(printf "%${count}s") + sed "s/^/$space| /g" +} + # See gulpfile.reh.ts for available targets. if [[ ! ${VSCODE_TARGET-} ]]; then VSCODE_TARGET="$(nodeOS)-$(nodeArch)" From 190b09cc762df7402d23908b2c33bd385a6e90ec Mon Sep 17 00:00:00 2001 From: Olivier Benz Date: Tue, 19 May 2026 19:54:22 +0200 Subject: [PATCH 416/497] Update Code to 1.119.1 (#7795) --- lib/vscode | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/vscode b/lib/vscode index 8b640eef5a6c..3fe68d450d49 160000 --- a/lib/vscode +++ b/lib/vscode @@ -1 +1 @@ -Subproject commit 8b640eef5a6c6089c029249d48efa5c99adf7d51 +Subproject commit 3fe68d450d4918f375c155b26a3a8e08f25b4e92 From ef7ea3e5153727025ccf82d7927dd0ed0e6f3144 Mon Sep 17 00:00:00 2001 From: Olivier Benz Date: Tue, 19 May 2026 20:07:59 +0200 Subject: [PATCH 417/497] Update Code to 1.120.0 (#7796) --- lib/vscode | 2 +- patches/clipboard.diff | 2 +- patches/copilot.diff | 2 +- patches/display-language.diff | 2 +- patches/external-file-actions.diff | 2 +- patches/getting-started.diff | 6 +++--- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/vscode b/lib/vscode index 3fe68d450d49..0958016b2af9 160000 --- a/lib/vscode +++ b/lib/vscode @@ -1 +1 @@ -Subproject commit 3fe68d450d4918f375c155b26a3a8e08f25b4e92 +Subproject commit 0958016b2af9f09bb4257e0df4a95e2f90590f9f diff --git a/patches/clipboard.diff b/patches/clipboard.diff index d479070d68f8..7f64d1709aaa 100644 --- a/patches/clipboard.diff +++ b/patches/clipboard.diff @@ -78,7 +78,7 @@ Index: code-server/lib/vscode/src/vs/platform/environment/common/argv.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/platform/environment/common/argv.ts +++ code-server/lib/vscode/src/vs/platform/environment/common/argv.ts -@@ -149,6 +149,7 @@ export interface NativeParsedArgs { +@@ -148,6 +148,7 @@ export interface NativeParsedArgs { 'disable-chromium-sandbox'?: boolean; sandbox?: boolean; 'enable-coi'?: boolean; diff --git a/patches/copilot.diff b/patches/copilot.diff index 8db68a1b7a23..3a847cef05bc 100644 --- a/patches/copilot.diff +++ b/patches/copilot.diff @@ -44,7 +44,7 @@ Index: code-server/lib/vscode/build/lib/extensions.ts import vzip from 'gulp-vinyl-zip'; import { createRequire } from 'module'; -@@ -487,6 +488,116 @@ export function packageCopilotExtensionS +@@ -492,6 +493,116 @@ export function packageCopilotExtensionS ).pipe(util2.setExecutableBit(['**/*.sh'])); } diff --git a/patches/display-language.diff b/patches/display-language.diff index db433fd9933e..e22e954ee575 100644 --- a/patches/display-language.diff +++ b/patches/display-language.diff @@ -32,7 +32,7 @@ Index: code-server/lib/vscode/src/vs/platform/environment/common/environmentServ =================================================================== --- code-server.orig/lib/vscode/src/vs/platform/environment/common/environmentService.ts +++ code-server/lib/vscode/src/vs/platform/environment/common/environmentService.ts -@@ -112,7 +112,7 @@ export abstract class AbstractNativeEnvi +@@ -98,7 +98,7 @@ export abstract class AbstractNativeEnvi return URI.file(join(vscodePortable, 'argv.json')); } diff --git a/patches/external-file-actions.diff b/patches/external-file-actions.diff index 40d7b4c6d5fb..fcfc0b84e628 100644 --- a/patches/external-file-actions.diff +++ b/patches/external-file-actions.diff @@ -207,7 +207,7 @@ Index: code-server/lib/vscode/src/vs/workbench/common/contextkeys.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/common/contextkeys.ts +++ code-server/lib/vscode/src/vs/workbench/common/contextkeys.ts -@@ -41,6 +41,9 @@ export const EmbedderIdentifierContext = +@@ -40,6 +40,9 @@ export const EmbedderIdentifierContext = export const InAutomationContext = new RawContextKey('inAutomation', false, localize('inAutomation', "Whether VS Code is running under automation/smoke test")); diff --git a/patches/getting-started.diff b/patches/getting-started.diff index 205bbbaea3a7..73f4188d4a60 100644 --- a/patches/getting-started.diff +++ b/patches/getting-started.diff @@ -28,7 +28,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/welcomeGettingStarted/bro import { IEditorOpenContext, IEditorSerializer } from '../../../common/editor.js'; import { IWebviewElement, IWebviewService } from '../../webview/browser/webview.js'; import './gettingStartedColors.js'; -@@ -925,6 +925,72 @@ export class GettingStartedPage extends +@@ -927,6 +927,72 @@ export class GettingStartedPage extends $('p.subtitle.description', {}, localize({ key: 'gettingStarted.editingEvolved', comment: ['Shown as subtitle on the Welcome page.'] }, "Editing evolved")) ); @@ -101,7 +101,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/welcomeGettingStarted/bro const leftColumn = $('.categories-column.categories-column-left', {},); const rightColumn = $('.categories-column.categories-column-right', {},); -@@ -974,6 +1040,9 @@ export class GettingStartedPage extends +@@ -976,6 +1042,9 @@ export class GettingStartedPage extends recentList.setLimit(5); reset(leftColumn, startList.getDomElement(), recentList.getDomElement()); } @@ -234,7 +234,7 @@ Index: code-server/lib/vscode/src/vs/workbench/common/contextkeys.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/common/contextkeys.ts +++ code-server/lib/vscode/src/vs/workbench/common/contextkeys.ts -@@ -43,6 +43,7 @@ export const InAutomationContext = new R +@@ -42,6 +42,7 @@ export const InAutomationContext = new R export const IsEnabledFileDownloads = new RawContextKey('isEnabledFileDownloads', true, true); export const IsEnabledFileUploads = new RawContextKey('isEnabledFileUploads', true, true); From 359b40d422aa257ee5a7db8534cbcd5f9c1eb373 Mon Sep 17 00:00:00 2001 From: Asher Date: Tue, 19 May 2026 10:13:01 -0800 Subject: [PATCH 418/497] Ensure dir exists before writing update checklist --- .github/workflows/trivy-docker.yaml | 2 -- ci/build/update-vscode.sh | 1 + ci/lib.sh | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/trivy-docker.yaml b/.github/workflows/trivy-docker.yaml index b38bf8287468..fb47132ca355 100644 --- a/.github/workflows/trivy-docker.yaml +++ b/.github/workflows/trivy-docker.yaml @@ -18,8 +18,6 @@ on: - .github/workflows/trivy-docker.yaml schedule: - # Run at 10:15 am UTC (3:15am PT/5:15am CT) - # Run at 0 minutes 0 hours of every day. - cron: "15 10 * * *" workflow_dispatch: diff --git a/ci/build/update-vscode.sh b/ci/build/update-vscode.sh index 828924b55979..542a5a497aa1 100755 --- a/ci/build/update-vscode.sh +++ b/ci/build/update-vscode.sh @@ -20,6 +20,7 @@ function update_vscode() { if ! git checkout 2>&1 "$target_vscode_version" ; then echo "$target_vscode_version does not exist locally, fetching..." git fetch --all --prune + echo "Checking out $target_vscode_version again..." git checkout "$target_vscode_version" fi popd diff --git a/ci/lib.sh b/ci/lib.sh index d6de76ce522a..df38a9552891 100755 --- a/ci/lib.sh +++ b/ci/lib.sh @@ -80,6 +80,7 @@ nodeArch() { run-steps() { local -i failed=0 + mkdir -p .cache rm -f .cache/checklist while (( $# )) ; do local name=$1 ; shift From 174b7757a53f5e8102564da28ac1deb7cb0bf477 Mon Sep 17 00:00:00 2001 From: cdrci <78873720+cdrci@users.noreply.github.com> Date: Thu, 21 May 2026 04:20:27 +1000 Subject: [PATCH 419/497] Update VS Code to 1.121.0 (#7805) --- CHANGELOG.md | 6 ++++++ ci/build/update-vscode.sh | 2 +- lib/vscode | 2 +- patches/clipboard.diff | 2 +- patches/display-language.diff | 4 ++-- patches/external-file-actions.diff | 2 +- patches/getting-started.diff | 6 +++--- patches/logout.diff | 2 +- patches/telemetry.diff | 2 +- patches/trusted-domains.diff | 2 +- patches/update-check.diff | 2 +- 11 files changed, 19 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 71ea8cbfc04c..c13b11fb52cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,12 @@ Code v99.99.999 ## Unreleased +Code v1.121.0 + +### Changed + +- Update to Code 1.121.0 + ## [4.119.0](https://github.com/coder/code-server/releases/tag/v4.119.0) - 2026-05-07 Code v1.119.0 diff --git a/ci/build/update-vscode.sh b/ci/build/update-vscode.sh index 542a5a497aa1..d31b15979bf4 100755 --- a/ci/build/update-vscode.sh +++ b/ci/build/update-vscode.sh @@ -19,7 +19,7 @@ function update_vscode() { pushd lib/vscode if ! git checkout 2>&1 "$target_vscode_version" ; then echo "$target_vscode_version does not exist locally, fetching..." - git fetch --all --prune + git fetch --all --prune --tags echo "Checking out $target_vscode_version again..." git checkout "$target_vscode_version" fi diff --git a/lib/vscode b/lib/vscode index 0958016b2af9..987c95975162 160000 --- a/lib/vscode +++ b/lib/vscode @@ -1 +1 @@ -Subproject commit 0958016b2af9f09bb4257e0df4a95e2f90590f9f +Subproject commit 987c9597516278c9fcf10d963a0592ce1384ab93 diff --git a/patches/clipboard.diff b/patches/clipboard.diff index 7f64d1709aaa..d4658b231494 100644 --- a/patches/clipboard.diff +++ b/patches/clipboard.diff @@ -78,7 +78,7 @@ Index: code-server/lib/vscode/src/vs/platform/environment/common/argv.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/platform/environment/common/argv.ts +++ code-server/lib/vscode/src/vs/platform/environment/common/argv.ts -@@ -148,6 +148,7 @@ export interface NativeParsedArgs { +@@ -146,6 +146,7 @@ export interface NativeParsedArgs { 'disable-chromium-sandbox'?: boolean; sandbox?: boolean; 'enable-coi'?: boolean; diff --git a/patches/display-language.diff b/patches/display-language.diff index e22e954ee575..1517e8eb4da8 100644 --- a/patches/display-language.diff +++ b/patches/display-language.diff @@ -18,7 +18,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverServices.ts import { ProtocolConstants } from '../../base/parts/ipc/common/ipc.net.js'; import { IConfigurationService } from '../../platform/configuration/common/configuration.js'; import { ConfigurationService } from '../../platform/configuration/common/configurationService.js'; -@@ -301,6 +301,9 @@ export async function setupServerService +@@ -358,6 +358,9 @@ export async function setupServerService socketServer.registerChannel('mcpManagement', new McpManagementChannel(mcpManagementService, (ctx: RemoteAgentConnectionContext) => getUriTransformer(ctx.remoteAuthority))); @@ -198,7 +198,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts /* ----- server setup ----- */ -@@ -116,6 +117,7 @@ export interface ServerParsedArgs { +@@ -120,6 +121,7 @@ export interface ServerParsedArgs { 'disable-file-downloads'?: boolean; 'disable-file-uploads'?: boolean; 'disable-getting-started-override'?: boolean, diff --git a/patches/external-file-actions.diff b/patches/external-file-actions.diff index fcfc0b84e628..582384af6cee 100644 --- a/patches/external-file-actions.diff +++ b/patches/external-file-actions.diff @@ -99,7 +99,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts /* ----- server setup ----- */ -@@ -110,6 +112,8 @@ export interface ServerParsedArgs { +@@ -114,6 +116,8 @@ export interface ServerParsedArgs { /* ----- code-server ----- */ 'disable-update-check'?: boolean; 'auth'?: string; diff --git a/patches/getting-started.diff b/patches/getting-started.diff index 73f4188d4a60..7135955f6efe 100644 --- a/patches/getting-started.diff +++ b/patches/getting-started.diff @@ -28,7 +28,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/welcomeGettingStarted/bro import { IEditorOpenContext, IEditorSerializer } from '../../../common/editor.js'; import { IWebviewElement, IWebviewService } from '../../webview/browser/webview.js'; import './gettingStartedColors.js'; -@@ -927,6 +927,72 @@ export class GettingStartedPage extends +@@ -928,6 +928,72 @@ export class GettingStartedPage extends $('p.subtitle.description', {}, localize({ key: 'gettingStarted.editingEvolved', comment: ['Shown as subtitle on the Welcome page.'] }, "Editing evolved")) ); @@ -101,7 +101,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/welcomeGettingStarted/bro const leftColumn = $('.categories-column.categories-column-left', {},); const rightColumn = $('.categories-column.categories-column-right', {},); -@@ -976,6 +1042,9 @@ export class GettingStartedPage extends +@@ -977,6 +1043,9 @@ export class GettingStartedPage extends recentList.setLimit(5); reset(leftColumn, startList.getDomElement(), recentList.getDomElement()); } @@ -189,7 +189,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts /* ----- server setup ----- */ -@@ -114,6 +115,7 @@ export interface ServerParsedArgs { +@@ -118,6 +119,7 @@ export interface ServerParsedArgs { 'auth'?: string; 'disable-file-downloads'?: boolean; 'disable-file-uploads'?: boolean; diff --git a/patches/logout.diff b/patches/logout.diff index 0c1f281a21ff..c21be0de9115 100644 --- a/patches/logout.diff +++ b/patches/logout.diff @@ -28,7 +28,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts /* ----- server setup ----- */ -@@ -108,6 +109,7 @@ export const serverOptions: OptionDescri +@@ -112,6 +113,7 @@ export const serverOptions: OptionDescri export interface ServerParsedArgs { /* ----- code-server ----- */ 'disable-update-check'?: boolean; diff --git a/patches/telemetry.diff b/patches/telemetry.diff index c830e09b0614..462d3ce01c77 100644 --- a/patches/telemetry.diff +++ b/patches/telemetry.diff @@ -28,7 +28,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverServices.ts import { NullPolicyService } from '../../platform/policy/common/policy.js'; import { OneDataSystemAppender } from '../../platform/telemetry/node/1dsAppender.js'; import { LoggerService } from '../../platform/log/node/loggerService.js'; -@@ -174,11 +176,23 @@ export async function setupServerService +@@ -176,11 +178,23 @@ export async function setupServerService const requestService = new RequestService('remote', configurationService, environmentService, logService); services.set(IRequestService, requestService); diff --git a/patches/trusted-domains.diff b/patches/trusted-domains.diff index 0444cada7e9e..9d42246bda34 100644 --- a/patches/trusted-domains.diff +++ b/patches/trusted-domains.diff @@ -12,7 +12,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts /* ----- server setup ----- */ -@@ -118,6 +119,7 @@ export interface ServerParsedArgs { +@@ -122,6 +123,7 @@ export interface ServerParsedArgs { 'disable-file-uploads'?: boolean; 'disable-getting-started-override'?: boolean, 'locale'?: string diff --git a/patches/update-check.diff b/patches/update-check.diff index dbbb7e31ae95..d668e4254c9f 100644 --- a/patches/update-check.diff +++ b/patches/update-check.diff @@ -134,7 +134,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts /* ----- server setup ----- */ -@@ -104,6 +106,8 @@ export const serverOptions: OptionDescri +@@ -108,6 +110,8 @@ export const serverOptions: OptionDescri }; export interface ServerParsedArgs { From 3c3f87a3d2ad80607aec50b08827dc82b2d49584 Mon Sep 17 00:00:00 2001 From: Asher Date: Wed, 20 May 2026 14:01:37 -0800 Subject: [PATCH 420/497] Fix adding release notes to draft release --- .github/workflows/release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 761b505e5703..5fba86cad09f 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -117,7 +117,7 @@ jobs: files: package.tar.gz tag_name: v${{ env.VERSION }} name: v${{ env.VERSION }} - body: .cache/release-notes + body_path: .cache/release-notes # Platform-specific release. - run: KEEP_MODULES=1 npm run release From 51bc3c0f09e7b990ee35044c18d275a691c2fdc2 Mon Sep 17 00:00:00 2001 From: Asher Date: Wed, 20 May 2026 14:05:31 -0800 Subject: [PATCH 421/497] Remove unpublished 4.119.0 For some reason, I never actually published the draft on this one. Since 4.121.0 will be out shortly, opted to just skip it. --- CHANGELOG.md | 8 -------- 1 file changed, 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c13b11fb52cc..1bfb2daf212a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,14 +28,6 @@ Code v1.121.0 - Update to Code 1.121.0 -## [4.119.0](https://github.com/coder/code-server/releases/tag/v4.119.0) - 2026-05-07 - -Code v1.119.0 - -### Changed - -- Update to Code 1.119.0 - ## [4.118.0](https://github.com/coder/code-server/releases/tag/v4.118.0) - 2026-05-06 Code v1.118.0 From cd1586214eb0de2ab41e00272d0ac4e883ff1de6 Mon Sep 17 00:00:00 2001 From: Asher Date: Wed, 20 May 2026 14:06:40 -0800 Subject: [PATCH 422/497] Remove "VS" from updates Technically it is Code (or Code OSS), not VS Code. --- .github/workflows/update.yaml | 4 ++-- ci/build/update-vscode.sh | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/update.yaml b/.github/workflows/update.yaml index 08bcb1b61d43..3ea12c5d9e07 100644 --- a/.github/workflows/update.yaml +++ b/.github/workflows/update.yaml @@ -63,10 +63,10 @@ jobs: git config --global user.email opensource@coder.com git checkout -b "update/$VERSION" git add . - git commit -m "Update VS Code to $VERSION" + git commit -m "Update Code to $VERSION" git push -u origin "$(git branch --show)" gh pr create \ --repo coder/code-server \ - --title "Update VS Code to $VERSION" \ + --title "Update Code to $VERSION" \ --body-file .cache/checklist \ --draft diff --git a/ci/build/update-vscode.sh b/ci/build/update-vscode.sh index d31b15979bf4..e0fff4886ba3 100755 --- a/ci/build/update-vscode.sh +++ b/ci/build/update-vscode.sh @@ -132,12 +132,12 @@ function main() { fi target_vscode_version="${VERSION#v}" steps+=( - "Update VS Code to $target_vscode_version" "update_vscode" - "Refresh VS Code patches" "refresh_patches" + "Update Code to $target_vscode_version" "update_vscode" + "Refresh Code patches" "refresh_patches" ) else target_vscode_version="$(git -C lib/vscode describe --tags --exact-match)" - echo "Detected VS Code version $target_vscode_version" + echo "Detected Code version $target_vscode_version" fi steps+=( From 2114937ec65e1c49f0e6faafb21d95e7dba1d168 Mon Sep 17 00:00:00 2001 From: Asher Date: Wed, 20 May 2026 14:19:06 -0800 Subject: [PATCH 423/497] Fix release draft trigger The branches filter is the target, not the PR branch. --- .github/workflows/release.yaml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 5fba86cad09f..49f8d543425e 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -10,7 +10,7 @@ on: types: - closed branches: - - "update/**" + - main permissions: contents: write # For creating releases. @@ -26,7 +26,9 @@ jobs: package-linux: name: ${{ format('linux-{0}', matrix.vscode_arch) }} runs-on: ubuntu-22.04 - if: github.event_name == 'workflow_dispatch' || github.event.pull_request.merged == true + if: >- + (github.event_name == 'workflow_dispatch') || + (github.event_name == 'pull_request_target' && github.event.pull_request.merged == true && startsWith(github.head_ref, 'update/')) strategy: matrix: @@ -133,7 +135,9 @@ jobs: package-macos: name: ${{ matrix.vscode_target }} runs-on: ${{ matrix.os }} - if: github.event_name == 'workflow_dispatch' || github.event.pull_request_merged == true + if: >- + (github.event_name == 'workflow_dispatch') || + (github.event_name == 'pull_request_target' && github.event.pull_request.merged == true && startsWith(github.head_ref, 'update/')) strategy: matrix: include: From bf61384523f986515562ef911ee303bff9262016 Mon Sep 17 00:00:00 2001 From: cdrci <78873720+cdrci@users.noreply.github.com> Date: Thu, 21 May 2026 09:41:27 +1000 Subject: [PATCH 424/497] Update to 4.121.0 (#7808) --- CHANGELOG.md | 2 ++ ci/helm-chart/Chart.yaml | 4 ++-- ci/helm-chart/values.yaml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1bfb2daf212a..d58496da7ad1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,8 @@ Code v99.99.999 ## Unreleased +## [4.121.0](https://github.com/coder/code-server/releases/tag/v4.121.0) - 2026-05-20 + Code v1.121.0 ### Changed diff --git a/ci/helm-chart/Chart.yaml b/ci/helm-chart/Chart.yaml index 0d045ffc290b..f9c3b1103d49 100644 --- a/ci/helm-chart/Chart.yaml +++ b/ci/helm-chart/Chart.yaml @@ -15,9 +15,9 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 3.35.0 +version: 3.36.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 4.116.0 +appVersion: 4.121.0 diff --git a/ci/helm-chart/values.yaml b/ci/helm-chart/values.yaml index e4f62ba0f7c0..0b5a3311d6b0 100644 --- a/ci/helm-chart/values.yaml +++ b/ci/helm-chart/values.yaml @@ -6,7 +6,7 @@ replicaCount: 1 image: repository: codercom/code-server - tag: '4.116.0' + tag: '4.121.0' pullPolicy: Always # Specifies one or more secrets to be used when pulling images from a From 238769e535ec28109f54e9f571ea58de40eb6495 Mon Sep 17 00:00:00 2001 From: Micah Zoltu <886059+MicahZoltu@users.noreply.github.com> Date: Fri, 22 May 2026 04:22:29 +0800 Subject: [PATCH 425/497] Apply --app-name to web page titles (#7794) --- patches/app-name.diff | 46 ++++++++++++++++++++++++++++++++++++++++ patches/series | 1 + test/e2e/appName.test.ts | 9 ++++++++ 3 files changed, 56 insertions(+) create mode 100644 patches/app-name.diff create mode 100644 test/e2e/appName.test.ts diff --git a/patches/app-name.diff b/patches/app-name.diff new file mode 100644 index 000000000000..5675d1646098 --- /dev/null +++ b/patches/app-name.diff @@ -0,0 +1,46 @@ +Apply --app-name to VS Code web page titles + +VS Code's `${appName}` title variable comes from `productService.nameLong` in the +web client. code-server already injects per-request product configuration into +VS Code's web bootstrap, so set `nameShort`/`nameLong` from the existing +`--app-name` CLI arg there. + +This keeps the patch minimal and makes browser tab titles honor `--app-name` +without changing unrelated product metadata. + +Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts +=================================================================== +--- code-server.orig/lib/vscode/src/vs/server/node/serverEnvironmentService.ts ++++ code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts +@@ -24,6 +24,7 @@ export const serverOptions: OptionDescri + 'disable-getting-started-override': { type: 'boolean' }, + 'locale': { type: 'string' }, + 'link-protection-trusted-domains': { type: 'string[]' }, ++ 'app-name': { type: 'string' }, + + /* ----- server setup ----- */ + +@@ -120,6 +121,7 @@ export interface ServerParsedArgs { + 'disable-getting-started-override'?: boolean, + 'locale'?: string + 'link-protection-trusted-domains'?: string[], ++ 'app-name'?: string, + + /* ----- server setup ----- */ + +Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts +=================================================================== +--- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts ++++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts +@@ -366,8 +366,11 @@ export class WebClientServer { + linkProtectionTrustedDomains.push(...this._productService.linkProtectionTrustedDomains); + } + ++ const appName = this._environmentService.args['app-name']; + const productConfiguration: Partial> = { + codeServerVersion: this._productService.codeServerVersion, ++ nameShort: appName, ++ nameLong: appName, + rootEndpoint: rootBase, + updateEndpoint: !this._environmentService.args['disable-update-check'] ? rootBase + '/update/check' : undefined, + logoutEndpoint: this._environmentService.args['auth'] && this._environmentService.args['auth'] !== "none" ? rootBase + '/logout' : undefined, diff --git a/patches/series b/patches/series index 3935786a69b6..6f438da313bf 100644 --- a/patches/series +++ b/patches/series @@ -23,3 +23,4 @@ display-language.diff trusted-domains.diff signature-verification.diff copilot.diff +app-name.diff diff --git a/test/e2e/appName.test.ts b/test/e2e/appName.test.ts new file mode 100644 index 000000000000..a12795cb0b33 --- /dev/null +++ b/test/e2e/appName.test.ts @@ -0,0 +1,9 @@ +import { version } from "../../src/node/constants" +import { describe, test, expect } from "./baseFixture" + +const appName = "testnäme" +describe("--app-name", [`--app-name=${appName}`], {}, () => { + test("should use app-name for the title", async ({ codeServerPage }) => { + expect(await codeServerPage.page.title()).toContain(appName) + }) +}) From 99bfbd5931eb28ad0086734aa0d190a4e09bd187 Mon Sep 17 00:00:00 2001 From: Asher Date: Thu, 21 May 2026 13:30:44 -0800 Subject: [PATCH 426/497] Update e2e example commands I think the syntax changed when we moved from yarn to npm. --- test/playwright.config.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/playwright.config.ts b/test/playwright.config.ts index 05d520f30b37..1de4b92ca3b6 100644 --- a/test/playwright.config.ts +++ b/test/playwright.config.ts @@ -5,10 +5,10 @@ import path from "path" // The default configuration runs all tests in three browsers with workers equal // to half the available threads. See 'npm run test:e2e --help' to customize // from the command line. For example: -// npm run test:e2e --workers 1 # Run with one worker -// npm run test:e2e --project Chromium # Only run on Chromium -// npm run test:e2e --grep login # Run tests matching "login" -// PWDEBUG=1 npm run test:e2e # Run Playwright inspector +// npm run test:e2e -- --workers 1 # Run with one worker +// npm run test:e2e -- --project Chromium # Only run on Chromium +// npm run test:e2e -- --grep login # Run tests matching "login" +// PWDEBUG=1 npm run test:e2e # Run Playwright inspector const config: PlaywrightTestConfig = { testDir: path.join(__dirname, "e2e"), // Search for tests in this directory. timeout: 60000, // Each test is given 60 seconds. From c9faf343ba480c016e325a0a4790142bbb4dc38d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 May 2026 12:27:36 -0800 Subject: [PATCH 427/497] chore: bump aquasecurity/trivy-action (#7769) --- .github/workflows/security.yaml | 2 +- .github/workflows/trivy-docker.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/security.yaml b/.github/workflows/security.yaml index f27584dcf251..ba4bcbba5da1 100644 --- a/.github/workflows/security.yaml +++ b/.github/workflows/security.yaml @@ -51,7 +51,7 @@ jobs: fetch-depth: 0 - name: Run Trivy vulnerability scanner in repo mode - uses: aquasecurity/trivy-action@97e0b3872f55f89b95b2f65b3dbab56962816478 # latest + uses: aquasecurity/trivy-action@314ff8b43182423b84c50b1670b0e10f858f2d98 # latest with: scan-type: "fs" scan-ref: "." diff --git a/.github/workflows/trivy-docker.yaml b/.github/workflows/trivy-docker.yaml index fb47132ca355..98a8d8c4063f 100644 --- a/.github/workflows/trivy-docker.yaml +++ b/.github/workflows/trivy-docker.yaml @@ -49,7 +49,7 @@ jobs: uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 - name: Run Trivy vulnerability scanner in image mode - uses: aquasecurity/trivy-action@97e0b3872f55f89b95b2f65b3dbab56962816478 # latest + uses: aquasecurity/trivy-action@314ff8b43182423b84c50b1670b0e10f858f2d98 # latest with: image-ref: "docker.io/codercom/code-server:latest" ignore-unfixed: true From 265713561ccbfb3374f22a91a75b2b58006d9339 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 May 2026 12:28:29 -0800 Subject: [PATCH 428/497] chore: bump ws from 8.19.0 to 8.20.1 (#7804) --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 19a1b3057eaf..aa974b914764 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6613,9 +6613,9 @@ "license": "ISC" }, "node_modules/ws": { - "version": "8.19.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.19.0.tgz", - "integrity": "sha512-blAT2mjOEIi0ZzruJfIhb3nps74PRWTCz1IjglWEEpQl5XS/UNama6u2/rjFkDDouqr4L67ry+1aGIALViWjDg==", + "version": "8.20.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.20.1.tgz", + "integrity": "sha512-It4dO0K5v//JtTXuPkfEOaI3uUN87iYPnqo/ZzqCoG3g8uhA66QUMs/SrM0YK7/NAu+r4LMh/9dq2A7k+rHs+w==", "license": "MIT", "engines": { "node": ">=10.0.0" From 62e5c450f7244e9797c7bc14d22b77b5eb26b87e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 May 2026 12:29:05 -0800 Subject: [PATCH 429/497] chore: bump prettier from 3.6.2 to 3.8.3 (#7776) --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index aa974b914764..7eb7efe953d4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -58,7 +58,7 @@ "eslint-plugin-import": "^2.28.1", "eslint-plugin-prettier": "^5.0.0", "globals": "^16.1.0", - "prettier": "3.6.2", + "prettier": "3.8.3", "prettier-plugin-sh": "^0.18.0", "ts-node": "^10.9.1", "typescript": "^5.6.2", @@ -5100,9 +5100,9 @@ } }, "node_modules/prettier": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.2.tgz", - "integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==", + "version": "3.8.3", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.8.3.tgz", + "integrity": "sha512-7igPTM53cGHMW8xWuVTydi2KO233VFiTNyF5hLJqpilHfmn8C8gPf+PS7dUT64YcXFbiMGZxS9pCSxL/Dxm/Jw==", "dev": true, "license": "MIT", "bin": { diff --git a/package.json b/package.json index 4f01a218b2fa..b229efb3f5e5 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "eslint-plugin-import": "^2.28.1", "eslint-plugin-prettier": "^5.0.0", "globals": "^16.1.0", - "prettier": "3.6.2", + "prettier": "3.8.3", "prettier-plugin-sh": "^0.18.0", "ts-node": "^10.9.1", "typescript": "^5.6.2", From 4f9c23893a07451a7b0f3470eb6aa31d178b6e6c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 May 2026 12:30:42 -0800 Subject: [PATCH 430/497] chore: bump robinraju/release-downloader from 1.12 to 1.13 (#7770) --- .github/workflows/publish.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index b9925f4dd3b8..690a4faca492 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -38,7 +38,7 @@ jobs: with: node-version-file: .node-version - - uses: robinraju/release-downloader@daf26c55d821e836577a15f77d86ddc078948b05 # v1.12 + - uses: robinraju/release-downloader@28fc21f50d76778e7023361aa1f863e717d3d56f # v1.13 with: repository: "coder/code-server" tag: ${{ env.TAG }} @@ -122,13 +122,13 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - uses: robinraju/release-downloader@daf26c55d821e836577a15f77d86ddc078948b05 # v1.12 + - uses: robinraju/release-downloader@28fc21f50d76778e7023361aa1f863e717d3d56f # v1.13 with: repository: "coder/code-server" tag: v${{ env.VERSION }} fileName: "*.deb" out-file-path: "release-packages" - - uses: robinraju/release-downloader@daf26c55d821e836577a15f77d86ddc078948b05 # v1.12 + - uses: robinraju/release-downloader@28fc21f50d76778e7023361aa1f863e717d3d56f # v1.13 with: repository: "coder/code-server" tag: v${{ env.VERSION }} From 2396092ae90e4fd1a1276823a878caafd83bd205 Mon Sep 17 00:00:00 2001 From: Micah Zoltu <886059+MicahZoltu@users.noreply.github.com> Date: Wed, 27 May 2026 04:26:48 +0800 Subject: [PATCH 431/497] Make app-name configurable via environment variable (#7818) --- src/node/cli.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/node/cli.ts b/src/node/cli.ts index ac4ee32f0deb..0946c8e04344 100644 --- a/src/node/cli.ts +++ b/src/node/cli.ts @@ -677,9 +677,7 @@ export async function setDefaults(cliArgs: UserProvidedArgs, configArgs?: Config } args["proxy-domain"] = finalProxies - if (!args["app-name"]) { - args["app-name"] = "code-server" - } + args["app-name"] ??= process.env.CODE_SERVER_APP_NAME || "code-server" args._ = getResolvedPathsFromArgs(args) From 477c0b11b8988a7940bc1d3067796b4bd25121e3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 28 May 2026 10:23:44 -0800 Subject: [PATCH 432/497] chore: bump qs from 6.15.0 to 6.15.2 (#7814) --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7eb7efe953d4..3e5e0256cf9d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5197,9 +5197,9 @@ } }, "node_modules/qs": { - "version": "6.15.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.15.0.tgz", - "integrity": "sha512-mAZTtNCeetKMH+pSjrb76NAM8V9a05I9aBZOHztWy/UqcJdQYNsf59vrRKWnojAT9Y+GbIvoTBC++CPHqpDBhQ==", + "version": "6.15.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.15.2.tgz", + "integrity": "sha512-Rzq0KEyX/w/tEybncDgdkZrJgVUsUMk3xjh3t5bv3S1HTAtg+uOYt72+ZfwiQwKdysThkTBdL/rTi6HDmX9Ddw==", "license": "BSD-3-Clause", "dependencies": { "side-channel": "^1.1.0" From 2243efb2e6a0745200d591e620fdaffa21896e1e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 28 May 2026 10:24:40 -0800 Subject: [PATCH 433/497] chore: bump docker/login-action from 3.7.0 to 4.2.0 (#7772) --- .github/workflows/publish.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 690a4faca492..51e57cb86edc 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -112,11 +112,11 @@ jobs: - uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4.0.0 - uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0 - - uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3 + - uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - - uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3 + - uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0 with: registry: ghcr.io username: ${{ github.actor }} From 382aa3ba8722c663fc17b46174f7674a46c6d2c9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 28 May 2026 10:25:20 -0800 Subject: [PATCH 434/497] chore: bump dorny/paths-filter from 3.0.3 to 4.0.1 (#7771) --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index def1c5c8201b..b64c12359b4c 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -26,7 +26,7 @@ jobs: helm: ${{ steps.filter.outputs.helm }} steps: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 - - uses: dorny/paths-filter@d1c1ffe0248fe513906c8e24db8ea791d46f8590 # v3 + - uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1 id: filter with: filters: | From 4a50b99b67fa279f9449913a79ad6b10bf962897 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 28 May 2026 10:26:53 -0800 Subject: [PATCH 435/497] chore: bump ip-address from 10.1.0 to 10.2.0 (#7785) --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3e5e0256cf9d..07b9c058ec10 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3637,9 +3637,9 @@ } }, "node_modules/ip-address": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.1.0.tgz", - "integrity": "sha512-XXADHxXmvT9+CRxhXg56LJovE+bmWnEWB78LB83VZTprKTmaC5QfruXocxzTZ2Kl0DNwKuBdlIhjL8LeY8Sf8Q==", + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.2.0.tgz", + "integrity": "sha512-/+S6j4E9AHvW9SWMSEY9Xfy66O5PWvVEJ08O0y5JGyEKQpojb0K0GKpz/v5HJ/G0vi3D2sjGK78119oXZeE0qA==", "license": "MIT", "engines": { "node": ">= 12" From 030bdcf7718addbfbaf9a5ee144ba2734bb2cc91 Mon Sep 17 00:00:00 2001 From: Asher Date: Thu, 28 May 2026 11:03:48 -0800 Subject: [PATCH 436/497] Still finish checklist if a step failed The point is to get as far as we can. --- ci/build/update-repo.sh | 3 ++- ci/build/update-vscode.sh | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ci/build/update-repo.sh b/ci/build/update-repo.sh index bc8bf522d50e..e36afaf9daaf 100755 --- a/ci/build/update-repo.sh +++ b/ci/build/update-repo.sh @@ -37,7 +37,8 @@ function main() { "Update changelog" "update_changelog" ) - run-steps "${steps[@]}" + # Even if a step failed, still output the last checkmark. + run-steps "${steps[@]}" || true # This step is always manual. echo "- [ ] https://github.com/coder/code-server-aur/pulls" >> .cache/checklist diff --git a/ci/build/update-vscode.sh b/ci/build/update-vscode.sh index e0fff4886ba3..26a43cd9b4cb 100755 --- a/ci/build/update-vscode.sh +++ b/ci/build/update-vscode.sh @@ -146,7 +146,8 @@ function main() { "Add changelog note" "add_changelog" ) - run-steps "${steps[@]}" + # Even if a step failed, still output the last checkmark. + run-steps "${steps[@]}" || true # This step is always manual. echo "- [ ] Verify changelog" >> .cache/checklist From 93d3ee8ab1b26a7655322814ef953f451f912ef1 Mon Sep 17 00:00:00 2001 From: cdrci <78873720+cdrci@users.noreply.github.com> Date: Fri, 29 May 2026 06:02:35 +1000 Subject: [PATCH 437/497] Update Code to 1.122.0 (#7822) --- CHANGELOG.md | 16 ++++++++++++++++ lib/vscode | 2 +- patches/app-name.diff | 2 +- patches/copilot.diff | 12 ++++++------ patches/display-language.diff | 2 +- patches/sourcemaps.diff | 2 +- patches/webview.diff | 2 +- 7 files changed, 27 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d58496da7ad1..4e430b4c3bb0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,22 @@ Code v99.99.999 ## Unreleased +Code v1.122.0 + +### Changed + +- Update to Code 1.122.0 + +### Fixed + +- `--app-name` will now affect window titles within the editor (it is now used + as the value for `${appName}` in the title template) as well as some other + places like the help > about dialog. + +### Added + +- App name can now be set with the `CODE_SERVER_APP_NAME` environment variable. + ## [4.121.0](https://github.com/coder/code-server/releases/tag/v4.121.0) - 2026-05-20 Code v1.121.0 diff --git a/lib/vscode b/lib/vscode index 987c95975162..6a49527b96e3 160000 --- a/lib/vscode +++ b/lib/vscode @@ -1 +1 @@ -Subproject commit 987c9597516278c9fcf10d963a0592ce1384ab93 +Subproject commit 6a49527b96e326fe62fbdb56f60e16877c9aa724 diff --git a/patches/app-name.diff b/patches/app-name.diff index 5675d1646098..32cb90ed0c28 100644 --- a/patches/app-name.diff +++ b/patches/app-name.diff @@ -20,7 +20,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts /* ----- server setup ----- */ -@@ -120,6 +121,7 @@ export interface ServerParsedArgs { +@@ -124,6 +125,7 @@ export interface ServerParsedArgs { 'disable-getting-started-override'?: boolean, 'locale'?: string 'link-protection-trusted-domains'?: string[], diff --git a/patches/copilot.diff b/patches/copilot.diff index 3a847cef05bc..c525d33a24fa 100644 --- a/patches/copilot.diff +++ b/patches/copilot.diff @@ -2,8 +2,8 @@ Index: code-server/lib/vscode/build/gulpfile.extensions.ts =================================================================== --- code-server.orig/lib/vscode/build/gulpfile.extensions.ts +++ code-server/lib/vscode/build/gulpfile.extensions.ts -@@ -294,6 +294,29 @@ export const compileCopilotExtensionBuil - gulp.task(compileCopilotExtensionBuildTask); +@@ -291,6 +291,29 @@ export const compileCopilotExtensionBuil + task.task(compileCopilotExtensionBuildTask); /** + * Compiles the built-in copilot extension with proper `.vscodeignore` filtering @@ -26,7 +26,7 @@ Index: code-server/lib/vscode/build/gulpfile.extensions.ts + return Promise.resolve(); + }) +)); -+gulp.task(compileCopilotExtensionFullBuildTask); ++task.task(compileCopilotExtensionFullBuildTask); + +/** * Compiles the extensions for the build. @@ -36,15 +36,15 @@ Index: code-server/lib/vscode/build/lib/extensions.ts =================================================================== --- code-server.orig/lib/vscode/build/lib/extensions.ts +++ code-server/lib/vscode/build/lib/extensions.ts -@@ -24,6 +24,7 @@ import { getProductionDependencies } fro +@@ -21,6 +21,7 @@ import { getProductionDependencies } fro import { type IExtensionDefinition, getExtensionStream } from './builtInExtensions.ts'; import { fetchUrls, fetchGithub } from './fetch.ts'; import { createTsgoStream, spawnTsgo } from './tsgo.ts'; +import { prepareBuiltInCopilotRipgrepShim } from './copilot.ts'; - import vzip from 'gulp-vinyl-zip'; + import watcher from './watch/index.ts'; import { createRequire } from 'module'; -@@ -492,6 +493,116 @@ export function packageCopilotExtensionS +@@ -483,6 +484,116 @@ export function packageCopilotExtensionS ).pipe(util2.setExecutableBit(['**/*.sh'])); } diff --git a/patches/display-language.diff b/patches/display-language.diff index 1517e8eb4da8..526272fe5775 100644 --- a/patches/display-language.diff +++ b/patches/display-language.diff @@ -18,7 +18,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverServices.ts import { ProtocolConstants } from '../../base/parts/ipc/common/ipc.net.js'; import { IConfigurationService } from '../../platform/configuration/common/configuration.js'; import { ConfigurationService } from '../../platform/configuration/common/configurationService.js'; -@@ -358,6 +358,9 @@ export async function setupServerService +@@ -359,6 +359,9 @@ export async function setupServerService socketServer.registerChannel('mcpManagement', new McpManagementChannel(mcpManagementService, (ctx: RemoteAgentConnectionContext) => getUriTransformer(ctx.remoteAuthority))); diff --git a/patches/sourcemaps.diff b/patches/sourcemaps.diff index d9c89634593c..615edca9dad4 100644 --- a/patches/sourcemaps.diff +++ b/patches/sourcemaps.diff @@ -6,7 +6,7 @@ Index: code-server/lib/vscode/build/gulpfile.reh.ts =================================================================== --- code-server.orig/lib/vscode/build/gulpfile.reh.ts +++ code-server/lib/vscode/build/gulpfile.reh.ts -@@ -261,10 +261,15 @@ function packageTask(type: string, platf +@@ -255,10 +255,15 @@ function packageTask(type: string, platf const destination = path.join(BUILD_ROOT, destinationFolderName); return () => { diff --git a/patches/webview.diff b/patches/webview.diff index 59fe37de2b04..a1ce247be496 100644 --- a/patches/webview.diff +++ b/patches/webview.diff @@ -41,7 +41,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/environment/browser/envi =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/services/environment/browser/environmentService.ts +++ code-server/lib/vscode/src/vs/workbench/services/environment/browser/environmentService.ts -@@ -223,7 +223,7 @@ export class BrowserWorkbenchEnvironment +@@ -226,7 +226,7 @@ export class BrowserWorkbenchEnvironment @memoize get webviewExternalEndpoint(): string { From d98fcd359834687122bdc559922e33a6eee34bff Mon Sep 17 00:00:00 2001 From: Asher Date: Thu, 28 May 2026 13:21:14 -0800 Subject: [PATCH 438/497] Fix macos release tag --- .github/workflows/release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 49f8d543425e..8f2979e20ed3 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -148,7 +148,7 @@ jobs: env: VSCODE_TARGET: ${{ matrix.vscode_target }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - TAG: ${{ inputs.version || github.ref_name }} + TAG: ${{ inputs.version || github.event.pull_request.head.ref || github.ref_name }} # Ensure native modules are built from source to avoid prebuilds. npm_config_build_from_source: true From f87e243225374b510e6f68b665737baac81fe249 Mon Sep 17 00:00:00 2001 From: cdrci <78873720+cdrci@users.noreply.github.com> Date: Sat, 30 May 2026 04:19:24 +1000 Subject: [PATCH 439/497] Update to 4.122.0 (#7823) --- CHANGELOG.md | 2 ++ ci/helm-chart/Chart.yaml | 4 ++-- ci/helm-chart/values.yaml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e430b4c3bb0..4b5da51f146e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,8 @@ Code v99.99.999 ## Unreleased +## [4.122.0](https://github.com/coder/code-server/releases/tag/v4.122.0) - 2026-05-29 + Code v1.122.0 ### Changed diff --git a/ci/helm-chart/Chart.yaml b/ci/helm-chart/Chart.yaml index f9c3b1103d49..eeb2cf3f1836 100644 --- a/ci/helm-chart/Chart.yaml +++ b/ci/helm-chart/Chart.yaml @@ -15,9 +15,9 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 3.36.0 +version: 3.37.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 4.121.0 +appVersion: 4.122.0 diff --git a/ci/helm-chart/values.yaml b/ci/helm-chart/values.yaml index 0b5a3311d6b0..7406fa1ffb64 100644 --- a/ci/helm-chart/values.yaml +++ b/ci/helm-chart/values.yaml @@ -6,7 +6,7 @@ replicaCount: 1 image: repository: codercom/code-server - tag: '4.121.0' + tag: '4.122.0' pullPolicy: Always # Specifies one or more secrets to be used when pulling images from a From cb2548f989254bd9a00f2b35e1ba9ae85e57f730 Mon Sep 17 00:00:00 2001 From: Asher Date: Fri, 29 May 2026 10:20:19 -0800 Subject: [PATCH 440/497] Make Helm and changelog commit more specific --- .github/workflows/publish.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 51e57cb86edc..64355ee0dcd8 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -159,7 +159,7 @@ jobs: git config --global user.email opensource@coder.com git checkout -b "helm/$VERSION" git add . - git commit -m "Update to $VERSION" + git commit -m "Update Helm chart and changelog with $VERSION" git push -u origin "$(git branch --show)" gh pr create \ --repo coder/code-server \ From 6cad75773e23aff738dad3a15e31770ead495b59 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Jun 2026 13:56:12 -0800 Subject: [PATCH 441/497] chore: bump basic-ftp from 5.3.0 to 5.3.1 (#7786) --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 07b9c058ec10..b3ef6a0f26cc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1639,9 +1639,9 @@ "license": "MIT" }, "node_modules/basic-ftp": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.3.0.tgz", - "integrity": "sha512-5K9eNNn7ywHPsYnFwjKgYH8Hf8B5emh7JKcPaVjjrMJFQQwGpwowEnZNEtHs7DfR7hCZsmaK3VA4HUK0YarT+w==", + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.3.1.tgz", + "integrity": "sha512-bopVNp6ugyA150DDuZfPFdt1KZ5a94ZDiwX4hMgZDzF+GttD80lEy8kj98kbyhLXnPvhtIo93mdnLIjpCAeeOw==", "license": "MIT", "engines": { "node": ">=10.0.0" From 923cb753b89c8ecc9b52009a24c97bf513ef2d0c Mon Sep 17 00:00:00 2001 From: Asher Date: Mon, 1 Jun 2026 14:02:13 -0800 Subject: [PATCH 442/497] Fix automatic release major version It was using the VS Code major version instead of code-server's. --- .github/workflows/release.yaml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 8f2979e20ed3..d6d0bd3a6ec3 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -72,10 +72,12 @@ jobs: curl -sSfL https://github.com/goreleaser/nfpm/releases/download/v2.3.1/nfpm_2.3.1_`uname -s`_`uname -m`.tar.gz | tar -C ~/.local/bin -zxv nfpm echo "$HOME/.local/bin" >> $GITHUB_PATH - - name: Strip update/ and v from tag + - name: Strip update/ and v from tag and set major version run: | version=${TAG#update/} - echo "VERSION=${version#v}" >> $GITHUB_ENV + version=${version#v} + version=4${version:1} + echo "VERSION=$version" >> $GITHUB_ENV - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 with: @@ -164,10 +166,12 @@ jobs: curl -sSfL https://github.com/goreleaser/nfpm/releases/download/v2.3.1/nfpm_2.3.1_`uname -s`_`uname -m`.tar.gz | tar -C ~/.local/bin -zxv nfpm echo "$HOME/.local/bin" >> $GITHUB_PATH - - name: Strip update/ and v from tag + - name: Strip update/ and v from tag and set major version run: | version=${TAG#update/} - echo "VERSION=${version#v}" >> $GITHUB_ENV + version=${version#v} + version=4${version:1} + echo "VERSION=$version" >> $GITHUB_ENV - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 with: From 7be257b252f18fc2797f6fbc435f0e8ddacfc192 Mon Sep 17 00:00:00 2001 From: cdrci <78873720+cdrci@users.noreply.github.com> Date: Tue, 2 Jun 2026 08:06:15 +1000 Subject: [PATCH 443/497] Update Code to 1.122.1 (#7825) --- CHANGELOG.md | 6 ++++++ lib/vscode | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b5da51f146e..f7a471d2305e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,12 @@ Code v99.99.999 ## Unreleased +Code v1.122.1 + +### Changed + +- Update to Code 1.122.1 + ## [4.122.0](https://github.com/coder/code-server/releases/tag/v4.122.0) - 2026-05-29 Code v1.122.0 diff --git a/lib/vscode b/lib/vscode index 6a49527b96e3..8761a5560cfd 160000 --- a/lib/vscode +++ b/lib/vscode @@ -1 +1 @@ -Subproject commit 6a49527b96e326fe62fbdb56f60e16877c9aa724 +Subproject commit 8761a5560cfd65fdd19ce7e2bd18dab5c0a4d84e From 63c071959faa3743a51224272932c475ea202784 Mon Sep 17 00:00:00 2001 From: cdrci <78873720+cdrci@users.noreply.github.com> Date: Wed, 3 Jun 2026 04:42:18 +1000 Subject: [PATCH 444/497] Update Helm chart and changelog with 4.122.1 (#7835) --- CHANGELOG.md | 2 ++ ci/helm-chart/Chart.yaml | 4 ++-- ci/helm-chart/values.yaml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f7a471d2305e..44f99ab0465d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,8 @@ Code v99.99.999 ## Unreleased +## [4.122.1](https://github.com/coder/code-server/releases/tag/v4.122.1) - 2026-06-02 + Code v1.122.1 ### Changed diff --git a/ci/helm-chart/Chart.yaml b/ci/helm-chart/Chart.yaml index eeb2cf3f1836..6e0eaae6338f 100644 --- a/ci/helm-chart/Chart.yaml +++ b/ci/helm-chart/Chart.yaml @@ -15,9 +15,9 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 3.37.0 +version: 3.37.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 4.122.0 +appVersion: 4.122.1 diff --git a/ci/helm-chart/values.yaml b/ci/helm-chart/values.yaml index 7406fa1ffb64..e9432f39e7eb 100644 --- a/ci/helm-chart/values.yaml +++ b/ci/helm-chart/values.yaml @@ -6,7 +6,7 @@ replicaCount: 1 image: repository: codercom/code-server - tag: '4.122.0' + tag: '4.122.1' pullPolicy: Always # Specifies one or more secrets to be used when pulling images from a From 6fd40c04c78d04778616c2acd780790507189a8a Mon Sep 17 00:00:00 2001 From: Asher Date: Tue, 2 Jun 2026 11:23:22 -0800 Subject: [PATCH 445/497] Fix Helm chart version bump script Instead of relying on semver which is not installed, just parse it with bash. --- ci/build/update-repo.sh | 65 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 57 insertions(+), 8 deletions(-) diff --git a/ci/build/update-repo.sh b/ci/build/update-repo.sh index e36afaf9daaf..0f1924fa91a4 100755 --- a/ci/build/update-repo.sh +++ b/ci/build/update-repo.sh @@ -2,16 +2,65 @@ set -Eeuo pipefail +# Given versions $1 and $2 figure out the first component that is different +# (major, minor, patch). +function find_version_diff() { + # shellcheck disable=SC2206 + local a=( ${1//./ } ) + # shellcheck disable=SC2206 + local b=( ${2//./ } ) + + if [[ ${a[0]} != "${b[0]}" ]] ; then + echo major + elif [[ ${a[1]} != "${b[1]}" ]] ; then + echo minor + else + echo patch + fi +} + +# Bump $1 by the bump type (major, minor, patch) in $2. +function bump_version() { + # shellcheck disable=SC2206 + local a=( ${1//./ } ) + case $2 in + major) + ((a[0]++)) + a[1]=0 + a[2]=0 + ;; + minor) + ((a[1]++)) + a[2]=0 + ;; + *) + ((a[2]++)) + ;; + esac + echo "${a[0]}.${a[1]}.${a[2]}" +} + function update_helm() { - local current - current=$(yq .version ci/helm-chart/Chart.yaml) - local next - next=$(semver "$current" -i minor) - echo "Bumping version from $current to $next..." - sed -i.bak "s/^version: $current\$/version: $next/" ci/helm-chart/Chart.yaml - - echo "Setting app version and image to $version..." + local chart_version + chart_version=$(yq .version ci/helm-chart/Chart.yaml) + local app_version + app_version=$(yq .appVersion ci/helm-chart/Chart.yaml) + local image_version + image_version=$(yq .image.tag ci/helm-chart/values.yaml) + + local bump_type + bump_type=$(find_version_diff "$app_version" "$version") + local chart_version_bump + chart_version_bump=$(bump_version "$chart_version" "$bump_type") + + # Use sed to replace because yq will reformat. + echo "Bumping version from $chart_version to $chart_version_bump..." + sed -i.bak "s/^version: $chart_version\$/version: $chart_version_bump/" ci/helm-chart/Chart.yaml + + echo "Bumping app version from $app_version to $version..." sed -i.bak "s/^appVersion: .\+\$/appVersion: $version/" ci/helm-chart/Chart.yaml + + echo "Bumping image version from $image_version to $version..." sed -i.bak "s/^ tag: .\+\$/ tag: '$version'/" ci/helm-chart/values.yaml } From 559d73a636592f965eeb15737d0b57167b66934a Mon Sep 17 00:00:00 2001 From: Asher Date: Wed, 3 Jun 2026 11:33:49 -0800 Subject: [PATCH 446/497] Update Code to 1.123.0 (#7837) --- .node-version | 2 +- CHANGELOG.md | 6 ++++++ lib/vscode | 2 +- patches/base-path.diff | 4 ++-- patches/disable-builtin-ext-update.diff | 2 +- patches/proxy-uri.diff | 2 +- patches/sourcemaps.diff | 2 +- 7 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.node-version b/.node-version index 32a2d7bd80d1..5bf4400f2292 100644 --- a/.node-version +++ b/.node-version @@ -1 +1 @@ -22.22.1 +24.15.0 diff --git a/CHANGELOG.md b/CHANGELOG.md index 44f99ab0465d..75e284f8bad7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,12 @@ Code v99.99.999 ## Unreleased +Code v1.123.0 + +### Changed + +- Update to Code 1.123.0 + ## [4.122.1](https://github.com/coder/code-server/releases/tag/v4.122.1) - 2026-06-02 Code v1.122.1 diff --git a/lib/vscode b/lib/vscode index 8761a5560cfd..6a44c352bd24 160000 --- a/lib/vscode +++ b/lib/vscode @@ -1 +1 @@ -Subproject commit 8761a5560cfd65fdd19ce7e2bd18dab5c0a4d84e +Subproject commit 6a44c352bd24569c417e530095901b649960f9f8 diff --git a/patches/base-path.diff b/patches/base-path.diff index 693afc8f4d5c..234b8403c6c4 100644 --- a/patches/base-path.diff +++ b/patches/base-path.diff @@ -263,7 +263,7 @@ Index: code-server/lib/vscode/src/vs/code/browser/workbench/workbench.ts } private startListening(): void { -@@ -584,17 +585,6 @@ class WorkspaceProvider implements IWork +@@ -590,17 +591,6 @@ class WorkspaceProvider implements IWork } } @@ -281,7 +281,7 @@ Index: code-server/lib/vscode/src/vs/code/browser/workbench/workbench.ts (function () { // Find config by checking for DOM -@@ -604,8 +594,8 @@ function readCookie(name: string): strin +@@ -610,8 +600,8 @@ function readCookie(name: string): strin if (!configElement || !configElementAttribute) { throw new Error('Missing web configuration element'); } diff --git a/patches/disable-builtin-ext-update.diff b/patches/disable-builtin-ext-update.diff index 20af3023a47c..96c916a16b5c 100644 --- a/patches/disable-builtin-ext-update.diff +++ b/patches/disable-builtin-ext-update.diff @@ -7,7 +7,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts +++ code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts -@@ -342,6 +342,10 @@ export class Extension implements IExten +@@ -344,6 +344,10 @@ export class Extension implements IExten if (this.type === ExtensionType.System && this.productService.quality === 'stable' && !this.productService.builtInExtensionsEnabledWithAutoUpdates?.some(id => id.toLowerCase() === this.identifier.id.toLowerCase())) { return false; } diff --git a/patches/proxy-uri.diff b/patches/proxy-uri.diff index ca55153eeb87..9921cc23022a 100644 --- a/patches/proxy-uri.diff +++ b/patches/proxy-uri.diff @@ -104,7 +104,7 @@ Index: code-server/lib/vscode/src/vs/code/browser/workbench/workbench.ts import type { IURLCallbackProvider } from '../../../workbench/services/url/browser/urlService.js'; import { create } from '../../../workbench/workbench.web.main.internal.js'; -@@ -606,6 +607,39 @@ class WorkspaceProvider implements IWork +@@ -612,6 +613,39 @@ class WorkspaceProvider implements IWork settingsSyncOptions: config.settingsSyncOptions ? { enabled: config.settingsSyncOptions.enabled, } : undefined, workspaceProvider: WorkspaceProvider.create(config), urlCallbackProvider: new LocalStorageURLCallbackProvider(config.callbackRoute), diff --git a/patches/sourcemaps.diff b/patches/sourcemaps.diff index 615edca9dad4..4c51aace765e 100644 --- a/patches/sourcemaps.diff +++ b/patches/sourcemaps.diff @@ -6,7 +6,7 @@ Index: code-server/lib/vscode/build/gulpfile.reh.ts =================================================================== --- code-server.orig/lib/vscode/build/gulpfile.reh.ts +++ code-server/lib/vscode/build/gulpfile.reh.ts -@@ -255,10 +255,15 @@ function packageTask(type: string, platf +@@ -296,10 +296,15 @@ function packageTask(type: string, platf const destination = path.join(BUILD_ROOT, destinationFolderName); return () => { From 77d880d0c3fcbf4ac613644b3e113cedd6173a16 Mon Sep 17 00:00:00 2001 From: Asher Date: Wed, 3 Jun 2026 12:05:24 -0800 Subject: [PATCH 447/497] Drop armhf builds --- .github/workflows/release.yaml | 3 --- CHANGELOG.md | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index d6d0bd3a6ec3..31589fa7ffa5 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -39,9 +39,6 @@ jobs: - npm_arch: arm64 vscode_arch: arm64 package_arch: arm64 - - npm_arch: arm - vscode_arch: armhf - package_arch: armv7l env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 75e284f8bad7..098f5b8e6ed0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,8 @@ Code v1.123.0 ### Changed - Update to Code 1.123.0 +- Microsoft dropped support for armhf remotes so there will no longer be any + builds for armhf. ## [4.122.1](https://github.com/coder/code-server/releases/tag/v4.122.1) - 2026-06-02 From d0d53d924e0d3462d8d02dfc6083031932bd024d Mon Sep 17 00:00:00 2001 From: cdrci <78873720+cdrci@users.noreply.github.com> Date: Fri, 5 Jun 2026 04:50:04 +1000 Subject: [PATCH 448/497] Update Helm chart and changelog with 4.123.0 (#7838) --- CHANGELOG.md | 2 ++ ci/helm-chart/Chart.yaml | 4 ++-- ci/helm-chart/values.yaml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 098f5b8e6ed0..9dbab3c87315 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,8 @@ Code v99.99.999 ## Unreleased +## [4.123.0](https://github.com/coder/code-server/releases/tag/v4.123.0) - 2026-06-03 + Code v1.123.0 ### Changed diff --git a/ci/helm-chart/Chart.yaml b/ci/helm-chart/Chart.yaml index 6e0eaae6338f..60f9b1720cf8 100644 --- a/ci/helm-chart/Chart.yaml +++ b/ci/helm-chart/Chart.yaml @@ -15,9 +15,9 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 3.37.1 +version: 3.38.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 4.122.1 +appVersion: 4.123.0 diff --git a/ci/helm-chart/values.yaml b/ci/helm-chart/values.yaml index e9432f39e7eb..81f112ced5fd 100644 --- a/ci/helm-chart/values.yaml +++ b/ci/helm-chart/values.yaml @@ -6,7 +6,7 @@ replicaCount: 1 image: repository: codercom/code-server - tag: '4.122.1' + tag: '4.123.0' pullPolicy: Always # Specifies one or more secrets to be used when pulling images from a From 92a7dce46ffcd363798e5ef008991e8cc6426de5 Mon Sep 17 00:00:00 2001 From: ka-ishimoto Date: Thu, 11 Jun 2026 04:59:45 +0900 Subject: [PATCH 449/497] Fix false positive CVE alerts by setting package name to code-oss-dev (#7839) The VS Code build process sets the bundled lib/vscode/package.json name to "code-server" (from product.json nameShort), causing vulnerability scanners to misidentify it and flag non-applicable CVEs. Override the name to "code-oss-dev" in build-release.sh after merging package.json. Fixes #7071 Signed-off-by: ka-ishimoto --- ci/build/build-release.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ci/build/build-release.sh b/ci/build/build-release.sh index 9ded35f98ccb..30dcfef6399e 100755 --- a/ci/build/build-release.sh +++ b/ci/build/build-release.sh @@ -128,7 +128,9 @@ bundle_vscode() { # Merge the package.json for the web/remote server so we can include # dependencies, since we want to ship this via NPM. - jq --slurp '.[0] * .[1]' \ + # Also override the name to prevent vulnerability scanners from + # misidentifying this package as VS Code (see #7071). + jq --slurp '.[0] * .[1] | .name = "code-oss-dev"' \ "$VSCODE_SRC_PATH/remote/package.json" \ "$VSCODE_OUT_PATH/package.json" > "$VSCODE_OUT_PATH/package.json.merged" mv "$VSCODE_OUT_PATH/package.json.merged" "$VSCODE_OUT_PATH/package.json" From 364cf99338d5f2f1574057b132fc00bf163b2653 Mon Sep 17 00:00:00 2001 From: Asher Date: Mon, 15 Jun 2026 16:37:07 -0800 Subject: [PATCH 450/497] Strip token from cookies before proxying Since this functionality requires information placed onto the request by code-server (req.args) and Express (req.cookies), move the standalone tests into the integration tests as the proxy can no longer run correctly on its own without that context. We could strip the header elsewhere or refactor in some way (pass in a callback function for the stripping or something) but this seems like the simplest and safest place at the moment to ensure we catch all uses of the proxy. In any case, I think it does lend more confidence to know we are testing the proxy the way it will be used in practice. The downside is some additional complexity when setting up tests, but at the moment I do not think that exchange is overly burdensome. --- package-lock.json | 31 +++++++++-- package.json | 1 + src/node/proxy.ts | 17 ++++++- test/unit/node/proxy.test.ts | 99 ++++++++++++++---------------------- 4 files changed, 81 insertions(+), 67 deletions(-) diff --git a/package-lock.json b/package-lock.json index b3ef6a0f26cc..eac3f50ddebe 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,6 +13,7 @@ "@coder/logger": "^3.0.1", "argon2": "^0.44.0", "compression": "^1.7.4", + "cookie": "^1.1.1", "cookie-parser": "^1.4.6", "env-paths": "^2.2.1", "express": "^5.0.1", @@ -1936,12 +1937,16 @@ } }, "node_modules/cookie": { - "version": "0.7.2", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz", - "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-1.1.1.tgz", + "integrity": "sha512-ei8Aos7ja0weRpFzJnEA9UHJ/7XQmqglbRwnf2ATjcB9Wq874VKH9kfjjirM6UhU2/E5fFYadylyhFldcqSidQ==", "license": "MIT", "engines": { - "node": ">= 0.6" + "node": ">=18" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" } }, "node_modules/cookie-parser": { @@ -1957,6 +1962,15 @@ "node": ">= 0.8.0" } }, + "node_modules/cookie-parser/node_modules/cookie": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz", + "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, "node_modules/cookie-signature": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", @@ -2953,6 +2967,15 @@ "url": "https://opencollective.com/express" } }, + "node_modules/express/node_modules/cookie": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz", + "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, "node_modules/express/node_modules/cookie-signature": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.2.2.tgz", diff --git a/package.json b/package.json index b229efb3f5e5..35fae5970f9d 100644 --- a/package.json +++ b/package.json @@ -70,6 +70,7 @@ "@coder/logger": "^3.0.1", "argon2": "^0.44.0", "compression": "^1.7.4", + "cookie": "^1.1.1", "cookie-parser": "^1.4.6", "env-paths": "^2.2.1", "express": "^5.0.1", diff --git a/src/node/proxy.ts b/src/node/proxy.ts index afa964ae529b..8282729cc34d 100644 --- a/src/node/proxy.ts +++ b/src/node/proxy.ts @@ -1,5 +1,7 @@ +import * as cookie from "cookie" +import type { Request } from "express" import proxyServer from "http-proxy" -import { HttpCode } from "../common/http" +import { getCookieSessionName, HttpCode } from "../common/http" export const proxy = proxyServer.createProxyServer({}) @@ -18,6 +20,19 @@ proxy.on("error", (error, _, res) => { } }) +// Strip the code-server cookie if it exists to avoid transmitting the cookie +// to potentially malicious local ports. +proxy.on("proxyReq", (preq, req) => { + const cookieSessionName = getCookieSessionName((req as Request).args["cookie-suffix"]) + preq.setHeader( + "Cookie", + cookie.stringifyCookie({ + ...(req as Request).cookies, + [cookieSessionName]: undefined, + }), + ) +}) + // Intercept the response to rewrite absolute redirects against the base path. // Is disabled when the request has no base path which means /absproxy is in use. proxy.on("proxyRes", (res, req) => { diff --git a/test/unit/node/proxy.test.ts b/test/unit/node/proxy.test.ts index b3509ed640df..94945cb94eaa 100644 --- a/test/unit/node/proxy.test.ts +++ b/test/unit/node/proxy.test.ts @@ -1,15 +1,12 @@ import * as express from "express" -import * as http from "http" -import nodeFetch from "node-fetch" import { HttpCode } from "../../../src/common/http" -import { proxy } from "../../../src/node/proxy" import { wss, Router as WsRouter } from "../../../src/node/wsRouter" -import { getAvailablePort, mockLogger } from "../../utils/helpers" +import { mockLogger } from "../../utils/helpers" import * as httpserver from "../../utils/httpserver" import * as integration from "../../utils/integration" describe("proxy", () => { - const nhooyrDevServer = new httpserver.HttpServer() + const proxyTarget = new httpserver.HttpServer() const wsApp = express.default() const wsRouter = WsRouter() let codeServer: httpserver.HttpServer | undefined @@ -19,21 +16,22 @@ describe("proxy", () => { beforeAll(async () => { wsApp.use("/", wsRouter.router) - await nhooyrDevServer.listen((req, res) => { + await proxyTarget.listen((req, res) => { e(req, res) }) - nhooyrDevServer.listenUpgrade(wsApp) - proxyPath = `/proxy/${nhooyrDevServer.port()}/wsup` + proxyTarget.listenUpgrade(wsApp) + proxyPath = `/proxy/${proxyTarget.port()}/wsup` absProxyPath = proxyPath.replace("/proxy/", "/absproxy/") }) afterAll(async () => { - await nhooyrDevServer.dispose() + await proxyTarget.dispose() }) beforeEach(() => { e = express.default() mockLogger() + delete process.env.PASSWORD }) afterEach(async () => { @@ -283,65 +281,42 @@ describe("proxy", () => { const resp = await codeServer.fetch(proxyPath, { method: "OPTIONS" }) expect(resp.status).toBe(200) }) -}) -// NOTE@jsjoeio -// Both this test suite and the one above it are very similar -// The main difference is this one uses http and node-fetch -// and specifically tests the proxy in isolation vs. using -// the httpserver abstraction we've built. -// -// Leaving this as a separate test suite for now because -// we may consider refactoring the httpserver abstraction -// in the future. -// -// If you're writing a test specifically for code in -// src/node/proxy.ts, you should probably add it to -// this test suite. -describe("proxy (standalone)", () => { - let URL = "" - let PROXY_URL = "" - let testServer: http.Server - let proxyTarget: http.Server + it("should return a 500 when no target is running ", async () => { + const target = new httpserver.HttpServer() + await target.listen(() => {}) + const port = target.port() + target.dispose() + codeServer = await integration.setup(["--auth=none"], "") + const resp = await codeServer.fetch(`/proxy/${port}/wsup`) + expect(resp.status).toBe(HttpCode.ServerError) + expect(resp.statusText).toBe("Internal Server Error") + }) - beforeEach(async () => { - const PORT = await getAvailablePort() - const PROXY_PORT = await getAvailablePort() - URL = `http://localhost:${PORT}` - PROXY_URL = `http://localhost:${PROXY_PORT}` - // Define server and a proxy server - testServer = http.createServer((req, res) => { - proxy.web(req, res, { - target: PROXY_URL, - }) - }) + it("should strip token cookie", async () => { + const token = "my-super-secure-token" + process.env.HASHED_PASSWORD = token + codeServer = await integration.setup(["--auth=password"]) - proxyTarget = http.createServer((req, res) => { - res.writeHead(200, { "Content-Type": "text/plain" }) - res.end() + // Set up a listener that just prints the cookies it got. + e.get("/wsup/cookies", (req, res) => { + res.writeHead(HttpCode.Ok, { "Content-Type": "text/plain" }) + res.end(req.headers.cookie) }) - // Start both servers - proxyTarget.listen(PROXY_PORT) - testServer.listen(PORT) - }) - - afterEach(async () => { - testServer.close() - proxyTarget.close() - }) - - it("should return a 500 when proxy target errors ", async () => { - // Close the proxy target so that proxy errors - proxyTarget.close() - const errorResp = await nodeFetch(`${URL}/error`) - expect(errorResp.status).toBe(HttpCode.ServerError) - expect(errorResp.statusText).toBe("Internal Server Error") - }) + // Send the token along with other cookies which should be preserved. + // Encode one to make sure they are being re-encoded properly. + const value = "hello=there" + const encodedValue = encodeURIComponent(value) + const resp = await codeServer.fetch(proxyPath + "/cookies", { + headers: { + cookie: `cookie1=${encodedValue}; code-server-session=${token}; cookie2=hello;`, + }, + }) - it("should proxy correctly", async () => { - const resp = await nodeFetch(`${URL}/route`) + // The proxied listener should not have printed the code-server token. expect(resp.status).toBe(200) - expect(resp.statusText).toBe("OK") + const text = await resp.text() + expect(text).toBe(`cookie1=${encodedValue}; cookie2=hello`) }) }) From 1ccd4f04d2f77ddace6df3f9e3945de45068568a Mon Sep 17 00:00:00 2001 From: Asher Date: Mon, 15 Jun 2026 16:40:30 -0800 Subject: [PATCH 451/497] Update brace-expansion, js-yaml, and ws --- package-lock.json | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index eac3f50ddebe..66bb41851332 100644 --- a/package-lock.json +++ b/package-lock.json @@ -969,9 +969,9 @@ } }, "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": { - "version": "5.0.5", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz", - "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==", + "version": "5.0.6", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.6.tgz", + "integrity": "sha512-kLpxurY4Z4r9sgMsyG0Z9uzsBlgiU/EFKhj/h91/8yHu0edo7XuixOIH3VcJ8kkxs6/jPzoI6U9Vj3WqbMQ94g==", "dev": true, "license": "MIT", "dependencies": { @@ -4153,9 +4153,19 @@ "license": "ISC" }, "node_modules/js-yaml": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz", - "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.2.0.tgz", + "integrity": "sha512-ePWsvanv0DWuDRsW8dnt+R4jQ31SCRCQ7hhNcPXZPsoBZiemuZNYGf7adZdqX2D86j6rvKp3RpCxVTSb8WQlOw==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/puzrin" + }, + { + "type": "github", + "url": "https://github.com/sponsors/nodeca" + } + ], "license": "MIT", "dependencies": { "argparse": "^2.0.1" @@ -6636,9 +6646,9 @@ "license": "ISC" }, "node_modules/ws": { - "version": "8.20.1", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.20.1.tgz", - "integrity": "sha512-It4dO0K5v//JtTXuPkfEOaI3uUN87iYPnqo/ZzqCoG3g8uhA66QUMs/SrM0YK7/NAu+r4LMh/9dq2A7k+rHs+w==", + "version": "8.21.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.21.0.tgz", + "integrity": "sha512-Vsp28b7DRcimFQvrqu2Wek3z1iYxDCWqHYB8Qsnk/S4RfaCQzPGPyBNuVjJV3cd6UiKtUtp6sNM77gWvzcCH+g==", "license": "MIT", "engines": { "node": ">=10.0.0" From 9fe7eb79d5ab2f2ed369d0e79cce4dbc6fe00a31 Mon Sep 17 00:00:00 2001 From: cdrci <78873720+cdrci@users.noreply.github.com> Date: Tue, 16 Jun 2026 16:28:49 +1000 Subject: [PATCH 452/497] Update Code to 1.124.2 (#7846) --- CHANGELOG.md | 14 ++++++++++++++ lib/vscode | 2 +- patches/disable-builtin-ext-update.diff | 2 +- patches/webview.diff | 4 ++-- 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9dbab3c87315..6d2568a32466 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,20 @@ Code v99.99.999 ## Unreleased +Code v1.124.2 + +### Security + +- Strip code-server's session token from the cookie before proxying to a local + port. Previously, when you used built-in password authentication, the cookie + would be sent to the local proxied port, which meant if the service was + malicious and not already running as your code-server user it could use the + cookie to log into code-server and execute commands as your code-server user. + +### Changed + +- Update to Code 1.124.2 + ## [4.123.0](https://github.com/coder/code-server/releases/tag/v4.123.0) - 2026-06-03 Code v1.123.0 diff --git a/lib/vscode b/lib/vscode index 6a44c352bd24..6928394f91b6 160000 --- a/lib/vscode +++ b/lib/vscode @@ -1 +1 @@ -Subproject commit 6a44c352bd24569c417e530095901b649960f9f8 +Subproject commit 6928394f91b684055b873eecb8bc281365131f1c diff --git a/patches/disable-builtin-ext-update.diff b/patches/disable-builtin-ext-update.diff index 96c916a16b5c..0d3690b35765 100644 --- a/patches/disable-builtin-ext-update.diff +++ b/patches/disable-builtin-ext-update.diff @@ -7,7 +7,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts +++ code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts -@@ -344,6 +344,10 @@ export class Extension implements IExten +@@ -345,6 +345,10 @@ export class Extension implements IExten if (this.type === ExtensionType.System && this.productService.quality === 'stable' && !this.productService.builtInExtensionsEnabledWithAutoUpdates?.some(id => id.toLowerCase() === this.identifier.id.toLowerCase())) { return false; } diff --git a/patches/webview.diff b/patches/webview.diff index a1ce247be496..5dd0f9d4b95c 100644 --- a/patches/webview.diff +++ b/patches/webview.diff @@ -70,8 +70,8 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index -+ content="default-src 'none'; script-src 'sha256-m1DlJtsIJd46QuWYNcsaYIG1xI+9FyjKQu+cfp+zq5Q=' 'self'; frame-src 'self'; style-src 'unsafe-inline';"> +- content="default-src 'none'; script-src 'sha256-nXjtuhBilO++r8hfxl5VjEScSmdm07wDAk6jw228DgM=' 'self'; frame-src 'self'; style-src 'unsafe-inline';"> ++ content="default-src 'none'; script-src 'sha256-A6/szVNdTzyi4hDa+9OLbzS8tSd2iUV4CqimLNWex2Y=' 'self'; frame-src 'self'; style-src 'unsafe-inline';"> Date: Wed, 17 Jun 2026 01:57:28 +1000 Subject: [PATCH 453/497] Update Helm chart and changelog with 4.124.2 (#7851) Co-authored-by: cdrci --- CHANGELOG.md | 2 ++ ci/helm-chart/Chart.yaml | 4 ++-- ci/helm-chart/values.yaml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d2568a32466..2abd8e0a57b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,8 @@ Code v99.99.999 ## Unreleased +## [4.124.2](https://github.com/coder/code-server/releases/tag/v4.124.2) - 2026-06-16 + Code v1.124.2 ### Security diff --git a/ci/helm-chart/Chart.yaml b/ci/helm-chart/Chart.yaml index 60f9b1720cf8..778a90353141 100644 --- a/ci/helm-chart/Chart.yaml +++ b/ci/helm-chart/Chart.yaml @@ -15,9 +15,9 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 3.38.0 +version: 3.39.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 4.123.0 +appVersion: 4.124.2 diff --git a/ci/helm-chart/values.yaml b/ci/helm-chart/values.yaml index 81f112ced5fd..413920542f8d 100644 --- a/ci/helm-chart/values.yaml +++ b/ci/helm-chart/values.yaml @@ -6,7 +6,7 @@ replicaCount: 1 image: repository: codercom/code-server - tag: '4.123.0' + tag: '4.124.2' pullPolicy: Always # Specifies one or more secrets to be used when pulling images from a From 71ba0191f2af9761f9a7f244912238b1644bbab6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Jun 2026 08:59:54 -0800 Subject: [PATCH 454/497] chore: bump globals from 16.5.0 to 17.6.0 (#7831) --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 66bb41851332..8b65159c4570 100644 --- a/package-lock.json +++ b/package-lock.json @@ -58,7 +58,7 @@ "eslint-import-resolver-typescript": "^4.4.4", "eslint-plugin-import": "^2.28.1", "eslint-plugin-prettier": "^5.0.0", - "globals": "^16.1.0", + "globals": "^17.6.0", "prettier": "3.8.3", "prettier-plugin-sh": "^0.18.0", "ts-node": "^10.9.1", @@ -3333,9 +3333,9 @@ } }, "node_modules/globals": { - "version": "16.5.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-16.5.0.tgz", - "integrity": "sha512-c/c15i26VrJ4IRt5Z89DnIzCGDn9EcebibhAOjw5ibqEHsE1wLUgkPn9RDmNcUKyU87GeaL633nyJ+pplFR2ZQ==", + "version": "17.6.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-17.6.0.tgz", + "integrity": "sha512-sepffkT8stwnIYbsMBpoCHJuJM5l98FUF2AnE07hfvE0m/qp3R586hw4jF4uadbhvg1ooIdzuu7CsfD2jzCaNA==", "dev": true, "license": "MIT", "engines": { diff --git a/package.json b/package.json index 35fae5970f9d..66577cdcd712 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "eslint-import-resolver-typescript": "^4.4.4", "eslint-plugin-import": "^2.28.1", "eslint-plugin-prettier": "^5.0.0", - "globals": "^16.1.0", + "globals": "^17.6.0", "prettier": "3.8.3", "prettier-plugin-sh": "^0.18.0", "ts-node": "^10.9.1", From f7663cc34cff80078ba1cbb8444fa00706812bdf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Jun 2026 09:02:59 -0800 Subject: [PATCH 455/497] chore: bump codecov/codecov-action from 5.5.4 to 6.0.1 (#7833) --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index b64c12359b4c..d92a46da632b 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -144,7 +144,7 @@ jobs: test/package-lock.json - run: SKIP_SUBMODULE_DEPS=1 npm ci - run: npm run test:unit - - uses: codecov/codecov-action@75cd11691c0faa626561e295848008c8a7dddffe # v5 + - uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1 if: success() with: token: ${{ secrets.CODECOV_TOKEN }} From 7393d50b09921e8d19d52909d162563b9235869b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Jun 2026 09:03:28 -0800 Subject: [PATCH 456/497] chore: bump awalsh128/cache-apt-pkgs-action from 1.5.3 to 1.6.0 (#7832) --- .github/workflows/build.yaml | 2 +- .github/workflows/release.yaml | 2 +- .github/workflows/update.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index d92a46da632b..e097e49ee3f7 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -163,7 +163,7 @@ jobs: steps: - run: sudo apt update && sudo apt install -y libkrb5-dev - - uses: awalsh128/cache-apt-pkgs-action@2c09a5e66da6c8016428a2172bd76e5e4f14bb17 # latest + - uses: awalsh128/cache-apt-pkgs-action@acb598e5ddbc6f68a970c5da0688d2f3a9f04d05 # latest with: packages: quilt version: 1.0 diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 31589fa7ffa5..59bf79cbc968 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -59,7 +59,7 @@ jobs: steps: - run: sudo apt update && sudo apt install -y libkrb5-dev - - uses: awalsh128/cache-apt-pkgs-action@2c09a5e66da6c8016428a2172bd76e5e4f14bb17 # latest + - uses: awalsh128/cache-apt-pkgs-action@acb598e5ddbc6f68a970c5da0688d2f3a9f04d05 # latest with: packages: quilt version: 1.0 diff --git a/.github/workflows/update.yaml b/.github/workflows/update.yaml index 3ea12c5d9e07..48753ca2fa52 100644 --- a/.github/workflows/update.yaml +++ b/.github/workflows/update.yaml @@ -47,7 +47,7 @@ jobs: echo done=false >> $GITHUB_OUTPUT fi - - uses: awalsh128/cache-apt-pkgs-action@2c09a5e66da6c8016428a2172bd76e5e4f14bb17 # latest + - uses: awalsh128/cache-apt-pkgs-action@acb598e5ddbc6f68a970c5da0688d2f3a9f04d05 # latest if: steps.check.outputs.done == 'false' with: packages: quilt From 53ed1e30d2a8b9b4c8dee3a3664060fa8ba60873 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Jun 2026 09:04:01 -0800 Subject: [PATCH 457/497] chore: bump docker/setup-qemu-action from 4.0.0 to 4.1.0 (#7830) --- .github/workflows/publish.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 64355ee0dcd8..c1ecbacf5d90 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -109,7 +109,7 @@ jobs: echo "VERSION=${TAG#v}" >> $GITHUB_ENV - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 - - uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4.0.0 + - uses: docker/setup-qemu-action@06116385d9baf250c9f4dcb4858b16962ea869c3 # v4.1.0 - uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0 - uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0 From 24811a62698a30c81bf03cc90043fc4d1c64ca61 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Jun 2026 17:16:41 +0000 Subject: [PATCH 458/497] chore: bump docker/setup-buildx-action from 4.0.0 to 4.1.0 (#7829) --- .github/workflows/publish.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index c1ecbacf5d90..c72ec1bd88ce 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -110,7 +110,7 @@ jobs: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 - uses: docker/setup-qemu-action@06116385d9baf250c9f4dcb4858b16962ea869c3 # v4.1.0 - - uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0 + - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0 - uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0 with: From a056406effc29b1562ddbdd92ee1521d150444cc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Jun 2026 17:35:17 +0000 Subject: [PATCH 459/497] chore: bump form-data in /test (#7848) --- test/package-lock.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/test/package-lock.json b/test/package-lock.json index 171c8d085db8..56b2e683ad84 100644 --- a/test/package-lock.json +++ b/test/package-lock.json @@ -2336,17 +2336,17 @@ } }, "node_modules/form-data": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz", - "integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==", + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.6.tgz", + "integrity": "sha512-vKatAh4SlVfgbv+YtmhiRjhEMJsYpsG1Y2rMQtR+SVSbytsSD1YGzDIcrAJmdFec88u/+VoGmxnl+80gL1tRCQ==", "dev": true, "license": "MIT", "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", "es-set-tostringtag": "^2.1.0", - "hasown": "^2.0.2", - "mime-types": "^2.1.12" + "hasown": "^2.0.4", + "mime-types": "^2.1.35" }, "engines": { "node": ">= 6" @@ -2561,9 +2561,9 @@ } }, "node_modules/hasown": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", - "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.4.tgz", + "integrity": "sha512-T2UbfbBEF32wiepXIsMlTW9+dDYC6wMh/t/vYA4tuOMKqWz/n3vr1NFSxQiyP+zk2mXsoMA/i/7qV6LKut1t1A==", "dev": true, "license": "MIT", "dependencies": { @@ -3602,16 +3602,16 @@ } }, "node_modules/jsdom/node_modules/form-data": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.4.tgz", - "integrity": "sha512-f0cRzm6dkyVYV3nPoooP8XlccPQukegwhAnpoLcXy+X+A8KfpGOoXwDr9FLZd3wzgLaBGQBE3lY93Zm/i1JvIQ==", + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.5.tgz", + "integrity": "sha512-j23EibVLnp4zNXGW7LjryXYa2X6U/M96yoOX+ybZxwkYajdxRNEqYY3zhh7y0i6kfISKS2jr+EJq1YTUDEv5+w==", "dev": true, "license": "MIT", "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", "es-set-tostringtag": "^2.1.0", - "hasown": "^2.0.2", + "hasown": "^2.0.4", "mime-types": "^2.1.35" }, "engines": { From 87ac56bf8c29fd091d2512d4321eb06aa9d3a734 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Jun 2026 09:37:41 -0800 Subject: [PATCH 460/497] chore: bump softprops/action-gh-release from 1 to 3 (#7774) --- .github/workflows/release.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 59bf79cbc968..9a1774fde86d 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -110,7 +110,7 @@ jobs: - run: | sed "/^## Unreleased/,/^## / ! d" CHANGELOG.md | head -n -2 | tail -n +3 > .cache/release-notes if: ${{ matrix.vscode_arch == 'x64' }} - - uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844 # v1 + - uses: softprops/action-gh-release@b4309332981a82ec1c5618f44dd2e27cc8bfbfda # v3.0.0 if: ${{ matrix.vscode_arch == 'x64' }} with: draft: true @@ -123,7 +123,7 @@ jobs: # Platform-specific release. - run: KEEP_MODULES=1 npm run release - run: npm run package - - uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844 # v1 + - uses: softprops/action-gh-release@b4309332981a82ec1c5618f44dd2e27cc8bfbfda # v3.0.0 with: draft: true discussion_category_name: "📣 Announcements" @@ -189,7 +189,7 @@ jobs: - run: npm run test:native - run: npm run package - - uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844 # v1 + - uses: softprops/action-gh-release@b4309332981a82ec1c5618f44dd2e27cc8bfbfda # v3.0.0 with: draft: true discussion_category_name: "📣 Announcements" From 5dca609c2a99a604cd2f9fb568eac68666a797ab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Jun 2026 09:38:09 -0800 Subject: [PATCH 461/497] chore: bump i18next from 25.8.13 to 26.3.1 (#7828) --- package-lock.json | 28 ++++++++-------------------- package.json | 2 +- src/node/i18n/index.ts | 1 - 3 files changed, 9 insertions(+), 22 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8b65159c4570..b873ca7ef0f8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,7 +19,7 @@ "express": "^5.0.1", "http-proxy": "^1.18.1", "httpolyglot": "^0.1.2", - "i18next": "^25.8.3", + "i18next": "^26.3.1", "js-yaml": "^4.1.0", "limiter": "^2.1.0", "pem": "^1.14.8", @@ -69,15 +69,6 @@ "node": "22" } }, - "node_modules/@babel/runtime": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.6.tgz", - "integrity": "sha512-05WQkdpL9COIMz4LjTxGpPNCdlpyimKppYNoJ5Di5EUObifl8t4tuLuUBBZEpoLYOmfvIWrsp9fCl0HoPRVTdA==", - "license": "MIT", - "engines": { - "node": ">=6.9.0" - } - }, "node_modules/@coder/logger": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/@coder/logger/-/logger-3.0.1.tgz", @@ -3555,29 +3546,26 @@ } }, "node_modules/i18next": { - "version": "25.8.13", - "resolved": "https://registry.npmjs.org/i18next/-/i18next-25.8.13.tgz", - "integrity": "sha512-E0vzjBY1yM+nsFrtgkjLhST2NBkirkvOVoQa0MSldhsuZ3jUge7ZNpuwG0Cfc74zwo5ZwRzg3uOgT+McBn32iA==", + "version": "26.3.1", + "resolved": "https://registry.npmjs.org/i18next/-/i18next-26.3.1.tgz", + "integrity": "sha512-txQqd5EULsqEh9OJqRH15aCaOuy/nLJyhw5EHCSKLKJE1aBbb3Zve2+uQIxgWhPm1QqUQoWyQBm2kfmmIrzkcQ==", "funding": [ { "type": "individual", - "url": "https://locize.com" + "url": "https://www.locize.com/i18next" }, { "type": "individual", - "url": "https://locize.com/i18next.html" + "url": "https://www.i18next.com/how-to/faq#i18next-is-awesome.-how-can-i-support-the-project" }, { "type": "individual", - "url": "https://www.i18next.com/how-to/faq#i18next-is-awesome.-how-can-i-support-the-project" + "url": "https://www.locize.com" } ], "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.28.4" - }, "peerDependencies": { - "typescript": "^5" + "typescript": "^5 || ^6" }, "peerDependenciesMeta": { "typescript": { diff --git a/package.json b/package.json index 66577cdcd712..170d7295247d 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "express": "^5.0.1", "http-proxy": "^1.18.1", "httpolyglot": "^0.1.2", - "i18next": "^25.8.3", + "i18next": "^26.3.1", "js-yaml": "^4.1.0", "limiter": "^2.1.0", "pem": "^1.14.8", diff --git a/src/node/i18n/index.ts b/src/node/i18n/index.ts index a7f9f17bccc4..e8186067ba98 100644 --- a/src/node/i18n/index.ts +++ b/src/node/i18n/index.ts @@ -54,7 +54,6 @@ init({ lowerCaseLng: true, debug: process.env.NODE_ENV === "development", resources: defaultResources, - showSupportNotice: false, }) export default i18next From d31d0347cf8c6683553f4d9e4795155dae631fbf Mon Sep 17 00:00:00 2001 From: Asher Date: Tue, 16 Jun 2026 09:43:26 -0800 Subject: [PATCH 462/497] Remove Dependabot commit prefix The changelog is manually curated so the prefixes are noise. --- .github/dependabot.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml index 87513b7cee1d..7cc5663e9f42 100644 --- a/.github/dependabot.yaml +++ b/.github/dependabot.yaml @@ -16,8 +16,6 @@ updates: interval: "monthly" time: "06:00" timezone: "America/Chicago" - commit-message: - prefix: "chore" labels: [] ignore: # Ignore patch updates for all dependencies From 7617ab2b92b3a4d991da1b4b60ac42a6ddaccdd6 Mon Sep 17 00:00:00 2001 From: Asher Date: Tue, 16 Jun 2026 09:42:12 -0800 Subject: [PATCH 463/497] Update AUR commit message to match code-server's --- .github/workflows/publish.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index c72ec1bd88ce..3ab55adacd10 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -93,7 +93,7 @@ jobs: run: | git checkout -b update-version-${{ env.VERSION }} git add . - git commit -m "chore: updating version to ${{ env.VERSION }}" + git commit -m "Update to ${{ env.VERSION }}" git push -u origin $(git branch --show) gh pr create --repo coder/code-server-aur --title "chore: bump version to ${{ env.VERSION }}" --body "PR opened by @$GITHUB_ACTOR" --assignee $GITHUB_ACTOR From 72086edbdb615389d804d04fa8e9e7652fa13237 Mon Sep 17 00:00:00 2001 From: Asher Date: Tue, 16 Jun 2026 09:41:30 -0800 Subject: [PATCH 464/497] Remove Windows npm installation recommendation We need to properly support Windows before we can recommend any method of installation, including npm. --- docs/install.md | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/docs/install.md b/docs/install.md index 30da4d415e77..edd256ba3072 100644 --- a/docs/install.md +++ b/docs/install.md @@ -101,9 +101,8 @@ _exact_ same commands presented in the rest of this document. We recommend installing with `npm` when: 1. You aren't using a machine with `amd64` or `arm64`. -2. You are installing code-server on Windows. -3. You're on Linux with `glibc` < v2.28 or `glibcxx` < v3.4.21. -4. You're running Alpine Linux or are using a non-glibc libc. See +2. You're on Linux with `glibc` < v2.28 or `glibcxx` < v3.4.21. +3. You're running Alpine Linux or are using a non-glibc libc. See [#1430](https://github.com/coder/code-server/issues/1430#issuecomment-629883198) for more information. @@ -296,8 +295,7 @@ You can install code-server using the [Helm package manager](https://coder.com/d ## Windows We currently [do not publish Windows -releases](https://github.com/coder/code-server/issues/1397). We recommend -installing code-server onto Windows with [`npm`](#npm). +releases](https://github.com/coder/code-server/issues/1397). ## Raspberry Pi From 7dfd68589a8757e7e967ebebeb6b72ff9f7015b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?YONGJAE=20LEE=20=28=EC=9D=B4=EC=9A=A9=EC=9E=AC=29?= Date: Wed, 17 Jun 2026 02:58:42 +0900 Subject: [PATCH 465/497] fix: re-enable skipped Heart tests and make non-asserting checks assert (#7845) --- test/e2e/codeServer.test.ts | 2 +- test/e2e/downloads.test.ts | 16 ++++++++-------- test/e2e/extensions.test.ts | 2 +- test/e2e/github.test.ts | 4 ++-- test/e2e/login.test.ts | 15 ++++++++------- test/e2e/uploads.test.ts | 8 ++++---- test/unit/node/heart.test.ts | 5 ++++- 7 files changed, 28 insertions(+), 24 deletions(-) diff --git a/test/e2e/codeServer.test.ts b/test/e2e/codeServer.test.ts index 0e04742ea31a..199298a1495e 100644 --- a/test/e2e/codeServer.test.ts +++ b/test/e2e/codeServer.test.ts @@ -32,7 +32,7 @@ describe("code-server", ["--disable-workspace-trust"], {}, () => { test("should show the Integrated Terminal", async ({ codeServerPage }) => { await codeServerPage.focusTerminal() - expect(await codeServerPage.page.isVisible("#terminal")).toBe(true) + await expect(codeServerPage.page.locator("#terminal")).toBeVisible() }) test("should open a file", async ({ codeServerPage }) => { diff --git a/test/e2e/downloads.test.ts b/test/e2e/downloads.test.ts index 0adcd68ff83d..f08e13b74e0a 100644 --- a/test/e2e/downloads.test.ts +++ b/test/e2e/downloads.test.ts @@ -18,7 +18,7 @@ describe("Downloads (enabled)", ["--disable-workspace-trust"], {}, async () => { // Action await codeServerPage.openContextMenu("text=unique-file.txt") - expect(await codeServerPage.page.isVisible("text=Download...")).toBe(true) + await expect(codeServerPage.page.locator("text=Download...")).toBeVisible() }) test("should see the 'Show Local' button on Save As", async ({ codeServerPage }) => { @@ -37,7 +37,7 @@ describe("Downloads (enabled)", ["--disable-workspace-trust"], {}, async () => { await codeServerPage.page.keyboard.type("Making some edits.") await codeServerPage.navigateMenus(["File", "Save As..."]) await codeServerPage.page.waitForSelector(".quick-input-widget") - expect(await codeServerPage.page.isVisible("text=Show Local")).toBe(true) + await expect(codeServerPage.page.locator("text=Show Local")).toBeVisible() }) test("should see the 'Show Local' button on Save File", async ({ codeServerPage }) => { @@ -46,14 +46,14 @@ describe("Downloads (enabled)", ["--disable-workspace-trust"], {}, async () => { await codeServerPage.waitForTab("Untitled-1") await codeServerPage.navigateMenus(["File", "Save"]) await codeServerPage.page.waitForSelector(".quick-input-widget") - expect(await codeServerPage.page.isVisible("text=Show Local")).toBe(true) + await expect(codeServerPage.page.locator("text=Show Local")).toBeVisible() }) test("should see the 'Show Local' button on Save Workspace As", async ({ codeServerPage }) => { // Action await codeServerPage.navigateMenus(["File", "Save Workspace As..."]) await codeServerPage.page.waitForSelector(".quick-input-widget") - expect(await codeServerPage.page.isVisible("text=Show Local")).toBe(true) + await expect(codeServerPage.page.locator("text=Show Local")).toBeVisible() }) }) @@ -72,7 +72,7 @@ describe("Downloads (disabled)", ["--disable-workspace-trust", "--disable-file-d // Action await codeServerPage.openContextMenu("text=unique-file.txt") - expect(await codeServerPage.page.isVisible("text=Download...")).toBe(false) + await expect(codeServerPage.page.locator("text=Download...")).not.toBeVisible() }) test("should not see the 'Show Local' button on Save as", async ({ codeServerPage }) => { @@ -87,7 +87,7 @@ describe("Downloads (disabled)", ["--disable-workspace-trust", "--disable-file-d await codeServerPage.openFile(fileName) await codeServerPage.page.click(".tab") await codeServerPage.navigateMenus(["File", "Save As..."]) - expect(await codeServerPage.page.isVisible("text=Show Local")).toBe(false) + await expect(codeServerPage.page.locator("text=Show Local")).not.toBeVisible() }) test("should not see the 'Show Local' button on Save File", async ({ codeServerPage }) => { @@ -96,13 +96,13 @@ describe("Downloads (disabled)", ["--disable-workspace-trust", "--disable-file-d await codeServerPage.waitForTab("Untitled-1") await codeServerPage.navigateMenus(["File", "Save"]) await codeServerPage.page.waitForSelector(".quick-input-widget") - expect(await codeServerPage.page.isVisible("text=Show Local")).toBe(false) + await expect(codeServerPage.page.locator("text=Show Local")).not.toBeVisible() }) test("should not see the 'Show Local' button on Save Workspace As", async ({ codeServerPage }) => { // Action await codeServerPage.navigateMenus(["File", "Save Workspace As..."]) await codeServerPage.page.waitForSelector(".quick-input-widget") - expect(await codeServerPage.page.isVisible("text=Show Local")).toBe(false) + await expect(codeServerPage.page.locator("text=Show Local")).not.toBeVisible() }) }) diff --git a/test/e2e/extensions.test.ts b/test/e2e/extensions.test.ts index ac56fcfec059..9861e0004e7b 100644 --- a/test/e2e/extensions.test.ts +++ b/test/e2e/extensions.test.ts @@ -13,7 +13,7 @@ function runTestExtensionTests() { // Remove end slash in address. const normalizedAddress = address.replace(/\/+$/, "") - await codeServerPage.page.getByText(`Info: proxyUri: ${normalizedAddress}/proxy/{{port}}/`) + await expect(codeServerPage.page.getByText(`Info: proxyUri: ${normalizedAddress}/proxy/{{port}}/`)).toBeVisible() }) } diff --git a/test/e2e/github.test.ts b/test/e2e/github.test.ts index 403d3161a208..aa45886bd1f6 100644 --- a/test/e2e/github.test.ts +++ b/test/e2e/github.test.ts @@ -12,7 +12,7 @@ if (process.env.GITHUB_TOKEN) { await codeServerPage.page.click("text=Allow") // It should ask to select an account, one of which will be the one we // pre-injected. - expect(await codeServerPage.page.isVisible("text=Select an account")).toBe(false) + await expect(codeServerPage.page.locator("text=Select an account")).not.toBeVisible() }) }) @@ -26,7 +26,7 @@ if (process.env.GITHUB_TOKEN) { await codeServerPage.page.click("text=Allow") // Since there is no account it will ask directly for the token (because // we are on localhost; otherwise it would initiate the oauth flow). - expect(await codeServerPage.page.isVisible("text=GitHub Personal Access Token")).toBe(false) + await expect(codeServerPage.page.locator("text=GitHub Personal Access Token")).not.toBeVisible() }) }) } else { diff --git a/test/e2e/login.test.ts b/test/e2e/login.test.ts index 90ec1b8cdef9..2ce9ce8e8035 100644 --- a/test/e2e/login.test.ts +++ b/test/e2e/login.test.ts @@ -24,8 +24,8 @@ describe("login", ["--disable-workspace-trust", "--auth", "password"], {}, () => // Skip entering password // Click the submit button and login await codeServerPage.page.click(".submit") - await codeServerPage.page.waitForLoadState("networkidle") - expect(await codeServerPage.page.isVisible("text=Missing password")) + // The required input blocks empty submits, so the server-side error can't render. + await expect(codeServerPage.page.locator("input.password:invalid")).toBeVisible() }) test("should see an error message for incorrect password", async ({ codeServerPage }) => { @@ -34,28 +34,29 @@ describe("login", ["--disable-workspace-trust", "--auth", "password"], {}, () => // Click the submit button and login await codeServerPage.page.click(".submit") await codeServerPage.page.waitForLoadState("networkidle") - expect(await codeServerPage.page.isVisible("text=Incorrect password")) + await expect(codeServerPage.page.locator("text=Incorrect password")).toBeVisible() }) test("should hit the rate limiter for too many unsuccessful logins", async ({ codeServerPage }) => { - // Type in password - await codeServerPage.page.fill(".password", "password123") + test.slow() // Click the submit button and login // The current RateLimiter allows 2 logins per minute plus // 12 logins per hour for a total of 14 // See: src/node/routes/login.ts for (let i = 1; i <= 14; i++) { + await codeServerPage.page.fill(".password", "password123") await codeServerPage.page.click(".submit") await codeServerPage.page.waitForLoadState("networkidle") // We double-check that the correct error message shows // which should be for incorrect password - expect(await codeServerPage.page.isVisible("text=Incorrect password")) + await expect(codeServerPage.page.locator("text=Incorrect password")).toBeVisible() } // The 15th should fail for a different reason: // login rate + await codeServerPage.page.fill(".password", "password123") await codeServerPage.page.click(".submit") await codeServerPage.page.waitForLoadState("networkidle") - expect(await codeServerPage.page.isVisible("text=Login rate limited!")) + await expect(codeServerPage.page.locator("text=Login rate limited!")).toBeVisible() }) }) diff --git a/test/e2e/uploads.test.ts b/test/e2e/uploads.test.ts index 80df808a44e4..05bb9ffd98a3 100644 --- a/test/e2e/uploads.test.ts +++ b/test/e2e/uploads.test.ts @@ -18,14 +18,14 @@ describe("Uploads (enabled)", ["--disable-workspace-trust"], {}, () => { // Action await codeServerPage.openContextMenu('span:has-text("test-directory")') - expect(await codeServerPage.page.isVisible("text=Upload...")).toBe(true) + await expect(codeServerPage.page.locator("text=Upload...")).toBeVisible() }) test("should see the 'Show Local' button on Open File", async ({ codeServerPage }) => { // Action await codeServerPage.navigateMenus(["File", "Open File..."]) await codeServerPage.page.waitForSelector(".quick-input-widget") - expect(await codeServerPage.page.isVisible("text=Show Local")).toBe(true) + await expect(codeServerPage.page.locator("text=Show Local")).toBeVisible() }) }) @@ -44,13 +44,13 @@ describe("Uploads (disabled)", ["--disable-workspace-trust", "--disable-file-upl // Action await codeServerPage.openContextMenu('span:has-text("test-directory")') - expect(await codeServerPage.page.isVisible("text=Upload...")).toBe(false) + await expect(codeServerPage.page.locator("text=Upload...")).not.toBeVisible() }) test("should not see the 'Show Local' button on Open File", async ({ codeServerPage }) => { // Action await codeServerPage.navigateMenus(["File", "Open File..."]) await codeServerPage.page.waitForSelector(".quick-input-widget") - expect(await codeServerPage.page.isVisible("text=Show Local")).toBe(false) + await expect(codeServerPage.page.locator("text=Show Local")).not.toBeVisible() }) }) diff --git a/test/unit/node/heart.test.ts b/test/unit/node/heart.test.ts index 7ad0d21752f2..e7c7b166ca11 100644 --- a/test/unit/node/heart.test.ts +++ b/test/unit/node/heart.test.ts @@ -115,6 +115,9 @@ describe("heartbeatTimer", () => { const heart = new Heart(`${testDir}/shutdown.txt`, mockIsActive) await heart.beat() jest.advanceTimersByTime(60 * 1000) + // Yield a real macrotask so the callback's rejection handler can run first + // (fake timers stub the global setImmediate). + await new Promise((resolve) => jest.requireActual("timers").setImmediate(resolve)) expect(mockIsActive).toHaveBeenCalled() expect(logger.warn).toHaveBeenCalledWith(errorMsg) @@ -147,7 +150,7 @@ describe("stateChange", () => { expect(mockOnChange.mock.calls[0][0]).toBe("alive") }) - it.only("should change to expired when not active", async () => { + it("should change to expired when not active", async () => { jest.useFakeTimers() heart = new Heart(`${testDir}/shutdown.txt`, () => new Promise((resolve) => resolve(false))) const mockOnChange = jest.fn() From e1c839fb1d9ce641919ffb8ea8afd8ac2cc62a0c Mon Sep 17 00:00:00 2001 From: Asher Date: Tue, 16 Jun 2026 11:23:29 -0800 Subject: [PATCH 466/497] Slightly improve heart tests - Get rid of the global isActive mock; in particular the way it shadows local ones seemed sketchy. - No need for requireActual from my testing. - Reword the comment for why we need setImmediate. - Add the setImmediate to another test that seemed to only pass because of an await on the timer call which is not actually a promise but had the side effect of yielding. - Always set fake/real timers in the before/after handlers and never in individual tests. --- test/unit/node/heart.test.ts | 79 +++++++++++++++++++++++------------- 1 file changed, 51 insertions(+), 28 deletions(-) diff --git a/test/unit/node/heart.test.ts b/test/unit/node/heart.test.ts index e7c7b166ca11..85b1945e3760 100644 --- a/test/unit/node/heart.test.ts +++ b/test/unit/node/heart.test.ts @@ -1,10 +1,9 @@ import { logger } from "@coder/logger" import { readFile, writeFile, stat, utimes } from "fs/promises" +import { setImmediate } from "timers" import { Heart } from "../../../src/node/heart" import { clean, mockLogger, tmpdir } from "../../utils/helpers" -const mockIsActive = (resolveTo: boolean) => jest.fn().mockResolvedValue(resolveTo) - describe("Heart", () => { const testName = "heartTests" let testDir = "" @@ -15,12 +14,15 @@ describe("Heart", () => { await clean(testName) testDir = await tmpdir(testName) }) - beforeEach(() => { - heart = new Heart(`${testDir}/shutdown.txt`, mockIsActive(true)) - }) + afterAll(() => { jest.restoreAllMocks() }) + + beforeEach(() => { + heart = new Heart(`${testDir}/shutdown.txt`, jest.fn().mockResolvedValue(true)) + }) + afterEach(() => { jest.resetAllMocks() jest.useRealTimers() @@ -28,6 +30,7 @@ describe("Heart", () => { heart.dispose() } }) + it("should write to a file when given a valid file path", async () => { // Set up heartbeat file with contents const text = "test" @@ -42,7 +45,7 @@ describe("Heart", () => { expect(fileContents).toBe(text) - heart = new Heart(pathToFile, mockIsActive(true)) + heart = new Heart(pathToFile, jest.fn().mockResolvedValue(true)) await heart.beat() // Check that the heart wrote to the heartbeatFilePath and overwrote our text const fileContentsAfterBeat = await readFile(pathToFile, { encoding: "utf8" }) @@ -51,31 +54,30 @@ describe("Heart", () => { const fileStatusAfterEdit = await stat(pathToFile) expect(fileStatusAfterEdit.mtimeMs).toBeGreaterThan(0) }) + it("should log a warning when given an invalid file path", async () => { - heart = new Heart(`fakeDir/fake.txt`, mockIsActive(false)) + heart = new Heart(`fakeDir/fake.txt`, jest.fn().mockResolvedValue(false)) await heart.beat() expect(logger.warn).toHaveBeenCalled() }) + it("should be active after calling beat", async () => { await heart.beat() const isAlive = heart.alive() expect(isAlive).toBe(true) }) + it("should not be active after dispose is called", () => { heart.dispose() const isAlive = heart.alive() expect(isAlive).toBe(false) }) + it("should beat twice without warnings", async () => { - // Use fake timers so we can speed up setTimeout - jest.useFakeTimers() - heart = new Heart(`${testDir}/hello.txt`, mockIsActive(true)) + heart = new Heart(`${testDir}/hello.txt`, jest.fn().mockResolvedValue(true)) await heart.beat() - // we need to speed up clocks, timeouts - // call heartbeat again (and it won't be alive I think) - // then assert no warnings were called jest.runAllTimers() expect(logger.warn).not.toHaveBeenCalled() }) @@ -84,43 +86,48 @@ describe("Heart", () => { describe("heartbeatTimer", () => { const testName = "heartbeatTimer" let testDir = "" + beforeAll(async () => { await clean(testName) testDir = await tmpdir(testName) mockLogger() }) + afterAll(() => { jest.restoreAllMocks() }) + beforeEach(() => { jest.useFakeTimers() }) + afterEach(() => { jest.resetAllMocks() jest.clearAllTimers() jest.useRealTimers() }) + it("should call isActive when timeout expires", async () => { - const isActive = true - const mockIsActive = jest.fn().mockResolvedValue(isActive) + const mockIsActive = jest.fn().mockResolvedValue(true) const heart = new Heart(`${testDir}/shutdown.txt`, mockIsActive) await heart.beat() jest.advanceTimersByTime(60 * 1000) expect(mockIsActive).toHaveBeenCalled() }) + it("should log a warning when isActive rejects", async () => { - const errorMsg = "oh no" - const error = new Error(errorMsg) + const error = new Error("oh no") const mockIsActive = jest.fn().mockRejectedValue(error) const heart = new Heart(`${testDir}/shutdown.txt`, mockIsActive) await heart.beat() jest.advanceTimersByTime(60 * 1000) - // Yield a real macrotask so the callback's rejection handler can run first - // (fake timers stub the global setImmediate). - await new Promise((resolve) => jest.requireActual("timers").setImmediate(resolve)) - expect(mockIsActive).toHaveBeenCalled() - expect(logger.warn).toHaveBeenCalledWith(errorMsg) + + // The timer callback waits on mockIsActive, so we need to yield to let the + // callback finish. + await new Promise((resolve) => setImmediate(resolve)) + + expect(logger.warn).toHaveBeenCalledWith(error.message) }) }) @@ -128,38 +135,54 @@ describe("stateChange", () => { const testName = "stateChange" let testDir = "" let heart: Heart + beforeAll(async () => { await clean(testName) testDir = await tmpdir(testName) mockLogger() }) + afterAll(() => { jest.restoreAllMocks() }) + + beforeEach(() => { + jest.useFakeTimers() + }) + afterEach(() => { jest.resetAllMocks() + jest.useRealTimers() if (heart) { heart.dispose() } }) + it("should change to alive after a beat", async () => { - heart = new Heart(`${testDir}/shutdown.txt`, mockIsActive(true)) + const mockIsActive = jest.fn().mockResolvedValue(true) + heart = new Heart(`${testDir}/shutdown.txt`, mockIsActive) const mockOnChange = jest.fn() heart.onChange(mockOnChange) + await heart.beat() expect(mockOnChange.mock.calls[0][0]).toBe("alive") }) + it("should change to expired when not active", async () => { - jest.useFakeTimers() - heart = new Heart(`${testDir}/shutdown.txt`, () => new Promise((resolve) => resolve(false))) + const mockIsActive = jest.fn().mockResolvedValue(false) + heart = new Heart(`${testDir}/shutdown.txt`, mockIsActive) const mockOnChange = jest.fn() heart.onChange(mockOnChange) + await heart.beat() + jest.advanceTimersByTime(60 * 1000) + expect(mockIsActive).toHaveBeenCalled() + + // The timer callback waits on the isActive promise, so we need to yield to + // let the callback finish. + await new Promise((resolve) => setImmediate(resolve)) - await jest.advanceTimersByTime(60 * 1000) expect(mockOnChange.mock.calls[1][0]).toBe("expired") - jest.clearAllTimers() - jest.useRealTimers() }) }) From 25e847dc9424252c2172afd259135018d0f014c2 Mon Sep 17 00:00:00 2001 From: Asher Date: Tue, 16 Jun 2026 11:33:33 -0800 Subject: [PATCH 467/497] Update Playwright --- test/package-lock.json | 73 ++++++++---------------------------------- test/package.json | 4 +-- 2 files changed, 15 insertions(+), 62 deletions(-) diff --git a/test/package-lock.json b/test/package-lock.json index 56b2e683ad84..422c6c393fa4 100644 --- a/test/package-lock.json +++ b/test/package-lock.json @@ -7,7 +7,7 @@ "license": "MIT", "devDependencies": { "@jest-mock/express": "^1.4.5", - "@playwright/test": "^1.56.1", + "@playwright/test": "^1.61.0", "@types/jest": "^27.0.2", "@types/jsdom": "^16.2.13", "@types/node-fetch": "^2.5.8", @@ -18,7 +18,7 @@ "jest-fetch-mock": "^3.0.3", "jsdom": "^16.4.0", "node-fetch": "^2.6.7", - "playwright": "^1.59.1", + "playwright": "^1.61.0", "ts-jest": "^27.0.7", "wtfnode": "^0.9.1" } @@ -998,13 +998,13 @@ } }, "node_modules/@playwright/test": { - "version": "1.56.1", - "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.56.1.tgz", - "integrity": "sha512-vSMYtL/zOcFpvJCW71Q/OEGQb7KYBPAdKh35WNSkaZA75JlAO8ED8UN6GUNTm3drWomcbcqRPFqQbLae8yBTdg==", + "version": "1.61.0", + "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.61.0.tgz", + "integrity": "sha512-cKA5B6lpFEMyMGjxF54QihfYpB4FkEGH+qZhtArDEG+wezQAJY8Pq6C7T1SjWz+FFzt3TbyoXBQYk/0292TdJA==", "dev": true, "license": "Apache-2.0", "dependencies": { - "playwright": "1.56.1" + "playwright": "1.61.0" }, "bin": { "playwright": "cli.js" @@ -1013,53 +1013,6 @@ "node": ">=18" } }, - "node_modules/@playwright/test/node_modules/fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", - "dev": true, - "hasInstallScript": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" - } - }, - "node_modules/@playwright/test/node_modules/playwright": { - "version": "1.56.1", - "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.56.1.tgz", - "integrity": "sha512-aFi5B0WovBHTEvpM3DzXTUaeN6eN0qWnTkKx4NQaH4Wvcmc153PdaY2UBdSYKaGYw+UyWXSVyxDUg5DoPEttjw==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "playwright-core": "1.56.1" - }, - "bin": { - "playwright": "cli.js" - }, - "engines": { - "node": ">=18" - }, - "optionalDependencies": { - "fsevents": "2.3.2" - } - }, - "node_modules/@playwright/test/node_modules/playwright-core": { - "version": "1.56.1", - "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.56.1.tgz", - "integrity": "sha512-hutraynyn31F+Bifme+Ps9Vq59hKuUCz7H1kDOcBs+2oGguKkWTU50bBWrtz34OUWmIwpBTWDxaRPXrIXkgvmQ==", - "dev": true, - "license": "Apache-2.0", - "bin": { - "playwright-core": "cli.js" - }, - "engines": { - "node": ">=18" - } - }, "node_modules/@sinonjs/commons": { "version": "1.8.6", "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz", @@ -4114,13 +4067,13 @@ } }, "node_modules/playwright": { - "version": "1.59.1", - "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.59.1.tgz", - "integrity": "sha512-C8oWjPR3F81yljW9o5OxcWzfh6avkVwDD2VYdwIGqTkl+OGFISgypqzfu7dOe4QNLL2aqcWBmI3PMtLIK233lw==", + "version": "1.61.0", + "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.61.0.tgz", + "integrity": "sha512-Z+7BeeqQPRRzklHsVFP4KTGIyMxKUmfeRA4WisM6G3/XW6nwGeX6fX9qYaDa+CiUqpOkb2f6X3nar05R3kSuJQ==", "dev": true, "license": "Apache-2.0", "dependencies": { - "playwright-core": "1.59.1" + "playwright-core": "1.61.0" }, "bin": { "playwright": "cli.js" @@ -4133,9 +4086,9 @@ } }, "node_modules/playwright-core": { - "version": "1.59.1", - "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.59.1.tgz", - "integrity": "sha512-HBV/RJg81z5BiiZ9yPzIiClYV/QMsDCKUyogwH9p3MCP6IYjUFu/MActgYAvK0oWyV9NlwM3GLBjADyWgydVyg==", + "version": "1.61.0", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.61.0.tgz", + "integrity": "sha512-caX7TrY3Ml6egyDX0WUcTHDxodl/b51y5wJOdCEA36QviK/s2g081hvmGs8eaE3DWb6NYZQ6BjO/QkNRPenoPA==", "dev": true, "license": "Apache-2.0", "bin": { diff --git a/test/package.json b/test/package.json index 508876c785f2..46ae308fda52 100644 --- a/test/package.json +++ b/test/package.json @@ -3,7 +3,7 @@ "#": "We must put jest in a sub-directory otherwise VS Code somehow picks up the types and generates conflicts with mocha.", "devDependencies": { "@jest-mock/express": "^1.4.5", - "@playwright/test": "^1.56.1", + "@playwright/test": "^1.61.0", "@types/jest": "^27.0.2", "@types/jsdom": "^16.2.13", "@types/node-fetch": "^2.5.8", @@ -14,7 +14,7 @@ "jest-fetch-mock": "^3.0.3", "jsdom": "^16.4.0", "node-fetch": "^2.6.7", - "playwright": "^1.59.1", + "playwright": "^1.61.0", "ts-jest": "^27.0.7", "wtfnode": "^0.9.1" }, From a7f457046f3d83cd4ef6b376cdf92480af2547a7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Jun 2026 11:51:19 -0800 Subject: [PATCH 468/497] Bump actions/checkout from 6.0.2 to 6.0.3 (#7852) --- .github/workflows/build.yaml | 20 ++++++++++---------- .github/workflows/installer.yaml | 6 +++--- .github/workflows/publish.yaml | 8 ++++---- .github/workflows/release.yaml | 4 ++-- .github/workflows/scripts.yaml | 4 ++-- .github/workflows/security.yaml | 6 +++--- .github/workflows/trivy-docker.yaml | 2 +- .github/workflows/update.yaml | 2 +- 8 files changed, 26 insertions(+), 26 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index e097e49ee3f7..b45473942e09 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -25,7 +25,7 @@ jobs: docs: ${{ steps.filter.outputs.docs }} helm: ${{ steps.filter.outputs.helm }} steps: - - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 - uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1 id: filter with: @@ -55,7 +55,7 @@ jobs: name: Run prettier check runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6 with: node-version-file: .node-version @@ -72,7 +72,7 @@ jobs: needs: changes if: needs.changes.outputs.docs == 'true' steps: - - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6 with: node-version-file: .node-version @@ -89,7 +89,7 @@ jobs: needs: changes if: needs.changes.outputs.helm == 'true' steps: - - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 - uses: azure/setup-helm@dda3372f752e03dde6b3237bc9431cdc2f7a02a2 # v5.0.0 with: token: ${{ secrets.GITHUB_TOKEN }} @@ -103,7 +103,7 @@ jobs: needs: changes if: needs.changes.outputs.code == 'true' steps: - - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6 with: node-version-file: .node-version @@ -121,7 +121,7 @@ jobs: if: needs.changes.outputs.ci == 'true' steps: - name: Checkout repo - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 - name: Check workflow files run: | bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash) 1.7.9 @@ -134,7 +134,7 @@ jobs: needs: changes if: needs.changes.outputs.code == 'true' steps: - - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6 with: node-version-file: .node-version @@ -168,7 +168,7 @@ jobs: packages: quilt version: 1.0 - - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 with: submodules: true - run: quilt push -a @@ -219,7 +219,7 @@ jobs: if: needs.changes.outputs.code == 'true' || needs.changes.outputs.deps == 'true' || needs.changes.outputs.ci == 'true' steps: - - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6 with: node-version-file: .node-version @@ -269,7 +269,7 @@ jobs: mkdir -p ~/.cache/caddy tar -xzf caddy_2.5.2_linux_amd64.tar.gz --directory ~/.cache/caddy - - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6 with: node-version-file: .node-version diff --git a/.github/workflows/installer.yaml b/.github/workflows/installer.yaml index a77a5fd61919..9b4ab9018ff1 100644 --- a/.github/workflows/installer.yaml +++ b/.github/workflows/installer.yaml @@ -30,7 +30,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repo - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 - name: Install code-server run: ./install.sh @@ -44,7 +44,7 @@ jobs: container: "alpine:3.17" steps: - name: Checkout repo - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 - name: Install curl run: apk add curl @@ -67,7 +67,7 @@ jobs: steps: - name: Checkout repo - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 - name: Install code-server run: ./install.sh diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 3ab55adacd10..37b4747aa7d9 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -33,7 +33,7 @@ jobs: run: | echo "VERSION=${TAG#v}" >> $GITHUB_ENV - - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6 with: node-version-file: .node-version @@ -64,7 +64,7 @@ jobs: echo "VERSION=${TAG#v}" >> $GITHUB_ENV - name: Checkout code-server-aur repo - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 with: repository: "cdrci/code-server-aur" token: ${{ secrets.HOMEBREW_GITHUB_API_TOKEN }} @@ -108,7 +108,7 @@ jobs: run: | echo "VERSION=${TAG#v}" >> $GITHUB_ENV - - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 - uses: docker/setup-qemu-action@06116385d9baf250c9f4dcb4858b16962ea869c3 # v4.1.0 - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0 @@ -149,7 +149,7 @@ jobs: run: | echo "VERSION=${TAG#v}" >> $GITHUB_ENV - - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 - run: ./ci/build/update-repo.sh diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 9a1774fde86d..2ed2ca1f95d1 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -76,7 +76,7 @@ jobs: version=4${version:1} echo "VERSION=$version" >> $GITHUB_ENV - - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 with: submodules: true - run: quilt push -a @@ -170,7 +170,7 @@ jobs: version=4${version:1} echo "VERSION=$version" >> $GITHUB_ENV - - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 with: submodules: true - run: quilt push -a diff --git a/.github/workflows/scripts.yaml b/.github/workflows/scripts.yaml index 4ebef47ea875..1c671c48fa90 100644 --- a/.github/workflows/scripts.yaml +++ b/.github/workflows/scripts.yaml @@ -41,7 +41,7 @@ jobs: container: "alpine:3.17" steps: - name: Checkout repo - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 - name: Install test utilities run: apk add bats checkbashisms @@ -58,7 +58,7 @@ jobs: timeout-minutes: 5 steps: - name: Checkout repo - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 - name: Install lint utilities run: sudo apt install shellcheck diff --git a/.github/workflows/security.yaml b/.github/workflows/security.yaml index ba4bcbba5da1..c47695e0bb4a 100644 --- a/.github/workflows/security.yaml +++ b/.github/workflows/security.yaml @@ -25,7 +25,7 @@ jobs: timeout-minutes: 15 steps: - name: Checkout repo - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 with: fetch-depth: 0 @@ -46,7 +46,7 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Checkout repo - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 with: fetch-depth: 0 @@ -76,7 +76,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/trivy-docker.yaml b/.github/workflows/trivy-docker.yaml index 98a8d8c4063f..0153229ac4fc 100644 --- a/.github/workflows/trivy-docker.yaml +++ b/.github/workflows/trivy-docker.yaml @@ -46,7 +46,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 - name: Run Trivy vulnerability scanner in image mode uses: aquasecurity/trivy-action@314ff8b43182423b84c50b1670b0e10f858f2d98 # latest diff --git a/.github/workflows/update.yaml b/.github/workflows/update.yaml index 48753ca2fa52..2c09920336fe 100644 --- a/.github/workflows/update.yaml +++ b/.github/workflows/update.yaml @@ -28,7 +28,7 @@ jobs: run: | echo "VERSION=${TAG#v}" >> $GITHUB_ENV - - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 with: submodules: true From a59c3ab99026e61031cab95e3c476d4e38395f34 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Jun 2026 11:51:47 -0800 Subject: [PATCH 469/497] Bump github/codeql-action from 4.35.4 to 4.36.2 (#7860) --- .github/workflows/security.yaml | 8 ++++---- .github/workflows/trivy-docker.yaml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/security.yaml b/.github/workflows/security.yaml index c47695e0bb4a..7671a094e6d5 100644 --- a/.github/workflows/security.yaml +++ b/.github/workflows/security.yaml @@ -62,7 +62,7 @@ jobs: severity: "HIGH,CRITICAL" - name: Upload Trivy scan results to GitHub Security tab - uses: github/codeql-action/upload-sarif@68bde559dea0fdcac2102bfdf6230c5f70eb485e # v4 + uses: github/codeql-action/upload-sarif@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4 with: sarif_file: "trivy-repo-results.sarif" @@ -80,13 +80,13 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@68bde559dea0fdcac2102bfdf6230c5f70eb485e # v4 + uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4 with: config-file: ./.github/codeql-config.yml languages: javascript - name: Autobuild - uses: github/codeql-action/autobuild@68bde559dea0fdcac2102bfdf6230c5f70eb485e # v4 + uses: github/codeql-action/autobuild@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@68bde559dea0fdcac2102bfdf6230c5f70eb485e # v4 + uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4 diff --git a/.github/workflows/trivy-docker.yaml b/.github/workflows/trivy-docker.yaml index 0153229ac4fc..26bf15886948 100644 --- a/.github/workflows/trivy-docker.yaml +++ b/.github/workflows/trivy-docker.yaml @@ -58,6 +58,6 @@ jobs: severity: "HIGH,CRITICAL" - name: Upload Trivy scan results to GitHub Security tab - uses: github/codeql-action/upload-sarif@68bde559dea0fdcac2102bfdf6230c5f70eb485e # v4 + uses: github/codeql-action/upload-sarif@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4 with: sarif_file: "trivy-image-results.sarif" From 4ae1fc202eb25367645423c0e9fcd3804859f887 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Jun 2026 11:52:36 -0800 Subject: [PATCH 470/497] Bump doctoc from 2.3.0 to 2.5.0 (#7858) --- package-lock.json | 142 +++++++++++++++++++++------------------------- 1 file changed, 64 insertions(+), 78 deletions(-) diff --git a/package-lock.json b/package-lock.json index b873ca7ef0f8..e458b23c7647 100644 --- a/package-lock.json +++ b/package-lock.json @@ -446,27 +446,28 @@ "license": "MIT" }, "node_modules/@textlint/ast-node-types": { - "version": "12.6.1", - "resolved": "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-12.6.1.tgz", - "integrity": "sha512-uzlJ+ZsCAyJm+lBi7j0UeBbj+Oy6w/VWoGJ3iHRHE5eZ8Z4iK66mq+PG/spupmbllLtz77OJbY89BYqgFyjXmA==", + "version": "15.7.1", + "resolved": "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-15.7.1.tgz", + "integrity": "sha512-Wii5UgUKFEh9Uv6wbq1zr4/Kf+dtjiUuzPrrXzKp8H+ifkvKNzi23V4Nz+6wVyHQn5T28AFuc8VH8OtzvGYecA==", "dev": true, "license": "MIT" }, "node_modules/@textlint/markdown-to-ast": { - "version": "12.6.1", - "resolved": "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-12.6.1.tgz", - "integrity": "sha512-T0HO+VrU9VbLRiEx/kH4+gwGMHNMIGkp0Pok+p0I33saOOLyhfGvwOKQgvt2qkxzQEV2L5MtGB8EnW4r5d3CqQ==", + "version": "15.7.1", + "resolved": "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-15.7.1.tgz", + "integrity": "sha512-9DLSah7g6mYNHvO6pssLdFvFPAl3HHyEIm4RE5of/1QN9FXJXDgdOcVV3YpQmbYT/YntuIvOQiqOndCSPWTW2A==", "dev": true, "license": "MIT", "dependencies": { - "@textlint/ast-node-types": "^12.6.1", - "debug": "^4.3.4", + "@textlint/ast-node-types": "15.7.1", + "debug": "^4.4.3", "mdast-util-gfm-autolink-literal": "^0.1.3", + "neotraverse": "^0.6.18", "remark-footnotes": "^3.0.0", "remark-frontmatter": "^3.0.0", "remark-gfm": "^1.0.0", "remark-parse": "^9.0.0", - "traverse": "^0.6.7", + "structured-source": "^4.0.0", "unified": "^9.2.2" } }, @@ -1397,9 +1398,9 @@ } }, "node_modules/anchor-markdown-header": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/anchor-markdown-header/-/anchor-markdown-header-0.8.2.tgz", - "integrity": "sha512-ix0Hx6ARkHOsQRmt1++ZmjURq4Pr5MGXQJjh0lQ/l5jTpTURn4aqhbZ+AJMpZ/Sd3JiyNwi7KaeiF64OsMGCPg==", + "version": "0.8.4", + "resolved": "https://registry.npmjs.org/anchor-markdown-header/-/anchor-markdown-header-0.8.4.tgz", + "integrity": "sha512-20eMBMpts7k5rXAAj67geSqc/tsexHZOZJDWQD214YcDuNtyizDa7Q77sYa5rkao2FwsQP1WKRt2X6mphwmhbg==", "dev": true, "license": "MIT", "dependencies": { @@ -1663,6 +1664,13 @@ "url": "https://opencollective.com/express" } }, + "node_modules/boundary": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/boundary/-/boundary-2.0.0.tgz", + "integrity": "sha512-rJKn5ooC9u8q13IMCrW0RSp31pxBCHE3y9V/tp3TdWSLf8Em3p6Di4NBpfzbJge9YjjFEsD0RtFEjtvHL5VyEA==", + "dev": true, + "license": "BSD-2-Clause" + }, "node_modules/brace-expansion": { "version": "1.1.14", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz", @@ -2172,18 +2180,17 @@ } }, "node_modules/doctoc": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/doctoc/-/doctoc-2.3.0.tgz", - "integrity": "sha512-duuDNVnRHE5mFGYlI+oDf1vguML8PIhKnbUCs7iKPHIEdzYhkCldk6MQeX3ZeXQStRtZxGspSHImtgOMQPIS4A==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/doctoc/-/doctoc-2.5.0.tgz", + "integrity": "sha512-xWb2P8mQw9x+T9xPYToytRP0/bA68oexdsY0anMG72RdhZGTVPx6oHJfI57gbZe9LsOSfQUNNLwxSspdoTlJIQ==", "dev": true, "license": "MIT", "dependencies": { - "@textlint/markdown-to-ast": "^12.1.1", - "anchor-markdown-header": "^0.8.2", + "@textlint/markdown-to-ast": "^15.6.0", + "anchor-markdown-header": "^0.8.4", "htmlparser2": "^7.2.0", - "minimist": "^1.2.6", - "underscore": "^1.13.2", - "update-section": "^0.3.3" + "loglevel": "^1.9.2", + "minimist": "^1.2.6" }, "bin": { "doctoc": "doctoc.js" @@ -4258,6 +4265,20 @@ "dev": true, "license": "MIT" }, + "node_modules/loglevel": { + "version": "1.9.2", + "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.9.2.tgz", + "integrity": "sha512-HgMmCqIJSAKqo68l0rS2AanEWfkxaZ5wNiEFb5ggm08lDs9Xl2KxBlX3PTcaD2chBM1gXAYf491/M2Rv8Jwayg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.6.0" + }, + "funding": { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/loglevel" + } + }, "node_modules/longest-streak": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-2.0.4.tgz", @@ -4731,6 +4752,16 @@ "node": ">= 0.6" } }, + "node_modules/neotraverse": { + "version": "0.6.18", + "resolved": "https://registry.npmjs.org/neotraverse/-/neotraverse-0.6.18.tgz", + "integrity": "sha512-Z4SmBUweYa09+o6pG+eASabEpP6QkQ70yHj351pQoEXIs8uHbaU2DWVmzBANKgflPa47A50PtB2+NgRpQvr7vA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 10" + } + }, "node_modules/netmask": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz", @@ -5360,9 +5391,9 @@ } }, "node_modules/remove-markdown": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/remove-markdown/-/remove-markdown-0.6.3.tgz", - "integrity": "sha512-Qvp2p0Q1irE7AaJO7QemJe04HdObHylJrG+q4hszvPlYp7q4EvfINpEIaIEFdB+3XTDp1h6fiyT60ae00gmRow==", + "version": "0.6.4", + "resolved": "https://registry.npmjs.org/remove-markdown/-/remove-markdown-0.6.4.tgz", + "integrity": "sha512-BompiLClzjfh46irZmzv+1Q61jZYlKN3iq/hzae9EOUwf7ctr/5wpD4qwgn/FWDAYE18RORO7z/yr+HXZJCY8Q==", "dev": true, "license": "MIT" }, @@ -5925,6 +5956,16 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/structured-source": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/structured-source/-/structured-source-4.0.0.tgz", + "integrity": "sha512-qGzRFNJDjFieQkl/sVOI2dUjHKRyL9dAJi2gCPGJLbJHBIkyOHxjuocpIEfbLioX+qSJpvbYdT49/YCdMznKxA==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "boundary": "^2.0.0" + } + }, "node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -5993,24 +6034,6 @@ "node": ">=0.6" } }, - "node_modules/traverse": { - "version": "0.6.11", - "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.11.tgz", - "integrity": "sha512-vxXDZg8/+p3gblxB6BhhG5yWVn1kGRlaL8O78UDXc3wRnPizB5g83dcvWV1jpDMIPnjZjOFuxlMmE82XJ4407w==", - "dev": true, - "license": "MIT", - "dependencies": { - "gopd": "^1.2.0", - "typedarray.prototype.slice": "^1.0.5", - "which-typed-array": "^1.1.18" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/trough": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/trough/-/trough-1.0.5.tgz", @@ -6203,29 +6226,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/typedarray.prototype.slice": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/typedarray.prototype.slice/-/typedarray.prototype.slice-1.0.5.tgz", - "integrity": "sha512-q7QNVDGTdl702bVFiI5eY4l/HkgCM6at9KhcFbgUAzezHFbOVy4+0O/lCjsABEQwbZPravVfBIiBVGo89yzHFg==", - "dev": true, - "license": "MIT", - "dependencies": { - "call-bind": "^1.0.8", - "define-properties": "^1.2.1", - "es-abstract": "^1.23.9", - "es-errors": "^1.3.0", - "get-proto": "^1.0.1", - "math-intrinsics": "^1.1.0", - "typed-array-buffer": "^1.0.3", - "typed-array-byte-offset": "^1.0.4" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/typescript": { "version": "5.9.3", "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz", @@ -6283,13 +6283,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/underscore": { - "version": "1.13.8", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.8.tgz", - "integrity": "sha512-DXtD3ZtEQzc7M8m4cXotyHR+FAS18C64asBYY5vqZexfYryNNnDc02W4hKg3rdQuqOYas1jkseX0+nZXjTXnvQ==", - "dev": true, - "license": "MIT" - }, "node_modules/undici-types": { "version": "6.21.0", "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz", @@ -6424,13 +6417,6 @@ "@unrs/resolver-binding-win32-x64-msvc": "1.11.1" } }, - "node_modules/update-section": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/update-section/-/update-section-0.3.3.tgz", - "integrity": "sha512-BpRZMZpgXLuTiKeiu7kK0nIPwGdyrqrs6EDSaXtjD/aQ2T+qVo9a5hRC3HN3iJjCMxNT/VxoLGQ7E/OzE5ucnw==", - "dev": true, - "license": "MIT" - }, "node_modules/uri-js": { "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", From 8009d3c360c0fd608bb2e8b4f1ceb1e213cdcd38 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Jun 2026 11:53:49 -0800 Subject: [PATCH 471/497] Bump typescript-eslint from 8.56.1 to 8.61.1 (#7857) --- package-lock.json | 158 +++++++++++++++++++++++----------------------- 1 file changed, 79 insertions(+), 79 deletions(-) diff --git a/package-lock.json b/package-lock.json index e458b23c7647..5b723da89b86 100644 --- a/package-lock.json +++ b/package-lock.json @@ -763,20 +763,20 @@ } }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "8.56.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.56.1.tgz", - "integrity": "sha512-Jz9ZztpB37dNC+HU2HI28Bs9QXpzCz+y/twHOwhyrIRdbuVDxSytJNDl6z/aAKlaRIwC7y8wJdkBv7FxYGgi0A==", + "version": "8.61.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.61.1.tgz", + "integrity": "sha512-ZPlVl3PB3et/59Ne0fv/sci6ZXz4T4Hp4nTJ56i/Y0gR89ARb+KphojTq6j+56E5PIezmOIOOWyY+aWQFd+IkQ==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.12.2", - "@typescript-eslint/scope-manager": "8.56.1", - "@typescript-eslint/type-utils": "8.56.1", - "@typescript-eslint/utils": "8.56.1", - "@typescript-eslint/visitor-keys": "8.56.1", + "@typescript-eslint/scope-manager": "8.61.1", + "@typescript-eslint/type-utils": "8.61.1", + "@typescript-eslint/utils": "8.61.1", + "@typescript-eslint/visitor-keys": "8.61.1", "ignore": "^7.0.5", "natural-compare": "^1.4.0", - "ts-api-utils": "^2.4.0" + "ts-api-utils": "^2.5.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -786,9 +786,9 @@ "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "@typescript-eslint/parser": "^8.56.1", + "@typescript-eslint/parser": "^8.61.1", "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", - "typescript": ">=4.8.4 <6.0.0" + "typescript": ">=4.8.4 <6.1.0" } }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/ignore": { @@ -802,16 +802,16 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "8.56.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.56.1.tgz", - "integrity": "sha512-klQbnPAAiGYFyI02+znpBRLyjL4/BrBd0nyWkdC0s/6xFLkXYQ8OoRrSkqacS1ddVxf/LDyODIKbQ5TgKAf/Fg==", + "version": "8.61.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.61.1.tgz", + "integrity": "sha512-PJ5vePq5/ognBbrIcoC5+SHO5dfpeLPzP9FpLkzWrguoYQEeeSjlJpVwOpo1JRSTEi7dRcwNy4h4dzV70PqHcg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/scope-manager": "8.56.1", - "@typescript-eslint/types": "8.56.1", - "@typescript-eslint/typescript-estree": "8.56.1", - "@typescript-eslint/visitor-keys": "8.56.1", + "@typescript-eslint/scope-manager": "8.61.1", + "@typescript-eslint/types": "8.61.1", + "@typescript-eslint/typescript-estree": "8.61.1", + "@typescript-eslint/visitor-keys": "8.61.1", "debug": "^4.4.3" }, "engines": { @@ -823,18 +823,18 @@ }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", - "typescript": ">=4.8.4 <6.0.0" + "typescript": ">=4.8.4 <6.1.0" } }, "node_modules/@typescript-eslint/project-service": { - "version": "8.56.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.56.1.tgz", - "integrity": "sha512-TAdqQTzHNNvlVFfR+hu2PDJrURiwKsUvxFn1M0h95BB8ah5jejas08jUWG4dBA68jDMI988IvtfdAI53JzEHOQ==", + "version": "8.61.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.61.1.tgz", + "integrity": "sha512-PrC4JYGmR241lYnfhmKGTXkFqv8+ymbTFgSAY0fVXpY82/QkMw5TZPl+vGzuDDU2QYJk9fIDOBTntF+yDv9LEA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/tsconfig-utils": "^8.56.1", - "@typescript-eslint/types": "^8.56.1", + "@typescript-eslint/tsconfig-utils": "^8.61.1", + "@typescript-eslint/types": "^8.61.1", "debug": "^4.4.3" }, "engines": { @@ -845,18 +845,18 @@ "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "typescript": ">=4.8.4 <6.0.0" + "typescript": ">=4.8.4 <6.1.0" } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "8.56.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.56.1.tgz", - "integrity": "sha512-YAi4VDKcIZp0O4tz/haYKhmIDZFEUPOreKbfdAN3SzUDMcPhJ8QI99xQXqX+HoUVq8cs85eRKnD+rne2UAnj2w==", + "version": "8.61.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.61.1.tgz", + "integrity": "sha512-L2bdIeoQS8FlKAvONAr20w6OcLXeB+qiDKbAooS9A0Ben+iSIkBef0FxqwKWYqt5sa0i4KJtxVyVmhMylKzF5w==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.56.1", - "@typescript-eslint/visitor-keys": "8.56.1" + "@typescript-eslint/types": "8.61.1", + "@typescript-eslint/visitor-keys": "8.61.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -867,9 +867,9 @@ } }, "node_modules/@typescript-eslint/tsconfig-utils": { - "version": "8.56.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.56.1.tgz", - "integrity": "sha512-qOtCYzKEeyr3aR9f28mPJqBty7+DBqsdd63eO0yyDwc6vgThj2UjWfJIcsFeSucYydqcuudMOprZ+x1SpF3ZuQ==", + "version": "8.61.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.61.1.tgz", + "integrity": "sha512-UN/H4di+OO7EWx2ovME+8t31YO+KVnK0RRKEHR3kOt21/Ay8BOq3M1OMvWs5vNiqcFCYGYoxK3MXPZzmMUE+yg==", "dev": true, "license": "MIT", "engines": { @@ -880,21 +880,21 @@ "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "typescript": ">=4.8.4 <6.0.0" + "typescript": ">=4.8.4 <6.1.0" } }, "node_modules/@typescript-eslint/type-utils": { - "version": "8.56.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.56.1.tgz", - "integrity": "sha512-yB/7dxi7MgTtGhZdaHCemf7PuwrHMenHjmzgUW1aJpO+bBU43OycnM3Wn+DdvDO/8zzA9HlhaJ0AUGuvri4oGg==", + "version": "8.61.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.61.1.tgz", + "integrity": "sha512-GYRicKmVK0C4fsKgaACaknOUAq9Oa2kwsjnpFhFcS/5p4Ht5IP9OVLbgIgcK4SRk92nVHFluurg1lumD9dBcLw==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.56.1", - "@typescript-eslint/typescript-estree": "8.56.1", - "@typescript-eslint/utils": "8.56.1", + "@typescript-eslint/types": "8.61.1", + "@typescript-eslint/typescript-estree": "8.61.1", + "@typescript-eslint/utils": "8.61.1", "debug": "^4.4.3", - "ts-api-utils": "^2.4.0" + "ts-api-utils": "^2.5.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -905,13 +905,13 @@ }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", - "typescript": ">=4.8.4 <6.0.0" + "typescript": ">=4.8.4 <6.1.0" } }, "node_modules/@typescript-eslint/types": { - "version": "8.56.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.56.1.tgz", - "integrity": "sha512-dbMkdIUkIkchgGDIv7KLUpa0Mda4IYjo4IAMJUZ+3xNoUXxMsk9YtKpTHSChRS85o+H9ftm51gsK1dZReY9CVw==", + "version": "8.61.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.61.1.tgz", + "integrity": "sha512-G+CRlPqLv7Bz1IZVs03x5K59F1veqL0EJUROAdGhKsEq8qOiRiZbI+HUojPq5l0fEGOKModD9br6lObhB8zkoA==", "dev": true, "license": "MIT", "engines": { @@ -923,21 +923,21 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "8.56.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.56.1.tgz", - "integrity": "sha512-qzUL1qgalIvKWAf9C1HpvBjif+Vm6rcT5wZd4VoMb9+Km3iS3Cv9DY6dMRMDtPnwRAFyAi7YXJpTIEXLvdfPxg==", + "version": "8.61.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.61.1.tgz", + "integrity": "sha512-u+oQD3BqYWPc8YV9Zab4vaJElJuwOLPRc10Jm1o/qS+6Qwen14HCWwx0Seo4LnSn2wxea2Ik8DxPt2/FHmuhrg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/project-service": "8.56.1", - "@typescript-eslint/tsconfig-utils": "8.56.1", - "@typescript-eslint/types": "8.56.1", - "@typescript-eslint/visitor-keys": "8.56.1", + "@typescript-eslint/project-service": "8.61.1", + "@typescript-eslint/tsconfig-utils": "8.61.1", + "@typescript-eslint/types": "8.61.1", + "@typescript-eslint/visitor-keys": "8.61.1", "debug": "^4.4.3", "minimatch": "^10.2.2", "semver": "^7.7.3", "tinyglobby": "^0.2.15", - "ts-api-utils": "^2.4.0" + "ts-api-utils": "^2.5.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -947,7 +947,7 @@ "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "typescript": ">=4.8.4 <6.0.0" + "typescript": ">=4.8.4 <6.1.0" } }, "node_modules/@typescript-eslint/typescript-estree/node_modules/balanced-match": { @@ -974,13 +974,13 @@ } }, "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": { - "version": "10.2.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.4.tgz", - "integrity": "sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg==", + "version": "10.2.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.5.tgz", + "integrity": "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==", "dev": true, "license": "BlueOak-1.0.0", "dependencies": { - "brace-expansion": "^5.0.2" + "brace-expansion": "^5.0.5" }, "engines": { "node": "18 || 20 || >=22" @@ -990,16 +990,16 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "8.56.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.56.1.tgz", - "integrity": "sha512-HPAVNIME3tABJ61siYlHzSWCGtOoeP2RTIaHXFMPqjrQKCGB9OgUVdiNgH7TJS2JNIQ5qQ4RsAUDuGaGme/KOA==", + "version": "8.61.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.61.1.tgz", + "integrity": "sha512-1+P/3Dj6jvtybE1q0HQ6yBt/gq+oKJyLdEv4HdnqasaEXRSYCAsD59mXEVQnM/ULNdQxbX77tdG4jPRjIS6knA==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.9.1", - "@typescript-eslint/scope-manager": "8.56.1", - "@typescript-eslint/types": "8.56.1", - "@typescript-eslint/typescript-estree": "8.56.1" + "@typescript-eslint/scope-manager": "8.61.1", + "@typescript-eslint/types": "8.61.1", + "@typescript-eslint/typescript-estree": "8.61.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -1010,17 +1010,17 @@ }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", - "typescript": ">=4.8.4 <6.0.0" + "typescript": ">=4.8.4 <6.1.0" } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "8.56.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.56.1.tgz", - "integrity": "sha512-KiROIzYdEV85YygXw6BI/Dx4fnBlFQu6Mq4QE4MOH9fFnhohw6wX/OAvDY2/C+ut0I3RSPKenvZJIVYqJNkhEw==", + "version": "8.61.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.61.1.tgz", + "integrity": "sha512-6fJ9MHWtK14C1DSkiMlHUSOmrVebL7150xZJBlJiL62jjhIA4JmOq6flwBgDxIdBKKdoiZRel+dfPD5MLfny3w==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.56.1", + "@typescript-eslint/types": "8.61.1", "eslint-visitor-keys": "^5.0.0" }, "engines": { @@ -6046,9 +6046,9 @@ } }, "node_modules/ts-api-utils": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.4.0.tgz", - "integrity": "sha512-3TaVTaAv2gTiMB35i3FiGJaRfwb3Pyn/j3m/bfAvGe8FB7CF6u+LMYqYlDh7reQf7UNvoTvdfAqHGmPGOSsPmA==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.5.0.tgz", + "integrity": "sha512-OJ/ibxhPlqrMM0UiNHJ/0CKQkoKF243/AEmplt3qpRgkW8VG7IfOS41h7V8TjITqdByHzrjcS/2si+y4lIh8NA==", "dev": true, "license": "MIT", "engines": { @@ -6241,16 +6241,16 @@ } }, "node_modules/typescript-eslint": { - "version": "8.56.1", - "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.56.1.tgz", - "integrity": "sha512-U4lM6pjmBX7J5wk4szltF7I1cGBHXZopnAXCMXb3+fZ3B/0Z3hq3wS/CCUB2NZBNAExK92mCU2tEohWuwVMsDQ==", + "version": "8.61.1", + "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.61.1.tgz", + "integrity": "sha512-V7PayAfJokV3pEHgN7/v03D1SpujhRfQtYLbLIiBfDDncdg4PAiRBfoS4cnCANK4jmAPncczi59QO3afiXUlNw==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/eslint-plugin": "8.56.1", - "@typescript-eslint/parser": "8.56.1", - "@typescript-eslint/typescript-estree": "8.56.1", - "@typescript-eslint/utils": "8.56.1" + "@typescript-eslint/eslint-plugin": "8.61.1", + "@typescript-eslint/parser": "8.61.1", + "@typescript-eslint/typescript-estree": "8.61.1", + "@typescript-eslint/utils": "8.61.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -6261,7 +6261,7 @@ }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", - "typescript": ">=4.8.4 <6.0.0" + "typescript": ">=4.8.4 <6.1.0" } }, "node_modules/unbox-primitive": { From 2ef530ce11f49874644fcd771ac61171cefc8e63 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Jun 2026 12:01:11 -0800 Subject: [PATCH 472/497] Bump actions/cache from 4.3.0 to 5.0.5 (#7856) --- .github/workflows/build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index b45473942e09..0d9e966fcb6f 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -191,7 +191,7 @@ jobs: # embedded into the code). Use VSCODE_CACHE_VERSION to force a rebuild. - name: Fetch prebuilt linux-x64 Code package from cache id: cache-vscode - uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4 + uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5 with: path: lib/vscode-reh-web-linux-x64 key: vscode-linux-x64-package-${{ secrets.VSCODE_CACHE_VERSION }}-${{ steps.vscode-rev.outputs.rev }}-${{ hashFiles('patches/*.diff', 'ci/build/build-vscode.sh') }} @@ -256,7 +256,7 @@ jobs: steps: - name: Cache Caddy - uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4 + uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5 id: caddy-cache with: path: | From 9545b26036b10a5c1eb9cfdaa58b6b3a6b6a22b5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Jun 2026 12:01:52 -0800 Subject: [PATCH 473/497] Bump awalsh128/cache-apt-pkgs-action from 1.6.0 to 1.6.1 (#7855) --- .github/workflows/build.yaml | 2 +- .github/workflows/release.yaml | 2 +- .github/workflows/update.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 0d9e966fcb6f..a8e28b175f16 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -163,7 +163,7 @@ jobs: steps: - run: sudo apt update && sudo apt install -y libkrb5-dev - - uses: awalsh128/cache-apt-pkgs-action@acb598e5ddbc6f68a970c5da0688d2f3a9f04d05 # latest + - uses: awalsh128/cache-apt-pkgs-action@681749ae568c81c2037cb9185e38b709b261bd2f # latest with: packages: quilt version: 1.0 diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 2ed2ca1f95d1..ce69cd72c9f7 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -59,7 +59,7 @@ jobs: steps: - run: sudo apt update && sudo apt install -y libkrb5-dev - - uses: awalsh128/cache-apt-pkgs-action@acb598e5ddbc6f68a970c5da0688d2f3a9f04d05 # latest + - uses: awalsh128/cache-apt-pkgs-action@681749ae568c81c2037cb9185e38b709b261bd2f # latest with: packages: quilt version: 1.0 diff --git a/.github/workflows/update.yaml b/.github/workflows/update.yaml index 2c09920336fe..461a31e1b40d 100644 --- a/.github/workflows/update.yaml +++ b/.github/workflows/update.yaml @@ -47,7 +47,7 @@ jobs: echo done=false >> $GITHUB_OUTPUT fi - - uses: awalsh128/cache-apt-pkgs-action@acb598e5ddbc6f68a970c5da0688d2f3a9f04d05 # latest + - uses: awalsh128/cache-apt-pkgs-action@681749ae568c81c2037cb9185e38b709b261bd2f # latest if: steps.check.outputs.done == 'false' with: packages: quilt From 804ba5bfce6a9bc1d3f8ca32d71720c22e9d6991 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Jun 2026 12:02:46 -0800 Subject: [PATCH 474/497] Bump codecov/codecov-action from 6.0.1 to 7.0.0 (#7853) --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index a8e28b175f16..e12411acca60 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -144,7 +144,7 @@ jobs: test/package-lock.json - run: SKIP_SUBMODULE_DEPS=1 npm ci - run: npm run test:unit - - uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1 + - uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0 if: success() with: token: ${{ secrets.CODECOV_TOKEN }} From fade53fcaf82e7c535cb972a7e3d8da4e43b63a4 Mon Sep 17 00:00:00 2001 From: cdrci <78873720+cdrci@users.noreply.github.com> Date: Thu, 18 Jun 2026 04:51:01 +1000 Subject: [PATCH 475/497] Update Code to 1.125.0 (#7861) --- CHANGELOG.md | 6 ++++++ lib/vscode | 2 +- patches/base-path.diff | 2 +- patches/disable-builtin-ext-update.diff | 2 +- patches/external-file-actions.diff | 4 ++-- patches/integration.diff | 4 ++-- patches/logout.diff | 2 +- patches/proxy-uri.diff | 2 +- patches/service-worker.diff | 2 +- patches/sourcemaps.diff | 2 +- patches/telemetry.diff | 2 +- patches/update-check.diff | 6 +++--- 12 files changed, 21 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2abd8e0a57b6..361124ba75b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,12 @@ Code v99.99.999 ## Unreleased +Code v1.125.0 + +### Changed + +- Update to Code 1.125.0 + ## [4.124.2](https://github.com/coder/code-server/releases/tag/v4.124.2) - 2026-06-16 Code v1.124.2 diff --git a/lib/vscode b/lib/vscode index 6928394f91b6..93cfdd489c3b 160000 --- a/lib/vscode +++ b/lib/vscode @@ -1 +1 @@ -Subproject commit 6928394f91b684055b873eecb8bc281365131f1c +Subproject commit 93cfdd489c3b228840d0f86ec77c3636277c93ea diff --git a/patches/base-path.diff b/patches/base-path.diff index 234b8403c6c4..1aef085bf3eb 100644 --- a/patches/base-path.diff +++ b/patches/base-path.diff @@ -241,7 +241,7 @@ Index: code-server/lib/vscode/src/vs/base/common/product.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/base/common/product.ts +++ code-server/lib/vscode/src/vs/base/common/product.ts -@@ -66,6 +66,7 @@ export type ExtensionVirtualWorkspaceSup +@@ -85,6 +85,7 @@ export interface IAgentSdkProductConfig export interface IProductConfiguration { readonly codeServerVersion?: string diff --git a/patches/disable-builtin-ext-update.diff b/patches/disable-builtin-ext-update.diff index 0d3690b35765..05f964dd5859 100644 --- a/patches/disable-builtin-ext-update.diff +++ b/patches/disable-builtin-ext-update.diff @@ -7,7 +7,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts +++ code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts -@@ -345,6 +345,10 @@ export class Extension implements IExten +@@ -343,6 +343,10 @@ export class Extension implements IExten if (this.type === ExtensionType.System && this.productService.quality === 'stable' && !this.productService.builtInExtensionsEnabledWithAutoUpdates?.some(id => id.toLowerCase() === this.identifier.id.toLowerCase())) { return false; } diff --git a/patches/external-file-actions.diff b/patches/external-file-actions.diff index 582384af6cee..4719d13ccdd9 100644 --- a/patches/external-file-actions.diff +++ b/patches/external-file-actions.diff @@ -230,7 +230,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/dialogs/browser/simpleFi import { IRemoteAgentService } from '../../remote/common/remoteAgentService.js'; import { IContextKeyService, IContextKey, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js'; import { equalsIgnoreCase, format, startsWithIgnoreCase } from '../../../../base/common/strings.js'; -@@ -161,7 +161,7 @@ export class SimpleFileDialog extends Di +@@ -152,7 +152,7 @@ export class SimpleFileDialog extends Di @IFileDialogService private readonly fileDialogService: IFileDialogService, @IModelService private readonly modelService: IModelService, @ILanguageService private readonly languageService: ILanguageService, @@ -239,7 +239,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/dialogs/browser/simpleFi @IRemoteAgentService private readonly remoteAgentService: IRemoteAgentService, @IPathService protected readonly pathService: IPathService, @IKeybindingService private readonly keybindingService: IKeybindingService, -@@ -392,21 +392,23 @@ export class SimpleFileDialog extends Di +@@ -362,21 +362,23 @@ export class SimpleFileDialog extends Di this.filePickBox.placeholder = nls.localize('remoteFileDialog.placeholder', "Folder path"); this.filePickBox.ok = true; this.filePickBox.okLabel = typeof this.options.openLabel === 'string' ? this.options.openLabel : this.options.openLabel?.withoutMnemonic; diff --git a/patches/integration.diff b/patches/integration.diff index 44327d24e005..a9244dd1734a 100644 --- a/patches/integration.diff +++ b/patches/integration.diff @@ -186,8 +186,8 @@ Index: code-server/lib/vscode/src/vs/base/common/product.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/base/common/product.ts +++ code-server/lib/vscode/src/vs/base/common/product.ts -@@ -65,6 +65,8 @@ export type ExtensionVirtualWorkspaceSup - }; +@@ -84,6 +84,8 @@ export interface IAgentSdkProductConfig + } export interface IProductConfiguration { + readonly codeServerVersion?: string diff --git a/patches/logout.diff b/patches/logout.diff index c21be0de9115..5af694506d6c 100644 --- a/patches/logout.diff +++ b/patches/logout.diff @@ -8,7 +8,7 @@ Index: code-server/lib/vscode/src/vs/base/common/product.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/base/common/product.ts +++ code-server/lib/vscode/src/vs/base/common/product.ts -@@ -68,6 +68,7 @@ export interface IProductConfiguration { +@@ -87,6 +87,7 @@ export interface IProductConfiguration { readonly codeServerVersion?: string readonly rootEndpoint?: string readonly updateEndpoint?: string diff --git a/patches/proxy-uri.diff b/patches/proxy-uri.diff index 9921cc23022a..ef98ae832064 100644 --- a/patches/proxy-uri.diff +++ b/patches/proxy-uri.diff @@ -30,7 +30,7 @@ Index: code-server/lib/vscode/src/vs/base/common/product.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/base/common/product.ts +++ code-server/lib/vscode/src/vs/base/common/product.ts -@@ -69,6 +69,7 @@ export interface IProductConfiguration { +@@ -88,6 +88,7 @@ export interface IProductConfiguration { readonly rootEndpoint?: string readonly updateEndpoint?: string readonly logoutEndpoint?: string diff --git a/patches/service-worker.diff b/patches/service-worker.diff index 9e048c3c66e6..0204d57dd904 100644 --- a/patches/service-worker.diff +++ b/patches/service-worker.diff @@ -6,7 +6,7 @@ Index: code-server/lib/vscode/src/vs/base/common/product.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/base/common/product.ts +++ code-server/lib/vscode/src/vs/base/common/product.ts -@@ -70,6 +70,10 @@ export interface IProductConfiguration { +@@ -89,6 +89,10 @@ export interface IProductConfiguration { readonly updateEndpoint?: string readonly logoutEndpoint?: string readonly proxyEndpointTemplate?: string diff --git a/patches/sourcemaps.diff b/patches/sourcemaps.diff index 4c51aace765e..f90d489b0204 100644 --- a/patches/sourcemaps.diff +++ b/patches/sourcemaps.diff @@ -6,7 +6,7 @@ Index: code-server/lib/vscode/build/gulpfile.reh.ts =================================================================== --- code-server.orig/lib/vscode/build/gulpfile.reh.ts +++ code-server/lib/vscode/build/gulpfile.reh.ts -@@ -296,10 +296,15 @@ function packageTask(type: string, platf +@@ -297,10 +297,15 @@ function packageTask(type: string, platf const destination = path.join(BUILD_ROOT, destinationFolderName); return () => { diff --git a/patches/telemetry.diff b/patches/telemetry.diff index 462d3ce01c77..cd17a28bbfcb 100644 --- a/patches/telemetry.diff +++ b/patches/telemetry.diff @@ -147,7 +147,7 @@ Index: code-server/lib/vscode/src/vs/base/common/product.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/base/common/product.ts +++ code-server/lib/vscode/src/vs/base/common/product.ts -@@ -74,6 +74,7 @@ export interface IProductConfiguration { +@@ -93,6 +93,7 @@ export interface IProductConfiguration { readonly path: string; readonly scope: string; } diff --git a/patches/update-check.diff b/patches/update-check.diff index d668e4254c9f..6cadd81e3ef7 100644 --- a/patches/update-check.diff +++ b/patches/update-check.diff @@ -93,7 +93,7 @@ Index: code-server/lib/vscode/src/vs/base/common/product.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/base/common/product.ts +++ code-server/lib/vscode/src/vs/base/common/product.ts -@@ -67,6 +67,7 @@ export type ExtensionVirtualWorkspaceSup +@@ -86,6 +86,7 @@ export interface IAgentSdkProductConfig export interface IProductConfiguration { readonly codeServerVersion?: string readonly rootEndpoint?: string @@ -101,14 +101,14 @@ Index: code-server/lib/vscode/src/vs/base/common/product.ts readonly version: string; readonly date?: string; -@@ -119,6 +120,7 @@ export interface IProductConfiguration { +@@ -138,6 +139,7 @@ export interface IProductConfiguration { readonly resourceUrlTemplate: string; readonly nlsBaseUrl: string; readonly accessSKUs?: string[]; + readonly authorizationHeaderToken?: string; }; - readonly mcpGallery?: { + readonly agentSdks?: { readonly [packageId: string]: IAgentSdkProductConfig }; Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts From 02e28cd2546aed36a47a40ff8be2f89bd203085b Mon Sep 17 00:00:00 2001 From: Asher Date: Thu, 18 Jun 2026 10:50:51 -0800 Subject: [PATCH 476/497] Name VS Code package "code-oss" The -dev seems a bit weird since it is not a dev version once it is built, and also there is a false positive advisory with the code-oss-dev name. --- ci/build/build-release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/build/build-release.sh b/ci/build/build-release.sh index 30dcfef6399e..6dbc2784acbc 100755 --- a/ci/build/build-release.sh +++ b/ci/build/build-release.sh @@ -130,7 +130,7 @@ bundle_vscode() { # dependencies, since we want to ship this via NPM. # Also override the name to prevent vulnerability scanners from # misidentifying this package as VS Code (see #7071). - jq --slurp '.[0] * .[1] | .name = "code-oss-dev"' \ + jq --slurp '.[0] * .[1] | .name = "code-oss"' \ "$VSCODE_SRC_PATH/remote/package.json" \ "$VSCODE_OUT_PATH/package.json" > "$VSCODE_OUT_PATH/package.json.merged" mv "$VSCODE_OUT_PATH/package.json.merged" "$VSCODE_OUT_PATH/package.json" From 40b39293fa7ca7eed44df270109064787063fe8c Mon Sep 17 00:00:00 2001 From: cdrci <78873720+cdrci@users.noreply.github.com> Date: Tue, 23 Jun 2026 05:29:01 +1000 Subject: [PATCH 477/497] Update Helm chart and changelog with 4.125.0 (#7863) --- CHANGELOG.md | 2 ++ ci/helm-chart/Chart.yaml | 4 ++-- ci/helm-chart/values.yaml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 361124ba75b0..4315b01b2f69 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,8 @@ Code v99.99.999 ## Unreleased +## [4.125.0](https://github.com/coder/code-server/releases/tag/v4.125.0) - 2026-06-18 + Code v1.125.0 ### Changed diff --git a/ci/helm-chart/Chart.yaml b/ci/helm-chart/Chart.yaml index 778a90353141..89c1af202b9a 100644 --- a/ci/helm-chart/Chart.yaml +++ b/ci/helm-chart/Chart.yaml @@ -15,9 +15,9 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 3.39.0 +version: 3.40.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 4.124.2 +appVersion: 4.125.0 diff --git a/ci/helm-chart/values.yaml b/ci/helm-chart/values.yaml index 413920542f8d..42308aa7065e 100644 --- a/ci/helm-chart/values.yaml +++ b/ci/helm-chart/values.yaml @@ -6,7 +6,7 @@ replicaCount: 1 image: repository: codercom/code-server - tag: '4.124.2' + tag: '4.125.0' pullPolicy: Always # Specifies one or more secrets to be used when pulling images from a From 9ccf763b0297eb4dd787b3470190df1e82d32dcc Mon Sep 17 00:00:00 2001 From: Asher Date: Mon, 22 Jun 2026 11:30:34 -0800 Subject: [PATCH 478/497] Match update PRs titles with commits --- .github/workflows/publish.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 37b4747aa7d9..76a7c78533bc 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -95,7 +95,7 @@ jobs: git add . git commit -m "Update to ${{ env.VERSION }}" git push -u origin $(git branch --show) - gh pr create --repo coder/code-server-aur --title "chore: bump version to ${{ env.VERSION }}" --body "PR opened by @$GITHUB_ACTOR" --assignee $GITHUB_ACTOR + gh pr create --repo coder/code-server-aur --title "Update to ${{ env.VERSION }}" --body "PR opened by @$GITHUB_ACTOR" --assignee $GITHUB_ACTOR docker: runs-on: ubuntu-latest @@ -164,4 +164,4 @@ jobs: gh pr create \ --repo coder/code-server \ --body-file .cache/checklist \ - --title "Update to $VERSION" + --title "Update Helm chart and changelog with $VERSION" From 2c06497ca93cab8ced876947c58e6b42be5a8210 Mon Sep 17 00:00:00 2001 From: cdrci <78873720+cdrci@users.noreply.github.com> Date: Thu, 25 Jun 2026 06:05:00 +1000 Subject: [PATCH 479/497] Update Code to 1.126.0 (#7868) --- CHANGELOG.md | 6 ++++++ lib/vscode | 2 +- patches/base-path.diff | 6 +++--- patches/display-language.diff | 2 +- patches/external-file-actions.diff | 2 +- patches/getting-started.diff | 2 +- patches/integration.diff | 4 ++-- patches/local-storage.diff | 2 +- patches/marketplace.diff | 2 +- patches/trusted-domains.diff | 2 +- patches/webview.diff | 2 +- 11 files changed, 19 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4315b01b2f69..7ee3d22c53d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,12 @@ Code v99.99.999 ## Unreleased +Code v1.126.0 + +### Changed + +- Update to Code 1.126.0 + ## [4.125.0](https://github.com/coder/code-server/releases/tag/v4.125.0) - 2026-06-18 Code v1.125.0 diff --git a/lib/vscode b/lib/vscode index 93cfdd489c3b..7e7950df89d0 160000 --- a/lib/vscode +++ b/lib/vscode @@ -1 +1 @@ -Subproject commit 93cfdd489c3b228840d0f86ec77c3636277c93ea +Subproject commit 7e7950df89d055b5a378379db9ee14290772148a diff --git a/patches/base-path.diff b/patches/base-path.diff index 1aef085bf3eb..9191effe8ed5 100644 --- a/patches/base-path.diff +++ b/patches/base-path.diff @@ -146,7 +146,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts embedderIdentifier: 'server-distro', extensionsGallery: this._webExtensionResourceUrlTemplate && this._productService.extensionsGallery ? { ...this._productService.extensionsGallery, -@@ -407,7 +414,9 @@ export class WebClientServer { +@@ -401,7 +408,9 @@ export class WebClientServer { WORKBENCH_AUTH_SESSION: authSessionInfo ? asJSON(authSessionInfo) : '', WORKBENCH_WEB_BASE_URL: staticRoute, WORKBENCH_NLS_URL, @@ -157,7 +157,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts }; // DEV --------------------------------------------------------------------------------------- -@@ -444,7 +453,7 @@ export class WebClientServer { +@@ -438,7 +447,7 @@ export class WebClientServer { 'default-src \'self\';', 'img-src \'self\' https: data: blob:;', 'media-src \'self\';', @@ -166,7 +166,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts 'child-src \'self\';', `frame-src 'self' https://*.vscode-cdn.net data:;`, 'worker-src \'self\' data: blob:;', -@@ -517,3 +526,70 @@ export class WebClientServer { +@@ -511,3 +520,70 @@ export class WebClientServer { return void res.end(data); } } diff --git a/patches/display-language.diff b/patches/display-language.diff index 526272fe5775..6c721eb2c102 100644 --- a/patches/display-language.diff +++ b/patches/display-language.diff @@ -161,7 +161,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts import { CharCode } from '../../base/common/charCode.js'; import { IExtensionManifest } from '../../platform/extensions/common/extensions.js'; import { ICSSDevelopmentService } from '../../platform/cssDev/node/cssDevService.js'; -@@ -405,14 +406,22 @@ export class WebClientServer { +@@ -399,14 +400,22 @@ export class WebClientServer { }; const cookies = cookie.parse(req.headers.cookie || ''); diff --git a/patches/external-file-actions.diff b/patches/external-file-actions.diff index 4719d13ccdd9..9624a1ae1778 100644 --- a/patches/external-file-actions.diff +++ b/patches/external-file-actions.diff @@ -112,7 +112,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -389,6 +389,8 @@ export class WebClientServer { +@@ -383,6 +383,8 @@ export class WebClientServer { serverBasePath: basePath, webviewEndpoint: staticRoute + '/out/vs/workbench/contrib/webview/browser/pre', userDataPath: this._environmentService.userDataPath, diff --git a/patches/getting-started.diff b/patches/getting-started.diff index 7135955f6efe..db7f80c73601 100644 --- a/patches/getting-started.diff +++ b/patches/getting-started.diff @@ -201,7 +201,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -393,6 +393,7 @@ export class WebClientServer { +@@ -387,6 +387,7 @@ export class WebClientServer { userDataPath: this._environmentService.userDataPath, isEnabledFileDownloads: !this._environmentService.args['disable-file-downloads'], isEnabledFileUploads: !this._environmentService.args['disable-file-uploads'], diff --git a/patches/integration.diff b/patches/integration.diff index a9244dd1734a..cb2e458dd1aa 100644 --- a/patches/integration.diff +++ b/patches/integration.diff @@ -164,7 +164,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/web.main.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/browser/web.main.ts +++ code-server/lib/vscode/src/vs/workbench/browser/web.main.ts -@@ -65,6 +65,7 @@ import { IOpenerService } from '../../pl +@@ -64,6 +64,7 @@ import { IOpenerService } from '../../pl import { mixin, safeStringify } from '../../base/common/objects.js'; import { IndexedDB } from '../../base/browser/indexedDB.js'; import { WebFileSystemAccess } from '../../platform/files/browser/webFileSystemAccess.js'; @@ -172,7 +172,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/web.main.ts import { IProgressService } from '../../platform/progress/common/progress.js'; import { DelayedLogChannel } from '../services/output/common/delayedLogChannel.js'; import { dirname, joinPath } from '../../base/common/resources.js'; -@@ -140,6 +141,9 @@ export class BrowserMain extends Disposa +@@ -139,6 +140,9 @@ export class BrowserMain extends Disposa // Startup const instantiationService = workbench.startup(); diff --git a/patches/local-storage.diff b/patches/local-storage.diff index 986eb4dde3ba..87710698a9ca 100644 --- a/patches/local-storage.diff +++ b/patches/local-storage.diff @@ -18,7 +18,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -384,6 +384,7 @@ export class WebClientServer { +@@ -378,6 +378,7 @@ export class WebClientServer { remoteAuthority, serverBasePath: basePath, webviewEndpoint: staticRoute + '/out/vs/workbench/contrib/webview/browser/pre', diff --git a/patches/marketplace.diff b/patches/marketplace.diff index 37347d13b660..539ba28bb7ca 100644 --- a/patches/marketplace.diff +++ b/patches/marketplace.diff @@ -64,7 +64,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts + extensionsGallery: this._productService.extensionsGallery, }; - const proposedApi = this._environmentService.args['enable-proposed-api']; + if (!this._environmentService.isBuilt) { Index: code-server/lib/vscode/src/vs/platform/extensionResourceLoader/common/extensionResourceLoader.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/platform/extensionResourceLoader/common/extensionResourceLoader.ts diff --git a/patches/trusted-domains.diff b/patches/trusted-domains.diff index 9d42246bda34..f6ca9dc5fc01 100644 --- a/patches/trusted-domains.diff +++ b/patches/trusted-domains.diff @@ -46,4 +46,4 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts + linkProtectionTrustedDomains, }; - const proposedApi = this._environmentService.args['enable-proposed-api']; + if (!this._environmentService.isBuilt) { diff --git a/patches/webview.diff b/patches/webview.diff index 5dd0f9d4b95c..fd5349d73198 100644 --- a/patches/webview.diff +++ b/patches/webview.diff @@ -54,7 +54,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -380,6 +380,7 @@ export class WebClientServer { +@@ -374,6 +374,7 @@ export class WebClientServer { const workbenchWebConfiguration = { remoteAuthority, serverBasePath: basePath, From dd48f7753b3b57f5f85c5c8ab8a09d4c2bec9dc9 Mon Sep 17 00:00:00 2001 From: cdrci <78873720+cdrci@users.noreply.github.com> Date: Thu, 25 Jun 2026 08:08:03 +1000 Subject: [PATCH 480/497] Update Helm chart and changelog with 4.126.0 (#7869) --- CHANGELOG.md | 2 ++ ci/helm-chart/Chart.yaml | 4 ++-- ci/helm-chart/values.yaml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7ee3d22c53d8..1706c15bc0da 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,8 @@ Code v99.99.999 ## Unreleased +## [4.126.0](https://github.com/coder/code-server/releases/tag/v4.126.0) - 2026-06-24 + Code v1.126.0 ### Changed diff --git a/ci/helm-chart/Chart.yaml b/ci/helm-chart/Chart.yaml index 89c1af202b9a..70a00e8e2272 100644 --- a/ci/helm-chart/Chart.yaml +++ b/ci/helm-chart/Chart.yaml @@ -15,9 +15,9 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 3.40.0 +version: 3.41.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 4.125.0 +appVersion: 4.126.0 diff --git a/ci/helm-chart/values.yaml b/ci/helm-chart/values.yaml index 42308aa7065e..1fa2e7fb1bb3 100644 --- a/ci/helm-chart/values.yaml +++ b/ci/helm-chart/values.yaml @@ -6,7 +6,7 @@ replicaCount: 1 image: repository: codercom/code-server - tag: '4.125.0' + tag: '4.126.0' pullPolicy: Always # Specifies one or more secrets to be used when pulling images from a From 1e6ed874e3138141a5636f6e0dbe8570aa6cd001 Mon Sep 17 00:00:00 2001 From: cdrci <78873720+cdrci@users.noreply.github.com> Date: Thu, 2 Jul 2026 07:01:48 +1000 Subject: [PATCH 481/497] Update Code to 1.127.0 (#7880) There is a new use of parsedArgs so we have to pass that in since we parse on demand instead of globally. --- CHANGELOG.md | 6 ++++++ lib/vscode | 2 +- patches/display-language.diff | 2 +- patches/external-file-actions.diff | 2 +- patches/getting-started.diff | 2 +- patches/integration.diff | 24 +++++++++++++++++++++--- patches/sourcemaps.diff | 2 +- 7 files changed, 32 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1706c15bc0da..64b0fbf57649 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,12 @@ Code v99.99.999 ## Unreleased +Code v1.127.0 + +### Changed + +- Update to Code 1.127.0 + ## [4.126.0](https://github.com/coder/code-server/releases/tag/v4.126.0) - 2026-06-24 Code v1.126.0 diff --git a/lib/vscode b/lib/vscode index 7e7950df89d0..a22d00300655 160000 --- a/lib/vscode +++ b/lib/vscode @@ -1 +1 @@ -Subproject commit 7e7950df89d055b5a378379db9ee14290772148a +Subproject commit a22d00300655c17490ce63dffc28bcdcedcd82c4 diff --git a/patches/display-language.diff b/patches/display-language.diff index 6c721eb2c102..3ff62227f3e8 100644 --- a/patches/display-language.diff +++ b/patches/display-language.diff @@ -18,7 +18,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverServices.ts import { ProtocolConstants } from '../../base/parts/ipc/common/ipc.net.js'; import { IConfigurationService } from '../../platform/configuration/common/configuration.js'; import { ConfigurationService } from '../../platform/configuration/common/configurationService.js'; -@@ -359,6 +359,9 @@ export async function setupServerService +@@ -358,6 +358,9 @@ export async function setupServerService socketServer.registerChannel('mcpManagement', new McpManagementChannel(mcpManagementService, (ctx: RemoteAgentConnectionContext) => getUriTransformer(ctx.remoteAuthority))); diff --git a/patches/external-file-actions.diff b/patches/external-file-actions.diff index 9624a1ae1778..abbfac2cb32a 100644 --- a/patches/external-file-actions.diff +++ b/patches/external-file-actions.diff @@ -147,7 +147,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/contextkeys.ts @IProductService private readonly productService: IProductService, @IEditorGroupsService private readonly editorGroupService: IEditorGroupsService, @IEditorService private readonly editorService: IEditorService, -@@ -201,6 +201,10 @@ export class WorkbenchContextKeysHandler +@@ -202,6 +202,10 @@ export class WorkbenchContextKeysHandler this.auxiliaryBarMaximizedContext = AuxiliaryBarMaximizedContext.bindTo(this.contextKeyService); this.auxiliaryBarMaximizedContext.set(this.layoutService.isAuxiliaryBarMaximized()); diff --git a/patches/getting-started.diff b/patches/getting-started.diff index db7f80c73601..9d50f8f47d35 100644 --- a/patches/getting-started.diff +++ b/patches/getting-started.diff @@ -222,7 +222,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/contextkeys.ts import { preferredSideBySideGroupDirection, GroupDirection, IEditorGroupsService } from '../services/editor/common/editorGroupsService.js'; import { IConfigurationService } from '../../platform/configuration/common/configuration.js'; import { IBrowserWorkbenchEnvironmentService } from '../services/environment/browser/environmentService.js'; -@@ -204,6 +204,7 @@ export class WorkbenchContextKeysHandler +@@ -205,6 +205,7 @@ export class WorkbenchContextKeysHandler // code-server IsEnabledFileDownloads.bindTo(this.contextKeyService).set(this.environmentService.isEnabledFileDownloads ?? true) IsEnabledFileUploads.bindTo(this.contextKeyService).set(this.environmentService.isEnabledFileUploads ?? true) diff --git a/patches/integration.diff b/patches/integration.diff index cb2e458dd1aa..2d4507fe2bd2 100644 --- a/patches/integration.diff +++ b/patches/integration.diff @@ -263,7 +263,7 @@ Index: code-server/lib/vscode/src/server-main.ts =================================================================== --- code-server.orig/lib/vscode/src/server-main.ts +++ code-server/lib/vscode/src/server-main.ts -@@ -22,6 +22,9 @@ import { IServerAPI } from './vs/server/ +@@ -23,6 +23,9 @@ import { IServerAPI } from './vs/server/ perf.mark('code/server/start'); (globalThis as { vscodeServerStartTime?: number }).vscodeServerStartTime = performance.now(); @@ -273,7 +273,16 @@ Index: code-server/lib/vscode/src/server-main.ts // Do a quick parse to determine if a server or the cli needs to be started const parsedArgs = minimist(process.argv.slice(2), { boolean: ['start-server', 'list-extensions', 'print-ip-address', 'help', 'version', 'accept-server-license-terms', 'update-extensions'], -@@ -150,6 +153,7 @@ if (shouldSpawnCli) { +@@ -50,7 +53,7 @@ if (shouldSpawnCli) { + mod.spawnCli(); + }); + } else { +- installServerProcessExitDiagnostics(); ++ installServerProcessExitDiagnostics(parsedArgs); + + let _remoteExtensionHostAgentServer: IServerAPI | null = null; + let _remoteExtensionHostAgentServerPromise: Promise | null = null; +@@ -153,6 +156,7 @@ if (shouldSpawnCli) { } }); } @@ -281,7 +290,16 @@ Index: code-server/lib/vscode/src/server-main.ts function sanitizeStringArg(val: unknown): string | undefined { if (Array.isArray(val)) { // if an argument is passed multiple times, minimist creates an array -@@ -283,3 +287,22 @@ function prompt(question: string): Promi +@@ -173,7 +177,7 @@ function sanitizeStringArg(val: unknown) + * provided) so they survive process teardown (an async stdio write from an + * `exit` handler does not). + */ +-function installServerProcessExitDiagnostics(): void { ++function installServerProcessExitDiagnostics(parsedArgs: minimist.ParsedArgs): void { + if (!process.env['VSCODE_SERVER_EXIT_DIAGNOSTICS']) { + return; + } +@@ -406,3 +410,22 @@ function prompt(question: string): Promi }); }); } diff --git a/patches/sourcemaps.diff b/patches/sourcemaps.diff index f90d489b0204..22ca7ef04323 100644 --- a/patches/sourcemaps.diff +++ b/patches/sourcemaps.diff @@ -6,7 +6,7 @@ Index: code-server/lib/vscode/build/gulpfile.reh.ts =================================================================== --- code-server.orig/lib/vscode/build/gulpfile.reh.ts +++ code-server/lib/vscode/build/gulpfile.reh.ts -@@ -297,10 +297,15 @@ function packageTask(type: string, platf +@@ -344,10 +344,15 @@ function packageTask(type: string, platf const destination = path.join(BUILD_ROOT, destinationFolderName); return () => { From 1e160477beaca340a07d5dc380d3f468ddd2d8d8 Mon Sep 17 00:00:00 2001 From: cdrci <78873720+cdrci@users.noreply.github.com> Date: Fri, 3 Jul 2026 06:05:31 +1000 Subject: [PATCH 482/497] Update Helm chart and changelog with 4.127.0 (#7882) --- CHANGELOG.md | 2 ++ ci/helm-chart/Chart.yaml | 4 ++-- ci/helm-chart/values.yaml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 64b0fbf57649..8d75ad4d5680 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,8 @@ Code v99.99.999 ## Unreleased +## [4.127.0](https://github.com/coder/code-server/releases/tag/v4.127.0) - 2026-07-02 + Code v1.127.0 ### Changed diff --git a/ci/helm-chart/Chart.yaml b/ci/helm-chart/Chart.yaml index 70a00e8e2272..46a363b985f5 100644 --- a/ci/helm-chart/Chart.yaml +++ b/ci/helm-chart/Chart.yaml @@ -15,9 +15,9 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 3.41.0 +version: 3.42.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 4.126.0 +appVersion: 4.127.0 diff --git a/ci/helm-chart/values.yaml b/ci/helm-chart/values.yaml index 1fa2e7fb1bb3..b96ed4486cb2 100644 --- a/ci/helm-chart/values.yaml +++ b/ci/helm-chart/values.yaml @@ -6,7 +6,7 @@ replicaCount: 1 image: repository: codercom/code-server - tag: '4.126.0' + tag: '4.127.0' pullPolicy: Always # Specifies one or more secrets to be used when pulling images from a From aed61bf6abec631c87b8371f701d10d4e746d5b0 Mon Sep 17 00:00:00 2001 From: Asher Date: Thu, 2 Jul 2026 12:26:47 -0800 Subject: [PATCH 483/497] Remove @schemastore/package Providing our own type is trivial. --- package-lock.json | 8 -------- package.json | 1 - src/node/constants.ts | 10 +++++++--- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5b723da89b86..91807c30f6ba 100644 --- a/package-lock.json +++ b/package-lock.json @@ -38,7 +38,6 @@ "@eslint/compat": "^1.2.0", "@eslint/eslintrc": "^3.1.0", "@eslint/js": "^9.12.0", - "@schemastore/package": "^0.0.10", "@types/compression": "^1.7.3", "@types/cookie-parser": "^1.4.4", "@types/eslint__js": "^8.42.3", @@ -438,13 +437,6 @@ "dev": true, "license": "MIT" }, - "node_modules/@schemastore/package": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/@schemastore/package/-/package-0.0.10.tgz", - "integrity": "sha512-D3LxMCnkgsb4LO5sDKf6E+yahM2SqpEHmkqMPDSJis5Cy/j2MgWo/g/iq0lECK0mrPWfx3hqKm2ZJlqxwbRJQA==", - "dev": true, - "license": "MIT" - }, "node_modules/@textlint/ast-node-types": { "version": "15.7.1", "resolved": "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-15.7.1.tgz", diff --git a/package.json b/package.json index 170d7295247d..dbebbc7c370d 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,6 @@ "@eslint/compat": "^1.2.0", "@eslint/eslintrc": "^3.1.0", "@eslint/js": "^9.12.0", - "@schemastore/package": "^0.0.10", "@types/compression": "^1.7.3", "@types/cookie-parser": "^1.4.4", "@types/eslint__js": "^8.42.3", diff --git a/src/node/constants.ts b/src/node/constants.ts index bb6873dfa113..06281c6889cf 100644 --- a/src/node/constants.ts +++ b/src/node/constants.ts @@ -1,9 +1,13 @@ import { logger } from "@coder/logger" -import type { JSONSchemaForNPMPackageJsonFiles } from "@schemastore/package" import * as os from "os" import * as path from "path" -export function getPackageJson(relativePath: string): JSONSchemaForNPMPackageJsonFiles { +type PackageJson = { + version: string + commit: string +} + +export function getPackageJson(relativePath: string): PackageJson { let pkg = {} try { pkg = require(relativePath) @@ -11,7 +15,7 @@ export function getPackageJson(relativePath: string): JSONSchemaForNPMPackageJso logger.warn(error.message) } - return pkg + return pkg as PackageJson } export const rootPath = path.resolve(__dirname, "../..") From d103d5057a7cb9beeacb4ea98407ea59398209c0 Mon Sep 17 00:00:00 2001 From: Asher Date: Thu, 9 Jul 2026 22:58:44 -0800 Subject: [PATCH 484/497] Fix update script using old Node version It needs to parse the version *after* the VS Code update, otherwise it is just pulling whatever the previous version was. That means we cannot use it in the step title without some refactoring; opted to just omit it for now. --- ci/build/update-vscode.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ci/build/update-vscode.sh b/ci/build/update-vscode.sh index 26a43cd9b4cb..bc4eddbe068c 100755 --- a/ci/build/update-vscode.sh +++ b/ci/build/update-vscode.sh @@ -42,6 +42,8 @@ function refresh_patches() { function update_node() { local node_version node_version=$(cat .node-version) + local target_node_version + target_node_version=$(grep target lib/vscode/remote/.npmrc | awk -F= '{print $2}' | tr -d '"') if [[ $node_version == "$target_node_version" ]] ; then echo "Already set to $target_node_version" else @@ -116,9 +118,6 @@ function main() { source ./ci/lib.sh - local target_node_version - target_node_version=$(grep target lib/vscode/remote/.npmrc | awk -F= '{print $2}' | tr -d '"') - declare -a steps # If version is not set, assume we are already at the target version and the @@ -141,7 +140,7 @@ function main() { fi steps+=( - "Set Node version to $target_node_version" "update_node" + "Update Node version" "update_node" "Update CSP webview hash" "update_csp" "Add changelog note" "add_changelog" ) From cb22f74650a539d6f824d5944ec34d9e74844f66 Mon Sep 17 00:00:00 2001 From: cdrci <78873720+cdrci@users.noreply.github.com> Date: Sat, 11 Jul 2026 06:08:44 +1000 Subject: [PATCH 485/497] Update Code to 1.128.0 (#7889) --- .node-version | 2 +- CHANGELOG.md | 6 ++++++ lib/vscode | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.node-version b/.node-version index 5bf4400f2292..1dd37d53743d 100644 --- a/.node-version +++ b/.node-version @@ -1 +1 @@ -24.15.0 +24.17.0 diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d75ad4d5680..6aff1d124869 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,12 @@ Code v99.99.999 ## Unreleased +Code v1.128.0 + +### Changed + +- Update to Code 1.128.0 + ## [4.127.0](https://github.com/coder/code-server/releases/tag/v4.127.0) - 2026-07-02 Code v1.127.0 diff --git a/lib/vscode b/lib/vscode index a22d00300655..fc3def6774c7 160000 --- a/lib/vscode +++ b/lib/vscode @@ -1 +1 @@ -Subproject commit a22d00300655c17490ce63dffc28bcdcedcd82c4 +Subproject commit fc3def6774c76082adf699d366f31a557ce5573f From 421e7eb0848eba9dcf22b19525db53d0bb2d0336 Mon Sep 17 00:00:00 2001 From: cdrci <78873720+cdrci@users.noreply.github.com> Date: Tue, 14 Jul 2026 02:56:29 +1000 Subject: [PATCH 486/497] Update Helm chart and changelog with 4.128.0 (#7891) --- CHANGELOG.md | 2 ++ ci/helm-chart/Chart.yaml | 4 ++-- ci/helm-chart/values.yaml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6aff1d124869..57416d3c64f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,8 @@ Code v99.99.999 ## Unreleased +## [4.128.0](https://github.com/coder/code-server/releases/tag/v4.128.0) - 2026-07-11 + Code v1.128.0 ### Changed diff --git a/ci/helm-chart/Chart.yaml b/ci/helm-chart/Chart.yaml index 46a363b985f5..6d1bda0f3678 100644 --- a/ci/helm-chart/Chart.yaml +++ b/ci/helm-chart/Chart.yaml @@ -15,9 +15,9 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 3.42.0 +version: 3.43.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 4.127.0 +appVersion: 4.128.0 diff --git a/ci/helm-chart/values.yaml b/ci/helm-chart/values.yaml index b96ed4486cb2..05954e11926e 100644 --- a/ci/helm-chart/values.yaml +++ b/ci/helm-chart/values.yaml @@ -6,7 +6,7 @@ replicaCount: 1 image: repository: codercom/code-server - tag: '4.127.0' + tag: '4.128.0' pullPolicy: Always # Specifies one or more secrets to be used when pulling images from a From 3e76a04b1b8d9cf2795777d77f63bef143779bc6 Mon Sep 17 00:00:00 2001 From: Asher Date: Thu, 16 Jul 2026 12:33:43 -0800 Subject: [PATCH 487/497] Fix automatic CSP hash update The problem was that whenever the hashe needed an update, the current patch would create a conflict which cannot be easily auto-resolved. Instead, put the hashes in a separate patch that is deleted and regenerated each time, avoiding the conflicts. Also the web worker iframe hash was not being updated. --- ci/build/update-vscode.sh | 85 +++++++++++++++++++++------------------ ci/lib.sh | 10 +++-- patches/csp-hashes.diff | 26 ++++++++++++ patches/series | 1 + patches/webview.diff | 31 -------------- 5 files changed, 79 insertions(+), 74 deletions(-) create mode 100644 patches/csp-hashes.diff diff --git a/ci/build/update-vscode.sh b/ci/build/update-vscode.sh index bc4eddbe068c..32b7fc1a2d1f 100755 --- a/ci/build/update-vscode.sh +++ b/ci/build/update-vscode.sh @@ -4,7 +4,7 @@ set -Eeuo pipefail function unapply_patches() { local -i exit_code=0 - quiet quilt pop -af || exit_code=$? + quiet quilt pop -af 2>&1 || exit_code=$? case $exit_code in # Sucessfully unapplied. 0) ;; @@ -15,6 +15,19 @@ function unapply_patches() { esac } +function apply_patches() { + local -i exit_code=0 + quiet quilt push -a 2>&1 || exit_code=$? + case $exit_code in + # Sucessfully applied. + 0) ;; + # No more patches to apply. + 2) ;; + # Some error. + *) return $exit_code ;; + esac +} + function update_vscode() { pushd lib/vscode if ! git checkout 2>&1 "$target_vscode_version" ; then @@ -28,8 +41,8 @@ function update_vscode() { function refresh_patches() { local -i exit_code=0 - while quiet quilt push ; ! (( exit_code=$? )) ; do - quilt refresh + while quiet quilt push 2>&1 ; ! (( exit_code=$? )) ; do + quilt refresh 2>&1 done case $exit_code in # No more patches to apply. @@ -56,50 +69,41 @@ function get-webview-script-hash() { local html html=$(<"$1") local start_tag='" html=${html##*"$start_tag"} html=${html%%"$end_tag"*} echo -n "$html" | openssl sha256 -binary | openssl base64 } +function delete_csp() { + quilt delete csp-hashes.diff +} + function update_csp() { - local current - current=$(quilt top 2>/dev/null || echo "") - local patch_action="" - echo "Currently at ${current:-base}" - if [[ $current != */webview.diff ]] ; then - echo "Moving to patches/webview.diff..." - local -i exit_code=0 - if quilt applied 2>/dev/null | grep --quiet webview.diff ; then - quiet quilt pop webview || exit_code=$? - patch_action=pop - else - quiet quilt push webview || exit_code=$? - patch_action=push - fi - case $exit_code in - # Successfully moved. - 0) ;; - # Some error. - *) return $exit_code ;; - esac - fi + apply_patches - local file=lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index.html - local hash - hash=$(get-webview-script-hash "$file") - echo "Calculated hash as $hash" - # Use octothorpe as a delimiter since the hash may contain a slash. - sed -i.bak "s#script-src 'sha256-[^']\+'#script-src 'sha256-$hash'#" "$file" - quilt refresh + local files=( + ./lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index.html + ./lib/vscode/src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html + ) - if [[ $patch_action != "" ]] ; then - echo "Moving back to ${current:-base}..." - case $patch_action in - pop) quiet quilt push "$current" ;; - push) quiet quilt pop "${current:--a}" ;; - esac - fi + quilt new csp-hashes.diff + + local file + for file in "${files[@]}" ; do + quilt add "$file" + + local hash + hash=$(get-webview-script-hash "$file") + echo "Calculated hash as $hash" + # Use octothorpe as a delimiter since the hash may contain a slash. + sed -i.bak "s#'sha256-[^']\+'#'sha256-$hash'#" "$file" + done + + quilt refresh } function add_changelog() { @@ -120,6 +124,9 @@ function main() { declare -a steps + # Hashes are always regenerated to avoid having to resolve conflicts.. + steps+=("Revert CSP hashes" "delete_csp") + # If version is not set, assume we are already at the target version and the # user is just trying to resolve conflics. local target_vscode_version @@ -141,7 +148,7 @@ function main() { steps+=( "Update Node version" "update_node" - "Update CSP webview hash" "update_csp" + "Regenerate CSP hashes" "update_csp" "Add changelog note" "add_changelog" ) diff --git a/ci/lib.sh b/ci/lib.sh index df38a9552891..41b75d65ce85 100755 --- a/ci/lib.sh +++ b/ci/lib.sh @@ -85,18 +85,20 @@ run-steps() { while (( $# )) ; do local name=$1 ; shift local fn=$1 ; shift + echo "$name..." # Only run if an earlier step has not failed. + # For all failed steps, write out an empty checkbox. if [[ $failed == 0 ]] ; then - echo "$name..." if $fn | indent ; then echo "- [X] $name" >> .cache/checklist else ((failed++)) + echo "- [-] $name" >> .cache/checklist + echo "Failed" | indent fi - fi - # For all failed steps, write out an empty checkbox. - if [[ $failed != 0 ]] ; then + else echo "- [ ] $name" >> .cache/checklist + echo "Skipped" | indent fi done if [[ $failed != 0 ]] ; then diff --git a/patches/csp-hashes.diff b/patches/csp-hashes.diff new file mode 100644 index 000000000000..6435caa92e2e --- /dev/null +++ b/patches/csp-hashes.diff @@ -0,0 +1,26 @@ +Index: code-server/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index.html +=================================================================== +--- code-server.orig/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index.html ++++ code-server/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index.html +@@ -5,7 +5,7 @@ + + + ++ content="default-src 'none'; script-src 'sha256-A6/szVNdTzyi4hDa+9OLbzS8tSd2iUV4CqimLNWex2Y=' 'self'; frame-src 'self'; style-src 'unsafe-inline';"> + + + + + diff --git a/patches/series b/patches/series index 6f438da313bf..5b548e3900dd 100644 --- a/patches/series +++ b/patches/series @@ -24,3 +24,4 @@ trusted-domains.diff signature-verification.diff copilot.diff app-name.diff +csp-hashes.diff diff --git a/patches/webview.diff b/patches/webview.diff index fd5349d73198..24ffef3dcb5b 100644 --- a/patches/webview.diff +++ b/patches/webview.diff @@ -3,9 +3,6 @@ Serve webviews from the same origin Normally webviews are served from vscode-webview.net but we would rather them be self-hosted. -When doing this CSP will block resources (for example when viewing images) so -add 'self' to the CSP to fix that. - Additionally the service worker defaults to handling *all* requests made to the current host but when self-hosting the webview this will end up including the webview HTML itself which means these requests will fail since the communication @@ -20,16 +17,6 @@ webview host is separate by default but we serve on the same host). To test, open a few types of webviews (images, markdown, extension details, etc). -Make sure to update the hash. To do so: -1. run code-server -2. open any webview (i.e. preview Markdown) -3. see error in console and copy hash - -That will test the hash change in pre/index.html - -Double-check the console to make sure there are no console errors for the webWorkerExtensionHostIframe -which also requires a hash change. - parentOriginHash changes This fixes webviews from not working properly due to a change upstream. @@ -66,15 +53,6 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index.html +++ code-server/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index.html -@@ -5,7 +5,7 @@ - - - -+ content="default-src 'none'; script-src 'sha256-A6/szVNdTzyi4hDa+9OLbzS8tSd2iUV4CqimLNWex2Y=' 'self'; frame-src 'self'; style-src 'unsafe-inline';"> - - - - - @@ -25,6 +25,13 @@ // validation not requested return start(); From 77baee7fe06f7031d45e6acf903c9b4b329e10c4 Mon Sep 17 00:00:00 2001 From: cdrci <78873720+cdrci@users.noreply.github.com> Date: Fri, 17 Jul 2026 17:05:13 +1000 Subject: [PATCH 488/497] Update Code to 1.129.0 (#7897) --- .node-version | 2 +- CHANGELOG.md | 6 ++++++ lib/vscode | 2 +- patches/csp-hashes.diff | 4 ++-- patches/proposed-api.diff | 17 ++++++++--------- patches/webview.diff | 4 ++-- 6 files changed, 20 insertions(+), 15 deletions(-) diff --git a/.node-version b/.node-version index 1dd37d53743d..ca5c350055cc 100644 --- a/.node-version +++ b/.node-version @@ -1 +1 @@ -24.17.0 +24.18.0 diff --git a/CHANGELOG.md b/CHANGELOG.md index 57416d3c64f0..f197b7bad3f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,12 @@ Code v99.99.999 ## Unreleased +Code v1.129.0 + +### Changed + +- Update to Code 1.129.0 + ## [4.128.0](https://github.com/coder/code-server/releases/tag/v4.128.0) - 2026-07-11 Code v1.128.0 diff --git a/lib/vscode b/lib/vscode index fc3def6774c7..125df4672b8a 160000 --- a/lib/vscode +++ b/lib/vscode @@ -1 +1 @@ -Subproject commit fc3def6774c76082adf699d366f31a557ce5573f +Subproject commit 125df4672b8a6a34975303c6b0baa124e560a4f7 diff --git a/patches/csp-hashes.diff b/patches/csp-hashes.diff index 6435caa92e2e..0202248875e8 100644 --- a/patches/csp-hashes.diff +++ b/patches/csp-hashes.diff @@ -19,8 +19,8 @@ Index: code-server/lib/vscode/src/vs/workbench/services/extensions/worker/webWor diff --git a/patches/proposed-api.diff b/patches/proposed-api.diff index daf7169f1436..3b2286b043e7 100644 --- a/patches/proposed-api.diff +++ b/patches/proposed-api.diff @@ -10,18 +10,17 @@ Index: code-server/lib/vscode/src/vs/workbench/services/extensions/common/extens =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/services/extensions/common/extensions.ts +++ code-server/lib/vscode/src/vs/workbench/services/extensions/common/extensions.ts -@@ -321,10 +321,7 @@ function extensionDescriptionArrayToMap( +@@ -324,6 +324,10 @@ function extensionDescriptionArrayToMap( } export function isProposedApiEnabled(extension: IExtensionDescription, proposal: ApiProposalName): boolean { -- if (!extension.enabledApiProposals) { -- return false; -- } -- return true;// extension.enabledApiProposals.includes(proposal); -+ return true - } - - export function checkProposedApiEnabled(extension: IExtensionDescription, proposal: ApiProposalName): void { ++ return true; ++} ++ ++export function _isProposedApiEnabled(extension: IExtensionDescription, proposal: ApiProposalName): boolean { + if (!extension.enabledApiProposals) { + return false; + } Index: code-server/lib/vscode/src/vs/workbench/services/extensions/common/extensionsProposedApi.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/services/extensions/common/extensionsProposedApi.ts diff --git a/patches/webview.diff b/patches/webview.diff index 24ffef3dcb5b..e3d82c35839c 100644 --- a/patches/webview.diff +++ b/patches/webview.diff @@ -79,8 +79,8 @@ Index: code-server/lib/vscode/src/vs/workbench/services/extensions/worker/webWor =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html +++ code-server/lib/vscode/src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html -@@ -25,6 +25,13 @@ - // validation not requested +@@ -34,6 +34,13 @@ + } return start(); } + From 22b0a3eeabd7f34a1185839553b88f81f1718ceb Mon Sep 17 00:00:00 2001 From: cdrci <78873720+cdrci@users.noreply.github.com> Date: Sat, 18 Jul 2026 05:33:10 +1000 Subject: [PATCH 489/497] Update Helm chart and changelog with 4.129.0 (#7898) --- CHANGELOG.md | 2 ++ ci/helm-chart/Chart.yaml | 4 ++-- ci/helm-chart/values.yaml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f197b7bad3f0..eb8495b6aac8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,8 @@ Code v99.99.999 ## Unreleased +## [4.129.0](https://github.com/coder/code-server/releases/tag/v4.129.0) - 2026-07-17 + Code v1.129.0 ### Changed diff --git a/ci/helm-chart/Chart.yaml b/ci/helm-chart/Chart.yaml index 6d1bda0f3678..9f959fe9a729 100644 --- a/ci/helm-chart/Chart.yaml +++ b/ci/helm-chart/Chart.yaml @@ -15,9 +15,9 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 3.43.0 +version: 3.44.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 4.128.0 +appVersion: 4.129.0 diff --git a/ci/helm-chart/values.yaml b/ci/helm-chart/values.yaml index 05954e11926e..472813165da9 100644 --- a/ci/helm-chart/values.yaml +++ b/ci/helm-chart/values.yaml @@ -6,7 +6,7 @@ replicaCount: 1 image: repository: codercom/code-server - tag: '4.128.0' + tag: '4.129.0' pullPolicy: Always # Specifies one or more secrets to be used when pulling images from a From 227d08660bc1381a71d26aa68a95d07577ea945a Mon Sep 17 00:00:00 2001 From: cdrci <78873720+cdrci@users.noreply.github.com> Date: Tue, 21 Jul 2026 05:00:27 +1000 Subject: [PATCH 490/497] Update Code to 1.129.1 (#7899) --- CHANGELOG.md | 6 ++++++ lib/vscode | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eb8495b6aac8..8b9e72db645a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,12 @@ Code v99.99.999 ## Unreleased +Code v1.129.1 + +### Changed + +- Update to Code 1.129.1 + ## [4.129.0](https://github.com/coder/code-server/releases/tag/v4.129.0) - 2026-07-17 Code v1.129.0 diff --git a/lib/vscode b/lib/vscode index 125df4672b8a..8a7abeba6e03 160000 --- a/lib/vscode +++ b/lib/vscode @@ -1 +1 @@ -Subproject commit 125df4672b8a6a34975303c6b0baa124e560a4f7 +Subproject commit 8a7abeba6e03ea3af87bfbce9a1b7e48fed567b8 From 31e6279646917de4a3bef76f3f55a0b746aaad18 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Jul 2026 14:03:57 -0800 Subject: [PATCH 491/497] chore: bump softprops/action-gh-release from 3.0.0 to 3.0.1 (#7878) --- .github/workflows/release.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index ce69cd72c9f7..417aa950963c 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -110,7 +110,7 @@ jobs: - run: | sed "/^## Unreleased/,/^## / ! d" CHANGELOG.md | head -n -2 | tail -n +3 > .cache/release-notes if: ${{ matrix.vscode_arch == 'x64' }} - - uses: softprops/action-gh-release@b4309332981a82ec1c5618f44dd2e27cc8bfbfda # v3.0.0 + - uses: softprops/action-gh-release@718ea10b132b3b2eba29c1007bb80653f286566b # v3.0.1 if: ${{ matrix.vscode_arch == 'x64' }} with: draft: true @@ -123,7 +123,7 @@ jobs: # Platform-specific release. - run: KEEP_MODULES=1 npm run release - run: npm run package - - uses: softprops/action-gh-release@b4309332981a82ec1c5618f44dd2e27cc8bfbfda # v3.0.0 + - uses: softprops/action-gh-release@718ea10b132b3b2eba29c1007bb80653f286566b # v3.0.1 with: draft: true discussion_category_name: "📣 Announcements" @@ -189,7 +189,7 @@ jobs: - run: npm run test:native - run: npm run package - - uses: softprops/action-gh-release@b4309332981a82ec1c5618f44dd2e27cc8bfbfda # v3.0.0 + - uses: softprops/action-gh-release@718ea10b132b3b2eba29c1007bb80653f286566b # v3.0.1 with: draft: true discussion_category_name: "📣 Announcements" From 1e2b734be89fb5f2222929f49a5cb425579f2c1f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Jul 2026 14:04:23 -0800 Subject: [PATCH 492/497] chore: bump awalsh128/cache-apt-pkgs-action from 1.6.1 to 1.6.3 (#7877) --- .github/workflows/build.yaml | 2 +- .github/workflows/release.yaml | 2 +- .github/workflows/update.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index e12411acca60..d8898d3be5c3 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -163,7 +163,7 @@ jobs: steps: - run: sudo apt update && sudo apt install -y libkrb5-dev - - uses: awalsh128/cache-apt-pkgs-action@681749ae568c81c2037cb9185e38b709b261bd2f # latest + - uses: awalsh128/cache-apt-pkgs-action@553a35bb8ebd9fcabcb1c9451aa4c98e1b4ca8a9 # latest with: packages: quilt version: 1.0 diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 417aa950963c..687a1cae7409 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -59,7 +59,7 @@ jobs: steps: - run: sudo apt update && sudo apt install -y libkrb5-dev - - uses: awalsh128/cache-apt-pkgs-action@681749ae568c81c2037cb9185e38b709b261bd2f # latest + - uses: awalsh128/cache-apt-pkgs-action@553a35bb8ebd9fcabcb1c9451aa4c98e1b4ca8a9 # latest with: packages: quilt version: 1.0 diff --git a/.github/workflows/update.yaml b/.github/workflows/update.yaml index 461a31e1b40d..308714ba5ec8 100644 --- a/.github/workflows/update.yaml +++ b/.github/workflows/update.yaml @@ -47,7 +47,7 @@ jobs: echo done=false >> $GITHUB_OUTPUT fi - - uses: awalsh128/cache-apt-pkgs-action@681749ae568c81c2037cb9185e38b709b261bd2f # latest + - uses: awalsh128/cache-apt-pkgs-action@553a35bb8ebd9fcabcb1c9451aa4c98e1b4ca8a9 # latest if: steps.check.outputs.done == 'false' with: packages: quilt From c2337fec2d867c12f09eaf6b4db5e1c93150f8d0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Jul 2026 11:12:19 -0800 Subject: [PATCH 493/497] chore: bump azure/setup-helm from 5.0.0 to 5.0.1 (#7873) --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index d8898d3be5c3..401003e5dd3b 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -90,7 +90,7 @@ jobs: if: needs.changes.outputs.helm == 'true' steps: - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 - - uses: azure/setup-helm@dda3372f752e03dde6b3237bc9431cdc2f7a02a2 # v5.0.0 + - uses: azure/setup-helm@9bc31f4ebc9c6b171d7bfbaa5d006ae7abdb4310 # v5.0.1 with: token: ${{ secrets.GITHUB_TOKEN }} version: "v3.19.2" From b99ce9a992da2468051034a9b0167c6f6a36d1b1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Jul 2026 11:12:59 -0800 Subject: [PATCH 494/497] chore: bump actions/cache from 5.0.5 to 6.1.0 (#7875) --- .github/workflows/build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 401003e5dd3b..a3c918abb3e7 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -191,7 +191,7 @@ jobs: # embedded into the code). Use VSCODE_CACHE_VERSION to force a rebuild. - name: Fetch prebuilt linux-x64 Code package from cache id: cache-vscode - uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5 + uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0 with: path: lib/vscode-reh-web-linux-x64 key: vscode-linux-x64-package-${{ secrets.VSCODE_CACHE_VERSION }}-${{ steps.vscode-rev.outputs.rev }}-${{ hashFiles('patches/*.diff', 'ci/build/build-vscode.sh') }} @@ -256,7 +256,7 @@ jobs: steps: - name: Cache Caddy - uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5 + uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0 id: caddy-cache with: path: | From 3ed5f9744836dd135980650dd6c85a893007ff6b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Jul 2026 11:14:19 -0800 Subject: [PATCH 495/497] chore: bump ws from 7.5.10 to 7.5.13 in /test (#7901) --- test/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/package-lock.json b/test/package-lock.json index 422c6c393fa4..6032ad15f1ab 100644 --- a/test/package-lock.json +++ b/test/package-lock.json @@ -4937,9 +4937,9 @@ } }, "node_modules/ws": { - "version": "7.5.10", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz", - "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==", + "version": "7.5.13", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.13.tgz", + "integrity": "sha512-rsKI6xDBFVf4r/x8XyChGK04QR/XHroxs/jUcoWvtEZM8TPU/X/uIY9B1CsSzYws9ZJb/6bbBu7dPhFW00CAoA==", "dev": true, "license": "MIT", "engines": { From 1dabd152beeca3d8ac40e98dc1a2e4c520a8a038 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Jul 2026 19:18:19 +0000 Subject: [PATCH 496/497] chore: bump actions/checkout from 6.0.3 to 7.0.1 (#7874) --- .github/workflows/build.yaml | 20 ++++++++++---------- .github/workflows/installer.yaml | 6 +++--- .github/workflows/publish.yaml | 8 ++++---- .github/workflows/release.yaml | 4 ++-- .github/workflows/scripts.yaml | 4 ++-- .github/workflows/security.yaml | 6 +++--- .github/workflows/trivy-docker.yaml | 2 +- .github/workflows/update.yaml | 2 +- 8 files changed, 26 insertions(+), 26 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index a3c918abb3e7..f9cf0e7064dd 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -25,7 +25,7 @@ jobs: docs: ${{ steps.filter.outputs.docs }} helm: ${{ steps.filter.outputs.helm }} steps: - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 - uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1 id: filter with: @@ -55,7 +55,7 @@ jobs: name: Run prettier check runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6 with: node-version-file: .node-version @@ -72,7 +72,7 @@ jobs: needs: changes if: needs.changes.outputs.docs == 'true' steps: - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6 with: node-version-file: .node-version @@ -89,7 +89,7 @@ jobs: needs: changes if: needs.changes.outputs.helm == 'true' steps: - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 - uses: azure/setup-helm@9bc31f4ebc9c6b171d7bfbaa5d006ae7abdb4310 # v5.0.1 with: token: ${{ secrets.GITHUB_TOKEN }} @@ -103,7 +103,7 @@ jobs: needs: changes if: needs.changes.outputs.code == 'true' steps: - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6 with: node-version-file: .node-version @@ -121,7 +121,7 @@ jobs: if: needs.changes.outputs.ci == 'true' steps: - name: Checkout repo - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 - name: Check workflow files run: | bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash) 1.7.9 @@ -134,7 +134,7 @@ jobs: needs: changes if: needs.changes.outputs.code == 'true' steps: - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6 with: node-version-file: .node-version @@ -168,7 +168,7 @@ jobs: packages: quilt version: 1.0 - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 with: submodules: true - run: quilt push -a @@ -219,7 +219,7 @@ jobs: if: needs.changes.outputs.code == 'true' || needs.changes.outputs.deps == 'true' || needs.changes.outputs.ci == 'true' steps: - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6 with: node-version-file: .node-version @@ -269,7 +269,7 @@ jobs: mkdir -p ~/.cache/caddy tar -xzf caddy_2.5.2_linux_amd64.tar.gz --directory ~/.cache/caddy - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6 with: node-version-file: .node-version diff --git a/.github/workflows/installer.yaml b/.github/workflows/installer.yaml index 9b4ab9018ff1..1777844dd11b 100644 --- a/.github/workflows/installer.yaml +++ b/.github/workflows/installer.yaml @@ -30,7 +30,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repo - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 - name: Install code-server run: ./install.sh @@ -44,7 +44,7 @@ jobs: container: "alpine:3.17" steps: - name: Checkout repo - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 - name: Install curl run: apk add curl @@ -67,7 +67,7 @@ jobs: steps: - name: Checkout repo - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 - name: Install code-server run: ./install.sh diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 76a7c78533bc..95299ce9e93b 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -33,7 +33,7 @@ jobs: run: | echo "VERSION=${TAG#v}" >> $GITHUB_ENV - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6 with: node-version-file: .node-version @@ -64,7 +64,7 @@ jobs: echo "VERSION=${TAG#v}" >> $GITHUB_ENV - name: Checkout code-server-aur repo - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 with: repository: "cdrci/code-server-aur" token: ${{ secrets.HOMEBREW_GITHUB_API_TOKEN }} @@ -108,7 +108,7 @@ jobs: run: | echo "VERSION=${TAG#v}" >> $GITHUB_ENV - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 - uses: docker/setup-qemu-action@06116385d9baf250c9f4dcb4858b16962ea869c3 # v4.1.0 - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0 @@ -149,7 +149,7 @@ jobs: run: | echo "VERSION=${TAG#v}" >> $GITHUB_ENV - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 - run: ./ci/build/update-repo.sh diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 687a1cae7409..fc4a126fb125 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -76,7 +76,7 @@ jobs: version=4${version:1} echo "VERSION=$version" >> $GITHUB_ENV - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 with: submodules: true - run: quilt push -a @@ -170,7 +170,7 @@ jobs: version=4${version:1} echo "VERSION=$version" >> $GITHUB_ENV - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 with: submodules: true - run: quilt push -a diff --git a/.github/workflows/scripts.yaml b/.github/workflows/scripts.yaml index 1c671c48fa90..180975866b12 100644 --- a/.github/workflows/scripts.yaml +++ b/.github/workflows/scripts.yaml @@ -41,7 +41,7 @@ jobs: container: "alpine:3.17" steps: - name: Checkout repo - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 - name: Install test utilities run: apk add bats checkbashisms @@ -58,7 +58,7 @@ jobs: timeout-minutes: 5 steps: - name: Checkout repo - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 - name: Install lint utilities run: sudo apt install shellcheck diff --git a/.github/workflows/security.yaml b/.github/workflows/security.yaml index 7671a094e6d5..fc1664965f55 100644 --- a/.github/workflows/security.yaml +++ b/.github/workflows/security.yaml @@ -25,7 +25,7 @@ jobs: timeout-minutes: 15 steps: - name: Checkout repo - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 with: fetch-depth: 0 @@ -46,7 +46,7 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Checkout repo - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 with: fetch-depth: 0 @@ -76,7 +76,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/trivy-docker.yaml b/.github/workflows/trivy-docker.yaml index 26bf15886948..8ceb95d60b04 100644 --- a/.github/workflows/trivy-docker.yaml +++ b/.github/workflows/trivy-docker.yaml @@ -46,7 +46,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 - name: Run Trivy vulnerability scanner in image mode uses: aquasecurity/trivy-action@314ff8b43182423b84c50b1670b0e10f858f2d98 # latest diff --git a/.github/workflows/update.yaml b/.github/workflows/update.yaml index 308714ba5ec8..b54826c79f70 100644 --- a/.github/workflows/update.yaml +++ b/.github/workflows/update.yaml @@ -28,7 +28,7 @@ jobs: run: | echo "VERSION=${TAG#v}" >> $GITHUB_ENV - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 with: submodules: true From 5cf68f624139e5a8e1b9d9fd4588815ad1c2ff2a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Jul 2026 11:45:28 -0800 Subject: [PATCH 497/497] Bump prettier from 3.8.3 to 3.9.4 (#7876) --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 91807c30f6ba..60ef2224b56a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -58,7 +58,7 @@ "eslint-plugin-import": "^2.28.1", "eslint-plugin-prettier": "^5.0.0", "globals": "^17.6.0", - "prettier": "3.8.3", + "prettier": "3.9.4", "prettier-plugin-sh": "^0.18.0", "ts-node": "^10.9.1", "typescript": "^5.6.2", @@ -5144,9 +5144,9 @@ } }, "node_modules/prettier": { - "version": "3.8.3", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.8.3.tgz", - "integrity": "sha512-7igPTM53cGHMW8xWuVTydi2KO233VFiTNyF5hLJqpilHfmn8C8gPf+PS7dUT64YcXFbiMGZxS9pCSxL/Dxm/Jw==", + "version": "3.9.4", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.9.4.tgz", + "integrity": "sha512-yWG/o/4oJfo036EKAfK6ACAoDOfHeRHx4tuxkfBZiauURiaSmYwlpOr5LQqKtIkRD2z1PLteme2WoxEnj4tHTg==", "dev": true, "license": "MIT", "bin": { diff --git a/package.json b/package.json index dbebbc7c370d..144b9232aa36 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "eslint-plugin-import": "^2.28.1", "eslint-plugin-prettier": "^5.0.0", "globals": "^17.6.0", - "prettier": "3.8.3", + "prettier": "3.9.4", "prettier-plugin-sh": "^0.18.0", "ts-node": "^10.9.1", "typescript": "^5.6.2",