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 001/376] 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 002/376] 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 003/376] 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 004/376] 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 005/376] 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 006/376] 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 007/376] 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 008/376] 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 009/376] 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 010/376] 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 011/376] 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 012/376] 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 013/376] 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 014/376] 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 015/376] 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 016/376] 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 017/376] 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 018/376] 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 019/376] 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 020/376] 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 021/376] 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 022/376] 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 023/376] 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 024/376] 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 025/376] 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 026/376] 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 027/376] 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 028/376] 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 029/376] 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 030/376] 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 031/376] 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 032/376] 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 033/376] 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 034/376] 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 035/376] 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 036/376] 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 037/376] 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 038/376] 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 039/376] 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 040/376] 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 041/376] 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 042/376] 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 043/376] 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 348/376] 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 349/376] 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 350/376] 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 351/376] 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 352/376] 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 353/376] 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 354/376] 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 355/376] 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 356/376] 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 357/376] 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 358/376] 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 359/376] 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 360/376] 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 361/376] 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 362/376] 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 363/376] 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 364/376] 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 365/376] 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 366/376] 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 367/376] 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 368/376] 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 369/376] 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 370/376] 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 371/376] 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 372/376] 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 373/376] 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 374/376] 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 375/376] 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 376/376] 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)