Merge pull request 'main' (#3 ) from Upstream/code-server:main into main

Reviewed-on: #3
Fix dangling links in standalone release
2024-07-29 10:55:17 +02:00 · 2024-07-25 09:16:15 -08:00 · 2024-07-19 10:51:31 -08:00 · 2024-07-15 09:57:32 -08:00 · 2024-07-12 17:02:40 -08:00 · 2024-07-12 16:23:29 -08:00
58 changed files with 627 additions and 797 deletions
--- a/.github/ranger.yml
+++ b/.github/ranger.yml
@ -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.
--- 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
@ -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
@ -229,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
--- 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 }}
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@ -222,7 +222,7 @@ jobs:
      # next update Node we can probably remove this.  For now, install
      # setuptools since it contains distutils.
      - name: Install Python utilities
-        run: python3 -m pip install setuptools
+        run: brew install python-setuptools
      - name: Download npm package
        uses: actions/download-artifact@v4
@ -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 }}
--- 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
@ -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@6e7b7d1fd3e4fef0c5fa8cce1229c54b2c9bd0d8
        with:
          scan-type: "fs"
          scan-ref: "."
--- 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@6e7b7d1fd3e4fef0c5fa8cce1229c54b2c9bd0d8
        with:
          image-ref: "docker.io/codercom/code-server:latest"
          ignore-unfixed: true
--- a/.node-version
+++ b/.node-version
@ -1 +1 @@
-18.18.2
+20.11.1
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -22,11 +22,88 @@ 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
 - 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
 ### 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
 ### 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
 - 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
 ### 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
 ### Changed
 - Updated to Code 1.89.1.
 ## [4.89.0](https://github.com/coder/code-server/releases/tag/v4.89.0) - 2024-04-08
 Code v1.89.0
 ### Changed
 - Updated to Code 1.89.0.
 ## [4.23.1](https://github.com/coder/code-server/releases/tag/v4.23.1) - 2024-04-15
 Code v1.88.1
-## Changed
+### Changed
 - Updated to Code 1.88.1.
@ -34,12 +111,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
@ -49,7 +126,7 @@ Code v1.88.0
 Code v1.87.2
-## Changed
+### Changed
 - Updated to Code 1.87.2.
 - Enable keep-alive for proxy agent.
@ -58,7 +135,7 @@ Code v1.87.2
 Code v1.87.0
-## Changed
+### Changed
 - Updated to Code 1.87.0.
@ -66,7 +143,7 @@ Code v1.87.0
 Code v1.86.2
-## Changed
+### Changed
 - Updated to Code 1.86.2.
@ -74,12 +151,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.
@ -87,7 +164,7 @@ Code v1.86.1
 Code v1.86.0
-## Changed
+### Changed
 - Updated to Code 1.86.0.
@ -95,11 +172,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.
--- 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).
--- 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)"
--- 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
 }
--- 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
+  if [ "$major_node_version" -ne "${FORCE_NODE_VERSION:-20}" ]; then
-    echo "ERROR: code-server currently requires node v18."
+    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
--- a/ci/dev/audit.sh
+++ b/ci/dev/audit.sh
@ -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 "$@"
--- a/ci/dev/ci.sh
+++ b/ci/dev/ci.sh
@ -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 "$@"
--- a/ci/helm-chart/Chart.yaml
+++ b/ci/helm-chart/Chart.yaml
@ -15,9 +15,9 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 3.19.1
+version: 3.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.23.1
+appVersion: 4.91.0
--- a/ci/helm-chart/templates/deployment.yaml
+++ b/ci/helm-chart/templates/deployment.yaml
@ -177,9 +177,12 @@ spec:
        {{- if .existingClaim }}
        persistentVolumeClaim:
          claimName: {{ .existingClaim }}
-        {{- else }}
+        {{- else if .hostPath }}
        hostPath:
          path: {{ .hostPath }}
          type: Directory
        {{- else }}
        emptyDir:
          {{- toYaml .emptyDir | nindent 10 }}
        {{- end }}
      {{- end }}
--- a/ci/helm-chart/values.yaml
+++ b/ci/helm-chart/values.yaml
@ -6,7 +6,7 @@ replicaCount: 1
 image:
  repository: codercom/code-server
-  tag: '4.23.1'
+  tag: '4.91.0'
  pullPolicy: Always
 # Specifies one or more secrets to be used when pulling images from a
@ -190,6 +190,7 @@ extraVolumeMounts: []
  #   readOnly: true
  #   existingClaim: volume-claim
  #   hostPath: ""
  #   emptyDir: {}
 extraConfigmapMounts: []
  # - name: certs-configmap
--- 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(
--- 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,16 +26,13 @@
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 <!-- prettier-ignore-end -->
 - [Detailed CI and build process docs](../ci)
 ## Requirements
 The prerequisites for contributing to code-server are almost the same as those
-for [VS
+for [VS Code](https://github.com/Microsoft/vscode/wiki/How-to-Contribute#prerequisites).
 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/)
@ -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.
+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.
 ## 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.
 When you make a change that affects people deploying the marketplace please
 update the changelog as part of your 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.
 Display language (Spanish, etc) support only works in a full build; it will not
 work in development mode.
 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
-1. Update the `lib/vscode` submodule to the desired upstream version branch.
+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 Code"`
+   2. `git add lib && git commit -m "chore: update to Code <version>"`
-2. Apply the patches (`quilt push -a`) or restore your stashed changes. At this
+3. Apply the patches one at a time (`quilt push`). If the application succeeds
-   stage you may need to resolve conflicts. For example use `quilt push -f`,
+   but the lines changed, update the patch with `quilt refresh`. If there are
-   manually apply the rejected portions, then `quilt refresh`.
+   conflicts, then force apply with `quilt push -f`, manually add back the
-3. From the code-server **project root**, run `yarn install`.
+   rejected code, then run `quilt refresh`.
-4. Test code-server locally to make sure everything works.
+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 your version of Node.js to match.
+   Code. If necessary, update our version of Node.js to match.
 6. Commit the updated submodule and patches to `code-server`.
 7. Open a PR.
 Tip: if you're certain all patches are applied correctly and you simply need to
 refresh, you can use this trick:
 ```shell
 while quilt push; do quilt refresh; done
 ```
 [Source](https://raphaelhertzog.com/2012/08/08/how-to-use-quilt-to-manage-patches-in-debian-packages/)
 ### Patching Code
-0. You can go through the patch stack with `quilt push` and `quilt pop`.
+1. 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.
+2. 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
+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`)
+5. Add your changes to the patch (`quilt refresh`)
-1. Add a comment in the patch about the reason for the patch and how to
+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
+These are a work in progress. We build code-server and run tests with `yarn
-platforms.
+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-server essentially serves as an HTTP API for logging in and starting a
-Code process.
+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).
--- 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)
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 <!-- prettier-ignore-end -->
@ -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`
--- a/docs/MAINTAINING.md
+++ b/docs/MAINTAINING.md
@ -3,24 +3,13 @@
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 # Maintaining
- [Team](#team)
+- [Releasing](#releasing)
  - [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)
    - [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 @@
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 <!-- prettier-ignore-end -->
-This document is meant to serve current and future maintainers of code-server,
+We keep code-server up to date with VS Code releases (there are usually two or
-as well as share our workflow for maintaining the project.
+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
+1. Check that the changelog lists all the important changes.
- @jsjoeio
+2. Make sure the changelog entry lists the current version of VS Code.
-
+3. Update the changelog with the release date.
-Occasionally, other Coder employees may step in time to time to assist with code-server.
+4. Go to GitHub Actions > Draft release > Run workflow on the commit you want to
 ### 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.
 - "<Month>" -> 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
 `<major.minor.patch>`
 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
   release. Make sure CI has finished the build workflow on that commit or this
-   will fail.
+   will fail. For the version we match VS Code's minor and patch version. The
-2. CI will automatically grab the build artifact on that commit, inject the
+   patch number may become temporarily out of sync if we need to put out a
-   version into the `package.json`, put together platform-specific packages, and
+   patch, but if we make our own minor change then we will not release it until
-   upload those packages to a draft release.
+   the next minor VS Code release.
-3. Summarize the major changes in the `CHANGELOG.md`.
+5. CI will automatically grab the build artifact on that commit (which is why CI
-4. Copy the relevant changelog section to the release then publish it.
+   has to have completed), inject the provided version into the `package.json`,
-5. CI will automatically publish the NPM package, Docker image, and update
+   put together platform-specific packages, and upload those packages to a draft
-   Homebrew using the published release assets.
+   release.
-6. Bump the chart version in `Chart.yaml` and merge in the changelog updates.
+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.
+- run `yarn test:unit` and look at the coverage chart. You'll see all the
- look at `test/scripts` to see which scripts are tested. We can always use more tests there.
+  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"
--- 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)
+- `yarn audit` and `npm audit`
-  - Audits npm and Yarn dependencies in CI (see `Audit for vulnerabilities` step
+  - Audits Yarn/NPM dependencies.
    in `build.yaml`) on PRs into the default branch and fails CI if moderate or
    higher vulnerabilities (see the `audit.sh` script) are present.
 ## Supported Versions
--- 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
--- 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)
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 <!-- prettier-ignore-end -->
@ -435,93 +432,3 @@ const config = {
 3. Access app at `<code-server-root>/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.
--- 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
 ```
--- 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)
--- a/flake.lock
+++ b/flake.lock
@ -5,11 +5,11 @@
        "systems": "systems"
      },
      "locked": {
-        "lastModified": 1681202837,
+        "lastModified": 1710146030,
-        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
+        "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,
+        "lastModified": 1716137900,
-        "narHash": "sha256-iUhLhEAgOCnexSGDsYT2ouydis09uDoNzM7UC685XGE=",
+        "narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=",
-        "owner": "NixOS",
+        "path": "/nix/store/r8nhgnkxacbnf4kv8kdi8b6ks3k9b16i-source",
-        "repo": "nixpkgs",
+        "rev": "6c0b7a92c30122196a761b440ac0d46d3d9954f1",
-        "rev": "8d447c5626cfefb9b129d5b30103344377fe09bc",
+        "type": "path"
        "type": "github"
      },
      "original": {
        "id": "nixpkgs",
--- 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 {
--- 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,12 +436,12 @@ 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
  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
--- a/lib/vscode
+++ b/lib/vscode
@ -1 +1 @@
-Subproject commit b58957e67ee1e712cebf466b995adf4c5307b2bd
+Subproject commit f1e16e1e6214d7c44d078b1f0607b2388f29d729
--- 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"
  },
@ -44,16 +42,15 @@
    "@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",
    "@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",
    "eslint": "^8.49.0",
    "eslint-config-prettier": "^9.0.0",
@ -88,7 +85,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 +100,8 @@
    "remote-development"
  ],
  "engines": {
-    "node": "18"
+    "node": "20",
    "yarn": "1"
  },
  "jest": {
    "transform": {
--- 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 = <Partial<IProductConfiguration>>{
+ 		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 } = {
--- a/patches/clipboard.diff
+++ b/patches/clipboard.diff
@ -0,0 +1,136 @@
 Index: code-server/lib/vscode/src/vs/workbench/api/browser/mainThreadCLICommands.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/workbench/api/browser/mainThreadCLICommands.ts
 +++ code-server/lib/vscode/src/vs/workbench/api/browser/mainThreadCLICommands.ts
@@ -8,6 +8,7 @@ import { isWeb } from 'vs/base/common/pl
 import { isString } from 'vs/base/common/types';
 import { URI, UriComponents } from 'vs/base/common/uri';
 import { localize } from 'vs/nls';
 +import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 import { CommandsRegistry, ICommandService } from 'vs/platform/commands/common/commands';
 import { IExtensionGalleryService, IExtensionManagementService } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { ExtensionManagementCLI } from 'vs/platform/extensionManagement/common/extensionManagementCLI';
@@ -89,6 +90,11 @@ CommandsRegistry.registerCommand('_remot
 	return lines.join('\n');
 });
 +CommandsRegistry.registerCommand('_remoteCLI.setClipboard', function (accessor: ServicesAccessor, content: string) {
 +	const clipboardService = accessor.get(IClipboardService);
 +	clipboardService.writeText(content);
 +})
 +
 class RemoteExtensionManagementCLI extends ExtensionManagementCLI {
 	private _location: string | undefined;
 Index: code-server/lib/vscode/src/vs/workbench/api/node/extHostCLIServer.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/workbench/api/node/extHostCLIServer.ts
 +++ code-server/lib/vscode/src/vs/workbench/api/node/extHostCLIServer.ts
@@ -43,7 +43,12 @@ export interface ExtensionManagementPipe
 	force?: boolean;
 }
 -export type PipeCommand = OpenCommandPipeArgs | StatusPipeArgs | OpenExternalCommandPipeArgs | ExtensionManagementPipeArgs;
 +export interface ClipboardPipeArgs {
 +	type: 'clipboard';
 +	content: string;
 +}
 +
 +export type PipeCommand = OpenCommandPipeArgs | StatusPipeArgs | OpenExternalCommandPipeArgs | ExtensionManagementPipeArgs | ClipboardPipeArgs;
 export interface ICommandsExecuter {
 	executeCommand<T>(id: string, ...args: any[]): Promise<T>;
@@ -105,6 +110,9 @@ export class CLIServerBase {
 					case 'extensionManagement':
 						returnObj = await this.manageExtensions(data);
 						break;
 +					case 'clipboard':
 +						returnObj = await this.clipboard(data);
 +						break;
 					default:
 						sendResponse(404, `Unknown message type: ${data.type}`);
 						break;
@@ -172,6 +180,10 @@ export class CLIServerBase {
 		return await this._commands.executeCommand<string | undefined>('_remoteCLI.getSystemStatus');
 	}
 +	private async clipboard(data: ClipboardPipeArgs): Promise<undefined> {
 +		return await this._commands.executeCommand('_remoteCLI.setClipboard', data.content);
 +	}
 +
 	dispose(): void {
 		this._server.close();
 Index: code-server/lib/vscode/src/vs/workbench/contrib/terminal/browser/remoteTerminalBackend.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/workbench/contrib/terminal/browser/remoteTerminalBackend.ts
 +++ code-server/lib/vscode/src/vs/workbench/contrib/terminal/browser/remoteTerminalBackend.ts
@@ -97,7 +97,7 @@ class RemoteTerminalBackend extends Base
 			}
 		});
 -		const allowedCommands = ['_remoteCLI.openExternal', '_remoteCLI.windowOpen', '_remoteCLI.getSystemStatus', '_remoteCLI.manageExtensions'];
 +		const allowedCommands = ['_remoteCLI.openExternal', '_remoteCLI.windowOpen', '_remoteCLI.getSystemStatus', '_remoteCLI.manageExtensions', '_remoteCLI.setClipboard'];
 		this._remoteTerminalChannel.onExecuteCommand(async e => {
 			// Ensure this request for for this window
 			const pty = this._ptys.get(e.persistentProcessId);
 Index: code-server/lib/vscode/src/vs/platform/environment/common/argv.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/platform/environment/common/argv.ts
 +++ code-server/lib/vscode/src/vs/platform/environment/common/argv.ts
@@ -119,6 +119,7 @@ export interface NativeParsedArgs {
 	sandbox?: boolean;
 	'enable-coi'?: boolean;
 +	'stdin-to-clipboard'?: boolean;
 	// chromium command line args: https://electronjs.org/docs/all#supported-chrome-command-line-switches
 	'no-proxy-server'?: boolean;
 Index: code-server/lib/vscode/src/vs/platform/environment/node/argv.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/platform/environment/node/argv.ts
 +++ code-server/lib/vscode/src/vs/platform/environment/node/argv.ts
@@ -90,6 +90,7 @@ export const OPTIONS: OptionDescriptions
 	'user-data-dir': { type: 'string', cat: 'o', args: 'dir', description: localize('userDataDir', "Specifies the directory that user data is kept in. Can be used to open multiple distinct instances of Code.") },
 	'profile': { type: 'string', 'cat': 'o', args: 'profileName', description: localize('profileName', "Opens the provided folder or workspace with the given profile and associates the profile with the workspace. If the profile does not exist, a new empty one is created.") },
 	'help': { type: 'boolean', cat: 'o', alias: 'h', description: localize('help', "Print usage.") },
 +	'stdin-to-clipboard': { type: 'boolean', cat: 'o', alias: 'c', description: localize('clipboard', "copies the STDIN to the clipboard") },
 	'extensions-dir': { type: 'string', deprecates: ['extensionHomePath'], cat: 'e', args: 'dir', description: localize('extensionHomePath', "Set the root path for extensions.") },
 	'extensions-download-dir': { type: 'string' },
 Index: code-server/lib/vscode/src/vs/server/node/server.cli.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/server/node/server.cli.ts
 +++ code-server/lib/vscode/src/vs/server/node/server.cli.ts
@@ -76,6 +76,7 @@ const isSupportedForPipe = (optionId: ke
 		case 'verbose':
 		case 'remote':
 		case 'locate-shell-integration-path':
 +		case 'stdin-to-clipboard':
 			return true;
 		default:
 			return false;
@@ -293,6 +294,23 @@ export async function main(desc: Product
 			}
 		}
 	} else {
 +		if (parsedArgs['stdin-to-clipboard']) {
 +			if(!hasStdinWithoutTty()) {
 +				console.error("stdin has a tty.");
 +				return;
 +			}
 +			const fs = require("fs");
 +			const stdinBuffer = fs.readFileSync(0); // STDIN_FILENO = 0
 +			const clipboardContent = stdinBuffer.toString();
 +			sendToPipe({
 +				type: 'clipboard',
 +				content: clipboardContent
 +			}, verbose).catch(e => {
 +				console.error('Error when requesting status:', e);
 +			});
 +			return;
 +		}
 +
 		if (parsedArgs.status) {
 			sendToPipe({
 				type: 'status'
--- 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
+@@ -287,6 +287,10 @@ export class Extension implements IExten
 			if (this.type === ExtensionType.System && this.productService.quality === 'stable') {
 				return false;
 			}
--- 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';
-@@ -240,6 +240,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,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
-@@ -342,9 +342,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)) {
+ 		if (this.extension.state !== ExtensionState.Uninstalled) {
- 			this.enabled = this.options.installPreReleaseVersion ? this.extension.hasPreReleaseVersion : this.extension.hasReleaseVersion;
+ 			return;
- 			this.updateLabel();
+ 		}
-@@ -615,7 +612,7 @@ export abstract class InstallInOtherServ
+@@ -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
-@@ -1843,17 +1840,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<any> {
-@@ -1870,7 +1856,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);
-@@ -1880,17 +1865,6 @@ export class ClearLanguageAction extends
+@@ -1965,17 +1950,6 @@ export class ClearLanguageAction extends
 	update(): void {
 		this.enabled = false;
 		this.class = ClearLanguageAction.DisabledClass;
--- 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, 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, 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, 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 { TEXT_DIFF_EDITOR_ID, EditorInputCapabilities, SIDE_BY_SIDE_EDITOR_ID, EditorResourceAccessor, SideBySideEditor } from 'vs/workbench/common/editor';
 import { trackFocus, addDisposableListener, EventType, onDidRegisterWindow, getActiveWindow } from 'vs/base/browser/dom';
 import { preferredSideBySideGroupDirection, GroupDirection, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
 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,
+@@ -197,6 +197,10 @@ export class WorkbenchContextKeysHandler
@@ -225,6 +225,10 @@ export class WorkbenchContextKeysHandler
 		this.auxiliaryBarVisibleContext = AuxiliaryBarVisibleContext.bindTo(this.contextKeyService);
 		this.auxiliaryBarVisibleContext.set(this.layoutService.isVisible(Parts.AUXILIARYBAR_PART));
@ -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, MultipleEditorsSelectedInGroupContext, TwoEditorsSelectedInGroupContext } 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, 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<ExplorerItem> {
-@@ -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) {
--- 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());
 			}
@ -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, 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, 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 { 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 { TEXT_DIFF_EDITOR_ID, EditorInputCapabilities, SIDE_BY_SIDE_EDITOR_ID, EditorResourceAccessor, SideBySideEditor } from 'vs/workbench/common/editor';
 import { trackFocus, addDisposableListener, EventType, onDidRegisterWindow, getActiveWindow } from 'vs/base/browser/dom';
 import { preferredSideBySideGroupDirection, GroupDirection, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-@@ -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)
--- 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 = <Partial<IProductConfiguration>>{
+ 		const productConfiguration = {
 +			codeServerVersion: this._productService.codeServerVersion,
 			embedderIdentifier: 'server-distro',
- 			extensionsGallery: this._webExtensionResourceUrlTemplate ? {
+ 			extensionsGallery: this._webExtensionResourceUrlTemplate && this._productService.extensionsGallery ? {
 				...this._productService.extensionsGallery,
--- 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<IProductConfiguration>;
 Index: code-server/lib/vscode/src/vs/workbench/browser/client.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/workbench/browser/client.ts
--- 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<IProductConfiguration>;
 		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;
 	}
--- 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)));
--- 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<IProductConfiguration>;
 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
--- a/patches/series
+++ b/patches/series
@ -20,3 +20,4 @@ cli-window-open.diff
 getting-started.diff
 safari.diff
 keepalive.diff
 clipboard.diff
--- 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<IProductConfiguration>;
--- 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);
--- 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';
+@@ -421,7 +422,28 @@ async function startExtensionHostProcess
@@ -418,7 +419,28 @@ async function startExtensionHostProcess
 	);
 	// rewrite onTerminate-function to be a proper shutdown
--- 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);
@ -42,7 +42,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverServices.ts
 -		if (!isLoggingOnly(productService, environmentService) && productService.aiConfig?.ariaKey) {
 -			oneDsAppender = new OneDataSystemAppender(requestService, isInternal, eventPrefix, null, productService.aiConfig.ariaKey);
 +		if (!isLoggingOnly(productService, environmentService) && productService.telemetryEndpoint) {
-+			oneDsAppender = new OneDataSystemAppender(requestService, isInternal, eventPrefix, null, () => new TelemetryClient(productService.telemetryEndpoint!, isContainer));
+			oneDsAppender = new OneDataSystemAppender(requestService, isInternal, eventPrefix, null, () => new TelemetryClient(productService.telemetryEndpoint!, machineId, isContainer));
 			disposables.add(toDisposable(() => oneDsAppender?.flush())); // Ensure the AI appender is disposed so that it flushes remaining data
 		}
@ -50,48 +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,53 @@
+@@ -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<string, number | undefined>;
 +	properties: Record<string, string | boolean | null | undefined>;
 +}
 +
 +export class TelemetryClient extends AppInsightsCore {
 +	private readonly systemInfo: SystemInfo = {
 +		measurements: {},
 +		properties: {},
 +	};
 +
 +	public constructor(
 +		private readonly endpoint: 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.measurements = {
-+			options.properties = {};
+			...(options.measurements || {}),
 +			...this.systemInfo.measurements,
 +		}
-+		if (!options.measurements) {
+		options.properties = {
-+			options.measurements = {};
+			...(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.isContainer'] = this.isContainer;
 +
 +		try {
 +			const request = (/^http:/.test(this.endpoint) ? http : https).request(this.endpoint, {
 +				method: 'POST',
 +				headers: {
@ -116,7 +134,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<IProductConfiguration>;
 Index: code-server/lib/vscode/src/vs/base/common/product.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/base/common/product.ts
--- 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 = <Partial<IProductConfiguration>>{
+ 		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<IProductConfiguration>;
 Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
--- 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 @@
 	<meta charset="UTF-8">
 	<meta http-equiv="Content-Security-Policy"
-		content="default-src 'none'; script-src 'sha256-bQPwjO6bLiyf6v9eDVtAI67LrfonA1w49aFkRXBy4/g=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
+ 
-+		content="default-src 'none'; script-src 'sha256-R3BsSkqy7qFbvWSmwr7WqT1eg6Sq4zSe0uIlrUQ4EKE=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
+-	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';">
 	<!-- Disable pinch zooming -->
- 	<meta name="viewport"
+@@ -350,6 +350,12 @@
@@ -344,6 +344,12 @@
 				const hostname = location.hostname;
--- 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) => {
--- 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()
    }
--- 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.logStdoutStream = rfs.createStream("code-server-stdout.log", opts)
-    this.logStderrStream = rfs.createStream(path.join(paths.data, "coder-logs", "code-server-stderr.log"), opts)
+    this.logStderrStream = rfs.createStream("code-server-stderr.log", opts)
    this.onDispose(() => this.disposeChild())
--- a/test/e2e/displayLang.test.ts
+++ b/test/e2e/displayLang.test.ts
@ -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)
    })
  },
 )
--- 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
@ -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
  }
 }
--- 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
@ -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"
    }
  }
 }
--- a/test/unit/node/settings.test.ts
+++ b/test/unit/node/settings.test.ts
@ -29,7 +29,7 @@ describe("settings", () => {
      const settings = new SettingsProvider<CoderSettings>(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", () => {
--- 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"
+  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+  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:
+fill-range@^7.1.1:
-  version "7.0.1"
+  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+  integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
  dependencies:
    to-regex-range "^5.0.1"
@ -3544,9 +3544,9 @@ write-file-atomic@^3.0.0:
    typedarray-to-buffer "^3.1.5"
 ws@^7.4.6:
-  version "7.5.6"
+  version "7.5.10"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.6.tgz#e59fc509fb15ddfb65487ee9765c5a51dec5fe7b"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.10.tgz#58b5c20dc281633f6c19113f39b349bd8bd558d9"
-  integrity sha512-6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA==
+  integrity sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==
 wtfnode@^0.9.1:
  version "0.9.1"
--- 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":
+"@types/node@*", "@types/node@20.x":
-  version "18.19.4"
+  version "20.14.2"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.4.tgz#89672e84f11a2c19543d694dac00ab8d7bc20ddb"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.14.2.tgz#a5f4d2bcb4b6a87bffcaa717718c5a0f208f4a18"
-  integrity sha512-xNzlUhzoHotIsnFoXmJB+yWmBvFZgKCI9TtPIEdYIMM1KWfwuY8zh7wvc1u1OAXlC7dlf6mZVx/s+Y5KfFz19A==
+  integrity sha512-xyu6WAMVwv6AKFLB+e/7ySZVr/0zLCzOa7rSpq6jNwpqOrUbcACDWC+53d4n2QHOnDou0fbIsg8wZu/sxrnI4Q==
  dependencies:
    undici-types "~5.26.4"
@ -359,16 +359,16 @@
  dependencies:
    "@types/node" "*"
-"@typescript-eslint/eslint-plugin@^6.7.2":
+"@typescript-eslint/eslint-plugin@^7.0.0":
-  version "6.21.0"
+  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.21.0.tgz#30830c1ca81fd5f3c2714e524c4303e0194f9cd3"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.0.0.tgz#62cda0d35bbf601683c6e58cf5d04f0275caca4e"
-  integrity sha512-oy9+hTPCUFpngkEZUSzbf9MxI65wbKFoQYsgPdILTfbUldp5ovUuphZVe4i30emU9M/kP+T64Di0mxl7dSw3MA==
+  integrity sha512-M72SJ0DkcQVmmsbqlzc6EJgb/3Oz2Wdm6AyESB4YkGgCxP8u5jt5jn4/OBMPK3HLOxcttZq5xbBBU7e2By4SZQ==
  dependencies:
    "@eslint-community/regexpp" "^4.5.1"
-    "@typescript-eslint/scope-manager" "6.21.0"
+    "@typescript-eslint/scope-manager" "7.0.0"
-    "@typescript-eslint/type-utils" "6.21.0"
+    "@typescript-eslint/type-utils" "7.0.0"
-    "@typescript-eslint/utils" "6.21.0"
+    "@typescript-eslint/utils" "7.0.0"
-    "@typescript-eslint/visitor-keys" "6.21.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":
+"@typescript-eslint/scope-manager@7.0.0":
-  version "6.21.0"
+  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.21.0.tgz#6473281cfed4dacabe8004e8521cee0bd9d4c01e"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.0.0.tgz#15ea9abad2b56fc8f5c0b516775f41c86c5c8685"
-  integrity sha512-rZQI7wHfao8qMX3Rd3xqeYSMCL3SoiSQLBATSiVKARdFGCYSRvmViieZjqc58jKgs8Y8i9YvVVhRbHSTA4VBag==
+  integrity sha512-IxTStwhNDPO07CCrYuAqjuJ3Xf5MrMaNgbAZPxFXAUpAtwqFxiuItxUaVtP/SJQeCdJjwDGh9/lMOluAndkKeg==
  dependencies:
-    "@typescript-eslint/typescript-estree" "6.21.0"
+    "@typescript-eslint/types" "7.0.0"
-    "@typescript-eslint/utils" "6.21.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":
+"@typescript-eslint/typescript-estree@7.0.0":
-  version "6.21.0"
+  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.21.0.tgz#4714e7a6b39e773c1c8e97ec587f520840cd8134"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.0.0.tgz#7ce66f2ce068517f034f73fba9029300302fdae9"
-  integrity sha512-NfWVaC8HP9T8cbKQxHcsJBY5YE1O33+jpMwN45qzWWaPDZgLIbo12toGMWnmhvCpd3sIxkpDw3Wv1B3dYrbDQQ==
+  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/scope-manager" "7.0.0"
-    "@typescript-eslint/types" "6.21.0"
+    "@typescript-eslint/types" "7.0.0"
-    "@typescript-eslint/typescript-estree" "6.21.0"
+    "@typescript-eslint/typescript-estree" "7.0.0"
    semver "^7.5.4"
 "@typescript-eslint/visitor-keys@6.21.0":
@ -445,19 +472,19 @@
    "@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"
  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"
@ -522,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==
@ -641,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"
@ -708,11 +721,11 @@ brace-expansion@^2.0.1:
    balanced-match "^1.0.0"
 braces@^3.0.2:
-  version "3.0.2"
+  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+  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"
@ -804,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"
@ -900,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==
@ -1076,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"
@ -1211,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"
@ -1402,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"
@ -1516,10 +1497,10 @@ file-entry-cache@^6.0.1:
  dependencies:
    flat-cache "^3.0.4"
-fill-range@^7.0.1:
+fill-range@^7.1.1:
-  version "7.0.1"
+  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+  integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
  dependencies:
    to-regex-range "^5.0.1"
@ -1585,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"
@ -1651,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"
@ -2137,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"
@ -2178,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"
@ -2251,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"
@ -2766,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"
@ -2809,9 +2758,9 @@ prettier-plugin-sh@^0.14.0:
    sh-syntax "^0.4.1"
 prettier@^3.0.3:
-  version "3.2.4"
+  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.2.4.tgz#4723cadeac2ce7c9227de758e5ff9b14e075f283"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.3.2.tgz#03ff86dc7c835f2d2559ee76876a3914cec4a90a"
-  integrity sha512-FWu1oLHKCrtpO1ypU6J0SbK2d9Ckwysq6bHj/uaCP26DxrPpppCLQRGVuqAxSTvhF00AcvDRyYrLNW7ocBhFFQ==
+  integrity sha512-rAVeHYMcv8ATV5d508CFdn+8/pHPpXeIid1DdrPwXnaAdH7cqjVbpJaT5eq4yRAFU/lsbwYwSF/n5iNrdJHPQA==
 proxy-addr@~2.0.7:
  version "2.0.7"
@ -2888,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"
@ -2943,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"
@ -3055,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==
@ -3196,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:
+"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.2.3:
  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:
  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==
@ -3259,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==
@ -3318,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"
@ -3449,9 +3368,9 @@ typed-array-length@^1.0.4:
    is-typed-array "^1.1.9"
 typescript@^5.2.2:
-  version "5.4.3"
+  version "5.5.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.3.tgz#5c6fedd4c87bee01cd7a528a30145521f8e0feff"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.2.tgz#c26f023cb0054e657ce04f72583ea2d85f8d0507"
-  integrity sha512-KrPd3PKaCLr78MalgiwJnA25Nm8HAmdwN3mYUYZgG/wizIo9EainNVQI9/yDavtVFRN2h3k8uf3GLHuhDMgEHg==
+  integrity sha512-NcRtPEOsPFFWjobJEtfihkLCZCXZt/os3zf8nTxjVH3RvTSxjrCamJpbExGvYOF+tFHc3pA65qpdwPbzjohhew==
 unbox-primitive@^1.0.2:
  version "1.0.2"
@ -3614,58 +3533,26 @@ 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"
  integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
 ws@^8.14.2:
-  version "8.17.0"
+  version "8.17.1"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.17.0.tgz#d145d18eca2ed25aaf791a183903f7be5e295fea"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.17.1.tgz#9293da530bb548febc95371d90f9c878727d919b"
-  integrity sha512-uJq6108EgZMAl20KagGkzCKfMEjxmKvZHG7Tlq0Z6nOky7YF7aq4mOx6xK8TJ/i1LeK4Qus7INktacctDgY8Ow==
+  integrity sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==
 xdg-basedir@^4.0.0:
  version "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"
Author	SHA1	Message	Date
OCram85	a8836a4c15	Merge pull request 'main' (#3 ) from Upstream/code-server:main into main Some checks failed ci/woodpecker/push/ci Pipeline failed Details Reviewed-on: #3	2024-07-29 10:55:17 +02:00
Asher	31bc0c6b1a	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.	2024-07-25 09:16:15 -08:00
Asher	0f9436e7b9	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.	2024-07-19 10:51:31 -08:00
Olivier Benz	1962f48b7f	Update Code to 1.91.1 (#6900 )	2024-07-15 09:57:32 -08:00
Asher	6467c60166	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.	2024-07-12 17:02:40 -08:00
Asher	d9812a5970	Use version in npm install Closes #4832.	2024-07-12 16:23:29 -08:00
Asher	f2c326147d	Fix login page assets over proxy domain	2024-07-12 15:06:44 -08:00
Asher	37a72ce63b	Enforce yarn version Closes https://github.com/coder/code-server/issues/6695.	2024-07-12 14:49:10 -08:00
Asher	6a14070664	Add faq entry about web views Closes #5671.	2024-07-11 11:52:23 -08:00
Asher	a9eb923790	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.	2024-07-10 13:23:24 -08:00
dependabot[bot]	2b33ca8a3f	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](`fd25fed697...6e7b7d1fd3`) --- updated-dependencies: - dependency-name: aquasecurity/trivy-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-07-10 13:10:01 -08:00
dependabot[bot]	8accfcc8ec	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] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-07-10 13:09:41 -08:00
dependabot[bot]	2e098a2b90	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] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-07-10 13:09:11 -08:00
dependabot[bot]	97bcc3b934	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] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-07-10 13:08:52 -08:00
dependabot[bot]	c86c4e8bb6	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] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-07-10 19:26:02 +00:00
Muhammad Atif Ali	3031f8599c	ci: updates actionlint to 1.7.1 version (#6887 )	2024-07-10 18:39:03 +00:00
Asher	d83ba4b46f	Release v4.91.0	2024-07-09 23:23:16 -08:00
Asher	fb3e3e1546	Log custom extensions gallery	2024-07-09 12:47:24 -08:00
Asher	901191e0f9	Update changelog	2024-07-08 17:51:47 -08:00
Asher	dd79446b00	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...	2024-07-08 17:50:08 -08:00
Asher	090e0fad76	Update to Code 1.91.0 (#6885 )	2024-07-08 14:10:34 -08:00
Asher	6514ba4bf3	Update contributing docs	2024-07-03 13:33:02 -08:00
dependabot[bot]	250281d071	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] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-06-26 13:28:34 -08:00
dependabot[bot]	93f31e6a74	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] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-06-26 13:27:58 -08:00
dependabot[bot]	603e467f38	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] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-06-26 13:27:36 -08:00
Asher	c7d88abf9f	v4.90.3	2024-06-21 11:01:16 -08:00
Asher	26c763485b	Update JSON parse error matcher Looks like this text changed?	2024-06-21 09:52:42 -08:00
Asher	d431c9cd9d	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.	2024-06-21 09:47:44 -08:00
Olivier Benz	c26ac35b25	Update Code to 1.90.2 (#6853 )	2024-06-20 14:14:21 -08:00
dependabot[bot]	d449729e18	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] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-06-17 10:43:23 -08:00
Asher	ed069310a4	v4.90.2	2024-06-17 10:42:09 -08:00
Olivier Benz	dce1d6e172	Update Code to 1.90.1 (#6840 )	2024-06-14 11:31:58 -08:00
Asher	a73549539b	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.	2024-06-12 15:09:45 -08:00
Asher	e7ca9cd6ac	Fix changelog heading indentation	2024-06-12 13:05:41 -08:00
Asher	9da9f2029c	v4.90.0	2024-06-12 13:03:51 -08:00
Asher	0c802ba165	Remove node-gyp install (#6831 ) Seems to install fine without it now.	2024-06-08 20:07:51 -08:00
Asher	1bd2b9cf08	Fix segfault in CI (#6830 ) Setting DISABLE_V8_COMPILE_CACHE=1 seems to fix it.	2024-06-08 20:07:24 -08:00
Asher	3b467dec95	Update changelog for 1.90.0	2024-06-06 15:05:12 -08:00
Olivier Benz	6d9530aa6b	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.	2024-06-06 15:02:13 -08:00
dependabot[bot]	fc47b4f1c5	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](`d710430a67...fd25fed697`) --- updated-dependencies: - dependency-name: aquasecurity/trivy-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-06-03 10:44:54 -08:00
dependabot[bot]	479eb5bfa5	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] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-06-03 10:44:33 -08:00
Paweł Wiśniewski	095c072a43	Add Ubuntu Noble image (#6812 )	2024-05-24 20:02:32 +00:00
XiaoZhang	4ff509d8db	Allow emptyDir type volume mounts (#6803 )	2024-05-22 10:52:42 -08:00
Simon Merschjohann	efc6edf536	Support copying to clipboard from CLI (#6807 ) Use --stdin-to-clipboard or -c to pass stdin to clipboard	2024-05-21 10:39:36 -08:00
Asher	3b6ad479a6	Release v4.89.1 and v4.89.0	2024-05-14 10:17:35 -08:00
Olivier Benz	effc6e95b4	Update Code to 1.89.1 (#6796 )	2024-05-13 10:41:25 -08:00
Asher	ab4b36f573	Fix setuptools install on macOS This is erroring now with "This environment is externally managed".	2024-05-07 13:41:21 -08:00
Asher	0f4791b816	Add remote machine ID to telemetry	2024-05-07 11:35:01 -08:00
		`@ -1 +1 @@`
			`Subproject commit b58957e67ee1e712cebf466b995adf4c5307b2bd`				`Subproject commit f1e16e1e6214d7c44d078b1f0607b2388f29d729`