Update changelog for 3.10.1

.eslintrc.yaml

@@ -36,8 +36,11 @@ rules:
   import/order:
     [error, { alphabetize: { order: "asc" }, groups: [["builtin", "external", "internal"], "parent", "sibling"] }]
   no-async-promise-executor: off
+  # This isn't a real module, just types, which apparently doesn't resolve.
+  import/no-unresolved: [error, { ignore: ["express-serve-static-core"] }]
 
 settings:
-  import/resolver:
+  # Does not work with CommonJS unfortunately.
-    typescript:
+  import/ignore:
-      alwaysTryTypes: true
+    - env-paths
+    - xdg-basedir

.github/CODEOWNERS

@@ -1,3 +1,3 @@
-* @coder/code-server-reviewers
+* @cdr/code-server-reviewers
 
-ci/helm-chart/ @Matthew-Beckett @alexgorbatchev
+ci/helm-chart @Matthew-Beckett @alexgorbatchev

.github/ISSUE_TEMPLATE/bug-report.md

@@ -0,0 +1,74 @@
+---
+name: Bug report
+about: Report a bug and help us improve
+title: ""
+labels: ""
+assignees: ""
+---
+
+<!--
+
+Hi there! 👋
+
+Thanks for reporting a bug.
+
+Please search for existing issues before filing, as they may contain additional
+information about the problem and descriptions of workarounds. Provide as much
+information as you can, so that we can reproduce the issue. Otherwise, we may
+not be able to help diagnose the problem, and may close the issue as
+unreproducible or incomplete. For visual defects, please include screenshots to
+help us understand the issue.
+-->
+
+## OS/Web Information
+
+- Web Browser:
+- Local OS:
+- Remote OS:
+- Remote Architecture:
+- `code-server --version`:
+
+## Steps to Reproduce
+
+1.
+2.
+3.
+
+## Expected
+
+<!-- What should happen? -->
+
+## Actual
+
+<!-- What actually happens? -->
+
+## Logs
+
+<!--
+First run code-server with at least debug logging (or trace to be really
+thorough) by setting the --log flag or the LOG_LEVEL environment variable. -vvv
+and --verbose are aliases for --log trace. For example:
+
+code-server --log debug
+
+Once this is done, replicate the issue you're having then collect logging
+information from the following places:
+
+    1. The most recent files from ~/.local/share/code-server/coder-logs.
+    2. The browser console.
+    3. The browser network tab.
+
+Additionally, collecting core dumps (you may need to enable them first) if
+code-server crashes can be helpful.
+-->
+
+## Screenshot
+
+<!-- Ideally provide a screenshot, gif, video or screen recording. -->
+
+## Notes
+
+<!-- If you can reproduce the issue on vanilla VS Code,
+please file the issue at the VS Code repository instead. -->
+
+This issue can be reproduced in VS Code: Yes/No

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -1,86 +0,0 @@
-name: Bug report
-description: File a bug report
-title: "[Bug]: "
-labels: ["bug", "triage"]
-body:
-  - type: checkboxes
-    attributes:
-      label: Is there an existing issue for this?
-      description: Please search to see if an issue already exists for the bug you encountered.
-      options:
-        - label: I have searched the existing issues
-          required: true
-  - type: textarea
-    attributes:
-      label: OS/Web Information
-      description: |
-        examples:
-          - **Web Browser**: Chrome
-          - **Local OS**: macOS
-          - **Remote OS**: Ubuntu
-          - **Remote Architecture**: amd64
-          - **`code-server --version`**: 4.0.1
-      value: |
-        - Web Browser:
-        - Local OS:
-        - Remote OS:
-        - Remote Architecture:
-        - `code-server --version`:
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Steps to Reproduce
-      description: |
-        1. open code-server
-        2. install extension
-        3. run command
-      value: |
-        1. 
-        2.
-        3.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Expected
-      description: What should happen?
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Actual
-      description: What actually happens?
-    validations:
-      required: true
-  - type: textarea
-    id: logs
-    attributes:
-      label: Logs
-      description: Run code-server with the --verbose flag and then paste any relevant logs from the server, from the browser console and/or the browser network tab. For issues with installation, include installation logs (i.e. output of `yarn global add code-server`).
-  - type: textarea
-    attributes:
-      label: Screenshot/Video
-      description: Please include a screenshot, gif or screen recording of your issue.
-    validations:
-      required: false
-  - type: checkboxes
-    attributes:
-      label: Does this issue happen in VS Code?
-      description: Please try reproducing this issue in VS Code
-      options:
-        - label: I cannot reproduce this in VS Code.
-          required: true
-  - type: checkboxes
-    attributes:
-      label: Are you accessing code-server over HTTPS?
-      description: code-server relies on service workers for many features. Double-check that you are using HTTPS.
-      options:
-        - label: I am using HTTPS.
-          required: true
-  - type: textarea
-    attributes:
-      label: Notes
-      description: Please include any addition notes that will help us resolve this issue.
-    validations:
-      required: false

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +1,8 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Question?
+  - name: Question
-    url: https://github.com/coder/code-server/discussions/new?category_id=22503114
+    url: https://github.com/cdr/code-server/discussions/new?category_id=22503114
     about: Ask the community for help on our GitHub Discussions board
-  - name: code-server Slack Community
+  - name: Chat
-    about: Need immediate help or just want to talk? Hop in our Slack. Note - this Slack is not actively monitored by code-server maintainers.
+    about: Need immediate help or just want to talk? Hop in our Slack
     url: https://cdr.co/join-community

.github/ISSUE_TEMPLATE/doc.md

@@ -1,13 +1,7 @@
 ---
 name: Documentation improvement
 about: Suggest a documentation improvement
-title: "[Docs]: "
+title: ""
 labels: "docs"
-assignees: "@jsjoeio"
+assignees: ""
 ---
-
-## What is your suggestion?
-
-## How will this improve the docs?
-
-## Are you interested in submitting a PR for this?

.github/ISSUE_TEMPLATE/extension-request.md

@@ -0,0 +1,18 @@
+---
+name: Extension request
+about: Request an extension missing from the code-server marketplace
+title: ""
+labels: extension-request
+assignees: ""
+---
+
+<!--
+Details on the code-server extension marketplace are at
+
+https://github.com/cdr/code-server/blob/master/docs/FAQ.md#whats-the-deal-with-extensions
+
+Please fill in the issue template!
+-->
+
+- [ ] Extension name:
+- [ ] Extension GitHub or homepage:

.github/ISSUE_TEMPLATE/feature-request.md

@@ -1,15 +1,13 @@
 ---
 name: Feature request
-about: Suggest an idea to improve code-server
+about: Suggest an idea
-title: "[Feat]: "
+title: ""
-labels: enhancement
+labels: feature
 assignees: ""
 ---
 
-## What is your suggestion?
+<!--
+Please search for existing issues before filing.
 
-## Why do you want this feature?
+Please describe the feature as clearly as possible!
-
+-->
-## Are there any workarounds to get this functionality today?
-
-## Are you interested in submitting a PR for this?

.github/ISSUE_TEMPLATE/release.md

@@ -0,0 +1,16 @@
+---
+name: Release
+about: "*For maintainers only*"
+title: "release: 0.0.0"
+labels: ""
+assignees: "@cdr/code-server-reviewers"
+---
+
+<!-- Maintainer: fill out the checklist -->
+
+## Checklist
+
+- [ ] Assign to next release manager
+- [ ] Close previous release milestone
+- [ ] Create next release milestone
+- [ ] Associate issue with next release milestone

.github/PULL_REQUEST_TEMPLATE.md

@@ -5,4 +5,6 @@ If there is no existing issue, please first create one unless the fix is minor.
 Please make sure the base of your PR is the default branch!
 -->
 
-Fixes #
+## Checklist
+
+- [ ] updated `CHANGELOG.md`

.github/codecov.yml

@@ -1,31 +0,0 @@
-codecov:
-  require_ci_to_pass: yes
-  allow_coverage_offsets: True
-
-coverage:
-  precision: 2
-  round: down
-  range: "40...70"
-  status:
-    patch: off
-  notify:
-    slack:
-      default:
-        url: secret:v1::tXC7VwEIKYjNU8HRgRv2GdKOSCt5UzpykKZb+o1eCDqBgb2PEqwE3A26QUPYMLo4BO2qtrJhFIvwhUvlPwyzDCNGoNiuZfXr0UeZZ0y1TcZu672R/NBNMwEPO/e1Ye0pHxjzKHnuH7HqbjFucox/RBQLtiL3J56SWGE3JtbkC6o=
-        threshold: 1%
-        only_pulls: false
-        branches:
-          - "main"
-
-parsers:
-  gcov:
-    branch_detection:
-      conditional: yes
-      loop: yes
-      method: no
-      macro: no
-
-comment:
-  layout: "reach,diff,flags,files,footer"
-  behavior: default
-  require_changes: no

.github/codeql-config.yml

@@ -1 +1,4 @@
 name: "code-server CodeQL config"
+
+paths-ignore:
+  - lib/vscode

.github/dependabot.yml

@@ -0,0 +1,28 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+      time: "11:00"
+    ignore:
+      # GitHub always delivers the latest versions for each major
+      # release tag, so handle updates manually
+      - dependency-name: "actions/*"
+      - dependency-name: "github/codeql-action/*"
+      - dependency-name: "microsoft/playwright-github-action"
+
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "daily"
+      time: "11:00"
+    ignore:
+      - dependency-name: "@types/node"
+        versions: ["15.x", "14.x", "13.x"]
+      - dependency-name: "xdg-basedir"
+        # 5.0.0 has breaking changes as they switch to named exports
+        # and convert the module to ESM
+        # We can't use it until we switch to ESM across the project
+        # See release notes: https://github.com/sindresorhus/xdg-basedir/releases/tag/v5.0.0
+        versions: ["5.x"]

.github/lock.yml

@@ -0,0 +1,37 @@
+# Configuration for Lock Threads - https://github.com/dessant/lock-threads-app
+
+# Number of days of inactivity before a closed issue or pull request is locked
+daysUntilLock: 90
+
+# Skip issues and pull requests created before a given timestamp. Timestamp must
+# follow ISO 8601 (`YYYY-MM-DD`). Set to `false` to disable
+skipCreatedBefore: false
+
+# Issues and pull requests with these labels will be ignored. Set to `[]` to disable
+exemptLabels: []
+
+# Label to add before locking, such as `outdated`. Set to `false` to disable
+lockLabel: false
+
+# Comment to post before locking. Set to `false` to disable
+lockComment: >
+  This thread has been automatically locked since there has not been
+  any recent activity after it was closed. Please open a new issue for
+  related bugs.
+
+# Assign `resolved` as the reason for locking. Set to `false` to disable
+setLockReason: true
+# Limit to only `issues` or `pulls`
+# only: issues
+
+# Optionally, specify configuration settings just for `issues` or `pulls`
+# issues:
+#   exemptLabels:
+#     - help-wanted
+#   lockLabel: outdated
+
+# pulls:
+#   daysUntilLock: 30
+
+# Repository to extend settings from
+# _extends: repo

.github/ranger.yml

@@ -15,10 +15,26 @@ labels:
   "squash when passing": merge
   "rebase when passing": merge
   "merge when passing": merge
+  stale:
+    action: close
+    delay: 7 days
+    comment: "⚠️ This issue has been marked stale and will automatically be closed in $DELAY."
   "new contributor":
     action: comment
     delay: 5s
     message: "Thanks for making your first contribution! :slightly_smiling_face:"
+  extension-request:
+    action: close
+    delay: 5s
+    comment: >
+      Thanks for opening an extension request!
+      We are currently in the process of switching extension
+      marketplaces and transitioning over to [Open VSX](https://open-vsx.org/).
+      Once https://github.com/eclipse/openvsx/issues/249 is implemented, we
+      can fully make this transition. Therefore, we are no longer accepting
+      new requests for extension requests. We suggest installing the VSIX
+      file and then installing into code-server as a temporary workaround.
+      See [docs](https://github.com/cdr/code-server/blob/main/docs/FAQ.md#installing-vsix-extensions-via-the-command-line) for more info.
   "upstream:vscode":
     action: close
     delay: 5s

.github/semantic.yaml

@@ -1,66 +0,0 @@
-###############################################################################
-# This file configures "Semantic Pull Requests", which is documented here:
-# https://github.com/zeke/semantic-pull-requests
-###############################################################################
-
-# Scopes are optionally supplied after a 'type'. For example, in
-#
-# feat(docs): autostart ui
-#
-# '(docs)' is the scope. Scopes are used to signify where the change occurred.
-scopes:
-  # docs: changes to the code-server documentation.
-  - docs
-
-  # vendor: changes to vendored dependencies.
-  - vendor
-
-  # deps: changes to code-server's dependencies.
-  - deps
-
-  # cs: changes to code specific to code-server.
-  - cs
-
-  # cli: changes to the command-line interface.
-  - cli
-
-# We only check that the PR title is semantic. The PR title is automatically
-# applied to the "Squash & Merge" flow as the suggested commit message, so this
-# should suffice unless someone drastically alters the message in that flow.
-titleOnly: true
-
-# Types are the 'tag' types in a commit or PR title. For example, in
-#
-# chore: fix thing
-#
-# 'chore' is the type.
-types:
-  # A build of any kind.
-  - build
-
-  # A user-facing change that corrects a defect in code-server.
-  - fix
-
-  # Any code task that is ignored for changelog purposes. Examples include
-  # devbin scripts and internal-only configurations.
-  - chore
-
-  # Any work performed on CI.
-  - ci
-
-  # Work that directly implements or supports the implementation of a feature.
-  - feat
-
-  # A refactor changes code structure without any behavioral change.
-  - refactor
-
-  # A git revert for any style of commit.
-  - revert
-
-  # Adding tests of any kind. Should be separate from feature or fix
-  # implementations. For example, if a commit adds a fix + test, it's a fix
-  # commit. If a commit is simply bumping coverage, it's a test commit.
-  - test
-
-  # A new release.
-  - release

.github/stale.yml

@@ -1,12 +0,0 @@
-# Number of days of inactivity before an issue becomes stale
-daysUntilStale: 180
-# Number of days of inactivity before a stale issue is closed
-daysUntilClose: 5
-# Label to apply when stale.
-staleLabel: stale
-# Comment to post when marking an issue as stale. Set to `false` to disable
-markComment: >
-  This issue has been automatically marked as stale because it has not had
-  recent activity. It will be closed if no activity occurs in the next 5 days.
-# Comment to post when closing a stale issue. Set to `false` to disable
-closeComment: false

.github/workflows/ci.yaml

@@ -1,4 +1,4 @@
-name: Build
+name: ci
 
 on:
   push:
@@ -8,13 +8,6 @@ on:
     branches:
       - main
 
-# Cancel in-progress runs for pull requests when developers push
-# additional changes, and serialize builds in branches.
-# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-concurrency-to-cancel-any-in-progress-job-or-run
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
-
 # Note: if: success() is used in several jobs -
 # this ensures that it only executes if all previous jobs succeeded.
 
@@ -25,34 +18,29 @@ jobs:
   prebuild:
     name: Pre-build checks
     runs-on: ubuntu-latest
-    timeout-minutes: 15
+    env:
+      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
 
-      - name: Install Node.js v14
+      - name: Install Node.js v12
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v2
         with:
-          node-version: "14"
+          node-version: "12"
 
       - name: Install helm
         uses: azure/setup-helm@v1.1
 
-      # NOTE@jsjoeio
+      - name: Fetch dependencies from cache
-      # disabling this until we can audit the build process
+        id: cache-yarn
-      # and the usefulness of this step
+        uses: actions/cache@v2
-      # See: https://github.com/coder/code-server/issues/4287
+        with:
-      # - name: Fetch dependencies from cache
+          path: "**/node_modules"
-      #   id: cache-yarn
+          key: yarn-build-${{ hashFiles('**/yarn.lock') }}
-      #   uses: actions/cache@v2
-      #   with:
-      #     path: "**/node_modules"
-      #     key: yarn-build-${{ hashFiles('**/yarn.lock') }}
-      #     restore-keys: |
-      #       yarn-build-
 
       - name: Install dependencies
-        # if: steps.cache-yarn.outputs.cache-hit != 'true'
+        if: steps.cache-yarn.outputs.cache-hit != 'true'
         run: yarn --frozen-lockfile
 
       - name: Run yarn fmt
@@ -63,19 +51,26 @@ jobs:
         run: yarn lint
         if: success()
 
+      - name: Run code-server unit tests
+        run: yarn test:unit
+        if: success()
+
+      - name: Upload coverage report to Codecov
+        run: yarn coverage
+        if: success()
+
   audit-ci:
     name: Run audit-ci
     needs: prebuild
     runs-on: ubuntu-latest
-    timeout-minutes: 15
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
 
-      - name: Install Node.js v14
+      - name: Install Node.js v12
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v2
         with:
-          node-version: "14"
+          node-version: "12"
 
       - name: Fetch dependencies from cache
         id: cache-yarn
@@ -83,8 +78,6 @@ jobs:
         with:
           path: "**/node_modules"
           key: yarn-build-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            yarn-build-
 
       - name: Install dependencies
         if: steps.cache-yarn.outputs.cache-hit != 'true'
@@ -98,76 +91,56 @@ jobs:
     name: Build
     needs: prebuild
     runs-on: ubuntu-latest
-    timeout-minutes: 30
-    env:
-      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
         with:
           fetch-depth: 0
 
-      - name: Install Node.js v14
+      - name: Install Node.js v12
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v2
         with:
-          node-version: "14"
+          node-version: "12"
 
-      # TODO@Teffen investigate why this omits code-oss-dev/node_modules
+      - name: Fetch dependencies from cache
-      # - name: Fetch dependencies from cache
+        id: cache-yarn
-      #   id: cache-yarn
+        uses: actions/cache@v2
-      #   uses: actions/cache@v2
+        with:
-      #   with:
+          path: "**/node_modules"
-      #     path: |
+          key: yarn-build-${{ hashFiles('**/yarn.lock') }}
-      #       "**/node_modules"
-      #       "**/vendor/modules"
-      #       "**/vendor/modules/code-oss-dev/node_modules"
-      #     key: yarn-build-${{ hashFiles('**/yarn.lock') }}-${{ hashFiles('**/vendor/yarn.lock') }}
-      #     restore-keys: |
-      #       yarn-build-
 
       - name: Install dependencies
-        # if: steps.cache-yarn.outputs.cache-hit != 'true'
+        if: steps.cache-yarn.outputs.cache-hit != 'true'
         run: yarn --frozen-lockfile
 
       - name: Build code-server
         run: yarn build
 
-      # Parse the hash of the latest commit inside vendor/modules/code-oss-dev
+      # Parse the hash of the latest commit inside lib/vscode
       # use this to avoid rebuilding it if nothing changed
       # How it works: the `git log` command fetches the hash of the last commit
-      # that changed a file inside `vendor/modules/code-oss-dev`. If a commit changes any file in there,
+      # that changed a file inside `lib/vscode`. If a commit changes any file in there,
       # the hash returned will change, and we rebuild vscode. If the hash did not change,
       # (for example, a change to `src/` or `docs/`), we reuse the same build as last time.
       # This saves a lot of time in CI, as compiling VSCode can take anywhere from 5-10 minutes.
-      - name: Get latest vendor/modules/code-oss-dev rev
+      - name: Get latest lib/vscode rev
         id: vscode-rev
-        run: echo "::set-output name=rev::$(jq -r '.devDependencies["code-oss-dev"]' vendor/package.json | sed -r 's|.*#(.*)$|\1|')"
+        run: echo "::set-output name=rev::$(git log -1 --format='%H' ./lib/vscode)"
 
       - name: Attempt to fetch vscode build from cache
         id: cache-vscode
         uses: actions/cache@v2
         with:
           path: |
-            vendor/modules/code-oss-dev/.build
+            lib/vscode/.build
-            vendor/modules/code-oss-dev/out-build
+            lib/vscode/out-build
-            vendor/modules/code-oss-dev/out-vscode-reh-web
+            lib/vscode/out-vscode
-            vendor/modules/code-oss-dev/out-vscode-reh-web-min
+            lib/vscode/out-vscode-min
-          key: vscode-reh-build-${{ steps.vscode-rev.outputs.rev }}
+          key: vscode-build-${{ steps.vscode-rev.outputs.rev }}
 
       - name: Build vscode
         if: steps.cache-vscode.outputs.cache-hit != 'true'
         run: yarn build:vscode
 
-      # Our code imports code from VS Code's `out` directory meaning VS Code
-      # must be built before running these tests.
-      # TODO: Move to its own step?
-      - name: Run code-server unit tests
-        run: yarn test:unit
-        if: success()
-
-      - name: Upload coverage report to Codecov
-        run: yarn coverage
-        if: success()
-
       # The release package does not contain any native modules
       # and is neutral to architecture/os/libc version.
       - name: Create release package
@@ -184,36 +157,6 @@ jobs:
           name: npm-package
           path: ./package.tar.gz
 
-  npm:
-    # the npm-package gets uploaded as an artifact in Build
-    # so we need that to complete before this runs
-    needs: build
-    # This environment "npm" requires someone from
-    # coder/code-server-reviewers to approve the PR before this job runs.
-    environment: npm
-    # Only run if PR comes from base repo
-    # Reason: forks cannot access secrets and this will always fail
-    if: github.event.pull_request.head.repo.full_name == github.repository
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-
-      - uses: actions/download-artifact@v3
-        id: download
-        with:
-          name: "npm-package"
-          path: release-npm-package
-
-      - name: Run ./ci/steps/publish-npm.sh
-        run: yarn publish:npm
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-          # NOTE@jsjoeio
-          # NPM_ENVIRONMENT intentionally not set here.
-          # Instead, itis determined in publish-npm.sh script
-          # using GITHUB environment variables
-
   # TODO: cache building yarn --production
   # possibly 2m30s of savings(?)
   # this requires refactoring our release scripts
@@ -221,16 +164,15 @@ jobs:
     name: x86-64 Linux build
     needs: build
     runs-on: ubuntu-latest
-    timeout-minutes: 15
     container: "centos:7"
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
 
-      - name: Install Node.js v14
+      - name: Install Node.js v12
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v2
         with:
-          node-version: "14"
+          node-version: "12"
 
       - name: Install development tools
         run: |
@@ -249,7 +191,7 @@ jobs:
         run: npm install -g yarn
 
       - name: Download npm package
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v2
         with:
           name: npm-package
 
@@ -282,44 +224,30 @@ jobs:
   # It is not feasible to cross-compile with CentOS.
 
   # Cross-compile notes: To compile native dependencies for arm64,
-  # we install the aarch64/armv7l cross toolchain and then set it as the default
+  # we install the aarch64 cross toolchain and then set it as the default
   # compiler/linker/etc. with the AR/CC/CXX/LINK environment variables.
   # qemu-user-static on ubuntu-16.04 currently doesn't run Node correctly,
-  # so we just build with "native"/x86_64 node, then download arm64/armv7l node
+  # so we just build with "native"/x86_64 node, then download arm64 node
-  # and then put it in our release. We can't smoke test the cross build this way,
+  # and then put it in our release. We can't smoke test the arm64 build this way,
   # but this means we don't need to maintain a self-hosted runner!
-
+  package-linux-arm64:
-  # NOTE@jsjoeio:
+    name: Linux ARM64 cross-compile build
-  # We used to use 16.04 until GitHub deprecated it on September 20, 2021
-  # See here: https://github.com/actions/virtual-environments/pull/3862/files
-  package-linux-cross:
-    name: Linux cross-compile builds
     needs: build
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-16.04
-    timeout-minutes: 15
-    strategy:
-      matrix:
-        include:
-          - prefix: aarch64-linux-gnu
-            arch: arm64
-          - prefix: arm-linux-gnueabihf
-            arch: armv7l
-
     env:
-      AR: ${{ format('{0}-ar', matrix.prefix) }}
+      AR: aarch64-linux-gnu-ar
-      CC: ${{ format('{0}-gcc', matrix.prefix) }}
+      CC: aarch64-linux-gnu-gcc
-      CXX: ${{ format('{0}-g++', matrix.prefix) }}
+      CXX: aarch64-linux-gnu-g++
-      LINK: ${{ format('{0}-g++', matrix.prefix) }}
+      LINK: aarch64-linux-gnu-g++
-      NPM_CONFIG_ARCH: ${{ matrix.arch }}
+      NPM_CONFIG_ARCH: arm64
-      NODE_VERSION: v14.17.4
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
 
-      - name: Install Node.js v14
+      - name: Install Node.js v12
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v2
         with:
-          node-version: "14"
+          node-version: "12"
 
       - name: Install nfpm
         run: |
@@ -327,12 +255,10 @@ jobs:
           echo "$HOME/.local/bin" >> $GITHUB_PATH
 
       - name: Install cross-compiler
-        run: sudo apt update && sudo apt install $PACKAGE
+        run: sudo apt install g++-aarch64-linux-gnu
-        env:
-          PACKAGE: ${{ format('g++-{0}', matrix.prefix) }}
 
       - name: Download npm package
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v2
         with:
           name: npm-package
 
@@ -342,14 +268,14 @@ jobs:
       - name: Build standalone release
         run: yarn release:standalone
 
-      - name: Replace node with cross-compile equivalent
+      - name: Replace node with arm64 equivalent
         run: |
-          wget https://nodejs.org/dist/${NODE_VERSION}/node-${NODE_VERSION}-linux-${NPM_CONFIG_ARCH}.tar.xz
+          wget https://nodejs.org/dist/v12.18.4/node-v12.18.4-linux-arm64.tar.gz
-          tar -xf node-${NODE_VERSION}-linux-${NPM_CONFIG_ARCH}.tar.xz node-${NODE_VERSION}-linux-${NPM_CONFIG_ARCH}/bin/node --strip-components=2
+          tar -xzf node-v12.18.4-linux-arm64.tar.gz node-v12.18.4-linux-arm64/bin/node --strip-components=2
           mv ./node ./release-standalone/lib/node
 
       - name: Build packages with nfpm
-        run: yarn package ${NPM_CONFIG_ARCH}
+        run: yarn package arm64
 
       - name: Upload release artifacts
         uses: actions/upload-artifact@v2
@@ -361,14 +287,13 @@ jobs:
     name: x86-64 macOS build
     needs: build
     runs-on: macos-latest
-    timeout-minutes: 15
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
 
-      - name: Install Node.js v14
+      - name: Install Node.js v12
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v2
         with:
-          node-version: "14"
+          node-version: "12"
 
       - name: Install nfpm
         run: |
@@ -376,7 +301,7 @@ jobs:
           echo "$HOME/.local/bin" >> $GITHUB_PATH
 
       - name: Download npm package
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v2
         with:
           name: npm-package
 
@@ -402,18 +327,19 @@ jobs:
     name: End-to-end tests
     needs: package-linux-amd64
     runs-on: ubuntu-latest
-    timeout-minutes: 15
     env:
-      # Since we build code-server we might as well run tests from the release
+      PASSWORD: e45432jklfdsab
-      # since VS Code will load faster due to the bundling.
+      CODE_SERVER_ADDRESS: http://localhost:8080
-      CODE_SERVER_TEST_ENTRY: "./release-packages/code-server-linux-amd64"
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
 
-      - name: Install Node.js v14
+      - name: Install Node.js v12
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v2
         with:
-          node-version: "14"
+          node-version: "12"
+
+      - name: Install playwright
+        uses: microsoft/playwright-github-action@v1
 
       - name: Fetch dependencies from cache
         id: cache-yarn
@@ -421,32 +347,34 @@ jobs:
         with:
           path: "**/node_modules"
           key: yarn-build-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            yarn-build-
 
       - name: Download release packages
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v2
         with:
           name: release-packages
           path: ./release-packages
 
-      - name: Untar code-server release
+      - name: Untar code-server file
         run: |
-          cd release-packages
+          cd release-packages && tar -xzf code-server*-linux-amd64.tar.gz
-          tar -xzf code-server*-linux-amd64.tar.gz
-          mv code-server*-linux-amd64 code-server-linux-amd64
 
       - name: Install dependencies
         if: steps.cache-yarn.outputs.cache-hit != 'true'
         run: yarn --frozen-lockfile
 
-      - name: Install Playwright OS dependencies
+      # HACK: this shouldn't need to exist, but put it here anyway
+      # in an attempt to solve Playwright cache failures.
+      - name: Reinstall playwright
+        if: steps.cache-yarn.outputs.cache-hit == 'true'
         run: |
-          ./test/node_modules/.bin/playwright install-deps
+          cd test/
-          ./test/node_modules/.bin/playwright install
+          rm -r node_modules/playwright
+          yarn install --check-files
 
       - name: Run end-to-end tests
-        run: yarn test:e2e
+        run: |
+          ./release-packages/code-server*-linux-amd64/bin/code-server --log trace &
+          yarn test:e2e
 
       - name: Upload test artifacts
         if: always()
@@ -458,14 +386,92 @@ jobs:
       - name: Remove release packages and test artifacts
         run: rm -rf ./release-packages ./test/test-results
 
+  docker-amd64:
+    runs-on: ubuntu-latest
+    needs: package-linux-amd64
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Download release package
+        uses: actions/download-artifact@v2
+        with:
+          name: release-packages
+          path: ./release-packages
+
+      - name: Run ./ci/steps/build-docker-image.sh
+        run: ./ci/steps/build-docker-image.sh
+
+      - name: Upload release image
+        uses: actions/upload-artifact@v2
+        with:
+          name: release-images
+          path: ./release-images
+
+  # TODO: this is the last place where we use our self-hosted arm64 runner.
+  # In the future, consider switching to docker buildx + qemu,
+  # thus removing the requirement for us to maintain the runner.
+  docker-arm64:
+    runs-on: ubuntu-arm64-latest
+    needs: package-linux-arm64
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Download release package
+        uses: actions/download-artifact@v2
+        with:
+          name: release-packages
+          path: ./release-packages
+
+      - name: Run ./ci/steps/build-docker-image.sh
+        run: ./ci/steps/build-docker-image.sh
+
+      - name: Upload release image
+        uses: actions/upload-artifact@v2
+        with:
+          name: release-images
+          path: ./release-images
+
+  trivy-scan-image:
+    runs-on: ubuntu-20.04
+    needs: docker-amd64
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Download release images
+        uses: actions/download-artifact@v2
+        with:
+          name: release-images
+          path: ./release-images
+
+      - name: Run Trivy vulnerability scanner in image mode
+        # Commit SHA for v0.0.17
+        uses: aquasecurity/trivy-action@dba83feec810c70bacbc4bead308ae1e466c572b
+        with:
+          input: "./release-images/code-server-amd64-*.tar"
+          scan-type: "image"
+          ignore-unfixed: true
+          format: "template"
+          template: "@/contrib/sarif.tpl"
+          output: "trivy-image-results.sarif"
+          severity: "HIGH,CRITICAL"
+
+      - name: Upload Trivy scan results to GitHub Security tab
+        uses: github/codeql-action/upload-sarif@v1
+        with:
+          sarif_file: "trivy-image-results.sarif"
+  # We have to use two trivy jobs
+  # because GitHub only allows
+  # codeql/upload-sarif action per job
   trivy-scan-repo:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
       - name: Run Trivy vulnerability scanner in repo mode
         #Commit SHA for v0.0.17
-        uses: aquasecurity/trivy-action@296212627a1e693efa09c00adc3e03b2ba8edf18
+        uses: aquasecurity/trivy-action@dba83feec810c70bacbc4bead308ae1e466c572b
         with:
           scan-type: "fs"
           scan-ref: "."

.github/workflows/codeql-analysis.yml

@@ -10,13 +10,6 @@ on:
     # Runs every Monday morning PST
     - cron: "17 15 * * 1"
 
-# Cancel in-progress runs for pull requests when developers push
-# additional changes, and serialize builds in branches.
-# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-concurrency-to-cancel-any-in-progress-job-or-run
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
-
 jobs:
   analyze:
     name: Analyze
@@ -24,7 +17,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL

.github/workflows/docker.yaml

@@ -1,41 +0,0 @@
-name: Publish on Docker
-
-on:
-  # Shows the manual trigger in GitHub UI
-  # helpful as a back-up in case the GitHub Actions Workflow fails
-  workflow_dispatch:
-
-  release:
-    types:
-      - released
-
-# Cancel in-progress runs for pull requests when developers push
-# additional changes, and serialize builds in branches.
-# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-concurrency-to-cancel-any-in-progress-job-or-run
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
-
-jobs:
-  docker-images:
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Run ./ci/steps/docker-buildx-push.sh
-        run: ./ci/steps/docker-buildx-push.sh
-        env:
-          GITHUB_TOKEN: ${{ github.token }}

.github/workflows/docs-preview.yaml

@@ -1,105 +0,0 @@
-name: Docs preview
-
-on:
-  pull_request:
-    branches:
-      - main
-
-permissions:
-  actions: none
-  checks: none
-  contents: read
-  deployments: none
-  issues: none
-  packages: none
-  pull-requests: write
-  repository-projects: none
-  security-events: none
-  statuses: none
-
-# Cancel in-progress runs for pull requests when developers push
-# additional changes, and serialize builds in branches.
-# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-concurrency-to-cancel-any-in-progress-job-or-run
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
-
-jobs:
-  preview:
-    name: Docs preview
-    runs-on: ubuntu-20.04
-    environment: CI
-    # Only run if PR comes from base repo
-    # Reason: forks cannot access secrets and this will always fail
-    if: github.event.pull_request.head.repo.full_name == github.repository
-    steps:
-      - name: Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@0.9.1
-
-      - name: Checkout m
-        uses: actions/checkout@v3
-        with:
-          repository: coder/m
-          ref: refs/heads/master
-          ssh-key: ${{ secrets.READONLY_M_DEPLOY_KEY }}
-          submodules: true
-          fetch-depth: 0
-
-      - name: Install Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: 14
-
-      - name: Cache Node Modules
-        uses: actions/cache@v2
-        with:
-          path: "/node_modules"
-          key: node-${{ hashFiles('yarn.lock') }}
-
-      - name: Create Deployment
-        id: deployment
-        run: ./ci/scripts/github_deployment.sh create
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-          DEPLOY_ENVIRONMENT: codercom-preview-docs
-
-      - name: Deploy Preview to Vercel
-        id: preview
-        run: ./ci/scripts/deploy_vercel.sh
-        env:
-          VERCEL_ORG_ID: team_tGkWfhEGGelkkqUUm9nXq17r
-          VERCEL_PROJECT_ID: QmZRucMRh3GFk1817ZgXjRVuw5fhTspHPHKct3JNQDEPGd
-          VERCEL_TOKEN: ${{ secrets.VERCEL_TOKEN }}
-          CODE_SERVER_DOCS_MAIN_BRANCH: ${{ github.event.pull_request.head.sha }}
-
-      - name: Install node_modules
-        run: yarn install
-
-      - name: Check docs
-        run: yarn ts-node ./product/coder.com/site/scripts/checkDocs.ts
-        env:
-          BASE_URL: ${{ steps.preview.outputs.url }}
-
-      - name: Update Deployment
-        # If we don't specify always, it won't run this check if failed.
-        # This means the deployment would be stuck pending.
-        if: always()
-        run: ./ci/scripts/github_deployment.sh update
-        env:
-          GITHUB_DEPLOYMENT: ${{ steps.deployment.outputs.id }}
-          GITHUB_TOKEN: ${{ github.token }}
-          DEPLOY_STATUS: ${{ steps.preview.outcome }}
-          DEPLOY_URL: ${{ steps.preview.outputs.url }}
-
-      - name: Comment Credentials
-        uses: marocchino/sticky-pull-request-comment@v2
-        if: always()
-        with:
-          header: codercom-preview-docs
-          message: |
-            ✨ Coder.com for PR #${{ github.event.number }} deployed! It will be updated on every commit.
-
-            * _Host_: ${{ steps.preview.outputs.url }}/docs/code-server
-            * _Last deploy status_: ${{ steps.preview.outcome }}
-            * _Commit_: ${{ github.event.pull_request.head.sha }}
-            * _Workflow status_: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}

.github/workflows/installer.yml

@@ -1,66 +0,0 @@
-name: Installer integration
-
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - "install.sh"
-  pull_request:
-    branches:
-      - main
-    paths:
-      - "install.sh"
-
-# Cancel in-progress runs for pull requests when developers push
-# additional changes, and serialize builds in branches.
-# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-concurrency-to-cancel-any-in-progress-job-or-run
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
-
-jobs:
-  ubuntu:
-    name: Test installer on Ubuntu
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v3
-
-      - name: Install code-server
-        run: ./install.sh
-
-      - name: Test code-server
-        run: yarn test:standalone-release code-server
-
-  alpine:
-    name: Test installer on Alpine
-    runs-on: ubuntu-latest
-    container: "alpine:3.14"
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v3
-
-      - name: Install curl
-        run: apk add curl
-
-      - name: Add user
-        run: adduser coder --disabled-password
-
-      # Standalone should work without root.
-      - name: Test standalone to a non-existent prefix
-        run: su coder -c "./install.sh --method standalone --prefix /tmp/does/not/yet/exist"
-
-  macos:
-    name: Test installer on macOS
-    runs-on: macos-latest
-
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v3
-
-      - name: Install code-server
-        run: ./install.sh
-
-      - name: Test code-server
-        run: yarn test:standalone-release code-server

.github/workflows/npm-brew.yaml

@@ -1,60 +0,0 @@
-name: Publish on npm and brew
-
-on:
-  # Shows the manual trigger in GitHub UI
-  # helpful as a back-up in case the GitHub Actions Workflow fails
-  workflow_dispatch:
-
-  release:
-    types: [released]
-
-# Cancel in-progress runs for pull requests when developers push
-# additional changes, and serialize builds in branches.
-# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-concurrency-to-cancel-any-in-progress-job-or-run
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
-
-jobs:
-  # NOTE: this job requires curl, jq and yarn
-  # All of them are included in ubuntu-latest.
-  npm:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-
-      - uses: actions/download-artifact@v3
-        id: download
-        with:
-          name: "npm-package"
-          path: release-npm-package
-
-      - name: Publish npm package and tag with "latest"
-        run: yarn publish:npm
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-          NPM_ENVIRONMENT: "production"
-
-  homebrew:
-    # The newest version of code-server needs to be available on npm when this runs
-    # otherwise, it will 404 and won't open a PR to bump version on homebrew/homebrew-core
-    needs: npm
-    runs-on: macos-latest
-    steps:
-      # Ensure things are up to date
-      # Suggested by homebrew maintainers
-      # https://github.com/Homebrew/discussions/discussions/1532#discussioncomment-782633
-      - name: Set up Homebrew
-        id: set-up-homebrew
-        uses: Homebrew/actions/setup-homebrew@master
-
-      - uses: actions/checkout@v3
-      - name: Configure git
-        run: |
-          git config user.name github-actions
-          git config user.email github-actions@github.com
-      - name: Bump code-server homebrew version
-        env:
-          HOMEBREW_GITHUB_API_TOKEN: ${{secrets.HOMEBREW_GITHUB_API_TOKEN}}
-        run: ./ci/steps/brew-bump.sh

.github/workflows/publish.yaml

@@ -0,0 +1,53 @@
+name: publish
+
+on:
+  # Shows the manual trigger in GitHub UI
+  # helpful as a back-up in case the GitHub Actions Workflow fails
+  workflow_dispatch:
+
+  release:
+    types: [published]
+
+jobs:
+  # NOTE: this job requires curl, jq and yarn
+  # All of them are included in ubuntu-latest.
+  npm:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Run ./ci/steps/publish-npm.sh
+        run: ./ci/steps/publish-npm.sh
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+
+  # NOTE: this job requires curl, jq and docker
+  # All of them are included in ubuntu-latest.
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Run ./ci/steps/push-docker-manifest.sh
+        run: ./ci/steps/push-docker-manifest.sh
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+
+  homebrew:
+    # The newest version of code-server needs to be available on npm when this runs
+    # otherwise, it will 404 and won't open a PR to bump version on homebrew/homebrew-core
+    needs: npm
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Configure git
+        run: |
+          git config user.name github-actions
+          git config user.email github-actions@github.com
+      - name: Bump code-server homebrew version
+        env:
+          HOMEBREW_GITHUB_API_TOKEN: ${{secrets.HOMEBREW_GITHUB_API_TOKEN}}
+        run: ./ci/steps/brew-bump.sh

.github/workflows/scripts.yml

@@ -1,53 +0,0 @@
-name: Script unit tests
-
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - "**.sh"
-      - "**.bats"
-  pull_request:
-    branches:
-      - main
-    paths:
-      - "**.sh"
-      - "**.bats"
-
-permissions:
-  actions: none
-  checks: none
-  contents: read
-  deployments: none
-  issues: none
-  packages: none
-  pull-requests: none
-  repository-projects: none
-  security-events: none
-  statuses: none
-
-# Cancel in-progress runs for pull requests when developers push
-# additional changes, and serialize builds in branches.
-# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-concurrency-to-cancel-any-in-progress-job-or-run
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
-
-jobs:
-  test:
-    name: Run script unit tests
-    runs-on: ubuntu-latest
-    # This runs on Alpine to make sure we're testing with actual sh.
-    container: "alpine:3.14"
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v3
-
-      - name: Install test utilities
-        run: apk add bats checkbashisms
-
-      - name: Check Bashisms
-        run: checkbashisms ./install.sh
-
-      - name: Run script unit tests
-        run: ./ci/dev/test-scripts.sh

.gitignore

@@ -1,6 +1,7 @@
 .tsbuildinfo
 .cache
-/out*/
+dist*
+out*
 release/
 release-npm-package/
 release-standalone/
@@ -8,7 +9,7 @@ release-packages/
 release-gcp/
 release-images/
 node_modules
-vendor/modules
+/lib/vscode/node_modules.asar
 node-*
 /plugins
 /lib/coder-cloud-agent

.node-version

@@ -1 +0,0 @@
-14

.nvmrc

@@ -1 +0,0 @@
-.node-version

.prettierrc.yaml

@@ -2,16 +2,3 @@ printWidth: 120
 semi: false
 trailingComma: all
 arrowParens: always
-singleQuote: false
-useTabs: false
-
-overrides:
-  # Attempt to keep VScode's existing code style intact.
-  - files: "vendor/modules/code-oss-dev/**/*.ts"
-    options:
-      # No limit defined upstream.
-      printWidth: 10000
-      semi: true
-      singleQuote: true
-      useTabs: true
-      arrowParens: avoid

.tours/contributing.tour

@@ -50,7 +50,7 @@
     {
       "file": "src/node/heart.ts",
       "line": 7,
-      "description": "code-server's heart beats to indicate recent activity.\n\nAlso documented here: [https://github.com/coder/code-server/blob/master/docs/FAQ.md#heartbeat-file](https://github.com/coder/code-server/blob/master/docs/FAQ.md#heartbeat-file)"
+      "description": "code-server's heart beats to indicate recent activity.\n\nAlso documented here: [https://github.com/cdr/code-server/blob/master/docs/FAQ.md#heartbeat-file](https://github.com/cdr/code-server/blob/master/docs/FAQ.md#heartbeat-file)"
     },
     {
       "file": "src/node/socket.ts",
@@ -80,12 +80,12 @@
     {
       "file": "src/node/routes/domainProxy.ts",
       "line": 18,
-      "description": "code-server provides a built-in proxy to help in developing web-based applications. This is the code for the domain-based proxy.\n\nAlso documented here: [https://github.com/coder/code-server/blob/master/docs/FAQ.md#how-do-i-securely-access-web-services](https://github.com/coder/code-server/blob/master/docs/FAQ.md#how-do-i-securely-access-web-services)"
+      "description": "code-server provides a built-in proxy to help in developing web-based applications. This is the code for the domain-based proxy.\n\nAlso documented here: [https://github.com/cdr/code-server/blob/master/docs/FAQ.md#how-do-i-securely-access-web-services](https://github.com/cdr/code-server/blob/master/docs/FAQ.md#how-do-i-securely-access-web-services)"
     },
     {
       "file": "src/node/routes/pathProxy.ts",
       "line": 19,
-      "description": "Here is the path-based version of the proxy.\n\nAlso documented here: [https://github.com/coder/code-server/blob/master/docs/FAQ.md#how-do-i-securely-access-web-services](https://github.com/coder/code-server/blob/master/docs/FAQ.md#how-do-i-securely-access-web-services)"
+      "description": "Here is the path-based version of the proxy.\n\nAlso documented here: [https://github.com/cdr/code-server/blob/master/docs/FAQ.md#how-do-i-securely-access-web-services](https://github.com/cdr/code-server/blob/master/docs/FAQ.md#how-do-i-securely-access-web-services)"
     },
     {
       "file": "src/node/proxy.ts",
@@ -95,7 +95,7 @@
     {
       "file": "src/node/routes/health.ts",
       "line": 5,
-      "description": "A simple endpoint that lets you see if code-server is up.\n\nAlso documented here: [https://github.com/coder/code-server/blob/master/docs/FAQ.md#healthz-endpoint](https://github.com/coder/code-server/blob/master/docs/FAQ.md#healthz-endpoint)"
+      "description": "A simple endpoint that lets you see if code-server is up.\n\nAlso documented here: [https://github.com/cdr/code-server/blob/master/docs/FAQ.md#healthz-endpoint](https://github.com/cdr/code-server/blob/master/docs/FAQ.md#healthz-endpoint)"
     },
     {
       "file": "src/node/routes/login.ts",
@@ -143,9 +143,9 @@
       "description": "Static images and the manifest live here in `src/browser/media` (see the explorer)."
     },
     {
-      "directory": "vendor/modules/code-oss-dev",
+      "directory": "lib/vscode",
       "line": 1,
-      "description": "code-server makes use of VS Code's frontend web/remote support. Most of the modifications implement the remote server since that portion of the code is closed source and not released with VS Code.\n\nWe also have a few bug fixes and have added some features (like client-side extensions). See [https://github.com/coder/code-server/blob/master/docs/CONTRIBUTING.md#modifications-to-vs-code](https://github.com/coder/code-server/blob/master/docs/CONTRIBUTING.md#modifications-to-vs-code) for a list.\n\nWe make an effort to keep the modifications as few as possible."
+      "description": "code-server makes use of VS Code's frontend web/remote support. Most of the modifications implement the remote server since that portion of the code is closed source and not released with VS Code.\n\nWe also have a few bug fixes and have added some features (like client-side extensions). See [https://github.com/cdr/code-server/blob/master/docs/CONTRIBUTING.md#modifications-to-vs-code](https://github.com/cdr/code-server/blob/master/docs/CONTRIBUTING.md#modifications-to-vs-code) for a list.\n\nWe make an effort to keep the modifications as few as possible."
     }
   ]
-}
+}

.tours/start-development.tour

@@ -5,7 +5,7 @@
     {
       "file": "package.json",
       "line": 31,
-      "description": "## Commands\n\nTo start developing, make sure you have Node 14+ and the [required dependencies](https://github.com/Microsoft/vscode/wiki/How-to-Contribute#prerequisites) installed. Then, run the following commands:\n\n1. Install dependencies:\n>> yarn\n\n3. Start development mode (and watch for changes):\n>> yarn watch"
+      "description": "## Commands\n\nTo start developing, make sure you have Node 12+ and the [required dependencies](https://github.com/Microsoft/vscode/wiki/How-to-Contribute#prerequisites) installed. Then, run the following commands:\n\n1. Install dependencies:\n>> yarn\n\n3. Start development mode (and watch for changes):\n>> yarn watch"
     },
     {
       "file": "src/node/app.ts",
@@ -20,7 +20,7 @@
     {
       "file": "src/node/app.ts",
       "line": 62,
-      "description": "## That's it!\n\n\nThat's all there is to it! When this tour ends, your terminal session may stop, but just use `yarn watch` to start developing from here on out!\n\n\nIf you haven't already, be sure to check out these resources:\n- [Tour: Contributing](command:codetour.startTourByTitle?[\"Contributing\")\n- [Docs: FAQ.md](https://github.com/coder/code-server/blob/master/docs/FAQ.md)\n- [Docs: CONTRIBUTING.md](https://github.com/coder/code-server/blob/master/docs/CONTRIBUTING.md)\n- [Community: GitHub Discussions](https://github.com/coder/code-server/discussions)\n- [Community: Slack](https://community.coder.com)"
+      "description": "## That's it!\n\n\nThat's all there is to it! When this tour ends, your terminal session may stop, but just use `yarn watch` to start developing from here on out!\n\n\nIf you haven't already, be sure to check out these resources:\n- [Tour: Contributing](command:codetour.startTourByTitle?[\"Contributing\")\n- [Docs: FAQ.md](https://github.com/cdr/code-server/blob/master/docs/FAQ.md)\n- [Docs: CONTRIBUTING.md](https://github.com/cdr/code-server/blob/master/docs/CONTRIBUTING.md)\n- [Community: GitHub Discussions](https://github.com/cdr/code-server/discussions)\n- [Community: Slack](https://community.coder.com)"
     }
   ]
 }

CHANGELOG.md

@@ -1,200 +1,143 @@
+<!-- START doctoc generated TOC please keep comment here to allow auto update -->
+<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 # Changelog
 
-All notable changes to this project will be documented in this file.
+- [Changelog](#changelog)
+  - [3.10.1](#3101)
+    - [Bug Fixes](#bug-fixes)
+    - [Documentation](#documentation)
+    - [Development](#development)
+  - [3.10.0](#3100)
+    - [New Features](#new-features)
+    - [Bug Fixes](#bug-fixes-1)
+    - [Documentation](#documentation-1)
+    - [Development](#development-1)
+  - [Previous versions](#previous-versions)
 
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+<!-- END doctoc generated TOC please keep comment here to allow auto update -->
-and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-<!-- Example:
+# Changelog
 
-## [9.99.999] - 9090-09-09
+<!--
 
-VS Code v99.99.999
+This should be updated on every PR.
 
-### Changed
+We copy from here into the release notes.
-### Added
+
-### Deprecated
+ -->
-### Removed
+
-### Fixed
+<!--
-### Security
+Add next version above previous version but below this line using the template
+
+## Next Version
+
+VS Code v0.00.0
+
+### New Features
+
+- item
+
+### Bug Fixes
+
+- fix(socket): did this thing #321 @githubuser
+
+### Documentation
+
+- item
+
+### Development
+
+- item
 
 -->
 
-## [Unreleased](https://github.com/coder/code-server/releases)
+## 3.10.1
 
-Code v0.00.0
+VS Code v1.56.1
 
-### Changed
+### Bug Fixes
 
-- Add here
+- fix: Check the logged user instead of $USER #3330 @videlanicolas
+- fix: Fix broken node_modules.asar symlink in npm package #3355 @code-asher
+- fix: Update cloud agent to fix version issue #3342 @oxy
 
-## [4.1.0](https://github.com/coder/code-server/releases/tag/v4.1.0) - 2022-03-03
+### Documentation
 
-Code v1.63.0
+- docs(install): add raspberry pi section #3376 @jsjoeio
+- docs(maintaining): add pull requests section #3378 @jsjoeio
+- docs(maintaining): add merge strategies section #3379 @jsjoeio
+- refactor: move default PR template #3375 @jsjoeio
+- docs(contributing): add commits section #3377 @jsjoeio
+- docs(maintaining): add process for release managers #3360 @jsjoeio
 
-### Added
+### Development
 
-- Support for injecting GitHub token into Code so extensions can make use of it.
+- chore: ignore updates to microsoft/playwright-github-action
-  This can be done with the `GITHUB_TOKEN` environment variable or `github-auth`
+- fix(socket): use xdgBasedir.runtime instead of tmp #3304 @jsjoeio
-  in the config file.
+- fix(ci): re-enable trivy-scan-repo #3368 @jsjoeio
-- New flag `--socket-mode` allows setting the mode (file permissions) of the
-  socket created when using `--socket`.
-- The version of Code bundled with code-server now appears when using the
-  `--version` flag. For example: `4.0.2 5cdfe74686aa73e023f8354a9a6014eb30caa7dd with Code 1.63.0`.
-  If you have been parsing this flag for the version you might want to use
-  `--version --json` instead as doing that will be more stable.
 
-### Changed
+## 3.10.0
 
-- The workspace or folder passed on the CLI will now use the same redirect
+VS Code v1.56.0
-  method that the last opened workspace or folder uses. This means if you use
-  something like `code-server /path/to/dir` you will now get a query parameter
-  added (like so: `my-domain.tld?folder=/path/to/dir`), making it easier to edit
-  by hand and making it consistent with the last opened and menu open behaviors.
-- The folder/workspace query parameter no longer has encoded slashes, making
-  them more readable and editable by hand. This was only affecting the last
-  opened behavior, not opens from the menu.
 
-### Fixed
+### New Features
 
-- Fix web sockets not connecting when using `--cert`.
+- feat: minor connections refactor #3178 @code-asher
-- Prevent workspace state collisions when opening a workspace that shares the
+- feat(security): add code-scanning with CodeQL #3229 @jsjoeio
-  same file path with another workspace on a different machine that shares the
+- feat(ci): add trivy job for security #3261 @jsjoeio
-  same domain. This was causing files opened in one workspace to be "re-"opened
+- feat(vscode): update to version 1.56.0 #3269 @oxy
-  in the other workspace when the other workspace is opened.
+- feat: use ptyHostService #3308 @code-asher
-- Pin the Express version which should make installing from npm work again.
-- Propagate signals to code-server in the Docker image which means it should
-  stop more quickly and gracefully.
-- Fix missing argon binaries in the standalone releases on arm machines.
 
-## [4.0.2](https://github.com/coder/code-server/releases/tag/v4.0.2) - 2022-01-27
+### Bug Fixes
 
-Code v1.63.0
+- fix(socket): did this thing #321 @githubuser
+- fix(login): rate limiter shouldn't count successful logins #3141 @jsjoeio
+- chore(lib/vscode): update netmask #3187 @oxy
+- chore(deps): update dependencies with CVEs #3223 @oxy
+- fix: refactor logout #3277 @code-asher
+- fix: add flag for toggling permessage-deflate #3286 @code-asher
+- fix: make sure directories exist #3309 @code-asher
 
-### Fixed
+### Documentation
 
-- Unset the `BROWSER` environment variable. This fixes applications that hard
+- docs(FAQ): add mention of sysbox #3087 @bpmct
-  exit when trying to spawn the helper script `BROWSER` points to because the
+- docs: add security policy #3148 @jsjoeio
-  file is missing. While we do include the script now we are leaving the
+- docs(guide.md): add `caddy` example for serving from sub-path #3217 @catthehacker
-  variable omitted because the script does not work yet.
+- docs: revamp debugging section #3224 @code-asher
+- docs(readme): refactor to use codecov shield #3227 @jsjoeio
+- docs(maintaining): use milestones over boards #3228 @jsjoeio
+- docs(faq): add entry for accessing OSX folders #3247 @bpmct
+- docs(termux): add workaround for Android backspace issue #3251 @jsjoeio
+- docs(maintaining): add triage to workflow #3284 @jsjoeio
+- docs(security): add section for tools #3287 @jsjoeio
+- docs(maintaining): add versioning #3288 @jsjoeio
+- docs: add changelog #3337 @jsjoeio
 
-## [4.0.1](https://github.com/coder/code-server/releases/tag/v4.0.1) - 2022-01-04
+### Development
 
-Code v1.63.0
+- fix(update-vscode): add check/docs for git-subtree #3129 @oxy
-
+- refactor(testing): migrate to playwright-test from jest-playwright #3133 @jsjoeio
-code-server has been rebased on upstream's newly open-sourced server
+- refactor(ci): remove unmaintained CI images and update release workflow #3147 @oxy
-implementation (#4414).
+- chore(ci): migrate from hub to gh #3168 @oxy
-
+- feat(testing): add e2e tests for code-server and terminal #3169 @jsjoeio
-### Changed
+- chore(ranger): fix syntax for extension-request #3172 @oxy
-
+- feat(testing): add codecov to generate test coverage reports #3194 @jsjoeio
-- Web socket compression has been made the default (when supported). This means
+- feat(testing): add tests for registerServiceWorker #3200 @jsjoeio
-  the `--enable` flag will no longer take `permessage-deflate` as an option.
+- refactor(testing): fix flaky terminal test #3230 @jsjoeio
-- The static endpoint can no longer reach outside code-server. However the
+- chore: ignore 15.x @types/node updates #3244 @jsjoeio
-  vscode-remote-resource endpoint still can.
+- chore(build): compile vscode+extensions in parallel #3250 @oxy
-- OpenVSX has been made the default marketplace.
+- fix(deps): remove eslint-plugin-jest-playwright #3260 @jsjoeio
-- The last opened folder/workspace is no longer stored separately in the
+- fix(testing): reduce flakiness of terminal.test.ts and use 1 worker for e2e tests #3263 @jsjoeio
-  settings file (we rely on the already-existing query object instead).
+- feat(testing): add isConnected check #3271 @jsjoeio
-- The marketplace override environment variables `SERVICE_URL` and `ITEM_URL`
+- feat(testing): add test for src/node/constants.ts #3290 @jsjoeio
-  have been replaced with a single `EXTENSIONS_GALLERY` variable that
+- feat: test static route #3297 @code-asher
-  corresponds to `extensionsGallery` in Code's `product.json`.
+- refactor(ci): split audit from prebuild #3298 @oxy
-
+- chore(lib/vscode): cleanup/update build deps #3314 @oxy
-### Added
+- fix(build): download correct cloud-agent for arch #3331 @oxy
-
+- fix: xmldom and underscore #3332 @oxy
-- `VSCODE_PROXY_URI` env var for use in the terminal and extensions.
-
-### Removed
-
-- Extra extension directories have been removed. The `--extra-extensions-dir`
-  and `--extra-builtin-extensions-dir` flags will no longer be accepted.
-- The `--install-source` flag has been removed.
-
-### Deprecated
-
-- `--link` is now deprecated (#4562).
-
-### Security
-
-- We fixed a XSS vulnerability by escaping HTML from messages in the error page (#4430).
-
-## [3.12.0](https://github.com/coder/code-server/releases/tag/v3.12.0) - 2021-09-15
-
-Code v1.60.0
-
-### Changed
-
-- Upgrade Code to 1.60.0.
-
-### Fixed
-
-- Fix logout when using a base path (#3608).
-
-## [3.11.1](https://github.com/coder/code-server/releases/tag/v3.11.1) - 2021-08-06
-
-Undocumented (see releases page).
-
-## [3.11.0](https://github.com/coder/code-server/releases/tag/v3.11.0) - 2021-06-14
-
-Undocumented (see releases page).
-
-## [3.10.2](https://github.com/coder/code-server/releases/tag/v3.10.2) - 2021-05-21
-
-Code v1.56.1
-
-### Added
-
-- Support `extraInitContainers` in helm chart values (#3393).
-
-### Changed
-
-- Change `extraContainers` to support templating in helm chart (#3393).
-
-### Fixed
-
-- Fix "Open Folder" on welcome page (#3437).
-
-## [3.10.1](https://github.com/coder/code-server/releases/tag/v3.10.1) - 2021-05-17
-
-Code v1.56.1
-
-### Fixed
-
-- Check the logged user instead of $USER (#3330).
-- Fix broken node_modules.asar symlink in npm package (#3355).
-- Update cloud agent to fix version issue (#3342).
-
-### Changed
-
-- Use xdgBasedir.runtime instead of tmp (#3304).
-
-## [3.10.0](https://github.com/coder/code-server/releases/tag/v3.10.0) - 2021-05-10
-
-Code v1.56.0
-
-### Changed
-
-- Update to Code 1.56.0 (#3269).
-- Minor connections refactor (#3178). Improves connection stability.
-- Use ptyHostService (#3308). This brings us closer to upstream Code.
-
-### Added
-
-- Add flag for toggling permessage-deflate (#3286). The default is off so
-  compression will no longer be used by default. Use the --enable flag to
-  toggle it back on.
-
-### Fixed
-
-- Make rate limiter not count against successful logins (#3141).
-- Refactor logout (#3277). This fixes logging out in some scenarios.
-- Make sure directories exist (#3309). This fixes some errors on startup.
-
-### Security
-
-- Update dependencies with CVEs (#3223).
 
 ## Previous versions
 
-This was added with `3.10.0`, which means any previous versions are not
+This was added with `3.10.0`, which means any previous versions are not documented in the changelog.
-documented in the changelog.
 
-To see those, please visit the [Releases page](https://github.com/coder/code-server/releases).
+To see those, please visit the [Releases page](https://github.com/cdr/code-server/releases).

README.md

@@ -0,0 +1,77 @@
+# code-server · [!["GitHub Discussions"](https://img.shields.io/badge/%20GitHub-%20Discussions-gray.svg?longCache=true&logo=github&colorB=purple)](https://github.com/cdr/code-server/discussions) [!["Join us on Slack"](https://img.shields.io/badge/join-us%20on%20slack-gray.svg?longCache=true&logo=slack&colorB=brightgreen)](https://cdr.co/join-community) [![Twitter Follow](https://img.shields.io/twitter/follow/CoderHQ?label=%40CoderHQ&style=social)](https://twitter.com/coderhq)
+
+[![codecov](https://codecov.io/gh/cdr/code-server/branch/main/graph/badge.svg?token=5iM9farjnC)](https://codecov.io/gh/cdr/code-server)
+[![See latest docs](https://img.shields.io/static/v1?label=Docs&message=see%20latest%20&color=blue)](https://github.com/cdr/code-server/tree/v3.10.1/docs)
+
+Run [VS Code](https://github.com/Microsoft/vscode) on any machine anywhere and access it in the browser.
+
+![Screenshot](./docs/assets/screenshot.png)
+
+## Highlights
+
+- Code on any device with a consistent development environment
+- Use cloud servers to speed up tests, compilations, downloads, and more
+- Preserve battery life when you're on the go; all intensive tasks run on your server
+
+## Requirements
+
+For a good experience, we recommend at least:
+
+- 1 GB of RAM
+- 2 cores
+
+You can use whatever linux distribution floats your boat but in our [guide](./docs/guide.md) we assume Debian on Google Cloud.
+
+## Getting Started
+
+There are three ways you can get started:
+
+1. Using the [install script](./install.sh), which automates most of the process. The script uses the system package manager (if possible)
+2. Manually installing code-server; see [Installation](./docs/install.md) for instructions applicable to most use cases
+3. Use our one-click buttons and guides to [deploy code-server to a popular cloud provider](https://github.com/cdr/deploy-code-server) ⚡
+
+If you choose to use the install script, you can preview what occurs during the install process:
+
+```bash
+curl -fsSL https://code-server.dev/install.sh | sh -s -- --dry-run
+```
+
+To install, run:
+
+```bash
+curl -fsSL https://code-server.dev/install.sh | sh
+```
+
+When done, the install script prints out instructions for running and starting code-server.
+
+We also have an in-depth [setup and configuration](./docs/guide.md) guide.
+
+### code-server --link
+
+We're working on a cloud platform that makes deploying and managing code-server easier.
+Consider running code-server with the beta flag `--link` if you don't want to worry about
+
+- TLS
+- Authentication
+- Port Forwarding
+
+```bash
+$ code-server --link
+Proxying code-server, you can access your IDE at https://valmar-jon.cdr.co
+```
+
+## FAQ
+
+See [./docs/FAQ.md](./docs/FAQ.md).
+
+## Want to help?
+
+See [CONTRIBUTING](./docs/CONTRIBUTING.md) for details.
+
+## Hiring
+
+Interested in [working at Coder](https://coder.com)? Check out [our open positions](https://jobs.lever.co/coder)!
+
+## For Organizations
+
+Visit [our website](https://coder.com) for more information about remote development for your organization or enterprise.

ci/README.md

@@ -10,6 +10,28 @@ Any file or directory in this subdirectory should be documented here.
 - [./ci/lib.sh](./lib.sh)
   - Contains code duplicated across these scripts.
 
+## Publishing a release
+
+1. Run `yarn release:prep` and type in the new version i.e. 3.8.1
+2. GitHub actions will generate the `npm-package`, `release-packages` and `release-images` artifacts.
+   1. You do not have to wait for these.
+3. Run `yarn release:github-draft` to create a GitHub draft release from the template with
+   the updated version.
+   1. Summarize the major changes in the release notes and link to the relevant issues.
+   2. Change the @ to target the version branch. Example: `v3.9.0 @ Target: v3.9.0`
+4. Wait for the artifacts in step 2 to build.
+5. Run `yarn release:github-assets` to download the `release-packages` artifact.
+   - It will upload them to the draft release.
+6. Run some basic sanity tests on one of the released packages.
+   - Especially make sure the terminal works fine.
+7. Publish the release and merge the PR.
+   1. CI will automatically grab the artifacts and then:
+      1. Publish the NPM package from `npm-package`.
+      2. Publish the Docker Hub image from `release-images`.
+8. Update the AUR package.
+   - Instructions on updating the AUR package are at [cdr/code-server-aur](https://github.com/cdr/code-server-aur).
+9. Wait for the npm package to be published.
+
 ## dev
 
 This directory contains scripts used for the development of code-server.
@@ -78,8 +100,8 @@ You can disable minification by setting `MINIFY=`.
 
 This directory contains the release docker container image.
 
-- [./ci/steps/build-docker-buildx-push.sh](./ci/steps/docker-buildx-push.sh)
+- [./release-image/build.sh](./release-image/build.sh)
-  - Builds the release containers with tags `codercom/code-server-$ARCH:$VERSION` for amd64 and arm64 with `docker buildx` and pushes them.
+  - Builds the release container with the tag `codercom/code-server-$ARCH:$VERSION`.
   - Assumes debian releases are ready in `./release-packages`.
 
 ## images
@@ -107,8 +129,8 @@ Helps avoid clobbering the CI configuration.
     release packages into `./release-packages`.
 - [./steps/publish-npm.sh](./steps/publish-npm.sh)
   - Grabs the `npm-package` release artifact for the current commit and publishes it on npm.
-- [./steps/docker-buildx-push.sh](./steps/docker-buildx-push.sh)
+- [./steps/build-docker-image.sh](./steps/build-docker-image.sh)
-  - Builds the docker image and then pushes it.
+  - Builds the docker image and then saves it into `./release-images/code-server-$ARCH-$VERSION.tar`.
 - [./steps/push-docker-manifest.sh](./steps/push-docker-manifest.sh)
   - Loads all images in `./release-images` and then builds and pushes a multi architecture
     docker manifest for the amd64 and arm64 images to `codercom/code-server:$VERSION` and

ci/build/build-code-server.sh

@@ -3,6 +3,9 @@ set -euo pipefail
 
 # Builds code-server into out and the frontend into dist.
 
+# MINIFY controls whether parcel minifies dist.
+MINIFY=${MINIFY-true}
+
 main() {
   cd "$(dirname "${0}")/../.."
 
@@ -15,21 +18,28 @@ main() {
     chmod +x out/node/entry.js
   fi
 
-  # for arch; we do not use OS from lib.sh and get our own.
-  # lib.sh normalizes macos to darwin - but cloud-agent's binaries do not
-  source ./ci/lib.sh
-  OS="$(uname | tr '[:upper:]' '[:lower:]')"
-
-  mkdir -p ./lib
-
   if ! [ -f ./lib/coder-cloud-agent ]; then
     echo "Downloading the cloud agent..."
 
+    # for arch; we do not use OS from lib.sh and get our own.
+    # lib.sh normalizes macos to darwin - but cloud-agent's binaries do not
+    source ./ci/lib.sh
+    OS="$(uname | tr '[:upper:]' '[:lower:]')"
+
     set +e
-    curl -fsSL "https://github.com/coder/cloud-agent/releases/latest/download/cloud-agent-$OS-$ARCH" -o ./lib/coder-cloud-agent
+    curl -fsSL "https://github.com/cdr/cloud-agent/releases/latest/download/cloud-agent-$OS-$ARCH" -o ./lib/coder-cloud-agent
     chmod +x ./lib/coder-cloud-agent
     set -e
   fi
+
+  parcel build \
+    --public-url "." \
+    --out-dir dist \
+    $([[ $MINIFY ]] || echo --no-minify) \
+    src/browser/register.ts \
+    src/browser/serviceWorker.ts \
+    src/browser/pages/login.ts \
+    src/browser/pages/vscode.ts
 }
 
 main "$@"

ci/build/build-lib.sh

@@ -1,28 +0,0 @@
-#!/usr/bin/env bash
-
-# This is a library which contains functions used inside ci/build
-#
-# We separated it into it's own file so that we could easily unit test
-# these functions and helpers.
-
-# On some CPU architectures (notably node/uname "armv7l", default on Raspberry Pis),
-# different package managers have different labels for the same CPU (deb=armhf, rpm=armhfp).
-# This function returns the overriden arch on platforms
-# with alternate labels, or the same arch otherwise.
-get_nfpm_arch() {
-  local PKG_FORMAT="${1:-}"
-  local ARCH="${2:-}"
-
-  case "$ARCH" in
-    armv7l)
-      if [ "$PKG_FORMAT" = "deb" ]; then
-        echo armhf
-      elif [ "$PKG_FORMAT" = "rpm" ]; then
-        echo armhfp
-      fi
-      ;;
-    *)
-      echo "$ARCH"
-      ;;
-  esac
-}

ci/build/build-packages.sh

@@ -7,7 +7,6 @@ set -euo pipefail
 main() {
   cd "$(dirname "${0}")/../.."
   source ./ci/lib.sh
-  source ./ci/build/build-lib.sh
 
   # Allow us to override architecture
   # we use this for our Linux ARM64 cross compile builds
@@ -47,22 +46,11 @@ release_gcp() {
 # Generates deb and rpm packages.
 release_nfpm() {
   local nfpm_config
+  nfpm_config="$(envsubst <./ci/build/nfpm.yaml)"
 
-  export NFPM_ARCH
+  # The underscores are convention for .deb.
-
+  nfpm pkg -f <(echo "$nfpm_config") --target "release-packages/code-server_${VERSION}_$ARCH.deb"
-  PKG_FORMAT="deb"
+  nfpm pkg -f <(echo "$nfpm_config") --target "release-packages/code-server-$VERSION-$ARCH.rpm"
-  NFPM_ARCH="$(get_nfpm_arch $PKG_FORMAT "$ARCH")"
-  nfpm_config="$(envsubst < ./ci/build/nfpm.yaml)"
-  echo "Building deb"
-  echo "$nfpm_config" | head --lines=4
-  nfpm pkg -f <(echo "$nfpm_config") --target "release-packages/code-server_${VERSION}_${NFPM_ARCH}.deb"
-
-  PKG_FORMAT="rpm"
-  NFPM_ARCH="$(get_nfpm_arch $PKG_FORMAT "$ARCH")"
-  nfpm_config="$(envsubst < ./ci/build/nfpm.yaml)"
-  echo "Building rpm"
-  echo "$nfpm_config" | head --lines=4
-  nfpm pkg -f <(echo "$nfpm_config") --target "release-packages/code-server-$VERSION-$NFPM_ARCH.rpm"
 }
 
 main "$@"

ci/build/build-release.sh

@@ -12,31 +12,29 @@ KEEP_MODULES="${KEEP_MODULES-0}"
 
 main() {
   cd "$(dirname "${0}")/../.."
-
   source ./ci/lib.sh
 
-  VSCODE_SRC_PATH="vendor/modules/code-oss-dev"
+  VSCODE_SRC_PATH="lib/vscode"
-  VSCODE_OUT_PATH="$RELEASE_PATH/vendor/modules/code-oss-dev"
+  VSCODE_OUT_PATH="$RELEASE_PATH/lib/vscode"
 
   mkdir -p "$RELEASE_PATH"
 
   bundle_code_server
   bundle_vscode
 
-  rsync ./docs/README.md "$RELEASE_PATH"
+  rsync README.md "$RELEASE_PATH"
   rsync LICENSE.txt "$RELEASE_PATH"
-  rsync ./vendor/modules/code-oss-dev/ThirdPartyNotices.txt "$RELEASE_PATH"
+  rsync ./lib/vscode/ThirdPartyNotices.txt "$RELEASE_PATH"
 }
 
 bundle_code_server() {
-  rsync out "$RELEASE_PATH"
+  rsync out dist "$RELEASE_PATH"
 
   # For source maps and images.
   mkdir -p "$RELEASE_PATH/src/browser"
   rsync src/browser/media/ "$RELEASE_PATH/src/browser/media"
   mkdir -p "$RELEASE_PATH/src/browser/pages"
   rsync src/browser/pages/*.html "$RELEASE_PATH/src/browser/pages"
-  rsync src/browser/pages/*.css "$RELEASE_PATH/src/browser/pages"
   rsync src/browser/robots.txt "$RELEASE_PATH/src/browser"
 
   # Add typings for plugins
@@ -45,15 +43,15 @@ bundle_code_server() {
 
   # Adds the commit to package.json
   jq --slurp '.[0] * .[1]' package.json <(
-    cat << EOF
+    cat <<EOF
   {
     "commit": "$(git rev-parse HEAD)",
     "scripts": {
-      "postinstall": "sh ./postinstall.sh"
+      "postinstall": "./postinstall.sh"
     }
   }
 EOF
-  ) > "$RELEASE_PATH/package.json"
+  ) >"$RELEASE_PATH/package.json"
   rsync yarn.lock "$RELEASE_PATH"
   rsync ci/build/npm-postinstall.sh "$RELEASE_PATH/postinstall.sh"
 
@@ -67,7 +65,7 @@ EOF
 bundle_vscode() {
   mkdir -p "$VSCODE_OUT_PATH"
   rsync "$VSCODE_SRC_PATH/yarn.lock" "$VSCODE_OUT_PATH"
-  rsync "$VSCODE_SRC_PATH/out-vscode-reh-web${MINIFY:+-min}/" "$VSCODE_OUT_PATH/out"
+  rsync "$VSCODE_SRC_PATH/out-vscode${MINIFY:+-min}/" "$VSCODE_OUT_PATH/out"
 
   rsync "$VSCODE_SRC_PATH/.build/extensions/" "$VSCODE_OUT_PATH/extensions"
   if [ "$KEEP_MODULES" = 0 ]; then
@@ -79,34 +77,24 @@ bundle_vscode() {
   rsync "$VSCODE_SRC_PATH/extensions/yarn.lock" "$VSCODE_OUT_PATH/extensions"
   rsync "$VSCODE_SRC_PATH/extensions/postinstall.js" "$VSCODE_OUT_PATH/extensions"
 
-  mkdir -p "$VSCODE_OUT_PATH/resources/"
+  mkdir -p "$VSCODE_OUT_PATH/resources/"{linux,web}
-  rsync "$VSCODE_SRC_PATH/resources/" "$VSCODE_OUT_PATH/resources/"
+  rsync "$VSCODE_SRC_PATH/resources/linux/code.png" "$VSCODE_OUT_PATH/resources/linux/code.png"
+  rsync "$VSCODE_SRC_PATH/resources/web/callback.html" "$VSCODE_OUT_PATH/resources/web/callback.html"
 
-  # TODO: We should look into using VS Code's packaging task (see
+  # Adds the commit and date to product.json
-  # gulpfile.reh.js).  For now copy this directory into the right spot (for some
-  # reason VS Code uses a different path in production).
-  mkdir -p "$VSCODE_OUT_PATH/bin/helpers"
-  rsync "$VSCODE_SRC_PATH/resources/server/bin/helpers/" "$VSCODE_OUT_PATH/bin/helpers"
-  chmod +x "$VSCODE_OUT_PATH/bin/helpers/browser.sh"
-
-  # Add the commit and date and enable telemetry. This just makes telemetry
-  # available; telemetry can still be disabled by flag or setting.
   jq --slurp '.[0] * .[1]' "$VSCODE_SRC_PATH/product.json" <(
-    cat << EOF
+    cat <<EOF
   {
-    "enableTelemetry": true,
+    "commit": "$(git rev-parse HEAD)",
-    "commit": "$(cd "$VSCODE_SRC_PATH" && git rev-parse HEAD)",
+    "date": $(jq -n 'now | todate')
-    "quality": "stable",
-    "date": $(jq -n 'now | todate'),
-    "codeServerVersion": "$VERSION"
   }
 EOF
-  ) > "$VSCODE_OUT_PATH/product.json"
+  ) >"$VSCODE_OUT_PATH/product.json"
 
   # We remove the scripts field so that later on we can run
   # yarn to fetch node_modules if necessary without build scripts running.
   # We cannot use --no-scripts because we still want dependent package scripts to run.
-  jq 'del(.scripts)' < "$VSCODE_SRC_PATH/package.json" > "$VSCODE_OUT_PATH/package.json"
+  jq 'del(.scripts)' <"$VSCODE_SRC_PATH/package.json" >"$VSCODE_OUT_PATH/package.json"
 
   pushd "$VSCODE_OUT_PATH"
   symlink_asar

ci/build/build-standalone-release.sh

@@ -1,13 +1,8 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-# This is due to an upstream issue with RHEL7/CentOS 7 comptability with node-argon2
-# See: https://github.com/cdr/code-server/pull/3422#pullrequestreview-677765057
-export npm_config_build_from_source=true
-
 main() {
   cd "$(dirname "${0}")/../.."
-
   source ./ci/lib.sh
 
   rsync "$RELEASE_PATH/" "$RELEASE_PATH-standalone"
@@ -17,10 +12,9 @@ main() {
   # we use the same version it's using so we instead run a script with yarn that
   # will print the path to node.
   local node_path
-  node_path="$(yarn -s node <<< 'console.info(process.execPath)')"
+  node_path="$(yarn -s node <<<'console.info(process.execPath)')"
 
   mkdir -p "$RELEASE_PATH/bin"
-  mkdir -p "$RELEASE_PATH/lib"
   rsync ./ci/build/code-server.sh "$RELEASE_PATH/bin/code-server"
   rsync "$node_path" "$RELEASE_PATH/lib/node"
 
@@ -29,12 +23,6 @@ main() {
 
   cd "$RELEASE_PATH"
   yarn --production --frozen-lockfile
-
-  # HACK: the version of Typescript vscode 1.57 uses in extensions/
-  # leaves a few stray symlinks. Clean them up so nfpm does not fail.
-  # Remove this line when its no longer needed.
-
-  rm -fr "$RELEASE_PATH/vendor/modules/code-oss-dev/extensions/node_modules/.bin"
 }
 
 main "$@"

ci/build/build-vscode.sh

@@ -1,18 +1,20 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-# Builds vscode into vendor/modules/code-oss-dev/out-vscode.
+# Builds vscode into lib/vscode/out-vscode.
 
 # MINIFY controls whether a minified version of vscode is built.
 MINIFY=${MINIFY-true}
 
 main() {
   cd "$(dirname "${0}")/../.."
+  cd lib/vscode
 
-  cd vendor/modules/code-oss-dev
+  yarn gulp compile-build compile-extensions-build
-
+  yarn gulp optimize --gulpfile ./coder.js
-  # Any platform works since we have our own packaging step (for now).
+  if [[ $MINIFY ]]; then
-  yarn gulp "vscode-reh-web-linux-x64${MINIFY:+-min}"
+    yarn gulp minify --gulpfile ./coder.js
+  fi
 }
 
 main "$@"

ci/build/clean.sh

@@ -6,6 +6,10 @@ main() {
   source ./ci/lib.sh
 
   git clean -Xffd
+
+  pushd lib/vscode
+  git clean -xffd
+  popd
 }
 
 main "$@"

ci/build/code-server.sh

@@ -5,7 +5,7 @@ set -eu
 # Runs code-server with the bundled node binary.
 
 _realpath() {
-  # See https://github.com/coder/code-server/issues/1537 on why no realpath or readlink -f.
+  # See https://github.com/cdr/code-server/issues/1537 on why no realpath or readlink -f.
 
   script="$1"
   cd "$(dirname "$script")"
@@ -16,7 +16,7 @@ _realpath() {
       && cat package.json | grep -q '^  "name": "code-server",$'; then
       echo "***** Please use the script in bin/code-server instead!" >&2
       echo "***** This script will soon be removed!" >&2
-      echo "***** See the release notes at https://github.com/coder/code-server/releases/tag/v3.4.0" >&2
+      echo "***** See the release notes at https://github.com/cdr/code-server/releases/tag/v3.4.0" >&2
     fi
 
     script="$(readlink "$(basename "$script")")"

ci/build/nfpm.yaml

@@ -1,5 +1,5 @@
 name: "code-server"
-arch: "${NFPM_ARCH}"
+arch: "${ARCH}"
 platform: "linux"
 version: "v${VERSION}"
 section: "devel"
@@ -8,7 +8,7 @@ maintainer: "Anmol Sethi <hi@nhooyr.io>"
 description: |
   Run VS Code in the browser.
 vendor: "Coder"
-homepage: "https://github.com/coder/code-server"
+homepage: "https://github.com/cdr/code-server"
 license: "MIT"
 
 contents:

ci/build/npm-postinstall.sh

@@ -4,43 +4,29 @@ set -eu
 # Copied from arch() in ci/lib.sh.
 detect_arch() {
   case "$(uname -m)" in
-    aarch64)
+  aarch64)
-      echo arm64
+    echo arm64
-      ;;
+    ;;
-    x86_64 | amd64)
+  x86_64 | amd64)
-      echo amd64
+    echo amd64
-      ;;
+    ;;
-    *)
+  *)
-      # This will cause the download to fail, but is intentional
+    # This will cause the download to fail, but is intentional
-      uname -m
+    uname -m
-      ;;
+    ;;
   esac
 }
 
 ARCH="${NPM_CONFIG_ARCH:-$(detect_arch)}"
-# This is due to an upstream issue with RHEL7/CentOS 7 comptability with node-argon2
-# See: https://github.com/cdr/code-server/pull/3422#pullrequestreview-677765057
-export npm_config_build_from_source=true
 
 main() {
   # Grabs the major version of node from $npm_config_user_agent which looks like
   # yarn/1.21.1 npm/? node/v14.2.0 darwin x64
   major_node_version=$(echo "$npm_config_user_agent" | sed -n 's/.*node\/v\([^.]*\).*/\1/p')
-
+  if [ "$major_node_version" -lt 12 ]; then
-  if [ -n "${FORCE_NODE_VERSION:-}" ]; then
+    echo "code-server currently requires at least node v12"
-    echo "WARNING: Overriding required Node.js version to v$FORCE_NODE_VERSION"
-    echo "This could lead to broken functionality, and is unsupported."
-    echo "USE AT YOUR OWN RISK!"
-  fi
-
-  if [ "$major_node_version" -ne "${FORCE_NODE_VERSION:-14}" ]; then
-    echo "ERROR: code-server currently requires node v14."
-    if [ -n "$FORCE_NODE_VERSION" ]; then
-      echo "However, you have overrided the version check to use v$FORCE_NODE_VERSION."
-    fi
     echo "We have detected that you are on node v$major_node_version"
-    echo "You can override this version check by setting \$FORCE_NODE_VERSION,"
+    echo "See https://github.com/cdr/code-server/issues/1633"
-    echo "but configurations that do not use the same node version are unsupported."
     exit 1
   fi
 
@@ -57,10 +43,7 @@ main() {
   esac
 
   OS="$(uname | tr '[:upper:]' '[:lower:]')"
-
+  if curl -fsSL "https://github.com/cdr/cloud-agent/releases/latest/download/cloud-agent-$OS-$ARCH" -o ./lib/coder-cloud-agent; then
-  mkdir -p ./lib
-
-  if curl -fsSL "https://github.com/coder/cloud-agent/releases/latest/download/cloud-agent-$OS-$ARCH" -o ./lib/coder-cloud-agent; then
     chmod +x ./lib/coder-cloud-agent
   else
     echo "Failed to download cloud agent; --link will not work"
@@ -68,20 +51,14 @@ main() {
 
   if ! vscode_yarn; then
     echo "You may not have the required dependencies to build the native modules."
-    echo "Please see https://github.com/coder/code-server/blob/master/docs/npm.md"
+    echo "Please see https://github.com/cdr/code-server/blob/master/docs/npm.md"
     exit 1
   fi
-
-  if [ -n "${FORCE_NODE_VERSION:-}" ]; then
-    echo "WARNING: The required Node.js version was overriden to v$FORCE_NODE_VERSION"
-    echo "This could lead to broken functionality, and is unsupported."
-    echo "USE AT YOUR OWN RISK!"
-  fi
 }
 
 # This is a copy of symlink_asar in ../lib.sh. Look there for details.
 symlink_asar() {
-  rm -rf node_modules.asar
+  rm -f node_modules.asar
   if [ "${WINDIR-}" ]; then
     mklink /J node_modules.asar node_modules
   else
@@ -90,15 +67,13 @@ symlink_asar() {
 }
 
 vscode_yarn() {
-  echo 'Installing vendor dependencies...'
+  cd lib/vscode
-  cd vendor/modules/code-oss-dev
   yarn --production --frozen-lockfile
 
   symlink_asar
 
   cd extensions
   yarn --production --frozen-lockfile
-
   for ext in */; do
     ext="${ext%/}"
     echo "extensions/$ext: installing dependencies"

ci/build/release-github-assets.sh

@@ -13,7 +13,7 @@ main() {
   download_artifact release-packages ./release-packages
   local assets=(./release-packages/code-server*"$VERSION"*{.tar.gz,.deb,.rpm})
 
-  EDITOR=true gh release upload "v$VERSION" "${assets[@]}" --clobber
+  EDITOR=true gh release upload "v$VERSION" "${assets[@]}"
 }
 
 main "$@"

ci/build/release-github-draft.sh

@@ -10,7 +10,7 @@ main() {
   gh release create "v$VERSION" \
     --notes-file - \
     --target "$(git rev-parse HEAD)" \
-    --draft << EOF
+    --draft <<EOF
 v$VERSION
 
 VS Code v$(vscode_version)

ci/build/release-prep.sh

@@ -20,7 +20,7 @@ main() {
   cd "$(dirname "$0")/../.."
 
   # Check that gh is installed
-  if ! command -v gh &> /dev/null; then
+  if ! command -v gh &>/dev/null; then
     echo "gh could not be found."
     echo "We use this with the release-github-draft.sh and release-github-assets.sh scripts."
     echo -e "See docs here: https://github.com/cli/cli#installation"
@@ -28,7 +28,7 @@ main() {
   fi
 
   # Check that they have jq installed
-  if ! command -v jq &> /dev/null; then
+  if ! command -v jq &>/dev/null; then
     echo "jq could not be found."
     echo "We use this to parse the package.json and grab the current version of code-server."
     echo -e "See docs here: https://stedolan.github.io/jq/download/"
@@ -36,7 +36,7 @@ main() {
   fi
 
   # Check that they have rg installed
-  if ! command -v rg &> /dev/null; then
+  if ! command -v rg &>/dev/null; then
     echo "rg could not be found."
     echo "We use this when updating files across the codebase."
     echo -e "See docs here: https://github.com/BurntSushi/ripgrep#installation"
@@ -44,7 +44,7 @@ main() {
   fi
 
   # Check that they have node installed
-  if ! command -v node &> /dev/null; then
+  if ! command -v node &>/dev/null; then
     echo "node could not be found."
     echo "That's surprising..."
     echo "We use it in this script for getting the package.json version"
@@ -53,7 +53,7 @@ main() {
   fi
 
   # Check that gh is authenticated
-  if ! gh auth status -h github.com &> /dev/null; then
+  if ! gh auth status -h github.com &>/dev/null; then
     echo "gh isn't authenticated to github.com."
     echo "This is needed for our scripts that use gh."
     echo -e "See docs regarding authentication: https://cli.github.com/manual/gh_auth_login"
@@ -83,14 +83,18 @@ main() {
   echo -e "Great! We'll prep a PR for updating to $CODE_SERVER_VERSION_TO_UPDATE\n"
   $CMD rg -g '!yarn.lock' -g '!*.svg' -g '!CHANGELOG.md' --files-with-matches --fixed-strings "${CODE_SERVER_CURRENT_VERSION}" | $CMD xargs sd "$CODE_SERVER_CURRENT_VERSION" "$CODE_SERVER_VERSION_TO_UPDATE"
 
-  $CMD git commit --no-verify -am "chore(release): bump version to $CODE_SERVER_VERSION_TO_UPDATE"
+  # Ensure the tests are passing and code coverage is up-to-date
+  echo -e "Running unit tests and updating code coverage...\n"
+  $CMD yarn test:unit
+
+  $CMD git commit -am "chore(release): bump version to $CODE_SERVER_VERSION_TO_UPDATE"
 
   # This runs from the root so that's why we use this path vs. ../../
   RELEASE_TEMPLATE_STRING=$(cat ./.github/PULL_REQUEST_TEMPLATE/release_template.md)
 
   echo -e "\nOpening a draft PR on GitHub"
   # To read about these flags, visit the docs: https://cli.github.com/manual/gh_pr_create
-  $CMD gh pr create --base main --title "release: $CODE_SERVER_VERSION_TO_UPDATE" --body "$RELEASE_TEMPLATE_STRING" --reviewer @coder/code-server-reviewers --repo coder/code-server --draft --assignee "@me"
+  $CMD gh pr create --base main --title "release: $CODE_SERVER_VERSION_TO_UPDATE" --body "$RELEASE_TEMPLATE_STRING" --reviewer @cdr/code-server-reviewers --repo cdr/code-server --draft
 
   # Open PR in browser
   $CMD gh pr view --web

ci/build/test-standalone-release.sh

@@ -1,9 +1,7 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-# Make sure a code-server release works. You can pass in the path otherwise it
+# Makes sure the release works.
-# will use release-standalone in the current directory.
-#
 # This is to make sure we don't have Node version errors or any other
 # compilation-related errors.
 main() {
@@ -12,14 +10,12 @@ main() {
   local EXTENSIONS_DIR
   EXTENSIONS_DIR="$(mktemp -d)"
 
-  local path=${1:-./release-standalone/bin/code-server}
+  echo "Testing standalone release."
 
-  echo "Testing standalone release in $path."
+  # Note: using a basic theme extension because it doesn't update often and is more reliable for testing
-
+  ./release-standalone/bin/code-server --extensions-dir "$EXTENSIONS_DIR" --install-extension wesbos.theme-cobalt2
-  # NOTE: using a basic theme extension because it doesn't update often and is more reliable for testing
-  "$path" --extensions-dir "$EXTENSIONS_DIR" --install-extension wesbos.theme-cobalt2
   local installed_extensions
-  installed_extensions="$("$path" --extensions-dir "$EXTENSIONS_DIR" --list-extensions 2>&1)"
+  installed_extensions="$(./release-standalone/bin/code-server --extensions-dir "$EXTENSIONS_DIR" --list-extensions 2>&1)"
   # We use grep as wesbos.theme-cobalt2 may have dependency extensions that change.
   if ! echo "$installed_extensions" | grep -q "wesbos.theme-cobalt2"; then
     echo "Unexpected output from listing extensions:"

ci/dev/fmt.sh

@@ -19,20 +19,20 @@ main() {
     "*.sh"
   )
   prettier --write --loglevel=warn $(
-    git ls-files "${prettierExts[@]}" | grep -v "lib/vscode" | grep -v "vendor/modules/code-oss-dev" | grep -v 'helm-chart'
+    git ls-files "${prettierExts[@]}" | grep -v "lib/vscode" | grep -v 'helm-chart'
   )
 
-  doctoc --title '# FAQ' docs/FAQ.md > /dev/null
+  doctoc --title '# FAQ' docs/FAQ.md >/dev/null
-  doctoc --title '# Setup Guide' docs/guide.md > /dev/null
+  doctoc --title '# Setup Guide' docs/guide.md >/dev/null
-  doctoc --title '# Install' docs/install.md > /dev/null
+  doctoc --title '# Install' docs/install.md >/dev/null
-  doctoc --title '# npm Install Requirements' docs/npm.md > /dev/null
+  doctoc --title '# npm Install Requirements' docs/npm.md >/dev/null
-  doctoc --title '# Contributing' docs/CONTRIBUTING.md > /dev/null
+  doctoc --title '# Contributing' docs/CONTRIBUTING.md >/dev/null
-  doctoc --title '# Maintaining' docs/MAINTAINING.md > /dev/null
+  doctoc --title '# Maintaining' docs/MAINTAINING.md >/dev/null
-  doctoc --title '# Contributor Covenant Code of Conduct' docs/CODE_OF_CONDUCT.md > /dev/null
+  doctoc --title '# Contributor Covenant Code of Conduct' docs/CODE_OF_CONDUCT.md >/dev/null
-  doctoc --title '# iPad' docs/ipad.md > /dev/null
+  doctoc --title '# iPad' docs/ipad.md >/dev/null
-  doctoc --title '# Termux' docs/termux.md > /dev/null
+  doctoc --title '# Termux' docs/termux.md >/dev/null
+  doctoc --title '# Changelog' CHANGELOG.md >/dev/null
 
-  # TODO: replace with a method that generates fewer false positives.
   if [[ ${CI-} && $(git ls-files --other --modified --exclude-standard) ]]; then
     echo "Files need generation or are formatted incorrectly:"
     git -c color.ui=always status | grep --color=no '\[31m'

ci/dev/gen_icons.sh

@@ -35,10 +35,10 @@ main() {
   # This escapes all newlines so that sed will accept them.
   favicon_dark_style="$(printf "%s\n" "$favicon_dark_style" | sed -e ':a' -e 'N' -e '$!ba' -e 's/\n/\\n/g')"
   sed "$(
-    cat -n << EOF
+    cat -n <<EOF
 s%<rect id="favicon"%$favicon_dark_style<rect id="favicon"%
 EOF
-  )" favicon.svg > favicon-dark-support.svg
+  )" favicon.svg >favicon-dark-support.svg
 }
 
 main "$@"

ci/dev/lint.sh

@@ -4,14 +4,17 @@ set -euo pipefail
 main() {
   cd "$(dirname "$0")/../.."
 
-  eslint --max-warnings=0 --fix $(git ls-files "*.ts" "*.tsx" "*.js" | grep -v "vendor/modules/code-oss-dev" | grep -v "lib/vscode")
+  eslint --max-warnings=0 --fix $(git ls-files "*.ts" "*.tsx" "*.js" | grep -v "lib/vscode")
-  stylelint $(git ls-files "*.css" | grep -v "vendor/modules/code-oss-dev" | grep -v "lib/vscode")
+  stylelint $(git ls-files "*.css" | grep -v "lib/vscode")
   tsc --noEmit --skipLibCheck
-  shellcheck -e SC2046,SC2164,SC2154,SC1091,SC1090,SC2002 $(git ls-files "*.sh" | grep -v "vendor/modules/code-oss-dev" | grep -v "lib/vscode")
+  shellcheck -e SC2046,SC2164,SC2154,SC1091,SC1090,SC2002 $(git ls-files "*.sh" | grep -v "lib/vscode")
-  if command -v helm && helm kubeval --help > /dev/null; then
+  if command -v helm && helm kubeval --help >/dev/null; then
     helm kubeval ci/helm-chart
   fi
 
+  cd lib/vscode
+  # Run this periodically in vanilla VS code to make sure we don't add any more warnings.
+  yarn -s eslint --max-warnings=3
   cd "$OLDPWD"
 }
 

ci/dev/postinstall.sh

@@ -5,46 +5,15 @@ main() {
   cd "$(dirname "$0")/../.."
   source ./ci/lib.sh
 
-  pushd test
+  # This installs the dependencies needed for testing
-  echo "Installing dependencies for $PWD"
+  cd test
-  yarn install
+  yarn
-  popd
+  cd ..
 
-  local args=(install)
+  cd lib/vscode
-  if [[ ${CI-} ]]; then
+  yarn ${CI+--frozen-lockfile}
-    args+=(--frozen-lockfile)
-  fi
 
-  pushd test
+  symlink_asar
-  echo "Installing dependencies for $PWD"
-  yarn "${args[@]}"
-  popd
-
-  pushd test/e2e/extensions/test-extension
-  echo "Installing dependencies for $PWD"
-  yarn "${args[@]}"
-  popd
-
-  pushd vendor
-  echo "Installing dependencies for $PWD"
-
-  # We install in 'modules' instead of 'node_modules' because VS Code's
-  # extensions use a webpack config which cannot differentiate between its own
-  # node_modules and itself being in a directory with the same name.
-  args+=(--modules-folder modules)
-
-  # We ignore scripts because NPM/Yarn's default behavior is to assume that
-  # devDependencies are not needed, and that even git repo based packages are
-  # assumed to be compiled. Because the default behavior for VS Code's
-  # `postinstall` assumes we're also compiled, this needs to be ignored.
-  args+=(--ignore-scripts)
-
-  yarn "${args[@]}"
-
-  # Finally, run the vendor `postinstall`
-  yarn run postinstall
-
-  popd
 }
 
 main "$@"

ci/dev/test-e2e.sh

@@ -1,50 +1,12 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-help() {
-  echo >&2 "  You can build with 'yarn watch' or you can build a release"
-  echo >&2 "  For example: 'yarn build && yarn build:vscode && KEEP_MODULES=1 yarn release'"
-  echo >&2 "  Then 'CODE_SERVER_TEST_ENTRY=./release yarn test:e2e'"
-  echo >&2 "  You can manually run that release with 'node ./release'"
-}
-
 main() {
   cd "$(dirname "$0")/../.."
-
-  source ./ci/lib.sh
-
-  pushd test/e2e/extensions/test-extension
-  echo "Building test extension"
-  yarn build
-  popd
-
-  local dir="$PWD"
-  if [[ ! ${CODE_SERVER_TEST_ENTRY-} ]]; then
-    echo "Set CODE_SERVER_TEST_ENTRY to test another build of code-server"
-  else
-    pushd "$CODE_SERVER_TEST_ENTRY"
-    dir="$PWD"
-    popd
-  fi
-
-  echo "Testing build in '$dir'"
-
-  # Simple sanity checks to see that we've built. There could still be things
-  # wrong (native modules version issues, incomplete build, etc).
-  if [[ ! -d $dir/out ]]; then
-    echo >&2 "No code-server build detected"
-    help
-    exit 1
-  fi
-
-  if [[ ! -d $dir/vendor/modules/code-oss-dev/out ]]; then
-    echo >&2 "No VS Code build detected"
-    help
-    exit 1
-  fi
-
   cd test
-  yarn playwright test "$@"
+  # We set these environment variables because they're used in the e2e tests
+  # they don't have to be these values, but these are the defaults
+  PASSWORD=e45432jklfdsab CODE_SERVER_ADDRESS=http://localhost:8080 yarn folio --config=config.ts --reporter=list "$@"
 }
 
 main "$@"

ci/dev/test-scripts.sh

@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-main() {
-  cd "$(dirname "$0")/../.."
-  bats ./test/scripts
-}
-
-main "$@"

ci/dev/test-unit.sh

@@ -3,27 +3,12 @@ set -euo pipefail
 
 main() {
   cd "$(dirname "$0")/../.."
-
+  cd test/unit/test-plugin
-  source ./ci/lib.sh
-
-  echo "Building test plugin"
-  pushd test/unit/node/test-plugin
   make -s out/index.js
-  popd
-
-  # Our code imports from `out` in order to work during development but if you
-  # have only built for production you will have not have this directory.  In
-  # that case symlink `out` to a production build directory.
-  local vscode="vendor/modules/code-oss-dev"
-  local link="$vscode/out"
-  local target="out-build"
-  if [[ ! -e $link ]] && [[ -d $vscode/$target ]]; then
-    ln -s "$target" "$link"
-  fi
-
   # We must keep jest in a sub-directory. See ../../test/package.json for more
   # information. We must also run it from the root otherwise coverage will not
   # include our source files.
+  cd "$OLDPWD"
   CS_DISABLE_PLUGINS=true ./test/node_modules/.bin/jest "$@"
 }
 

ci/dev/update-vscode.sh

@@ -0,0 +1,133 @@
+#!/usr/bin/env bash
+# Description: This is a script to make the process of updating vscode versions easier
+# Run it with `yarn update:vscode` and it will do the following:
+# 1. Check that you have a remote called `vscode`
+# 2. Ask you which version you want to upgrade to
+# 3. Grab the exact version from the package.json i.e. 1.53.2
+# 4. Fetch the vscode remote branches to run the subtree update
+# 5. Run the subtree update and pull in the vscode update
+# 6. Commit the changes (including merge conflicts)
+# 7. Open a draft PR
+
+set -euo pipefail
+
+# This function expects two arguments
+# 1. the vscode version we're updating to
+# 2. the list of merge conflict files
+make_pr_body() {
+  local BODY="This PR updates vscode to $1
+
+## TODOS
+
+- [ ] test editor locally
+- [ ] test terminal locally
+- [ ] make notes about any significant changes in docs/CONTRIBUTING.md#notes-about-changes
+
+## Files with conflicts (fix these)
+$2"
+  echo "$BODY"
+}
+
+main() {
+  cd "$(dirname "$0")/../.."
+
+  # Check if the remote exists
+  # if it doesn't, we add it
+  if ! git config remote.vscode.url >/dev/null; then
+    echo "Could not find 'vscode' as a remote"
+    echo "Adding with: git remote add vscode https://github.com/microsoft/vscode.git"
+    git remote add vscode https://github.com/microsoft/vscode.git
+  fi
+
+  # Ask which version we should update to
+  # In the future, we'll automate this and grab the latest version automatically
+  read -r -p "What version of VSCode would you like to update to? (i.e. 1.52) " VSCODE_VERSION_TO_UPDATE
+
+  # Check that this version exists
+  if [[ -z $(git ls-remote --heads vscode release/"$VSCODE_VERSION_TO_UPDATE") ]]; then
+    echo "Oops, that doesn't look like a valid version."
+    echo "You entered: $VSCODE_VERSION_TO_UPDATE"
+    echo "Verify that this branches exists here: https://github.com/microsoft/vscode/branches/all?query=release%2F$VSCODE_VERSION_TO_UPDATE"
+    exit 1
+  fi
+
+  # Check that they have jq installed
+  if ! command -v jq &>/dev/null; then
+    echo "jq could not be found."
+    echo "We use this when looking up the exact version to update to in the package.json in VS Code."
+    echo -e "See docs here: https://stedolan.github.io/jq/download/"
+    exit 1
+  fi
+
+  # Note: `git subtree` returns 129 when installed, and prints help;
+  # but when uninstalled, returns 1.
+  set +e
+  git subtree &>/dev/null
+  if [ $? -ne 129 ]; then
+    echo "git-subtree could not be found."
+    echo "We use this to fetch and update the lib/vscode subtree."
+    echo -e "Please install git subtree."
+    exit 1
+  fi
+  set -e
+
+  # Grab the exact version from package.json
+  VSCODE_EXACT_VERSION=$(curl -s "https://raw.githubusercontent.com/microsoft/vscode/release/$VSCODE_VERSION_TO_UPDATE/package.json" | jq -r ".version")
+
+  echo -e "Great! We'll prep a PR for updating to $VSCODE_EXACT_VERSION\n"
+
+  # For some reason the subtree update doesn't work
+  # unless we fetch all the branches
+  echo -e "Fetching vscode branches..."
+  echo -e "Note: this might take a while"
+  git fetch vscode
+
+  # Check if GitHub CLI is installed
+  if ! command -v gh &>/dev/null; then
+    echo "GitHub CLI could not be found."
+    echo "If you install it before you run this script next time, we'll open a draft PR for you!"
+    echo -e "See docs here: https://github.com/cli/cli#installation\n"
+    exit
+  fi
+
+  # Push branch to remote if not already pushed
+  # If we don't do this, the opening a draft PR step won't work
+  # because it will stop and ask where you want to push the branch
+  CURRENT_BRANCH=$(git branch | grep '\*' | cut -d' ' -f2-)
+  if [[ -z $(git config "branch.${CURRENT_BRANCH}.remote") ]]; then
+    echo "Doesn't look like you've pushed this branch to remote"
+    echo -e "Pushing now using: git push origin $CURRENT_BRANCH\n"
+    # Note: we need to set upstream as well or the gh pr create step will fail
+    # See: https://github.com/cli/cli/issues/575
+    echo "Please set the upstream and re-run the script"
+    exit 1
+  fi
+
+  echo "Going to try to update vscode for you..."
+  echo -e "Running: git subtree pull --prefix lib/vscode vscode release/${VSCODE_VERSION_TO_UPDATE} --squash\n"
+  # Try to run subtree update command
+  # Note: we add `|| true` because we want the script to keep running even if the squash fails
+  # We know the squash fails everytime because there will always be merge conflicts
+  git subtree pull --prefix lib/vscode vscode release/"${VSCODE_VERSION_TO_UPDATE}" --squash || true
+
+  # Get the files with conflicts before we commit them
+  # so we can list them in the PR body as todo items
+  CONFLICTS=$(git diff --name-only --diff-filter=U | while read -r line; do echo "- [ ] $line"; done)
+  PR_BODY=$(make_pr_body "$VSCODE_EXACT_VERSION" "$CONFLICTS")
+
+  echo -e "\nForcing a commit with conflicts"
+  echo "Note: this is intentional"
+  echo "If we don't do this, code review is impossible."
+  echo -e "For more info, see docs: docs/CONTRIBUTING.md#updating-vs-code\n"
+  # We need --no-verify to skip the husky pre-commit hook
+  # which fails because of the merge conflicts
+  git add . && git commit -am "chore(vscode): update to $VSCODE_EXACT_VERSION" --no-verify
+
+  # Note: we can't open a draft PR unless their are changes.
+  # Hence why we do this after the subtree update.
+  echo "Opening a draft PR on GitHub"
+  # To read about these flags, visit the docs: https://cli.github.com/manual/gh_pr_create
+  gh pr create --base main --title "feat(vscode): update to version $VSCODE_EXACT_VERSION" --body "$PR_BODY" --reviewer @cdr/code-server-reviewers --repo cdr/code-server --draft
+}
+
+main "$@"

ci/dev/watch.ts

@@ -1,140 +1,194 @@
-import { spawn, fork, ChildProcess } from "child_process"
+import * as cp from "child_process"
+import Bundler from "parcel-bundler"
 import * as path from "path"
-import { onLine, OnLineCallback } from "../../src/node/util"
-
-interface DevelopmentCompilers {
-  [key: string]: ChildProcess | undefined
-  vscode: ChildProcess
-  vscodeWebExtensions: ChildProcess
-  codeServer: ChildProcess
-  plugins: ChildProcess | undefined
-}
-
-class Watcher {
-  private rootPath = path.resolve(process.cwd())
-  private readonly paths = {
-    /** Path to uncompiled VS Code source. */
-    vscodeDir: path.join(this.rootPath, "vendor", "modules", "code-oss-dev"),
-    pluginDir: process.env.PLUGIN_DIR,
-  }
-
-  //#region Web Server
-
-  /** Development web server. */
-  private webServer: ChildProcess | undefined
-
-  private reloadWebServer = (): void => {
-    if (this.webServer) {
-      this.webServer.kill()
-    }
-
-    // Pass CLI args, save for `node` and the initial script name.
-    const args = process.argv.slice(2)
-    this.webServer = fork(path.join(this.rootPath, "out/node/entry.js"), args)
-    const { pid } = this.webServer
-
-    this.webServer.on("exit", () => console.log("[Code Server]", `Web process ${pid} exited`))
-
-    console.log("\n[Code Server]", `Spawned web server process ${pid}`)
-  }
-
-  //#endregion
-
-  //#region Compilers
-
-  private readonly compilers: DevelopmentCompilers = {
-    codeServer: spawn("tsc", ["--watch", "--pretty", "--preserveWatchOutput"], { cwd: this.rootPath }),
-    vscode: spawn("yarn", ["watch"], { cwd: this.paths.vscodeDir }),
-    vscodeWebExtensions: spawn("yarn", ["watch-web"], { cwd: this.paths.vscodeDir }),
-    plugins: this.paths.pluginDir ? spawn("yarn", ["build", "--watch"], { cwd: this.paths.pluginDir }) : undefined,
-  }
-
-  public async initialize(): Promise<void> {
-    for (const event of ["SIGINT", "SIGTERM"]) {
-      process.on(event, () => this.dispose(0))
-    }
-
-    for (const [processName, devProcess] of Object.entries(this.compilers)) {
-      if (!devProcess) continue
-
-      devProcess.on("exit", (code) => {
-        console.log(`[${processName}]`, "Terminated unexpectedly")
-        this.dispose(code)
-      })
-
-      if (devProcess.stderr) {
-        devProcess.stderr.on("data", (d: string | Uint8Array) => process.stderr.write(d))
-      }
-    }
-
-    onLine(this.compilers.vscode, this.parseVSCodeLine)
-    onLine(this.compilers.codeServer, this.parseCodeServerLine)
-
-    if (this.compilers.plugins) {
-      onLine(this.compilers.plugins, this.parsePluginLine)
-    }
-  }
-
-  //#endregion
-
-  //#region Line Parsers
-
-  private parseVSCodeLine: OnLineCallback = (strippedLine, originalLine) => {
-    if (!strippedLine.length) return
-
-    console.log("[VS Code]", originalLine)
-
-    if (strippedLine.includes("Finished compilation with")) {
-      console.log("[VS Code] ✨ Finished compiling! ✨", "(Refresh your web browser ♻️)")
-      this.reloadWebServer()
-    }
-  }
-
-  private parseCodeServerLine: OnLineCallback = (strippedLine, originalLine) => {
-    if (!strippedLine.length) return
-
-    console.log("[Compiler][Code Server]", originalLine)
-
-    if (strippedLine.includes("Watching for file changes")) {
-      console.log("[Compiler][Code Server]", "Finished compiling!", "(Refresh your web browser ♻️)")
-      this.reloadWebServer()
-    }
-  }
-
-  private parsePluginLine: OnLineCallback = (strippedLine, originalLine) => {
-    if (!strippedLine.length) return
-
-    console.log("[Compiler][Plugin]", originalLine)
-
-    if (strippedLine.includes("Watching for file changes...")) {
-      this.reloadWebServer()
-    }
-  }
-
-  //#endregion
-
-  //#region Utilities
-
-  private dispose(code: number | null): void {
-    for (const [processName, devProcess] of Object.entries(this.compilers)) {
-      console.log(`[${processName}]`, "Killing...\n")
-      devProcess?.removeAllListeners()
-      devProcess?.kill()
-    }
-    process.exit(typeof code === "number" ? code : 0)
-  }
-
-  //#endregion
-}
 
 async function main(): Promise<void> {
   try {
     const watcher = new Watcher()
-    await watcher.initialize()
+    await watcher.watch()
-  } catch (error: any) {
+  } catch (error) {
     console.error(error.message)
     process.exit(1)
   }
 }
 
+class Watcher {
+  private readonly rootPath = path.resolve(__dirname, "../..")
+  private readonly vscodeSourcePath = path.join(this.rootPath, "lib/vscode")
+
+  private static log(message: string, skipNewline = false): void {
+    process.stdout.write(message)
+    if (!skipNewline) {
+      process.stdout.write("\n")
+    }
+  }
+
+  public async watch(): Promise<void> {
+    let server: cp.ChildProcess | undefined
+    const restartServer = (): void => {
+      if (server) {
+        server.kill()
+      }
+      const s = cp.fork(path.join(this.rootPath, "out/node/entry.js"), process.argv.slice(2))
+      console.log(`[server] spawned process ${s.pid}`)
+      s.on("exit", () => console.log(`[server] process ${s.pid} exited`))
+      server = s
+    }
+
+    const vscode = cp.spawn("yarn", ["watch"], { cwd: this.vscodeSourcePath })
+    const tsc = cp.spawn("tsc", ["--watch", "--pretty", "--preserveWatchOutput"], { cwd: this.rootPath })
+    const plugin = process.env.PLUGIN_DIR
+      ? cp.spawn("yarn", ["build", "--watch"], { cwd: process.env.PLUGIN_DIR })
+      : undefined
+    const bundler = this.createBundler()
+
+    const cleanup = (code?: number | null): void => {
+      Watcher.log("killing vs code watcher")
+      vscode.removeAllListeners()
+      vscode.kill()
+
+      Watcher.log("killing tsc")
+      tsc.removeAllListeners()
+      tsc.kill()
+
+      if (plugin) {
+        Watcher.log("killing plugin")
+        plugin.removeAllListeners()
+        plugin.kill()
+      }
+
+      if (server) {
+        Watcher.log("killing server")
+        server.removeAllListeners()
+        server.kill()
+      }
+
+      Watcher.log("killing bundler")
+      process.exit(code || 0)
+    }
+
+    process.on("SIGINT", () => cleanup())
+    process.on("SIGTERM", () => cleanup())
+
+    vscode.on("exit", (code) => {
+      Watcher.log("vs code watcher terminated unexpectedly")
+      cleanup(code)
+    })
+    tsc.on("exit", (code) => {
+      Watcher.log("tsc terminated unexpectedly")
+      cleanup(code)
+    })
+    if (plugin) {
+      plugin.on("exit", (code) => {
+        Watcher.log("plugin terminated unexpectedly")
+        cleanup(code)
+      })
+    }
+    const bundle = bundler.bundle().catch(() => {
+      Watcher.log("parcel watcher terminated unexpectedly")
+      cleanup(1)
+    })
+    bundler.on("buildEnd", () => {
+      console.log("[parcel] bundled")
+    })
+    bundler.on("buildError", (error) => {
+      console.error("[parcel]", error)
+    })
+
+    vscode.stderr.on("data", (d) => process.stderr.write(d))
+    tsc.stderr.on("data", (d) => process.stderr.write(d))
+    if (plugin) {
+      plugin.stderr.on("data", (d) => process.stderr.write(d))
+    }
+
+    // From https://github.com/chalk/ansi-regex
+    const pattern = [
+      "[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:[a-zA-Z\\d]*(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)",
+      "(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-ntqry=><~]))",
+    ].join("|")
+    const re = new RegExp(pattern, "g")
+
+    /**
+     * Split stdout on newlines and strip ANSI codes.
+     */
+    const onLine = (proc: cp.ChildProcess, callback: (strippedLine: string, originalLine: string) => void): void => {
+      let buffer = ""
+      if (!proc.stdout) {
+        throw new Error("no stdout")
+      }
+      proc.stdout.setEncoding("utf8")
+      proc.stdout.on("data", (d) => {
+        const data = buffer + d
+        const split = data.split("\n")
+        const last = split.length - 1
+
+        for (let i = 0; i < last; ++i) {
+          callback(split[i].replace(re, ""), split[i])
+        }
+
+        // The last item will either be an empty string (the data ended with a
+        // newline) or a partial line (did not end with a newline) and we must
+        // wait to parse it until we get a full line.
+        buffer = split[last]
+      })
+    }
+
+    let startingVscode = false
+    let startedVscode = false
+    onLine(vscode, (line, original) => {
+      console.log("[vscode]", original)
+      // Wait for watch-client since "Finished compilation" will appear multiple
+      // times before the client starts building.
+      if (!startingVscode && line.includes("Starting watch-client")) {
+        startingVscode = true
+      } else if (startingVscode && line.includes("Finished compilation")) {
+        if (startedVscode) {
+          bundle.then(restartServer)
+        }
+        startedVscode = true
+      }
+    })
+
+    onLine(tsc, (line, original) => {
+      // tsc outputs blank lines; skip them.
+      if (line !== "") {
+        console.log("[tsc]", original)
+      }
+      if (line.includes("Watching for file changes")) {
+        bundle.then(restartServer)
+      }
+    })
+
+    if (plugin) {
+      onLine(plugin, (line, original) => {
+        // tsc outputs blank lines; skip them.
+        if (line !== "") {
+          console.log("[plugin]", original)
+        }
+        if (line.includes("Watching for file changes")) {
+          bundle.then(restartServer)
+        }
+      })
+    }
+  }
+
+  private createBundler(out = "dist"): Bundler {
+    return new Bundler(
+      [
+        path.join(this.rootPath, "src/browser/register.ts"),
+        path.join(this.rootPath, "src/browser/serviceWorker.ts"),
+        path.join(this.rootPath, "src/browser/pages/login.ts"),
+        path.join(this.rootPath, "src/browser/pages/vscode.ts"),
+      ],
+      {
+        outDir: path.join(this.rootPath, out),
+        cacheDir: path.join(this.rootPath, ".cache"),
+        minify: !!process.env.MINIFY,
+        logLevel: 1,
+        publicUrl: ".",
+      },
+    )
+  }
+}
+
 main()

ci/helm-chart/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: code-server
-description: A Helm chart for coder/code-server
+description: A Helm chart for cdr/code-server
 
 # A chart can be either an 'application' or a 'library' chart.
 #
@@ -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: 2.2.0
+version: 1.0.3
 
 # 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.1.0
+appVersion: 3.10.1

ci/helm-chart/README.md

@@ -0,0 +1,117 @@
+# code-server
+
+![Version: 1.0.0](https://img.shields.io/badge/Version-1.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.10.1](https://img.shields.io/badge/AppVersion-3.10.1-informational?style=flat-square)
+
+[code-server](https://github.com/cdr/code-server) code-server is VS Code running
+on a remote server, accessible through the browser.
+
+This chart is community maintained by [@Matthew-Beckett](https://github.com/Matthew-Beckett) and [@alexgorbatchev](https://github.com/alexgorbatchev)
+
+## TL;DR;
+
+```console
+$ git clone https://github.com/cdr/code-server
+$ cd code-server
+$ helm upgrade --install code-server ci/helm-chart
+```
+
+## Introduction
+
+This chart bootstraps a code-server deployment on a
+[Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh)
+package manager.
+
+## Prerequisites
+
+  - Kubernetes 1.6+
+
+## Installing the Chart
+
+To install the chart with the release name `code-server`:
+
+```console
+$ git clone https://github.com/cdr/code-server
+$ cd code-server
+$ helm upgrade --install code-server ci/helm-chart
+```
+
+The command deploys code-server on the Kubernetes cluster in the default
+configuration. The [configuration](#configuration) section lists the parameters
+that can be configured during installation.
+
+> **Tip**: List all releases using `helm list`
+
+## Uninstalling the Chart
+
+To uninstall/delete the `code-server` deployment:
+
+```console
+$ helm delete code-server
+```
+
+The command removes all the Kubernetes components associated with the chart and
+deletes the release.
+
+## Configuration
+
+The following table lists the configurable parameters of the code-server chart
+and their default values.
+
+## Values
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| affinity | object | `{}` |  |
+| extraArgs | list | `[]` |  |
+| extraConfigmapMounts | list | `[]` |  |
+| extraContainers | string | `""` |  |
+| extraSecretMounts | list | `[]` |  |
+| extraVars | list | `[]` |  |
+| extraVolumeMounts | list | `[]` |  |
+| fullnameOverride | string | `""` |  |
+| hostnameOverride | string | `""` |  |
+| image.pullPolicy | string | `"Always"` |  |
+| image.repository | string | `"codercom/code-server"` |  |
+| image.tag | string | `"3.10.1"` |  |
+| imagePullSecrets | list | `[]` |  |
+| ingress.enabled | bool | `false` |  |
+| nameOverride | string | `""` |  |
+| nodeSelector | object | `{}` |  |
+| persistence.accessMode | string | `"ReadWriteOnce"` |  |
+| persistence.annotations | object | `{}` |  |
+| persistence.enabled | bool | `true` |  |
+| persistence.size | string | `"1Gi"` |  |
+| podAnnotations | object | `{}` |  |
+| podSecurityContext | object | `{}` |  |
+| replicaCount | int | `1` |  |
+| resources | object | `{}` |  |
+| securityContext.enabled | bool | `true` |  |
+| securityContext.fsGroup | int | `1000` |  |
+| securityContext.runAsUser | int | `1000` |  |
+| service.port | int | `8443` |  |
+| service.type | string | `"ClusterIP"` |  |
+| serviceAccount.create | bool | `true` |  |
+| serviceAccount.name | string | `nil` |  |
+| tolerations | list | `[]` |  |
+| volumePermissions.enabled | bool | `true` |  |
+| volumePermissions.securityContext.runAsUser | int | `0` |  |
+
+Specify each parameter using the `--set key=value[,key=value]` argument to `helm
+install`. For example,
+
+```console
+$ helm upgrade --install code-server \
+    ci/helm-chart \
+    --set persistence.enabled=false
+```
+
+The above command sets the the persistence storage to false.
+
+Alternatively, a YAML file that specifies the values for the above parameters
+can be provided while installing the chart. For example,
+
+```console
+$ helm upgrade --install code-server ci/helm-chart -f values.yaml
+```
+
+> **Tip**: You can use the default [values.yaml](values.yaml)

ci/helm-chart/templates/NOTES.txt

@@ -15,8 +15,9 @@
   export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "code-server.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
   echo http://$SERVICE_IP:{{ .Values.service.port }}
 {{- else if contains "ClusterIP" .Values.service.type }}
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "code-server.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
   echo "Visit http://127.0.0.1:8080 to use your application"
-  kubectl port-forward --namespace {{ .Release.Namespace }} service/{{ include "code-server.fullname" . }} 8080:http
+  kubectl port-forward $POD_NAME 8080:80
 {{- end }}
 
 Administrator credentials:

ci/helm-chart/templates/deployment.yaml

@@ -21,7 +21,6 @@ spec:
         app.kubernetes.io/name: {{ include "code-server.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
     spec:
-      imagePullSecrets: {{- toYaml .Values.imagePullSecrets | nindent 8 }}
       {{- if .Values.hostnameOverride }}
       hostname: {{ .Values.hostnameOverride }}
       {{- end }}
@@ -44,13 +43,10 @@ spec:
         volumeMounts:
         - name: data
           mountPath: /home/coder
-{{- if .Values.extraInitContainers }}
-{{ tpl .Values.extraInitContainers . | indent 6}}
-{{- end }}
       {{- end }}
       containers:
 {{- if .Values.extraContainers }}
-{{ tpl .Values.extraContainers . | indent 8}}
+{{ toYaml .Values.extraContainers | indent 8}}
 {{- end }}
         - name: {{ .Chart.Name }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
@@ -143,12 +139,6 @@ spec:
           secretName: {{ .secretName }}
           defaultMode: {{ .defaultMode }}
       {{- end }}
-      {{- range .Values.extraConfigmapMounts }}
-      - name: {{ .name }}
-        configMap:
-          name: {{ .configMap }}
-          defaultMode: {{ .defaultMode }}
-      {{- end }}
       {{- range .Values.extraVolumeMounts }}
       - name: {{ .name }}
         {{- if .existingClaim }}

ci/helm-chart/templates/ingress.yaml

@@ -1,9 +1,7 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "code-server.fullname" . -}}
 {{- $svcPort := .Values.service.port -}}
-{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion -}}
+{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-apiVersion: networking.k8s.io/v1
-{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
 apiVersion: networking.k8s.io/v1beta1
 {{- else -}}
 apiVersion: extensions/v1beta1
@@ -18,9 +16,6 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
-  {{- if .Values.ingress.ingressClassName }}
-  ingressClassName: {{ .Values.ingress.ingressClassName }}
-  {{- end }}
   {{- if .Values.ingress.tls }}
   tls:
     {{- range .Values.ingress.tls }}
@@ -32,22 +27,6 @@ spec:
     {{- end }}
   {{- end }}
   rules:
-  {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion -}}
-    {{- range .Values.ingress.hosts }}
-    - host: {{ .host | quote }}
-      http:
-        paths:
-          {{- range .paths }}
-          - path: {{ . }}
-            pathType: Prefix
-            backend:
-              service:
-                name: {{ $fullName }}
-                port: 
-                  number: {{ $svcPort }}
-          {{- end }}
-    {{- end }}
-  {{- else -}}
     {{- range .Values.ingress.hosts }}
     - host: {{ .host | quote }}
       http:
@@ -60,4 +39,3 @@ spec:
           {{- end }}
     {{- end }}
   {{- end }}
-{{- end }}

ci/helm-chart/values.yaml

@@ -6,15 +6,10 @@ replicaCount: 1
 
 image:
   repository: codercom/code-server
-  tag: '4.1.0'
+  tag: '3.10.1'
   pullPolicy: Always
 
-# Specifies one or more secrets to be used when pulling images from a
-# private container repository
-# https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry
 imagePullSecrets: []
-#  - name: registry-creds
-
 nameOverride: ""
 fullnameOverride: ""
 hostnameOverride: ""
@@ -33,6 +28,14 @@ podAnnotations: {}
 podSecurityContext: {}
   # fsGroup: 2000
 
+securityContext: {}
+  # capabilities:
+  #   drop:
+  #   - ALL
+  # readOnlyRootFilesystem: true
+  # runAsNonRoot: true
+  # runAsUser: 1000
+
 service:
   type: ClusterIP
   port: 8080
@@ -40,12 +43,13 @@ service:
 ingress:
   enabled: false
   #annotations:
+  #  kubernetes.io/ingress.class: nginx
   #  kubernetes.io/tls-acme: "true"
   #hosts:
   #  - host: code-server.example.loc
   #    paths:
   #      - /
-  ingressClassName: ""
+
   #tls:
   #  - secretName: code-server
   #    hosts:
@@ -53,18 +57,8 @@ ingress:
 
 # Optional additional arguments
 extraArgs: []
-  # These are the arguments normally passed to code-server; run
+#  - --allow-http
-  # code-server --help for a list of available options.
+#  - --no-auth
-  #
-  # Each argument and parameter must have its own entry; if you use
-  # --param value on the command line, then enter it here as:
-  #
-  # - --param
-  # - value
-  #
-  # If you receive an error like "Unknown option --param value", it may be
-  # because both the parameter and value are specified as a single argument,
-  # rather than two separate arguments (e.g. "- --param value" on a line).
 
 # Optional additional environment variables
 extraVars: []
@@ -123,6 +117,10 @@ persistence:
   # existingClaim: ""
   # hostPath: /data
 
+serviceAccount:
+  create: true
+  name:
+
 ## Enable an Specify container in extraContainers.
 ## This is meant to allow adding code-server dependencies, like docker-dind.
 extraContainers: |

ci/lib.sh

@@ -2,11 +2,11 @@
 set -euo pipefail
 
 pushd() {
-  builtin pushd "$@" > /dev/null
+  builtin pushd "$@" >/dev/null
 }
 
 popd() {
-  builtin popd > /dev/null
+  builtin popd >/dev/null
 }
 
 pkg_json_version() {
@@ -14,7 +14,7 @@ pkg_json_version() {
 }
 
 vscode_version() {
-  jq -r .version vendor/modules/code-oss-dev/package.json
+  jq -r .version lib/vscode/package.json
 }
 
 os() {
@@ -35,17 +35,17 @@ os() {
 }
 
 arch() {
-  cpu="$(uname -m)"
+  case "$(uname -m)" in
-  case "$cpu" in
+  aarch64)
-    aarch64)
+    echo arm64
-      echo arm64
+    ;;
-      ;;
+  x86_64 | amd64)
-    x86_64 | amd64)
+    echo amd64
-      echo amd64
+    ;;
-      ;;
+  *)
-    *)
+    echo "unknown architecture $(uname -a)"
-      echo "$cpu"
+    exit 1
-      ;;
+    ;;
   esac
 }
 
@@ -57,12 +57,12 @@ arch() {
 # https://developer.github.com/v3/actions/workflow-runs/#list-workflow-runs
 get_artifacts_url() {
   local artifacts_url
+  local workflow_runs_url="repos/:owner/:repo/actions/workflows/ci.yaml/runs?event=pull_request"
   local version_branch="v$VERSION"
-  local workflow_runs_url="repos/:owner/:repo/actions/workflows/ci.yaml/runs?event=pull_request&branch=$version_branch"
   artifacts_url=$(gh api "$workflow_runs_url" | jq -r ".workflow_runs[] | select(.head_branch == \"$version_branch\") | .artifacts_url" | head -n 1)
   if [[ -z "$artifacts_url" ]]; then
     echo >&2 "ERROR: artifacts_url came back empty"
-    echo >&2 "We looked for a successful run triggered by a pull_request with for code-server version: $VERSION and a branch named $version_branch"
+    echo >&2 "We looked for a successful run triggered by a pull_request with for code-server version: $code_server_version and a branch named $version_branch"
     echo >&2 "URL used for gh API call: $workflow_runs_url"
     exit 1
   fi
@@ -85,7 +85,7 @@ download_artifact() {
   local tmp_file
   tmp_file="$(mktemp)"
 
-  gh api "$(get_artifact_url "$artifact_name")" > "$tmp_file"
+  gh api "$(get_artifact_url "$artifact_name")" >"$tmp_file"
   unzip -q -o "$tmp_file" -d "$dst"
   rm "$tmp_file"
 }
@@ -113,7 +113,7 @@ RELEASE_PATH="${RELEASE_PATH-release}"
 # Code itself but also extensions will look specifically in this directory for
 # files (like the ripgrep binary or the oniguruma wasm).
 symlink_asar() {
-  rm -rf node_modules.asar
+  rm -f node_modules.asar
   if [ "${WINDIR-}" ]; then
     # mklink takes the link name first.
     mklink /J node_modules.asar node_modules

ci/release-image/Dockerfile

@@ -1,4 +1,4 @@
-FROM debian:11
+FROM debian:10
 
 RUN apt-get update \
  && apt-get install -y \
@@ -10,13 +10,11 @@ RUN apt-get update \
     man \
     nano \
     git \
-    git-lfs \
     procps \
     openssh-client \
     sudo \
     vim.tiny \
     lsb-release \
-  && git lfs install \
   && rm -rf /var/lib/apt/lists/*
 
 # https://wiki.debian.org/Locale#Manually

ci/release-image/build.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+main() {
+  cd "$(dirname "$0")/../.."
+  source ./ci/lib.sh
+
+  docker build -t "codercom/code-server-$ARCH:$VERSION" -f ./ci/release-image/Dockerfile .
+}
+
+main "$@"

ci/release-image/docker-bake.hcl

@@ -1,20 +0,0 @@
-# Use this file from the top of the repo, with `-f ci/release-image/docker-bake.hcl`
-
-# Uses env var VERSION if set;
-# normally, this is set by ci/lib.sh
-variable "VERSION" {
-    default = "latest"
-}
-
-group "default" {
-    targets = ["code-server"]
-}
-
-target "code-server" {
-    dockerfile = "ci/release-image/Dockerfile"
-    tags = [
-        "docker.io/codercom/code-server:latest",
-        notequal("latest",VERSION) ? "docker.io/codercom/code-server:${VERSION}" : "",
-    ]
-    platforms = ["linux/amd64", "linux/arm64"]
-}

ci/release-image/entrypoint.sh

@@ -8,7 +8,7 @@ eval "$(fixuid -q)"
 if [ "${DOCKER_USER-}" ]; then
   USER="$DOCKER_USER"
   if [ "$DOCKER_USER" != "$(whoami)" ]; then
-    echo "$DOCKER_USER ALL=(ALL) NOPASSWD:ALL" | sudo tee -a /etc/sudoers.d/nopasswd > /dev/null
+    echo "$DOCKER_USER ALL=(ALL) NOPASSWD:ALL" | sudo tee -a /etc/sudoers.d/nopasswd >/dev/null
     # Unfortunately we cannot change $HOME as we cannot move any bind mounts
     # nor can we bind mount $HOME into a new home as that requires a privileged container.
     sudo usermod --login "$DOCKER_USER" coder
@@ -18,4 +18,4 @@ if [ "${DOCKER_USER-}" ]; then
   fi
 fi
 
-exec dumb-init /usr/bin/code-server "$@"
+dumb-init /usr/bin/code-server "$@"

ci/steps/brew-bump.sh

@@ -5,110 +5,9 @@ main() {
   cd "$(dirname "$0")/../.."
   # Only sourcing this so we get access to $VERSION
   source ./ci/lib.sh
-  source ./ci/steps/steps-lib.sh
-
-  echo "Checking environment variables"
-
-  # We need VERSION to bump the brew formula
-  if ! is_env_var_set "VERSION"; then
-    echo "VERSION is not set"
-    exit 1
-  fi
-
-  # We need HOMEBREW_GITHUB_API_TOKEN to push up commits
-  if ! is_env_var_set "HOMEBREW_GITHUB_API_TOKEN"; then
-    echo "HOMEBREW_GITHUB_API_TOKEN is not set"
-    exit 1
-  fi
-
-  # NOTE: we need to make sure coderci/homebrew-core
-  # is up-to-date
-  # otherwise, brew bump-formula-pr will use an
-  # outdated base
-  echo "Cloning coderci/homebrew-core"
-  git clone https://github.com/coderci/homebrew-core.git
-
-  # Make sure the git clone step is successful
-  if directory_exists "homebrew-core"; then
-    echo "git clone failed. Cannot find homebrew-core directory."
-    ls -la
-    exit 1
-  fi
-
-  echo "Changing into homebrew-core directory"
-  pushd homebrew-core && pwd
-
-  echo "Adding Homebrew/homebrew-core"
-  git remote add upstream https://github.com/Homebrew/homebrew-core.git
-
-  # Make sure the git remote step is successful
-  if ! git config remote.upstream.url > /dev/null; then
-    echo "git remote add upstream failed."
-    echo "Could not find upstream in list of remotes."
-    git remote -v
-    exit 1
-  fi
-
-  # TODO@jsjoeio - can I somehow check that this succeeded?
-  echo "Fetching upstream Homebrew/hombrew-core commits"
-  git fetch upstream
-
-  # TODO@jsjoeio - can I somehow check that this succeeded?
-  echo "Merging in latest Homebrew/homebrew-core changes"
-  git merge upstream/master
-
-  echo "Pushing changes to coderci/homebrew-core fork on GitHub"
-
-  # GIT_ASKPASS lets us use the password when pushing without revealing it in the process list
-  # See: https://serverfault.com/a/912788
-  PATH_TO_GIT_ASKPASS="$HOME/git-askpass.sh"
-  # Source: https://serverfault.com/a/912788
-  # shellcheck disable=SC2016,SC2028
-  echo 'echo $HOMEBREW_GITHUB_API_TOKEN' > "$PATH_TO_ASKPASS"
-
-  # Make sure the git-askpass.sh file creation is successful
-  if file_exists "$PATH_TO_GIT_ASKPASS"; then
-    echo "git-askpass.sh not found in $HOME."
-    ls -la "$HOME"
-    exit 1
-  fi
-
-  # Ensure it's executable since we just created it
-  chmod +x "$PATH_TO_GIT_ASKPASS"
-
-  # Make sure the git-askpass.sh file is executable
-  if is_executable "$PATH_TO_GIT_ASKPASS"; then
-    echo "$PATH_TO_GIT_ASKPASS is not executable."
-    ls -la "$PATH_TO_GIT_ASKPASS"
-    exit 1
-  fi
-
-  # Export the variables so git sees them
-  export HOMEBREW_GITHUB_API_TOKEN="$HOMEBREW_GITHUB_API_TOKEN"
-  export GIT_ASKPASS="$PATH_TO_ASKPASS"
-  git push https://coder-oss@github.com/coder-oss/homebrew-core.git --all
-
   # Find the docs for bump-formula-pr here
   # https://github.com/Homebrew/brew/blob/master/Library/Homebrew/dev-cmd/bump-formula-pr.rb#L18
-  local output
+  brew bump-formula-pr --force --version="${VERSION}" code-server --no-browse --no-audit
-  if ! output=$(brew bump-formula-pr --version="${VERSION}" code-server --no-browse --no-audit 2>&1); then
-    if [[ $output == *"Duplicate PRs should not be opened"* ]]; then
-      echo "$VERSION is already submitted"
-    else
-      echo "$output"
-      exit 1
-    fi
-  fi
-
-  # Clean up and remove homebrew-core
-  popd
-  rm -rf homebrew-core
-
-  # Make sure homebrew-core is removed
-  if directory_exists "homebrew-core"; then
-    echo "rm -rf homebrew-core failed."
-    ls -la
-  fi
 }
 
 main "$@"

ci/steps/build-docker-image.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+main() {
+  cd "$(dirname "$0")/../.."
+  source ./ci/lib.sh
+
+  ./ci/release-image/build.sh
+
+  mkdir -p release-images
+  docker save "codercom/code-server-$ARCH:$VERSION" >"release-images/code-server-$ARCH-$VERSION.tar"
+}
+
+main "$@"

ci/steps/docker-buildx-push.sh

@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-main() {
-  cd "$(dirname "$0")/../.."
-
-  # ci/lib.sh sets VERSION and provides download_artifact here
-  source ./ci/lib.sh
-
-  # Download the release-packages artifact
-  download_artifact release-packages ./release-packages
-
-  docker buildx bake -f ci/release-image/docker-bake.hcl --push
-}
-
-main "$@"

ci/steps/publish-npm.sh

@@ -4,144 +4,15 @@ set -euo pipefail
 main() {
   cd "$(dirname "$0")/../.."
   source ./ci/lib.sh
-  source ./ci/steps/steps-lib.sh
 
-  ## Authentication tokens
-  # Needed to publish on NPM
-  if ! is_env_var_set "NPM_TOKEN"; then
-    echo "NPM_TOKEN is not set. Cannot publish to npm without credentials."
-    exit 1
-  fi
-
-  # NOTE@jsjoeio - only needed if we use the download_artifact
-  # because we talk to the GitHub API.
-  # Needed to use GitHub API
-  if ! is_env_var_set "GITHUB_TOKEN"; then
-    echo "GITHUB_TOKEN is not set. Cannot download npm release artifact without GitHub credentials."
-    exit 1
-  fi
-
-  ## Publishing Information
-  # All the variables below are used to determine how we should publish
-  # the npm package. We also use this information for bumping the version.
-  # This is because npm won't publish your package unless it's a new version.
-  # i.e. for development, we bump the version to <current version>-<pr number>-<commit sha>
-  # example: "version": "4.0.1-4769-ad7b23cfe6ffd72914e34781ef7721b129a23040"
-  # We need the current package.json VERSION
-  if ! is_env_var_set "VERSION"; then
-    echo "VERSION is not set. Cannot publish to npm without VERSION."
-    exit 1
-  fi
-
-  # We use this to grab the PR_NUMBER
-  if ! is_env_var_set "GITHUB_REF"; then
-    echo "GITHUB_REF is not set. Are you running this locally? We rely on values provided by GitHub."
-    exit 1
-  fi
-
-  # We use this when setting NPM_VERSION
-  if ! is_env_var_set "GITHUB_SHA"; then
-    echo "GITHUB_SHA is not set. Are you running this locally? We rely on values provided by GitHub."
-    exit 1
-  fi
-
-  # We use this to determine the NPM_ENVIRONMENT
-  if ! is_env_var_set "GITHUB_EVENT_NAME"; then
-    echo "GITHUB_EVENT_NAME is not set. Are you running this locally? We rely on values provided by GitHub."
-    exit 1
-  fi
-
-  # This allows us to publish to npm in CI workflows
   if [[ ${CI-} ]]; then
-    echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > ~/.npmrc
+    echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" >~/.npmrc
   fi
 
-  ## Environment
+  download_artifact npm-package ./release-npm-package
-  # This string is used to determine how we should tag the npm release.
-  # Environment can be one of three choices:
-  # "development" - this means we tag with the PR number, allowing
-  # a developer to install this version with `yarn add code-server@<pr-number>`
-  # "staging" - this means we tag with `beta`, allowing
-  # a developer to install this version with `yarn add code-server@beta`
-  # "production" - this means we tag with `latest` (default), allowing
-  # a developer to install this version with `yarn add code-server@latest`
-  if ! is_env_var_set "NPM_ENVIRONMENT"; then
-    echo "NPM_ENVIRONMENT is not set. Determining in script based on GITHUB environment variables."
-
-    if [[ "$GITHUB_EVENT_NAME" == 'push' && "$GITHUB_REF" == 'refs/heads/main' ]]; then
-      NPM_ENVIRONMENT="staging"
-    else
-      NPM_ENVIRONMENT="development"
-    fi
-
-    echo "Using npm environment: $NPM_ENVIRONMENT"
-  fi
-
-  # NOTE@jsjoeio - this script assumes we have the artifact downloaded on disk
-  # That happens in CI as a step before we run this.
   # https://github.com/actions/upload-artifact/issues/38
   tar -xzf release-npm-package/package.tar.gz
-
+  yarn publish --non-interactive release
-  # Ignore symlink when publishing npm package
-  # See: https://github.com/coder/code-server/pull/3935
-  echo "node_modules.asar" > release/.npmignore
-
-  # NOTES:@jsjoeio
-  # We only need to run npm version for "development" and "staging".
-  # This is because our release:prep script automatically bumps the version
-  # in the package.json and we commit it as part of the release PR.
-  if [[ "$NPM_ENVIRONMENT" == "production" ]]; then
-    NPM_VERSION="$VERSION"
-    # This means the npm version will be published as "stable"
-    # and installed when a user runs `yarn install code-server`
-    NPM_TAG="latest"
-  else
-    COMMIT_SHA="$GITHUB_SHA"
-    echo "Not a production environment"
-    echo "Found environment: $NPM_ENVIRONMENT"
-    echo "Manually bumping npm version..."
-
-    if [[ "$NPM_ENVIRONMENT" == "staging" ]]; then
-      NPM_VERSION="$VERSION-beta-$COMMIT_SHA"
-      # This means the npm version will be tagged with "beta"
-      # and installed when a user runs `yarn install code-server@beta`
-      NPM_TAG="beta"
-    fi
-
-    if [[ "$NPM_ENVIRONMENT" == "development" ]]; then
-      # Source: https://github.com/actions/checkout/issues/58#issuecomment-614041550
-      PR_NUMBER=$(echo "$GITHUB_REF" | awk 'BEGIN { FS = "/" } ; { print $3 }')
-      NPM_VERSION="$VERSION-$PR_NUMBER-$COMMIT_SHA"
-      # This means the npm version will be tagged with "<pr number>"
-      # and installed when a user runs `yarn install code-server@<pr number>`
-      NPM_TAG="$PR_NUMBER"
-    fi
-
-    echo "using tag: $NPM_TAG"
-
-    # We modify the version in the package.json
-    # to be the current version + the PR number + commit SHA
-    # or we use current version + beta + commit SHA
-    # Example: "version": "4.0.1-4769-ad7b23cfe6ffd72914e34781ef7721b129a23040"
-    # Example: "version": "4.0.1-beta-ad7b23cfe6ffd72914e34781ef7721b129a23040"
-    pushd release
-    # NOTE:@jsjoeio
-    # I originally tried to use `yarn version` but ran into issues and abandoned it.
-    npm version "$NPM_VERSION"
-    popd
-  fi
-
-  # We need to make sure we haven't already published the version.
-  # This is because npm view won't exit with non-zero so we have
-  # to check the output.
-  local hasVersion
-  hasVersion=$(npm view "code-server@$NPM_VERSION" version)
-  if [[ $hasVersion == "$NPM_VERSION" ]]; then
-    echo "$NPM_VERSION is already published"
-    return
-  fi
-
-  yarn publish --non-interactive release --tag "$NPM_TAG"
 }
 
 main "$@"

ci/steps/push-docker-manifest.sh

@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+main() {
+  cd "$(dirname "$0")/../.."
+  source ./ci/lib.sh
+
+  download_artifact release-images ./release-images
+  if [[ ${CI-} ]]; then
+    echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+  fi
+
+  for img in ./release-images/*; do
+    docker load -i "$img"
+  done
+
+  # We have to ensure the amd64 and arm64 images exist on the remote registry
+  # in order to build the manifest.
+  # We don't put the arch in the tag to avoid polluting the main repository.
+  # These other repositories are private so they don't pollute our organization namespace.
+  docker push "codercom/code-server-amd64:$VERSION"
+  docker push "codercom/code-server-arm64:$VERSION"
+
+  export DOCKER_CLI_EXPERIMENTAL=enabled
+
+  docker manifest create "codercom/code-server:$VERSION" \
+    "codercom/code-server-amd64:$VERSION" \
+    "codercom/code-server-arm64:$VERSION"
+  docker manifest push --purge "codercom/code-server:$VERSION"
+
+  docker manifest create "codercom/code-server:latest" \
+    "codercom/code-server-amd64:$VERSION" \
+    "codercom/code-server-arm64:$VERSION"
+  docker manifest push --purge "codercom/code-server:latest"
+}
+
+main "$@"

ci/steps/steps-lib.sh

@@ -1,47 +0,0 @@
-#!/usr/bin/env bash
-
-# This is a library which contains functions used inside ci/steps
-#
-# We separated it into it's own file so that we could easily unit test
-# these functions and helpers
-
-# Checks whether and environment variable is set.
-# Source: https://stackoverflow.com/a/62210688/3015595
-is_env_var_set() {
-  local name="${1:-}"
-  if test -n "${!name:-}"; then
-    return 0
-  else
-    return 1
-  fi
-}
-
-# Checks whether a directory exists.
-directory_exists() {
-  local dir="${1:-}"
-  if [[ -d "${dir:-}" ]]; then
-    return 0
-  else
-    return 1
-  fi
-}
-
-# Checks whether a file exists.
-file_exists() {
-  local file="${1:-}"
-  if test -f "${file:-}"; then
-    return 0
-  else
-    return 1
-  fi
-}
-
-# Checks whether a file is executable.
-is_executable() {
-  local file="${1:-}"
-  if [ -f "${file}" ] && [ -r "${file}" ] && [ -x "${file}" ]; then
-    return 0
-  else
-    return 1
-  fi
-}

docs/CONTRIBUTING.md

@@ -2,19 +2,13 @@
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 # Contributing
 
+- [Pull Requests](#pull-requests)
+  - [Commits](#commits)
 - [Requirements](#requirements)
-  - [Linux-specific requirements](#linux-specific-requirements)
+- [Development Workflow](#development-workflow)
-- [Creating pull requests](#creating-pull-requests)
+  - [Updating VS Code](#updating-vs-code)
-  - [Commits and commit history](#commits-and-commit-history)
+    - [Notes about Changes](#notes-about-changes)
-- [Development workflow](#development-workflow)
+- [Build](#build)
-  - [Updates to VS Code](#updates-to-vs-code)
-  - [Build](#build)
-  - [Help](#help)
-- [Test](#test)
-  - [Unit tests](#unit-tests)
-  - [Script tests](#script-tests)
-  - [Integration tests](#integration-tests)
-  - [End-to-end tests](#end-to-end-tests)
 - [Structure](#structure)
   - [Modifications to VS Code](#modifications-to-vs-code)
   - [Currently Known Issues](#currently-known-issues)
@@ -23,100 +17,72 @@
 
 - [Detailed CI and build process docs](../ci)
 
-## Requirements
+## Pull Requests
 
-The prerequisites for contributing to code-server are almost the same as those
+Please create a [GitHub Issue](https://github.com/cdr/code-server/issues) for each issue
-for [VS
+you'd like to address unless the proposed fix is minor.
-Code](https://github.com/Microsoft/vscode/wiki/How-to-Contribute#prerequisites).
-Here is what is needed:
 
-- `node` v14.x
+In your Pull Requests (PR), link to the issue that the PR solves.
-- `git` v2.x or greater
-- [`git-lfs`](https://git-lfs.github.com)
-- [`yarn`](https://classic.yarnpkg.com/en/)
-  - Used to install JS packages and run scripts
-- [`nfpm`](https://nfpm.goreleaser.com/)
-  - Used to build `.deb` and `.rpm` packages
-- [`jq`](https://stedolan.github.io/jq/)
-  - Used to build code-server releases
-- [`gnupg`](https://gnupg.org/index.html)
-  - All commits must be signed and verified; see GitHub's [Managing commit
-    signature
-    verification](https://docs.github.com/en/github/authenticating-to-github/managing-commit-signature-verification)
-    or follow [this tutorial](https://joeprevite.com/verify-commits-on-github)
-- `rsync` and `unzip`
-  - Used for code-server releases
-- `bats`
-  - Used to run script unit tests
-
-### Linux-specific requirements
-
-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 python-is-python3
-```
-
-These are required by VS 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
+### Commits
 
-We prefer a clean commit history. This means you should squash all fixups and
+We prefer a clean commit history. This means you should squash all fixups and fixup-type commits before asking for review (cleanup, squash, force-push). If you need help with this, feel free to leave a comment in your PR and we'll guide you.
-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
+## Requirements
 
-The current development workflow is a bit tricky because we have this repo and we use our `coder/vscode` fork inside it with [`yarn link`](https://classic.yarnpkg.com/lang/en/docs/cli/link/).
+The prerequisites for contributing to code-server are almost the same as those for
+[VS Code](https://github.com/Microsoft/vscode/wiki/How-to-Contribute#prerequisites).
+There are several differences, however. Here is what is needed:
 
-Here are these steps you should follow to get your dev environment setup:
+- `node` v12.x or greater
+- `git` v2.x or greater
+- [`yarn`](https://classic.yarnpkg.com/en/)
+  - used to install JS packages and run scripts
+- [`nfpm`](https://classic.yarnpkg.com/en/)
+  - used to build `.deb` and `.rpm` packages
+- [`jq`](https://stedolan.github.io/jq/)
+  - used to build code-server releases
+- [`gnupg`](https://gnupg.org/index.html)
+  - all commits must be signed and verified
+  - see GitHub's ["Managing commit signature verification"](https://docs.github.com/en/github/authenticating-to-github/managing-commit-signature-verification) or follow [this tutorial](https://joeprevite.com/verify-commits-on-github)
+- `build-essential` (Linux)
+  - `apt-get install -y build-essential` - used by VS Code
+- `rsync` and `unzip`
+  - used for code-server releases
 
-1. `git clone https://github.com/coder/code-server.git` - Clone `code-server`
+## Development Workflow
-2. `git clone https://github.com/coder/vscode.git` - Clone `vscode`
-3. `cd vscode && yarn install` - install the dependencies in the `vscode` repo
-4. `cd code-server && yarn install` - install the dependencies in the `code-server` repo
-5. `cd vscode && yarn link` - use `yarn` to create a symlink to the `vscode` repo (`code-oss-dev` package)
-6. `cd code-server && yarn link code-oss-dev --modules-folder vendor/modules` - links your local `vscode` repo (`code-oss-dev` package) inside your local version of code-server
-7. `cd code-server && yarn watch` - this will spin up code-server on localhost:8080 which you can start developing. It will live reload changes to the source.
 
-### Updates to VS Code
+```shell
-
+yarn
-If changes are made and merged into `main` in the [`coder/vscode`](https://github.com/coder/vscode) repo, then you'll need to update the version in the `code-server` repo by following these steps:
+yarn watch
-
+# Visit http://localhost:8080 once the build is completed.
-1. Update the package tag listed in `vendor/package.json`:
-
-```json
-{
-  "devDependencies": {
-    "vscode": "coder/vscode#<latest-commit-sha>"
-  }
-}
 ```
 
-2. From the code-server **project root**, run `yarn install`.
+`yarn watch` will live reload changes to the source.
-   Then, test code-server locally to make sure everything works.
-3. 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.
-4. Open a PR
 
-> Watch for updates to
+### Updating VS Code
-> `vendor/modules/code-oss-dev/src/vs/code/browser/workbench/workbench.html`. You may need to
-> make changes to `src/browser/pages/vscode.html`.
 
-### Build
+Updating VS Code requires `git subtree`. On some rpm-based Linux distros, `git subtree` is not included by default, and needs to be installed separately.
+To install, run `dnf install git-subtree` or `yum install git-subtree` as necessary.
 
-You can build as follows:
+To update VS Code, follow these steps:
+
+1. Run `yarn update:vscode`.
+2. Enter a version. Ex. 1.53
+3. This will open a draft PR for you.
+4. There will be merge conflicts. First commit them.
+   1. We do this because if we don't, it will be impossible to review your PR.
+5. Once they're all fixed, test code-server locally and make sure it all works.
+
+#### Notes about Changes
+
+- watch out for updates to `lib/vscode/src/vs/code/browser/workbench/workbench.html`. You may need to make changes to `src/browser/pages/vscode.html`
+
+## Build
+
+You can build using:
 
 ```shell
 yarn build
@@ -124,7 +90,7 @@ yarn build:vscode
 yarn release
 ```
 
-Run your build:
+Run your build with:
 
 ```shell
 cd release
@@ -141,153 +107,42 @@ yarn test:standalone-release
 yarn package
 ```
 
-> On Linux, the currently running distro will become the minimum supported
+NOTE: On Linux, the currently running distro will become the minimum supported version.
-> version. In our GitHub Actions CI, we use CentOS 7 for maximum compatibility.
+In our GitHub Actions CI, we use CentOS 7 for maximum compatibility.
-> If you need your builds to support older distros, run the build commands
+If you need your builds to support older distros, run the build commands
-> inside a Docker container with all the build requirements installed.
+inside a Docker container with all the build requirements installed.
-
-### 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.
-
-## Test
-
-There are four kinds of tests in code-server:
-
-1. Unit tests
-2. Script tests
-3. Integration tests
-4. End-to-end tests
-
-### Unit tests
-
-Our unit tests are written in TypeScript and run using
-[Jest](https://jestjs.io/), the testing framework].
-
-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.
-
-### Script tests
-
-Our script tests are written in bash and run using [bats](https://github.com/bats-core/bats-core).
-
-These tests live under `test/scripts`.
-
-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 a script called
-[test-standalone-release.sh](../ci/build/test-standalone-release.sh), which
-ensures that code-server's CLI is working.
-
-Our integration tests look at components that rely on one another. For example,
-testing the CLI requires us to build and package code-server.
-
-### End-to-end tests
-
-The end-to-end (e2e) tests are written in TypeScript and run using
-[Playwright](https://playwright.dev/).
-
-These live under [test/e2e](../test/e2e).
-
-Before the e2e tests run, we run `globalSetup`, which eliminates the need to log
-in before each test by preserving the authentication state.
-
-Take a look at `codeServer.test.ts` to see how you would use it (see
-`test.use`).
-
-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 VS
+The `code-server` script serves an HTTP API for login and starting a remote VS Code process.
-Code process.
 
-The CLI code is in [src/node](../src/node) and the HTTP routes are implemented
+The CLI code is in [src/node](../src/node) and the HTTP routes are implemented in
-in [src/node/routes](../src/node/routes).
+[src/node/routes](../src/node/routes).
 
-Most of the meaty parts are in the VS Code portion of the codebase under
+Most of the meaty parts are in the VS Code portion of the codebase under [lib/vscode](../lib/vscode), which we described next.
-[vendor/modules/code-oss-dev](../vendor/modules/code-oss-dev), which we describe next.
 
 ### Modifications to VS Code
 
-In v1 of code-server, we had a patch of VS Code that split the codebase into a
+In v1 of code-server, we had a patch of VS Code that split the codebase into a front-end
-front-end and a server. The front-end consisted of the UI code, while the server
+and a server. The front-end consisted of all UI code, while the server ran the extensions
-ran the extensions and exposed an API to the front-end for file access and all
+and exposed an API to the front-end for file access and all UI needs.
-UI needs.
 
-Over time, Microsoft added support to VS Code to run it on the web. They have
+Over time, Microsoft added support to VS Code to run it on the web. They have made
-made the front-end open source, but not the server. As such, code-server v2 (and
+the front-end open source, but not the server. As such, code-server v2 (and later) uses
-later) uses the VS Code front-end and implements the server. We do this by using
+the VS Code front-end and implements the server. We do this by using a git subtree to fork and modify VS Code. This code lives under [lib/vscode](../lib/vscode).
-a Git subtree to fork and modify VS Code. This code lives under
-[vendor/modules/code-oss-dev](../vendor/modules/code-oss-dev).
 
-Some noteworthy changes in our version of VS Code include:
+Some noteworthy changes in our version of VS Code:
 
-- Adding our build file, [`vendor/modules/code-oss-dev/coder.js`](../vendor/modules/code-oss-dev/coder.js), which includes build steps specific to code-server
+- Adding our build file, which includes our code and VS Code's web code
-- Node.js version detection changes in [`build/lib/node.ts`](../vendor/modules/code-oss-dev/build/lib/node.ts) and [`build/lib/util.ts`](../vendor/modules/code-oss-dev/build/lib/util.ts)
+- Allowing multiple extension directories (both user and built-in)
-- Allowing extra extension directories
+- Modifying the loader, websocket, webview, service worker, and asset requests to
-  - Added extra arguments to [`src/vs/platform/environment/common/argv.ts`](../vendor/modules/code-oss-dev/src/vs/platform/environment/common/argv.ts) and to [`src/vs/platform/environment/node/argv.ts`](../vendor/modules/code-oss-dev/src/vs/platform/environment/node/argv.ts)
+  use the URL of the page as a base (and TLS, if necessary for the websocket)
-  - Added extra environment state to [`src/vs/platform/environment/common/environment.ts`](../vendor/modules/code-oss-dev/src/vs/platform/environment/common/environment.ts);
+- Sending client-side telemetry through the server
-  - Added extra getters to [`src/vs/platform/environment/common/environmentService.ts`](../vendor/modules/code-oss-dev/src/vs/platform/environment/common/environmentService.ts)
+- Allowing modification of the display language
-  - Added extra scanning paths to [`src/vs/platform/extensionManagement/node/extensionsScanner.ts`](../vendor/modules/code-oss-dev/src/vs/platform/extensionManagement/node/extensionsScanner.ts)
+- Making it possible for us to load code on the client
-- Additions/removals from [`package.json`](../vendor/modules/code-oss-dev/package.json):
+- Making it possible to install extensions of any kind
-  - Removing `electron`, `keytar` and `native-keymap` to avoid pulling in desktop dependencies during build on Linux
+- Fixing issue with getting disconnected when your machine sleeps or hibernates
-  - Removing `gulp-azure-storage` and `gulp-tar` (unsued in our build process, may pull in outdated dependencies)
+- Adding connection type to web socket query parameters
-  - Adding `proxy-agent`, `proxy-from-env` (for proxying) and `rimraf` (used during build/install steps)
-- Adding our branding/custom URLs/version:
-  - [`product.json`](../vendor/modules/code-oss-dev/product.json)
-  - [`src/vs/base/common/product.ts`](../vendor/modules/code-oss-dev/src/vs/base/common/product.ts)
-  - [`src/vs/workbench/browser/parts/dialogs/dialogHandler.ts`](../vendor/modules/code-oss-dev/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts)
-  - [`src/vs/workbench/contrib/welcome/page/browser/vs_code_welcome_page.ts`](../vendor/modules/code-oss-dev/src/vs/workbench/contrib/welcome/page/browser/vs_code_welcome_page.ts)
-  - [`src/vs/workbench/contrib/welcome/page/browser/welcomePage.ts`](../vendor/modules/code-oss-dev/src/vs/workbench/contrib/welcome/page/browser/welcomePage.ts)
-- Removing azure/macOS signing related dependencies from [`build/package.json`](../vendor/modules/code-oss-dev/build/package.json)
-- Modifying `.gitignore` to allow us to add files to `src/vs/server` and modifying `.eslintignore` to ignore lint on the shared files below (we use different formatter settings than VS Code).
-- Sharing some files with our codebase via symlinks:
-  - [`src/vs/base/common/ipc.d.ts`](../vendor/modules/code-oss-dev/src/vs/base/common/ipc.d.ts) points to [`typings/ipc.d.ts`](../typings/ipc.d.ts)
-  - [`src/vs/base/common/util.ts`](../vendor/modules/code-oss-dev/src/vs/base/common/util.ts) points to [`src/common/util.ts`](../src/common/util.ts)
-  - [`src/vs/base/node/proxy_agent.ts`](../vendor/modules/code-oss-dev/src/vs/base/node/proxy_agent.ts) points to [`src/node/proxy_agent.ts`](../src/node/proxy_agent.ts)
-- Allowing socket changes by adding `setSocket` in [`src/vs/base/parts/ipc/common/ipc.net.ts`](../vendor/modules/code-oss-dev/src/vs/base/parts/ipc/common/ipc.net.ts)
-  - We use this for connection persistence in our server-side code.
-- Added our server-side Node.JS code to `src/vs/server`.
-  - This code includes the logic to spawn the various services (extension host, terminal, etc.) and some glue
-- Added [`src/vs/workbench/browser/client.ts`](../vendor/modules/code-oss-dev/src/vs/workbench/browser/client.ts) to hold some server customizations.
-  - Includes the functionality for the Log Out command and menu item
-  - Also, imported and called `initialize` from the main web file, [`src/vs/workbench/browser/web.main.ts`](../vendor/modules/code-oss-dev/src/vs/workbench/browser/web.main.ts)
-- Added a (hopefully temporary) hotfix to [`src/vs/workbench/common/resources.ts`](../vendor/modules/code-oss-dev/src/vs/workbench/common/resources.ts) to get context menu actions working for the Git integration.
-- Added connection type to WebSocket query parameters in [`src/vs/platform/remote/common/remoteAgentConnection.ts`](../vendor/modules/code-oss-dev/src/vs/platform/remote/common/remoteAgentConnection.ts)
-- Added `CODE_SERVER*` variables to the sanitization list in [`src/vs/base/common/processes.ts`](../vendor/modules/code-oss-dev/src/vs/base/common/processes.ts)
-- Fix localization support:
-  - Added file [`src/vs/workbench/services/localizations/browser/localizationsService.ts`](../vendor/modules/code-oss-dev/src/vs/workbench/services/localizations/browser/localizationsService.ts).
-  - Modified file [`src/vs/base/common/platform.ts`](../vendor/modules/code-oss-dev/src/vs/base/common/platform.ts)
-  - Modified file [`src/vs/base/node/languagePacks.js`](../vendor/modules/code-oss-dev/src/vs/base/node/languagePacks.js)
-- Added code to allow server to inject settings to [`src/vs/platform/product/common/product.ts`](../vendor/modules/code-oss-dev/src/vs/platform/product/common/product.ts)
-- Extension fixes:
-  - Avoid disabling extensions by extensionKind in [`src/vs/workbench/services/extensionManagement/browser/extensionEnablementService.ts`](../vendor/modules/code-oss-dev/src/vs/workbench/services/extensionManagement/browser/extensionEnablementService.ts) (Needed for vscode-icons)
-  - Remove broken symlinks in [`extensions/postinstall.js`](../vendor/modules/code-oss-dev/extensions/postinstall.js)
-  - Add tip about extension gallery in [`src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts`](../vendor/modules/code-oss-dev/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts)
-  - Use our own server for GitHub authentication in [`extensions/github-authentication/src/githubServer.ts`](../vendor/modules/code-oss-dev/extensions/github-authentication/src/githubServer.ts)
-  - Settings persistence on the server in [`src/vs/workbench/services/environment/browser/environmentService.ts`](../vendor/modules/code-oss-dev/src/vs/workbench/services/environment/browser/environmentService.ts)
-  - Add extension install fallback in [`src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts`](../vendor/modules/code-oss-dev/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts)
-  - Add proxy-agent monkeypatch and keep extension host indefinitely running in [`src/vs/workbench/services/extensions/node/extensionHostProcessSetup.ts`](../vendor/modules/code-oss-dev/src/vs/workbench/services/extensions/node/extensionHostProcessSetup.ts)
-  - Patch build system to avoid removing extension dependencies for `yarn global add` users in [`build/lib/extensions.ts`](../vendor/modules/code-oss-dev/build/lib/extensions.ts)
-  - Allow all extensions to use proposed APIs in [`src/vs/workbench/services/environment/browser/environmentService.ts`](../vendor/modules/code-oss-dev/src/vs/workbench/services/environment/browser/environmentService.ts)
-  - Make storage writes async to allow extensions to wait for them to complete in [`src/vs/platform/storage/common/storage.ts`](../vendor/modules/code-oss-dev/src/vs/platform/storage/common/storage.ts)
-- Specify webview path in [`src/vs/code/browser/workbench/workbench.ts`](../vendor/modules/code-oss-dev/src/vs/code/browser/workbench/workbench.ts)
-- URL readability improvements for folder/workspace in [`src/vs/code/browser/workbench/workbench.ts`](../vendor/modules/code-oss-dev/src/vs/code/browser/workbench/workbench.ts)
-- Socket/Authority-related fixes (for remote proxying etc.):
-  - [`src/vs/code/browser/workbench/workbench.ts`](../vendor/modules/code-oss-dev/src/vs/code/browser/workbench/workbench.ts)
-  - [`src/vs/platform/remote/browser/browserSocketFactory.ts`](../vendor/modules/code-oss-dev/src/vs/platform/remote/browser/browserSocketFactory.ts)
-  - [`src/vs/base/common/network.ts`](../vendor/modules/code-oss-dev/src/vs/base/common/network.ts)
-- Added code to write out IPC path in [`src/vs/workbench/api/node/extHostCLIServer.ts`](../vendor/modules/code-oss-dev/src/vs/workbench/api/node/extHostCLIServer.ts)
 
 As the web portion of VS Code matures, we'll be able to shrink and possibly
 eliminate our modifications. In the meantime, upgrading the VS Code version requires
@@ -295,7 +150,7 @@ us to ensure that our changes are still applied and work as intended. In the fut
 we'd like to run VS Code unit tests against our builds to ensure that features
 work as expected.
 
-> We have [extension docs](../ci/README.md) on the CI and build system.
+**Note**: We have [extension docs](../ci/README.md) on the CI and build system.
 
 If the functionality you're working on does NOT depend on code from VS Code, please
 move it out and into code-server.

docs/FAQ.md

@@ -3,136 +3,159 @@
 # FAQ
 
 - [Questions?](#questions)
-- [How should I expose code-server to the internet?](#how-should-i-expose-code-server-to-the-internet)
+- [iPad Status?](#ipad-status)
-- [Can I use code-server on the iPad?](#can-i-use-code-server-on-the-ipad)
+- [Community Projects (awesome-code-server)](#community-projects-awesome-code-server)
-- [How does the config file work?](#how-does-the-config-file-work)
-- [How do I make my keyboard shortcuts work?](#how-do-i-make-my-keyboard-shortcuts-work)
-- [Why can't code-server use Microsoft's extension marketplace?](#why-cant-code-server-use-microsofts-extension-marketplace)
-- [How can I request an extension that's missing from the marketplace?](#how-can-i-request-an-extension-thats-missing-from-the-marketplace)
-- [How do I install an extension?](#how-do-i-install-an-extension)
-- [How do I install an extension manually?](#how-do-i-install-an-extension-manually)
-- [How do I use my own extensions marketplace?](#how-do-i-use-my-own-extensions-marketplace)
-- [Where are extensions stored?](#where-are-extensions-stored)
 - [How can I reuse my VS Code configuration?](#how-can-i-reuse-my-vs-code-configuration)
-- [How does code-server decide what workspace or folder to open?](#how-does-code-server-decide-what-workspace-or-folder-to-open)
+- [Differences compared to VS Code?](#differences-compared-to-vs-code)
-- [How do I access my Documents/Downloads/Desktop folders in code-server on macOS?](#how-do-i-access-my-documentsdownloadsdesktop-folders-in-code-server-on-macos)
+  - [Installing an extension](#installing-an-extension)
-- [How do I direct server-side requests through a proxy?](#how-do-i-direct-server-side-requests-through-a-proxy)
+- [How can I request a missing extension?](#how-can-i-request-a-missing-extension)
-- [How do I debug issues with code-server?](#how-do-i-debug-issues-with-code-server)
+- [Installing an extension manually](#installing-an-extension-manually)
-- [What is the healthz endpoint?](#what-is-the-healthz-endpoint)
+- [How do I configure the marketplace URL?](#how-do-i-configure-the-marketplace-url)
-- [What is the heartbeat file?](#what-is-the-heartbeat-file)
+- [Where are extensions stored?](#where-are-extensions-stored)
-- [How do I change the password?](#how-do-i-change-the-password)
+- [How is this different from VS Code Codespaces?](#how-is-this-different-from-vs-code-codespaces)
+- [How should I expose code-server to the internet?](#how-should-i-expose-code-server-to-the-internet)
 - [Can I store my password hashed?](#can-i-store-my-password-hashed)
-- [Is multi-tenancy possible?](#is-multi-tenancy-possible)
+- [How do I securely access web services?](#how-do-i-securely-access-web-services)
-- [Can I use Docker in a code-server container?](#can-i-use-docker-in-a-code-server-container)
+  - [Sub-paths](#sub-paths)
-- [How do I disable telemetry?](#how-do-i-disable-telemetry)
+  - [Sub-domains](#sub-domains)
-- [What's the difference between code-server and Theia?](#whats-the-difference-between-code-server-and-theia)
+- [Why does the code-server proxy strip `/proxy/<port>` from the request path?](#why-does-the-code-server-proxy-strip-proxyport-from-the-request-path)
-- [What's the difference between code-server and OpenVSCode-Server?](#whats-the-difference-between-code-server-and-openvscode-server)
+  - [Proxying to Create React App](#proxying-to-create-react-app)
-- [What's the difference between code-server and GitHub Codespaces?](#whats-the-difference-between-code-server-and-github-codespaces)
+- [Multi-tenancy](#multi-tenancy)
-- [Does code-server have any security login validation?](#does-code-server-have-any-security-login-validation)
+- [Docker in code-server container?](#docker-in-code-server-container)
-- [Are there community projects involving code-server?](#are-there-community-projects-involving-code-server)
+- [How can I disable telemetry?](#how-can-i-disable-telemetry)
-- [How do I change the port?](#how-do-i-change-the-port)
+- [How does code-server decide what workspace or folder to open?](#how-does-code-server-decide-what-workspace-or-folder-to-open)
+- [How do I debug issues with code-server?](#how-do-i-debug-issues-with-code-server)
+- [Heartbeat File](#heartbeat-file)
+- [Healthz endpoint](#healthz-endpoint)
+- [How does the config file work?](#how-does-the-config-file-work)
+- [Isn't an install script piped into sh insecure?](#isnt-an-install-script-piped-into-sh-insecure)
+- [How do I make my keyboard shortcuts work?](#how-do-i-make-my-keyboard-shortcuts-work)
+- [How do I access my Documents/Downloads/Desktop folders in code-server on OSX?](#how-do-i-access-my-documentsdownloadsdesktop-folders-in-code-server-on-osx)
+- [Differences compared to Theia?](#differences-compared-to-theia)
+- [`$HTTP_PROXY`, `$HTTPS_PROXY`, `$NO_PROXY`](#http_proxy-https_proxy-no_proxy)
+- [Enterprise](#enterprise)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 
 ## Questions?
 
-Please file all questions and support requests at
+Please file all questions and support requests at <https://github.com/cdr/code-server/discussions>.
-<https://github.com/coder/code-server/discussions>.
 
-## How should I expose code-server to the internet?
+## iPad Status?
 
-Please see [our instructions on exposing code-server safely to the
+Please see [./ipad.md](./ipad.md).
-internet](./guide.md).
 
-## Can I use code-server on the iPad?
+## Community Projects (awesome-code-server)
 
-See [iPad](./ipad.md) for information on using code-server on the iPad.
+Visit the [awesome-code-server](https://github.com/cdr/awesome-code-server) repository to view community projects and guides with code-server! Feel free to add your own!
 
-## How does the config file work?
+## How can I reuse my VS Code configuration?
 
-When `code-server` starts up, it creates a default config file in `~/.config/code-server/config.yaml`:
+The very popular [Settings Sync](https://marketplace.visualstudio.com/items?itemName=Shan.code-settings-sync) extension works.
 
-```yaml
+You can also pass `--user-data-dir ~/.vscode` to reuse your existing VS Code extensions and configuration.
-bind-addr: 127.0.0.1:8080
-auth: password
-password: mew...22 # Randomly generated for each config.yaml
-cert: false
-```
 
-The default config defines the following behavior:
+Or copy `~/.vscode` into `~/.local/share/code-server`.
 
-- Listen on the loopback IP port 8080
+## Differences compared to VS Code?
-- Enable password authorization
-- Do not use TLS
 
-Each key in the file maps directly to a `code-server` flag (run `code-server --help` to see a listing of all the flags). Any flags passed to `code-server`
+`code-server` takes the open source core of VS Code and allows you to run it in the browser.
-will take priority over the config file.
+However, it is not entirely equivalent to Microsoft's VS Code.
 
-You can change the config file's location using the `--config` flag or
+While the core of VS Code is open source, the marketplace and many published Microsoft extensions are not.
-`$CODE_SERVER_CONFIG` environment variable.
 
-The default location respects `$XDG_CONFIG_HOME`.
+Furthermore, Microsoft prohibits the use of any non-Microsoft VS Code from accessing their marketplace.
 
-## How do I make my keyboard shortcuts work?
+See the [TOS](https://cdn.vsassets.io/v/M146_20190123.39/_content/Microsoft-Visual-Studio-Marketplace-Terms-of-Use.pdf).
 
-Many shortcuts will not work by default, since they'll be "caught" by the browser.
+> Marketplace Offerings are intended for use only with Visual Studio Products and Services
+> and you may only install and use Marketplace Offerings with Visual Studio Products and Services.
 
-If you use Chrome, you can work around this by installing the progressive web
+As a result, we cannot offer any extensions on the Microsoft marketplace. Instead,
-app (PWA):
+we have created our own marketplace for open source extensions.
+It works by scraping GitHub for VS Code extensions and building them. It's not perfect but getting
+better by the day with more and more extensions.
 
-1. Start the editor
+These are the closed source extensions presently unavailable:
-2. Click the **plus** icon in the URL toolbar to install the PWA
 
-For other browsers, you'll have to remap keybindings for shortcuts to work.
+1. [Live Share](https://visualstudio.microsoft.com/services/live-share)
+   - We may implement something similar, see [#33](https://github.com/cdr/code-server/issues/33)
+1. [Remote Extensions (SSH, Containers, WSL)](https://github.com/microsoft/vscode-remote-release)
+   - We may reimplement these at some point, see [#1315](https://github.com/cdr/code-server/issues/1315)
 
-## Why can't code-server use Microsoft's extension marketplace?
+For more about the closed source parts of VS Code, see [vscodium/vscodium](https://github.com/VSCodium/vscodium#why-does-this-exist).
 
-Though code-server takes the open-source core of VS Code and allows you to run
+### Installing an extension
-it in the browser, it is not entirely equivalent to Microsoft's VS Code.
 
-One major difference is in regards to extensions and the marketplace. The core
+Extensions can be installed from the marketplace using the extensions sidebar in
-of VS code is open source, while the marketplace and many published Microsoft
-extensions are not. Furthermore, Microsoft prohibits the use of any
-non-Microsoft VS Code from accessing their marketplace. Per the [Terms of
-Service](https://cdn.vsassets.io/v/M146_20190123.39/_content/Microsoft-Visual-Studio-Marketplace-Terms-of-Use.pdf):
-
-> Marketplace Offerings are intended for use only with Visual Studio Products
-> and Services, and you may only install and use Marketplace Offerings with
-> Visual Studio Products and Services.
-
-Because of this, we can't offer any extensions on Microsoft's marketplace.
-Instead, we use the [Open-VSX extension gallery](https://open-vsx.org), which is also used by various other forks.
-It isn't perfect, but its getting better by the day with more and more extensions.
-
-We also offer our own marketplace for open source extensions, but plan to
-deprecate it at a future date and completely migrate to Open-VSX.
-
-These are the closed-source extensions that are presently unavailable:
-
-1. [Live Share](https://visualstudio.microsoft.com/services/live-share). We may
-   implement something similar (see
-   [#33](https://github.com/coder/code-server/issues/33))
-1. [Remote Extensions (SSH, Containers,
-   WSL)](https://github.com/microsoft/vscode-remote-release). We may implement
-   these again at some point, see
-   ([#1315](https://github.com/coder/code-server/issues/1315)).
-
-For more about the closed source portions of VS Code, see [vscodium/vscodium](https://github.com/VSCodium/vscodium#why-does-this-exist).
-
-## How can I request an extension that's missing from the marketplace?
-
-To add an extension to Open-VSX, please see [open-vsx/publish-extensions](https://github.com/open-vsx/publish-extensions).
-We no longer plan to add new extensions to our legacy extension gallery.
-
-## How do I install an extension?
-
-You can install extensions from the marketplace using the extensions sidebar in
 code-server or from the command line:
 
-```console
+```shell
 code-server --install-extension <extension id>
 # example: code-server --install-extension wesbos.theme-cobalt2
+```
 
+## How can I request a missing extension?
+
+We are currently in the process of transitioning to [Open VSX](https://open-vsx.org/).
+Once <https://github.com/eclipse/openvsx/issues/249>
+is implemented, we can fully make this transition. Therefore, we are no longer
+accepting new requests for extension requests.
+
+Instead, we suggest one of the following:
+
+- [Switch to Open VSX](#how-do-i-configure-the-marketplace-url) now
+- Download and [install the extension manually](#installing-an-extension-manually)
+
+## Installing an extension manually
+
+If an extension is not available from the marketplace or does not work, you can
+grab its VSIX from its GitHub releases or build it yourself.
+
+Once you have downloaded the VSIX to the remote machine you can either:
+
+- Run the `Extensions: Install from VSIX` command in the Command Palette.
+- Use `code-server --install-extension <path to vsix>`
+
+You can also download extensions from the command line. For instance, downloading off OpenVSX can be done like this:
+
+```shell
+SERVICE_URL=https://open-vsx.org/vscode/gallery ITEM_URL=https://open-vsx.org/vscode/item code-server --install-extension <extension id>
+```
+
+## How do I configure the marketplace URL?
+
+If you have your own marketplace that implements the VS Code Extension Gallery API, it is possible to
+point code-server to it by setting `$SERVICE_URL` and `$ITEM_URL`. These correspond directly
+to `serviceUrl` and `itemUrl` in VS Code's `product.json`.
+
+e.g. to use [open-vsx.org](https://open-vsx.org):
+
+```bash
+export SERVICE_URL=https://open-vsx.org/vscode/gallery
+export ITEM_URL=https://open-vsx.org/vscode/item
+```
+
+While you can technically use Microsoft's marketplace with these, please do not do so as it
+is against their terms of use. See [above](#differences-compared-to-vs-code) and this
+discussion regarding the use of the Microsoft URLs in forks:
+
+<https://github.com/microsoft/vscode/issues/31168#issue-244533026>
+
+See also [VSCodium's docs](https://github.com/VSCodium/vscodium/blob/master/DOCS.md#extensions--marketplace).
+
+These variables are most valuable to our enterprise customers for whom we have a self hosted marketplace product.
+
+## Where are extensions stored?
+
+Defaults to `~/.local/share/code-server/extensions`.
+
+If the `XDG_DATA_HOME` environment variable is set the data directory will be
+`$XDG_DATA_HOME/code-server/extensions`. In general we try to follow the XDG directory spec.
+
+You can install an extension on the CLI with:
+
+```bash
 # From the Coder extension marketplace
 code-server --install-extension ms-python.python
 
@@ -140,100 +163,280 @@ code-server --install-extension ms-python.python
 code-server --install-extension downloaded-ms-python.python.vsix
 ```
 
-## How do I install an extension manually?
+## How is this different from VS Code Codespaces?
 
-If there's an extension unavailable in the marketplace or an extension that
+VS Code Codespaces is a closed source and paid service by Microsoft. It also allows you to access
-doesn't work, you can download the VSIX from its GitHub releases or build it
+VS Code via the browser.
-yourself.
 
-Once you have downloaded the VSIX to the remote machine, you can either:
+However, code-server is free, open source and can be run on any machine without any limitations.
 
-- Run the **Extensions: Install from VSIX** command in the Command Palette.
+While you can self host environments with VS Code Codespaces, you still need an Azure billing
-- Run `code-server --install-extension <path to vsix>` in the terminal
+account and you have to access VS Code via the Codespaces web dashboard instead of directly
+connecting to your instance.
 
-You can also download extensions using the command line. For instance,
+## How should I expose code-server to the internet?
-downloading from OpenVSX can be done like this:
 
-```shell
+Please follow [./guide.md](./guide.md) for our recommendations on setting up and using code-server.
-code-server --install-extension <extension id>
+
+code-server only supports password authentication natively.
+
+**note**: code-server will rate limit password authentication attempts at 2 a minute and 12 an hour.
+
+If you want to use external authentication (i.e sign in with Google) you should handle this
+with a reverse proxy using something like [oauth2_proxy](https://github.com/pusher/oauth2_proxy)
+or [Cloudflare Access](https://teams.cloudflare.com/access).
+
+For HTTPS, you can use a self signed certificate by passing in just `--cert` or
+pass in an existing certificate by providing the path to `--cert` and the path to
+the key with `--cert-key`.
+
+The self signed certificate will be generated into
+`~/.local/share/code-server/self-signed.crt`.
+
+If `code-server` has been passed a certificate it will also respond to HTTPS
+requests and will redirect all HTTP requests to HTTPS.
+
+You can use [Let's Encrypt](https://letsencrypt.org/) to get a TLS certificate
+for free.
+
+Again, please follow [./guide.md](./guide.md) for our recommendations on setting up and using code-server.
+
+## Can I store my password hashed?
+
+Yes you can! Set the value of `hashed-password` instead of `password`. Generate the hash with:
+
+```
+printf "thisismypassword" | sha256sum | cut -d' ' -f1
 ```
 
-## How do I use my own extensions marketplace?
+Of course replace `thisismypassword` with your actual password.
 
-If you own a marketplace that implements the VS Code Extension Gallery API, you
+Example:
-can point code-server to it by setting `$EXTENSIONS_GALLERY`.
-This corresponds directly with the `extensionsGallery` entry in in VS Code's `product.json`.
 
-For example, to use the legacy Coder extensions marketplace:
+```yaml
-
+auth: password
-```bash
+hashed-password: 1da9133ab9dbd11d2937ec8d312e1e2569857059e73cc72df92e670928983ab5 # You got this from the command above
-export EXTENSIONS_GALLERY='{"serviceUrl": "https://extensions.coder.com/api"}'
 ```
 
-Though you can technically use Microsoft's marketplace in this manner, we
+## How do I securely access web services?
-strongly discourage you from doing so since this is [against their Terms of Use](#why-cant-code-server-use-microsofts-extension-marketplace).
 
-For further information, see [this
+code-server is capable of proxying to any port using either a subdomain or a
-discussion](https://github.com/microsoft/vscode/issues/31168#issue-244533026)
+subpath which means you can securely access these services using code-server's
-regarding the use of the Microsoft URLs in forks, as well as [VSCodium's
+built-in authentication.
-docs](https://github.com/VSCodium/vscodium/blob/master/DOCS.md#extensions--marketplace).
 
-## Where are extensions stored?
+### Sub-paths
 
-Extensions are store, by default, to `~/.local/share/code-server/extensions`.
+Just browse to `/proxy/<port>/`.
 
-If you set the `XDG_DATA_HOME` environment variable, the data directory will be
+### Sub-domains
-`$XDG_DATA_HOME/code-server/extensions`. In general, we try to follow the XDG directory spec.
 
-## How can I reuse my VS Code configuration?
+You will need a DNS entry that points to your server for each port you want to
+access. You can either set up a wildcard DNS entry for `*.<domain>` if your domain
+name registrar supports it or you can create one for every port you want to
+access (`3000.<domain>`, `8080.<domain>`, etc).
 
-You can use the [Settings
+You should also set up TLS certificates for these subdomains, either using a
-Sync](https://marketplace.visualstudio.com/items?itemName=Shan.code-settings-sync)
+wildcard certificate for `*.<domain>` or individual certificates for each port.
-extension for this purpose.
 
-Alternatively, you can also pass `--user-data-dir ~/.vscode` or copy `~/.vscode`
+Start code-server with the `--proxy-domain` flag set to your domain.
-into `~/.local/share/code-server` to reuse your existing VS Code extensions and
+
-configuration.
+```
+code-server --proxy-domain <domain>
+```
+
+Now you can browse to `<port>.<domain>`. Note that this uses the host header so
+ensure your reverse proxy forwards that information if you are using one.
+
+## Why does the code-server proxy strip `/proxy/<port>` from the request path?
+
+HTTP servers should strive to use relative URLs to avoid needed to be coupled to the
+absolute path at which they are served. This means you must use trailing slashes on all
+paths with subpaths. See <https://blog.cdivilly.com/2019/02/28/uri-trailing-slashes>
+
+This is really the "correct" way things work and why the striping of the base path is the
+default. If your application uses relative URLs and does not assume the absolute path at
+which it is being served, it will just work no matter what port you decide to serve it off
+or if you put it in behind code-server or any other proxy!
+
+However many people prefer the cleaner aesthetic of no trailing slashes. This couples you
+to the base path as you cannot use relative redirects correctly anymore. See the above
+link.
+
+For users who are ok with this tradeoff, use `/absproxy` instead and the path will be
+passed as is. e.g. `/absproxy/3000/my-app-path`
+
+### Proxying to Create React App
+
+You must use `/absproxy/<port>` with create-react-app.
+See [#2565](https://github.com/cdr/code-server/issues/2565) and
+[#2222](https://github.com/cdr/code-server/issues/2222). You will need to inform
+create-react-app of the path at which you are serving via `$PUBLIC_URL` and webpack
+via `$WDS_SOCKET_PATH`.
+
+e.g.
+
+```sh
+PUBLIC_URL=/absproxy/3000 \
+  WDS_SOCKET_PATH=$PUBLIC_URL/sockjs-node \
+  BROWSER=none yarn start
+```
+
+Then visit `https://my-code-server-address.io/absproxy/3000` to see your app exposed through
+code-server!
+
+Highly recommend using the subdomain approach instead to avoid this class of issue.
+
+## Multi-tenancy
+
+If you want to run multiple code-servers on shared infrastructure, we recommend using virtual
+machines with a VM per user. This will easily allow users to run a docker daemon. If you want
+to use kubernetes, you'll definitely want to use [kubevirt](https://kubevirt.io) or [sysbox](https://github.com/nestybox/sysbox) to give each
+user a VM-like experience instead of just a container.
+
+## Docker in code-server container?
+
+If you'd like to access docker inside of code-server, mount the docker socket in from `/var/run/docker.sock`.
+Install the docker CLI in the code-server container and you should be able to access the daemon!
+
+You can even make volume mounts work. Lets say you want to run a container and mount in
+`/home/coder/myproject` into it from inside the `code-server` container. You need to make sure
+the docker daemon's `/home/coder/myproject` is the same as the one mounted inside the `code-server`
+container and the mount will just work.
+
+## How can I disable telemetry?
+
+Use the `--disable-telemetry` flag to completely disable telemetry. We use the
+data collected only to improve code-server.
 
 ## How does code-server decide what workspace or folder to open?
 
-code-server tries the following in this order:
+code-server tries the following in order:
 
-1. The `workspace` query parameter
+1. The `workspace` query parameter.
-2. The `folder` query parameter
+2. The `folder` query parameter.
-3. The workspace or directory passed via the command line
+3. The workspace or directory passed on the command line.
-4. The last opened workspace or directory
+4. The last opened workspace or directory.
 
-## How do I access my Documents/Downloads/Desktop folders in code-server on macOS?
+## How do I debug issues with code-server?
 
-Newer versions of macOS require permission through a non-UNIX mechanism for
+First run code-server with at least `debug` logging (or `trace` to be really
-code-server to access the Desktop, Documents, Pictures, Downloads, and other folders.
+thorough) by setting the `--log` flag or the `LOG_LEVEL` environment variable.
+`-vvv` and `--verbose` are aliases for `--log trace`.
 
-You may have to give Node.js full disk access, since it doesn't implement any of the macOS permission request features natively:
+```
+code-server --log debug
+```
 
-1. Find where Node.js is installed on your machine
+Once this is done, replicate the issue you're having then collect logging
+information from the following places:
+
+1. The most recent files from `~/.local/share/code-server/coder-logs`.
+2. The browser console.
+3. The browser network tab.
+
+Additionally, collecting core dumps (you may need to enable them first) if
+code-server crashes can be helpful.
+
+## Heartbeat File
+
+`code-server` touches `~/.local/share/code-server/heartbeat` once a minute as long
+as there is an active browser connection.
+
+If you want to shutdown `code-server` if there hasn't been an active connection in X minutes
+you can do so by continuously checking the last modified time on the heartbeat file and if it is
+older than X minutes, kill `code-server`.
+
+[#1636](https://github.com/cdr/code-server/issues/1636) will make the experience here better.
+
+## Healthz endpoint
+
+`code-server` exposes an endpoint at `/healthz` which can be used to check
+whether `code-server` is up without triggering a heartbeat. The response will
+include a status (`alive` or `expired`) and a timestamp for the last heartbeat
+(defaults to `0`). This endpoint does not require authentication.
+
+```json
+{
+  "status": "alive",
+  "lastHeartbeat": 1599166210566
+}
+```
+
+## How does the config file work?
+
+When `code-server` starts up, it creates a default config file in `~/.config/code-server/config.yaml` that looks
+like this:
+
+```yaml
+bind-addr: 127.0.0.1:8080
+auth: password
+password: mewkmdasosafuio3422 # This is randomly generated for each config.yaml
+cert: false
+```
+
+Each key in the file maps directly to a `code-server` flag. Run `code-server --help` to see
+a listing of all the flags.
+
+The default config here says to listen on the loopback IP port 8080, enable password authorization
+and no TLS. Any flags passed to `code-server` will take priority over the config file.
+
+The `--config` flag or `$CODE_SERVER_CONFIG` can be used to change the config file's location.
+
+The default location also respects `$XDG_CONFIG_HOME`.
+
+## Isn't an install script piped into sh insecure?
+
+Please give
+[this wonderful blogpost](https://sandstorm.io/news/2015-09-24-is-curl-bash-insecure-pgp-verified-install) by
+[sandstorm.io](https://sandstorm.io) a read.
+
+## How do I make my keyboard shortcuts work?
+
+Many shortcuts will not work by default as they'll be caught by the browser.
+
+If you use Chrome you can get around this by installing the PWA.
+
+Once you've entered the editor, click the "plus" icon present in the URL toolbar area.
+This will install a Chrome PWA and now all keybindings will work!
+
+For other browsers you'll have to remap keybindings unfortunately.
+
+## How do I access my Documents/Downloads/Desktop folders in code-server on OSX?
+
+Newer versions of macOS require permission through a non-UNIX mechanism for access to the Desktop, Documents, Pictures, Downloads, and other folders.
+
+You may have to give Node "full disk access" since it doesn't implement any of the macOS permission request stuff natively.
+
+1. Find where Node is installed on your machine
 
    ```console
-   $ which node
+   ➜ ~ which node
    /usr/local/bin/node
    ```
 
-2. Grant Node.js full disk access. Open **System Preferences** > **Security &
+1. Grant Node Full Disk Access:
-   Privacy** > **Privacy** > **Full Disk Access**. Then, click the 🔒 to unlock,
-   click **+**, and select the Node.js binary you located in the previous step.
 
-See [#2794](https://github.com/coder/code-server/issues/2794) for additional context.
+Open System Preferences > Security & Privacy > Privacy (horizontal) tab > Full Disk Access (vertical) tab > Click the 🔒 to unlock > Click + and select the Node binary you located.
 
-## How do I direct server-side requests through a proxy?
+See [#2794](https://github.com/cdr/code-server/issues/2794) for context on this.
 
-> code-server proxies only server-side requests.
+## Differences compared to Theia?
 
-To direct server-side requests through a proxy, code-server supports the
+[Theia](https://github.com/eclipse-theia/theia) is a browser IDE loosely based on VS Code. It uses the same
-following environment variables:
+text editor library named [Monaco](https://github.com/Microsoft/monaco-editor) and the same
+extension API but everything else is very different. It also uses [open-vsx.org](https://open-vsx.org)
+for extensions which has an order of magnitude less extensions than our marketplace.
+See [#1473](https://github.com/cdr/code-server/issues/1473).
 
-- `$HTTP_PROXY`
+You can't just use your VS Code config in Theia like you can with code-server.
-- `$HTTPS_PROXY`
+
-- `$NO_PROXY`
+To summarize, code-server is a patched fork of VS Code to run in the browser whereas
+Theia takes some parts of VS Code but is an entirely different editor.
+
+## `$HTTP_PROXY`, `$HTTPS_PROXY`, `$NO_PROXY`
+
+code-server supports the standard environment variables to allow directing
+server side requests through a proxy.
 
 ```sh
 export HTTP_PROXY=https://134.8.5.4
@@ -243,176 +446,18 @@ export HTTPS_PROXY=https://134.8.5.4
 code-server
 ```
 
-- See
+- See [proxy-from-env](https://www.npmjs.com/package/proxy-from-env#environment-variables)
-  [proxy-from-env](https://www.npmjs.com/package/proxy-from-env#environment-variables)
+  for a detailed reference on the various environment variables and their syntax.
-  for a detailed reference on these environment variables and their syntax (note
+  - code-server only uses the `http` and `https` protocols.
-  that code-server only uses the `http` and `https` protocols).
+- See [proxy-agent](https://www.npmjs.com/package/proxy-agent) for the various supported
-- See [proxy-agent](https://www.npmjs.com/package/proxy-agent) for information
+  proxy protocols.
-  on on the supported proxy protocols.
 
-## How do I debug issues with code-server?
+**note**: Only server side requests will be proxied! This includes fetching extensions,
+requests made from extensions etc. To proxy requests from your browser you need to
+configure your browser separately. Browser requests would cover exploring the extension
+marketplace.
 
-First, run code-server with the `debug` logging (or `trace` to be really
+## Enterprise
-thorough) by setting the `--log` flag or the `LOG_LEVEL` environment variable.
-`-vvv` and `--verbose` are aliases for `--log trace`.
 
-First, run code-server with `debug` logging (or `trace` logging for more
+Visit [our enterprise page](https://coder.com) for more information about our
-thorough messages) by setting the `--log` flag or the `LOG_LEVEL` environment
+enterprise offerings.
-variable.
-
-```text
-code-server --log debug
-```
-
-> Note that the `-vvv` and `--verbose` flags are aliases for `--log trace`.
-
-Next, replicate the issue you're having so that you can collect logging
-information from the following places:
-
-1. The most recent files from `~/.local/share/code-server/coder-logs`
-2. The browser console
-3. The browser network tab
-
-Additionally, collecting core dumps (you may need to enable them first) if
-code-server crashes can be helpful.
-
-## What is the healthz endpoint?
-
-You can use the `/healthz` endpoint exposed by code-server to check whether
-code-server is running without triggering a heartbeat. The response includes a
-status (e.g., `alive` or `expired`) and a timestamp for the last heartbeat
-(the default is `0`).
-
-```json
-{
-  "status": "alive",
-  "lastHeartbeat": 1599166210566
-}
-```
-
-This endpoint doesn't require authentication.
-
-## What is the heartbeat file?
-
-As long as there is an active browser connection, code-server touches
-`~/.local/share/code-server/heartbeat` once a minute.
-
-If you want to shutdown code-server if there hasn't been an active connection
-after a predetermined amount of time, you can do so by checking continuously for
-the last modified time on the heartbeat file. If it is older than X minutes (or
-whatever amount of time you'd like), you can kill code-server.
-
-Eventually, [#1636](https://github.com/coder/code-server/issues/1636) will make
-this process better.
-
-## How do I change the password?
-
-Edit the `password` field in the code-server config file at
-`~/.config/code-server/config.yaml`, then restart code-server:
-
-```bash
-sudo systemctl restart code-server@$USER
-```
-
-## Can I store my password hashed?
-
-Yes, you can do so by setting the value of `hashed-password` instead of `password`. Generate the hash with:
-
-```shell
-echo -n "thisismypassword" | npx argon2-cli -e
-$argon2i$v=19$m=4096,t=3,p=1$wst5qhbgk2lu1ih4dmuxvg$ls1alrvdiwtvzhwnzcm1dugg+5dto3dt1d5v9xtlws4
-```
-
-Replace `thisismypassword` with your actual password and **remember to put it
-inside quotes**! For example:
-
-```yaml
-auth: password
-hashed-password: "$argon2i$v=19$m=4096,t=3,p=1$wST5QhBgk2lu1ih4DMuxvg$LS1alrVdIWtvZHwnzCM1DUGg+5DTO3Dt1d5v9XtLws4"
-```
-
-The `hashed-password` field takes precedence over `password`.
-
-## Is multi-tenancy possible?
-
-If you want to run multiple code-servers on shared infrastructure, we recommend
-using virtual machines (provide one VM per user). This will easily allow users
-to run a Docker daemon. If you want to use Kubernetes, you'll want to
-use [kubevirt](https://kubevirt.io) or
-[sysbox](https://github.com/nestybox/sysbox) to give each user a VM-like
-experience instead of just a container.
-
-## Can I use Docker in a code-server container?
-
-If you'd like to access Docker inside of code-server, mount the Docker socket in
-from `/var/run/docker.sock`. Then, install the Docker CLI in the code-server
-container, and you should be able to access the daemon.
-
-You can even make volume mounts work. Let's say you want to run a container and
-mount into `/home/coder/myproject` from inside the `code-server` container. You
-need to make sure the Docker daemon's `/home/coder/myproject` is the same as the
-one mounted inside the `code-server` container, and the mount will work.
-
-## How do I disable telemetry?
-
-Use the `--disable-telemetry` flag to disable telemetry.
-
-> We use the data collected only to improve code-server.
-
-## What's the difference between code-server and Theia?
-
-At a high level, code-server is a patched fork of VS Code that runs in the
-browser whereas Theia takes some parts of VS Code but is an entirely different
-editor.
-
-[Theia](https://github.com/eclipse-theia/theia) is a browser IDE loosely based
-on VS Code. It uses the same text editor library
-([Monaco](https://github.com/Microsoft/monaco-editor)) and extension API, but
-everything else is different. Theia also uses [Open VSX](https://open-vsx.org)
-for extensions.
-
-Theia doesn't allow you to reuse your existing VS Code config.
-
-## What's the difference between code-server and OpenVSCode-Server?
-
-code-server and OpenVSCode-Server both allow you to access VS Code via a
-browser. The two projects also use their own [forks of VS Code](https://github.com/coder/vscode) to
-leverage modern VS Code APIs and stay up to date with the upsteam version.
-
-However, OpenVSCode-Server is scoped at only making VS Code available in the web browser.
-code-server includes some other features:
-
-- password auth
-- proxy web ports
-- certificate support
-- plugin API
-- settings sync (coming soon)
-
-For more details, see [this discussion post](https://github.com/coder/code-server/discussions/4267#discussioncomment-1411583).
-
-## What's the difference between code-server and GitHub Codespaces?
-
-Both code-server and GitHub Codespaces allow you to access VS Code via a
-browser. GitHub Codespaces, however, is a closed-source, paid service offered by
-GitHub and Microsoft.
-
-On the other hand, code-server is self-hosted, free, open-source, and
-can be run on any machine with few limitations.
-
-## Does code-server have any security login validation?
-
-code-server supports setting a single password and limits logins to two per
-minute plus an additional twelve per hour.
-
-## Are there community projects involving code-server?
-
-Visit the [awesome-code-server](https://github.com/coder/awesome-code-server)
-repository to view community projects and guides with code-server! Feel free to
-add your own!
-
-## How do I change the port?
-
-There are two ways to change the port on which code-server runs:
-
-1. with an environment variable e.g. `PORT=3000 code-server`
-2. using the flag `--bind-addr` e.g. `code-server --bind-addr localhost:3000`

docs/MAINTAINING.md

@@ -2,254 +2,91 @@
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 # Maintaining
 
-- [Team](#team)
+- [Maintaining](#maintaining)
-  - [Onboarding](#onboarding)
+  - [Workflow](#workflow)
-  - [Offboarding](#offboarding)
+    - [Milestones](#milestones)
-- [Workflow](#workflow)
+    - [Triage](#triage)
-  - [Milestones](#milestones)
+    - [Project Boards](#project-boards)
-  - [Triage](#triage)
+  - [Versioning](#versioning)
-  - [Project boards](#project-boards)
+  - [Pull Requests](#pull-requests)
-- [Versioning](#versioning)
+    - [Merge Strategies](#merge-strategies)
-- [Pull requests](#pull-requests)
+  - [Release](#release)
-  - [Merge strategies](#merge-strategies)
+    - [Release Manager Rotation](#release-manager-rotation)
-  - [Changelog](#changelog)
-- [Releases](#releases)
-  - [Publishing a release](#publishing-a-release)
-    - [AUR](#aur)
-    - [Docker](#docker)
-    - [Homebrew](#homebrew)
-    - [npm](#npm)
-- [Syncing with Upstream VS Code](#syncing-with-upstream-vs-code)
-- [Testing](#testing)
-- [Documentation](#documentation)
-  - [Troubleshooting](#troubleshooting)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 
-This document is meant to serve current and future maintainers of code-server,
+# Maintaining
-as well as share our workflow for maintaining the project.
-
-## Team
 
 Current maintainers:
 
 - @code-asher
+- @oxy
 - @jsjoeio
 
-Occasionally, other Coder employees may step in time to time to assist with code-server.
+This document is meant to serve current and future maintainers of code-server, but also share openly our workflow for maintaining the project.
-
-### Onboarding
-
-To onboard a new maintainer to the project, please make sure to do the following:
-
-- [ ] Add to [coder/code-server-reviewers](https://github.com/orgs/coder/teams/code-server-reviewers)
-- [ ] 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 workflow used by code-server maintainers is one that aims to be easy to understood by the community and easy enough for new maintainers to jump in and start contributing on day one.
-the community and easy enough for new maintainers to jump in and start
-contributing on day one.
 
 ### Milestones
 
-We operate mainly using
+We operate mainly using [milestones](https://github.com/cdr/code-server/milestones). This was heavily inspired by our friends over at [vscode](https://github.com/microsoft/vscode).
-[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
+- "Backlog Candidates" -> Work that is not yet accepted for the backlog. We wait for the community to weigh in.
-  for the community to weigh in.
+- "<0.0.0>" -> Work to be done for that version.
-- "<0.0.0>" -> Work to be done for a specific version.
 
-With this flow, any un-assigned issues are essentially in triage state. Once
+With this flow, any un-assigned issues are essentially in triage state and once triaged 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.
-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. a submitter creates an issue
-1. Add appropriate labels to the issue (including "needs-investigation" if we
+1. add appropriate labels
-   should look into it further)
+   1. if we need to look into it further, add "needs-investigation"
-1. Add the issue to a milestone
+1. add to milestone
-   1. If it should be fixed soon, add to version milestone or "On Deck"
+   1. if it should be fixed soon, add to version milestone or "On Deck"
-   2. If not urgent, add to "Backlog"
+   1. if not urgent, add to "Backlog"
-   3. Otherwise, add to "Backlog Candidate" for future consideration
+   1. otherwise, add to "Backlog Candidate" if it should be considered
 
-### Project boards
+### Project Boards
 
 We use project boards for projects or goals that span multiple milestones.
 
-Think of this as a place to put miscellaneous things (like testing, clean up
+Think of this as a place to put miscellaneous things (like testing, clean up stuff, etc). As a maintainer, random todos may come up here and there. This gives you a place to add notes temporarily before opening a new issue. Given that our release milestones function off of issues, we believe tasks should have dedicated issues.
-stuff, etc). As a maintainer, random tasks may come up here and there. The
-project boards give you places to add temporary notes before opening a new
-issue. Given that our release milestones function off of issues, we believe
-tasks should have dedicated issues.
 
-Project boards also give us a way to separate the issue triage from
+It also gives us a way to separate the issue triage from bigger-picture, long-term work.
-bigger-picture, long-term work.
 
 ## Versioning
 
 `<major.minor.patch>`
 
-The code-server project follows traditional [semantic
+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.
-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
+## Pull Requests
 
-Ideally, every PR should fix an issue. If it doesn't, make sure it's associated
+Ideally, every PR should fix an issue. If it doesn't, make sure it's associated with a version milestone.
-with a version milestone.
 
-If a PR does fix an issue, don't add it to the version milestone. Otherwise, the
+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 & the PR fixing the issue.
-version milestone will have duplicate information: the issue and the PR fixing
-the issue.
 
-### Merge strategies
+### Merge Strategies
 
-For most things, we recommend the **squash and merge** strategy. There
+For most things, we recommend "Squash and Merge". If you're updating `lib/vscode`, we suggest using the "Rebase and Merge" strategy. There may be times where "Create a merge commit" makes sense as well. Use your best judgement. If you're unsure, you can always discuss in the PR with the team.
-may be times where **creating a merge commit** makes sense as well. Use your
+The code-server project follows traditional [semantic versioning](ttps://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.
-best judgment. If you're unsure, you can always discuss in the PR with the team.
 
-### Changelog
+## Release
 
-To save time when creating a new release for code-server, we keep a running
+### Release Manager Rotation
-changelog at `CHANGELOG.md`.
 
-If either the author or reviewer of a PR believes the change should be mentioned
+With each release, we rotate the role of "release manager" to ensure every maintainer goes through the process. This helps us keep documentation up-to-date and encourages us to continually review and improve the flow with each set of eyes.
-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
-
-With each release, we rotate the role of release manager to ensure every
-maintainer goes through the process. This helps us keep documentation up-to-date
-and encourages us to continually review and improve the flow.
 
 If you're the current release manager, follow these steps:
 
 1. Create a [release issue](../.github/ISSUE_TEMPLATE/release.md)
-1. Fill out checklist
+2. Fill out checklist
-1. Publish the release
+3. After release is published, close release milestone
-1. After release is published, close release milestone
-
-### Publishing a release
-
-1. Create a release branch called `v0.0.0` but replace with new version
-1. Run `yarn release:prep` and type in the new version (e.g., `3.8.1`)
-1. GitHub Actions will generate the `npm-package`, `release-packages` and
-   `release-images` artifacts. You do not have to wait for this step to complete
-   before proceeding.
-1. Run `yarn release:github-draft` to create a GitHub draft release from the
-   template with the updated version.
-1. Summarize the major changes in the release notes and link to the relevant
-   issues.
-1. Change the @ to target the version branch. Example: `v3.9.0 @ Target: v3.9.0`
-1. Wait for the `npm-package`, `release-packages` and `release-images` artifacts
-   to build.
-1. Run `yarn release:github-assets` to download the `release-packages` artifact.
-   They will upload them to the draft release.
-1. Run some basic sanity tests on one of the released packages (pay special
-   attention to making sure the terminal works).
-1. Publish the release and merge the PR. CI will automatically grab the
-   artifacts, publish the NPM package from `npm-package`, and publish the Docker
-   Hub image from `release-images`.
-1. Update the AUR package. Instructions for updating the AUR package are at
-   [coder/code-server-aur](https://github.com/coder/code-server-aur).
-1. Wait for the npm package to be published.
-
-#### AUR
-
-We publish to AUR as a package [here](https://aur.archlinux.org/packages/code-server/). This process is manual and can be done by following the steps in [this repo](https://github.com/coder/code-server-aur).
-
-#### Docker
-
-We publish code-server as a Docker image [here](https://registry.hub.docker.com/r/codercom/code-server), tagging it both with the version and latest.
-
-This is currently automated with the release process.
-
-#### Homebrew
-
-We publish code-server on Homebrew [here](https://github.com/Homebrew/homebrew-core/blob/master/Formula/code-server.rb).
-
-This is currently automated with the release process (but may fail occasionally). If it does, run this locally:
-
-```shell
-# Replace VERSION with version
-brew bump-formula-pr --version="${VERSION}" code-server --no-browse --no-audit
-```
-
-#### 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 VS Code
-
-The VS Code portion of code-server lives under [`coder/vscode`](https://github.com/coder/vscode). To update VS Code for code-server, follow these steps:
-
-1. `git checkout -b vscode-update` - Create a new branch locally based off `main`
-2. `git fetch upstream` - Fetch upstream (VS Code)'s latest branches
-3. `git merge upstream/release/1.64` - Merge it locally
-   1. replace `1.64` with the version you're upgrading to
-   1. If there are merge conflicts, commit first, then fix them locally.
-4. Open a PR merging your branch (`vscode-update`) into `main` and add the code-server review team
-
-Ideally, our fork stays as close to upstream as possible. See the differences between our fork and upstream [here](https://github.com/microsoft/vscode/compare/main...coder:main).
-
-## Testing
-
-Our testing structure is laid out under our [Contributing docs](https://coder.com/docs/code-server/latest/CONTRIBUTING#test).
-
-We hope to eventually hit 100% test coverage with our unit tests, and maybe one day our scripts (coverage not tracked currently).
-
-If you're ever looking to add more tests, here are a few ways to get started:
-
-- run `yarn test:unit` and look at the coverage chart. You'll see all the uncovered lines. This is a good place to start.
-- look at `test/scripts` to see which scripts are tested. We can always use more tests there.
-- 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.
-
-## 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.
-
-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"
-3. In a separate tab, open the preview link from github-actions-bot
-4. Now look at the function logs and see if there are errors in the logs

docs/README.md

@@ -1,77 +0,0 @@
-# code-server
-
-[!["GitHub Discussions"](https://img.shields.io/badge/%20GitHub-%20Discussions-gray.svg?longCache=true&logo=github&colorB=purple)](https://github.com/coder/code-server/discussions) [!["Join us on Slack"](https://img.shields.io/badge/join-us%20on%20slack-gray.svg?longCache=true&logo=slack&colorB=brightgreen)](https://coder.com/community) [![Twitter Follow](https://img.shields.io/twitter/follow/CoderHQ?label=%40CoderHQ&style=social)](https://twitter.com/coderhq) [![codecov](https://codecov.io/gh/coder/code-server/branch/main/graph/badge.svg?token=5iM9farjnC)](https://codecov.io/gh/coder/code-server) [![See v4.1.0 docs](https://img.shields.io/static/v1?label=Docs&message=see%20v4.1.0%20&color=blue)](https://github.com/coder/code-server/tree/v4.1.0/docs)
-
-Run [VS Code](https://github.com/Microsoft/vscode) on any machine anywhere and
-access it in the browser.
-
-![Screenshot](./assets/screenshot.png)
-
-## Highlights
-
-- Code on any device with a consistent development environment
-- Use cloud servers to speed up tests, compilations, downloads, and more
-- Preserve battery life when you're on the go; all intensive tasks run on your
-  server
-
-| 🔔 code-server is a free browser-based IDE while [Coder](https://coder.com/) is our enterprise developer workspace platform. For more information, visit [Coder.com](https://coder.com/docs/comparison)
-| ---
-
-## Requirements
-
-See [requirements](requirements.md) for minimum specs, as well as instructions
-on how to set up a Google VM on which you can install code-server.
-
-**TL;DR:** Linux machine with WebSockets enabled, 1 GB RAM, and 2 CPUs
-
-## Getting started
-
-There are three ways to get started:
-
-1. Using the [install
-   script](https://github.com/coder/code-server/blob/main/install.sh), which
-   automates most of the process. The script uses the system package manager if
-   possible.
-2. Manually [installing
-   code-server](https://coder.com/docs/code-server/latest/install)
-3. Using our one-click buttons and guides to [deploy code-server to a cloud
-   provider](https://github.com/coder/deploy-code-server) ⚡
-
-If you use the install script, you can preview what occurs during the install
-process:
-
-```bash
-curl -fsSL https://code-server.dev/install.sh | sh -s -- --dry-run
-```
-
-To install, run:
-
-```bash
-curl -fsSL https://code-server.dev/install.sh | sh
-```
-
-When done, the install script prints out instructions for running and starting
-code-server.
-
-We also have an in-depth [setup and
-configuration](https://coder.com/docs/code-server/latest/guide) guide.
-
-## Questions?
-
-See answers to [frequently asked
-questions](https://coder.com/docs/code-server/latest/FAQ).
-
-## Want to help?
-
-See [Contributing](https://coder.com/docs/code-server/latest/CONTRIBUTING) for
-details.
-
-## Hiring
-
-Interested in [working at Coder](https://coder.com/careers)? Check out [our open
-positions](https://coder.com/careers#openings)!
-
-## For Organizations
-
-Want remote development for your organization or enterprise? Visit [our
-website](https://coder.com) to learn more about Coder.

docs/SECURITY.md

@@ -1,35 +1,29 @@
 # Security Policy
 
-Coder and the code-server team want to keep the code-server project secure and safe for end-users.
+The code-server team (and Coder, the organization) care a lot about keeping the project secure and safe for end-users.
 
 ## Tools
 
-We use the following tools to help us stay on top of vulnerability mitigation.
+We use a combination of tools to help us stay on top of vulnerabilities.
 
 - [dependabot](https://dependabot.com/)
-  - Submits pull requests to upgrade dependencies. We use dependabot's version
+  - Submits pull requests to upgrade dependencies. We use dependabot's version upgrades as well as security updates.
-    upgrades as well as security updates.
 - code-scanning
   - [CodeQL](https://securitylab.github.com/tools/codeql/)
-    - Semantic code analysis engine that runs on a regular schedule (see
+    - Semantic code analysis engine that runs on a regular schedule (see `codeql-analysis.yml`)
-      `codeql-analysis.yml`)
   - [trivy](https://github.com/aquasecurity/trivy)
-    - Comprehensive vulnerability scanner that runs on PRs into the default
+    - 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 `ci.yaml`)
-      branch and scans both our container image and repository code (see
-      `trivy-scan-repo` and `trivy-scan-image` jobs in `ci.yaml`)
 - [`audit-ci`](https://github.com/IBM/audit-ci)
-  - Audits npm and Yarn dependencies in CI (see `Audit for vulnerabilities` step
+  - Audits npm and Yarn dependencies in CI (see "Audit for vulnerabilities" step in `ci.yaml`) on PRs into the default branch and fails CI if moderate or higher vulnerabilities(see the `audit.sh` script) are present.
-    in `ci.yaml`) on PRs into the default branch and fails CI if moderate or
-    higher vulnerabilities (see the `audit.sh` script) are present.
 
 ## Supported Versions
 
-Coder sponsors the development and maintenance of the code-server project. We will fix security issues within 90 days of receiving a report and publish the fix in a subsequent release. The code-server project does not provide backports or patch releases for security issues at this time.
+Coder sponsors development and maintenance of the code-server project. We will fix security issues within 90 days of receiving a report, and publish the fix in a subsequent release. The code-server project does not provide backports or patch releases for security issues at this time.
 
-| Version                                                 | Supported          |
+| Version                                               | Supported          |
-| ------------------------------------------------------- | ------------------ |
+| ----------------------------------------------------- | ------------------ |
-| [Latest](https://github.com/coder/code-server/releases) | :white_check_mark: |
+| [Latest](https://github.com/cdr/code-server/releases) | :white_check_mark: |
 
 ## Reporting a Vulnerability
 
-To report a vulnerability, please send an email to security[@]coder.com, and our security team will respond to you.
+To report a vulnerability, please send an email to security[@]coder.com and our security team will respond to you.

docs/android.md

@@ -1,23 +0,0 @@
-# Running code-server using UserLAnd
-
-1. Install UserLAnd from [Google Play](https://play.google.com/store/apps/details?id=tech.ula&hl=en_US&gl=US)
-2. Install an Ubuntu VM
-3. Start app
-4. Install Node.js, `curl` and `yarn` using `sudo apt install nodejs npm yarn curl -y`
-5. Install `nvm`:
-
-```shell
-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 14:
-
-```shell
-nvm install 14
-nvm use 14
-```
-
-8. Install code-server globally on device with: `npm i -g code-server`
-9. Run code-server with `code-server`
-10. Access on localhost:8080 in your browser

docs/collaboration.md

@@ -1,65 +0,0 @@
-# Collaboration
-
-With third-party extensions, you can use code-server to collaborate with other developers in real time.
-
-## Code sharing using Duckly
-
-[Duckly](https://duckly.com/) allows you to share your code in real-time even with people using different IDEs (like JetBrains and VSCode).
-
-- Cross-IDE support,
-- Real-time typing,
-- P2P encrypted,
-- Voice and audio chat,
-- Terminal sharing
-
-### Installing the Duckly Extension
-
-Duckly uses an extension to provide real time sharing features
-
-1. Install the Duckly extension from OpenVSX on `code-server`.
-
-```bash
-SERVICE_URL=https://open-vsx.org/vscode/gallery \
-  ITEM_URL=https://open-vsx.org/vscode/item \
-  code-server --install-extension gitduck.code-streaming
-```
-
-2. Refresh you `code-server` window. You should now be able to see the Duckly extension.
-
-### Sharing with Duckly
-
-As `code-server` is based on VS Code, you can follow the steps described on Duckly's [Pair programming with VS Code](https://duckly.com/tools/vscode) page and skip the installation step.
-
-## Code sharing using CodeTogether
-
-[CodeTogether](https://www.codetogether.com/) is a real-time cross-IDE replacement for Microsoft Live Share providing:
-
-- Cross-IDE support - between VS Code, Eclipse, IntelliJ and IDEs based on them (browser or desktop)
-- Real-time editing - shared or individual cursors for pairing, mobbing, swarming, or whatever
-- P2P encrypted - servers can't decrypt the traffic ([Security Details](https://codetogether.com/download/security/))
-- SaaS or [On-premises](https://codetogether.com/on-premises/) options
-- Shared servers, terminals, and consoles
-- Unit Testing - with support for Red, Green, Refactor TDD
-- Joining via a web browser or your preferred IDE
-- Free unlimited 1 hour sessions with 4 participants
-- Multiple plans including [free or paid options](https://www.codetogether.com/pricing/)
-
-### Installing the CodeTogether extension
-
-1. Install the CodeTogether extension from OpenVSX on `code-server`.
-
-   ```sh
-   SERVICE_URL=https://open-vsx.org/vscode/gallery \
-     ITEM_URL=https://open-vsx.org/vscode/item \
-     code-server --install-extension genuitecllc.codetogether
-   ```
-
-2. CodeTogether requires VS Code's proposed API to run. Start code-server with the following flag:
-
-   ```sh
-   code-server --enable-proposed-api genuitecllc.codetogether
-   ```
-
-   Another option would be to add a value in code-server's [config file](https://coder.com/docs/code-server/v4.1.0/FAQ#how-does-the-config-file-work).
-
-3. Refresh code-server and navigate to the CodeTogether icon in the sidebar to host or join a coding session.

docs/guide.md

@@ -2,129 +2,184 @@
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 # Setup Guide
 
-- [Expose code-server](#expose-code-server)
+- [1. Acquire a remote machine](#1-acquire-a-remote-machine)
-  - [Port forwarding via SSH](#port-forwarding-via-ssh)
+  - [Requirements](#requirements)
-  - [Using Let's Encrypt with Caddy](#using-lets-encrypt-with-caddy)
+  - [Google Cloud](#google-cloud)
-  - [Using Let's Encrypt with NGINX](#using-lets-encrypt-with-nginx)
+- [2. Install code-server](#2-install-code-server)
-  - [Using a self-signed certificate](#using-a-self-signed-certificate)
+- [3. Expose code-server](#3-expose-code-server)
-  - [TLS 1.3 and Safari](#tls-13-and-safari)
+  - [SSH forwarding](#ssh-forwarding)
-- [External authentication](#external-authentication)
+  - [Let's Encrypt](#lets-encrypt)
-- [HTTPS and self-signed certificates](#https-and-self-signed-certificates)
+    - [NGINX](#nginx)
-- [Accessing web services](#accessing-web-services)
+  - [Self Signed Certificate](#self-signed-certificate)
-  - [Using a subdomain](#using-a-subdomain)
+  - [Change the password?](#change-the-password)
-  - [Using a subpath](#using-a-subpath)
+  - [How do I securely access development web services?](#how-do-i-securely-access-development-web-services)
-  - [Stripping `/proxy/<port>` from the request path](#stripping-proxyport-from-the-request-path)
-  - [Proxying to create a React app](#proxying-to-create-a-react-app)
-  - [Proxying to a Vue app](#proxying-to-a-vue-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 -->
 
-This article will walk you through exposing code-server securely once you've
+This guide demonstrates how to setup and use `code-server`.
-completed the [installation process](install.md).
+To reiterate, `code-server` lets you run VS Code on a remote server and then access it via a browser.
 
-## Expose code-server
+Further docs are at:
 
-**Never** expose code-server directly to the internet without some form of
+- [README](../README.md) for a general overview
-authentication and encryption, otherwise someone can take over your machine via
+- [INSTALL](../docs/install.md) for installation
-the terminal.
+- [FAQ](./FAQ.md) for common questions.
+- [CONTRIBUTING](../docs/CONTRIBUTING.md) for development docs
 
-By default, code-server uses password authentication. As such, you must copy the
+We highly recommend reading the [FAQ](./FAQ.md) on the [Differences compared to VS Code](./FAQ.md#differences-compared-to-vs-code) before beginning.
-password from code-server's config file to log in. To avoid exposing itself
-unnecessarily, code-server listens on `localhost`; this practice is fine for
-testing, but it doesn't work if you want to access code-server from a different
-machine.
 
-> **Rate limits:** code-server rate limits password authentication attempts to
+We'll walk you through acquiring a remote machine to run `code-server` on
-> two per minute plus an additional twelve per hour.
+and then exposing `code-server` so you can securely access it.
 
-There are several approaches to operating and exposing code-server securely:
+## 1. Acquire a remote machine
 
-- Port forwarding via SSH
+First, you need a machine to run `code-server` on. You can use a physical
-- Using Let's Encrypt with Caddy
+machine you have lying around or use a VM on GCP/AWS.
-- Using Let's Encrypt with NGINX
-- Using a self-signed certificate
 
-### Port forwarding via SSH
+### Requirements
 
-We highly recommend using [port forwarding via
+For a good experience, we recommend at least:
-SSH](https://help.ubuntu.com/community/SSH/OpenSSH/PortForwarding) to access
-code-server. If you have an SSH server on your remote machine, this approach
-doesn't required additional setup.
 
-The downside to SSH forwarding, however, is that you can't access code-server
+- 1 GB of RAM
-when using machines without SSH clients (such as iPads). If this applies to you,
+- 2 cores
-we recommend using another method, such as [Let's Encrypt](#let-encrypt) instead.
 
-> To work properly, your environment should have WebSockets enabled, which
+You can use whatever linux distribution floats your boat but in this guide we assume Debian on Google Cloud.
-> code-server uses to communicate between the browser and server.
 
-1. SSH into your instance and edit the code-server config file to disable
+### Google Cloud
-   password authentication:
 
-   ```console
+For demonstration purposes, this guide assumes you're using a VM on GCP but you should be
-   # Replaces "auth: password" with "auth: none" in the code-server config.
+able to easily use any machine or VM provider.
-   sed -i.bak 's/auth: password/auth: none/' ~/.config/code-server/config.yaml
-   ```
 
-2. Restart code-server:
+You can sign up at https://console.cloud.google.com/getting-started. You'll get a 12 month \$300
+free trial.
 
-   ```console
+Once you've signed up and created a GCP project, create a new Compute Engine VM Instance.
-   sudo systemctl restart code-server@$USER
-   ```
 
-3. Forward local port `8080` to `127.0.0.1:8080` on the remote instance by running the following command on your local machine:
+1. Navigate to `Compute Engine -> VM Instances` on the sidebar.
+2. Now click `Create Instance` to create a new instance.
+3. Name it whatever you want.
+4. Choose the region closest to you based on [gcping.com](http://www.gcping.com).
+5. Any zone is fine.
+6. We'd recommend a `E2` series instance from the General-purpose family.
+   - Change the type to custom and set at least 2 cores and 2 GB of ram.
+   - Add more vCPUs and memory as you prefer, you can edit after creating the instance as well.
+   - https://cloud.google.com/compute/docs/machine-types#general_purpose
+7. We highly recommend switching the persistent disk to an SSD of at least 32 GB.
+   - Click `Change` under `Boot Disk` and change the type to `SSD Persistent Disk` and the size
+     to `32`.
+   - You can always grow your disk later.
+8. Navigate to `Networking -> Network interfaces` and edit the existing interface
+   to use a static external IP.
+   - Click done to save network interface changes.
+9. If you do not have a [project wide SSH key](https://cloud.google.com/compute/docs/instances/adding-removing-ssh-keys#project-wide), navigate to `Security -> SSH Keys` and add your public key there.
+10. Click create!
 
-   ```console
+Remember, you can shutdown your server when not in use to lower costs.
-   # -N disables executing a remote shell
-   ssh -N -L 8080:127.0.0.1:8080 [user]@<instance-ip>
-   ```
 
-4. At this point, you can access code-server by pointing your web browser to `http://127.0.0.1:8080`.
+We highly recommend learning to use the [`gcloud`](https://cloud.google.com/sdk/gcloud) cli
+to avoid the slow dashboard.
 
-5. If you'd like to make the port forwarding via SSH persistent, we recommend
+## 2. Install code-server
-   using [mutagen](https://mutagen.io/documentation/introduction/installation)
-   to do so. Once you've installed mutagen, you can port forward as follows:
 
-   ```console
+We have a [script](../install.sh) to install `code-server` for Linux, macOS and FreeBSD.
-   # This is the same as the above SSH command, but it runs in the background
-   # continuously. Be sure to add `mutagen daemon start` to your ~/.bashrc to
-   # start the mutagen daemon when you open a shell.
-   
-   mutagen forward create --name=code-server tcp:127.0.0.1:8080 < instance-ip > :tcp:127.0.0.1:8080
-   ```
 
-6. Optional, but highly recommended: add the following to `~/.ssh/config` so
+It tries to use the system package manager if possible.
-   that you can detect bricked SSH connections:
 
-   ```bash
+First run to print out the install process:
-   Host *
-   ServerAliveInterval 5
-   ExitOnForwardFailure yes
-   ```
 
-> You can [forward your
+```bash
-> SSH](https://developer.github.com/v3/guides/using-ssh-agent-forwarding/) and
+curl -fsSL https://code-server.dev/install.sh | sh -s -- --dry-run
-> [GPG agent](https://wiki.gnupg.org/AgentForwarding) to the instance to
+```
-> securely access GitHub and sign commits without having to copy your keys.
 
-### Using Let's Encrypt with Caddy
+Now to actually install:
 
-Using [Let's Encrypt](https://letsencrypt.org) is an option if you want to
+```bash
-access code-server on an iPad or do not want to use SSH port forwarding.
+curl -fsSL https://code-server.dev/install.sh | sh
+```
 
-1. This option requires that the remote machine be exposed to the internet. Make sure that your instance allows HTTP/HTTPS traffic.
+The install script will print out how to run and start using `code-server`.
 
-1. You'll need a domain name (if you don't have one, you can purchase one from
+Docs on the install script, manual installation and docker image are at [./install.md](./install.md).
-   [Google Domains](https://domains.google.com) or the domain service of your
-   choice)). Once you have a domain name, add an A record to your domain that contains your
-   instance's IP address.
 
-1. Install [Caddy](https://caddyserver.com/docs/download#debian-ubuntu-raspbian):
+## 3. Expose code-server
 
-```console
+**Never**, **ever** expose `code-server` directly to the internet without some form of authentication
+and encryption as someone can completely takeover your machine with the terminal.
+
+By default, `code-server` will enable password authentication which will require you to copy the
+password from the`code-server`config file to login. It will listen on`localhost` to avoid exposing
+itself to the world. This is fine for testing but will not work if you want to access `code-server`
+from a different machine.
+
+There are several approaches to securely operating and exposing `code-server`.
+
+**tip**: You can list the full set of `code-server` options with `code-server --help`
+
+### SSH forwarding
+
+We highly recommend this approach for not requiring any additional setup, you just need an
+SSH server on your remote machine. The downside is you won't be able to access `code-server`
+on any machine without an SSH client like on iPad. If that's important to you, skip to [Let's Encrypt](#lets-encrypt).
+
+First, ssh into your instance and edit your `code-server` config file to disable password authentication.
+
+```bash
+# Replaces "auth: password" with "auth: none" in the code-server config.
+sed -i.bak 's/auth: password/auth: none/' ~/.config/code-server/config.yaml
+```
+
+Restart `code-server` with (assuming you followed the guide):
+
+```bash
+sudo systemctl restart code-server@$USER
+```
+
+Now forward local port 8080 to `127.0.0.1:8080` on the remote instance by running the following command on your local machine.
+
+Recommended reading: https://help.ubuntu.com/community/SSH/OpenSSH/PortForwarding.
+
+```bash
+# -N disables executing a remote shell
+ssh -N -L 8080:127.0.0.1:8080 [user]@<instance-ip>
+```
+
+Now if you access http://127.0.0.1:8080 locally, you should see `code-server`!
+
+If you want to make the SSH port forwarding persistent we recommend using
+[mutagen](https://mutagen.io/documentation/introduction/installation).
+
+```
+# Same as the above SSH command but runs in the background continuously.
+# Add `mutagen daemon start` to your ~/.bashrc to start the mutagen daemon when you open a shell.
+mutagen forward create --name=code-server tcp:127.0.0.1:8080 <instance-ip>:tcp:127.0.0.1:8080
+```
+
+We also recommend adding the following lines to your `~/.ssh/config` to quickly detect bricked SSH connections:
+
+```bash
+Host *
+ServerAliveInterval 5
+ExitOnForwardFailure yes
+```
+
+You can also forward your SSH and GPG agent to the instance to securely access GitHub
+and sign commits without copying your keys.
+
+1. https://developer.github.com/v3/guides/using-ssh-agent-forwarding/
+2. https://wiki.gnupg.org/AgentForwarding
+
+### Let's Encrypt
+
+[Let's Encrypt](https://letsencrypt.org) is a great option if you want to access `code-server` on an iPad
+or do not want to use SSH forwarding. This does require that the remote machine be exposed to the internet.
+
+Assuming you have been following the guide, edit your instance and checkmark the allow HTTP/HTTPS traffic options.
+
+1. You'll need to buy a domain name. We recommend [Google Domains](https://domains.google.com).
+2. Add an A record to your domain with your instance's IP.
+3. Install caddy https://caddyserver.com/docs/download#debian-ubuntu-raspbian.
+
+```bash
 sudo apt install -y debian-keyring debian-archive-keyring apt-transport-https
 curl -1sLf 'https://dl.cloudsmith.io/public/caddy/stable/cfg/gpg/gpg.155B6D79CA56EA34.key' | sudo apt-key add -
 curl -1sLf 'https://dl.cloudsmith.io/public/caddy/stable/cfg/setup/config.deb.txt?distro=debian&version=any-version' | sudo tee -a /etc/apt/sources.list.d/caddy-stable.list
@@ -132,342 +187,131 @@ sudo apt update
 sudo apt install caddy
 ```
 
-1. Replace `/etc/caddy/Caddyfile` using `sudo` so that the file looks like this:
+4. Replace `/etc/caddy/Caddyfile` with sudo to look like this:
 
-   ```text
+```
-   mydomain.com
+mydomain.com
 
-   reverse_proxy 127.0.0.1:8080
+reverse_proxy 127.0.0.1:8080
-   ```
-
-   If you want to serve code-server from a sub-path, you can do so as follows:
-
-   ```text
-   mydomain.com/code/* {
-     uri strip_prefix /code
-     reverse_proxy 127.0.0.1:8080
-   }
-   ```
-
-   Remember to replace `mydomain.com` with your domain name!
-
-1. Reload Caddy:
-
-   ```console
-   sudo systemctl reload caddy
-   ```
-
-At this point, you should be able to access code-server via
-`https://mydomain.com`.
-
-### Using Let's Encrypt with NGINX
-
-1. This option requires that the remote machine be exposed to the internet. Make sure that your instance allows HTTP/HTTPS traffic.
-
-1. You'll need a domain name (if you don't have one, you can purchase one from
-   [Google Domains](https://domains.google.com) or the domain service of your
-   choice)). Once you have a domain name, add an A record to your domain that contains your
-   instance's IP address.
-
-1. Install NGINX:
-
-   ```bash
-   sudo apt update
-   sudo apt install -y nginx certbot python3-certbot-nginx
-   ```
-
-1. Update `/etc/nginx/sites-available/code-server` using sudo with the following
-   configuration:
-
-   ```text
-   server {
-       listen 80;
-       listen [::]:80;
-       server_name mydomain.com;
-
-       location / {
-         proxy_pass http://localhost:8080/;
-         proxy_set_header Host $host;
-         proxy_set_header Upgrade $http_upgrade;
-         proxy_set_header Connection upgrade;
-         proxy_set_header Accept-Encoding gzip;
-       }
-   }
-   ```
-
-   Be sure to replace `mydomain.com` with your domain name!
-
-1. Enable the config:
-
-   ```console
-   sudo ln -s ../sites-available/code-server /etc/nginx/sites-enabled/code-server
-   sudo certbot --non-interactive --redirect --agree-tos --nginx -d mydomain.com -m me@example.com
-   ```
-
-   Be sure to replace `me@example.com` with your actual email.
-
-At this point, you should be able to access code-server via
-`https://mydomain.com`.
-
-### Using a self-signed certificate
-
-> Self signed certificates do not work with iPad; see [./ipad.md](./ipad.md) for
-> more information.
-
-Before proceeding, we recommend familiarizing yourself with the [risks of
-self-signing a certificate for
-SSL](https://security.stackexchange.com/questions/8110).
-
-We recommend self-signed certificates as a last resort, since self-signed
-certificates do not work with iPads and may cause unexpected issues with
-code-server. You should only proceed with this option if:
-
-- You do not want to buy a domain or you cannot expose the remote machine to
-  the internet
-- You do not want to use port forwarding via SSH
-
-To use a self-signed certificate:
-
-1. This option requires that the remote machine be exposed to the internet. Make
-   sure that your instance allows HTTP/HTTPS traffic.
-
-1. SSH into your instance and edit your code-server config file to use a
-   randomly generated self-signed certificate:
-
-   ```console
-   # Replaces "cert: false" with "cert: true" in the code-server config.
-   sed -i.bak 's/cert: false/cert: true/' ~/.config/code-server/config.yaml
-   # Replaces "bind-addr: 127.0.0.1:8080" with "bind-addr: 0.0.0.0:443" in the code-server config.
-   sed -i.bak 's/bind-addr: 127.0.0.1:8080/bind-addr: 0.0.0.0:443/' ~/.config/code-server/config.yaml
-   # Allows code-server to listen on port 443.
-   sudo setcap cap_net_bind_service=+ep /usr/lib/code-server/lib/node
-   ```
-
-1. Restart code-server:
-
-   ```console
-   sudo systemctl restart code-server@$USER
-   ```
-
-At this point, you should be able to access code-server via
-`https://<your-instance-ip>`.
-
-If you'd like to avoid the warnings displayed by code-server when using a
-self-signed certificate, you can use [mkcert](https://mkcert.dev) to create a
-self-signed certificate that's trusted by your operating system, then pass the
-certificate to code-server via the `cert` and `cert-key` config fields.
-
-### TLS 1.3 and Safari
-
-If you will be using Safari and your configuration does not allow anything less
-than TLS 1.3 you will need to add support for TLS 1.2 since Safari does not
-support TLS 1.3 for web sockets at the time of writing. If this is the case you
-should see OSSStatus: 9836 in the browser console.
-
-## External authentication
-
-If you want to use external authentication mechanism (e.g., Sign in with
-Google), you can do this with a reverse proxy such as:
-
-- [Pomerium](https://www.pomerium.io/guides/code-server.html)
-- [oauth2_proxy](https://github.com/pusher/oauth2_proxy)
-- [Cloudflare Access](https://teams.cloudflare.com/access)
-
-## HTTPS and self-signed certificates
-
-For HTTPS, you can use a self-signed certificate by:
-
-- Passing in `--cert`
-- Passing in an existing certificate by providing the path to `--cert` and the
-  path to the key with `--cert-key`
-
-The self signed certificate will be generated to
-`~/.local/share/code-server/self-signed.crt`.
-
-If you pass a certificate to code-server, it will respond to HTTPS requests and
-redirect all HTTP requests to HTTPS.
-
-> You can use [Let's Encrypt](https://letsencrypt.org/) to get a TLS certificate
-> for free.
-
-Note: if you set `proxy_set_header Host $host;` in your reverse proxy config, it will change the address displayed in the green section of code-server in the bottom left to show the correct address.
-
-## Accessing web services
-
-If you're working on web services and want to access them locally, code-server
-can proxy to any port using either a subdomain or a subpath, allowing you to
-securely access these services using code-server's built-in authentication.
-
-### Using a subdomain
-
-You will need a DNS entry that points to your server for each port you want to
-access. You can either set up a wildcard DNS entry for `*.<domain>` if your
-domain name registrar supports it, or you can create one for every port you want
-to access (`3000.<domain>`, `8080.<domain>`, etc).
-
-You should also set up TLS certificates for these subdomains, either using a
-wildcard certificate for `*.<domain>` or individual certificates for each port.
-
-To set your domain, start code-server with the `--proxy-domain` flag:
-
-```console
-code-server --proxy-domain <domain>
 ```
 
-Now you can browse to `<port>.<domain>`. Note that this uses the host header, so
+If you want to serve `code-server` from a sub-path, below is sample configuration for Caddy:
-ensure your reverse proxy (if you're using one) forwards that information.
 
-### Using a subpath
-
-Simply browse to `/proxy/<port>/`.
-
-### Stripping `/proxy/<port>` from the request path
-
-You may notice that the code-server proxy strips `/proxy/<port>` from the
-request path.
-
-HTTP servers should use relative URLs to avoid the need to be coupled to the
-absolute path at which they are served. This means you must [use trailing
-slashes on all paths with
-subpaths](https://blog.cdivilly.com/2019/02/28/uri-trailing-slashes).
-
-This reasoning is why the default behavior is to strip `/proxy/<port>` from the
-base path. If your application uses relative URLs and does not assume the
-absolute path at which it is being served, it will just work no matter what port
-you decide to serve it off or if you put it in behind code-server or any other
-proxy.
-
-However, some prefer the cleaner aesthetic of no trailing slashes. Omitting the
-trailing slashes couples you to the base path, since you cannot use relative
-redirects correctly anymore. If you're okay with this tradeoff, use `/absproxy`
-instead and the path will be passed as is (e.g., `/absproxy/3000/my-app-path`).
-
-### Proxying to create a React app
-
-You must use `/absproxy/<port>` with `create-react-app` (see
-[#2565](https://github.com/coder/code-server/issues/2565) and
-[#2222](https://github.com/coder/code-server/issues/2222) for more information).
-You will need to inform `create-react-app` of the path at which you are serving
-via `$PUBLIC_URL` and webpack via `$WDS_SOCKET_PATH`:
-
-```sh
-PUBLIC_URL=/absproxy/3000 \
-  WDS_SOCKET_PATH=$PUBLIC_URL/sockjs-node \
-  BROWSER=none yarn start
 ```
-
+mydomain.com/code/* {
-You should then be able to visit `https://my-code-server-address.io/absproxy/3000` to see your app exposed through
+  uri strip_prefix /code
-code-server!
+  reverse_proxy 127.0.0.1:8080
-
-> We highly recommend using the subdomain approach instead to avoid this class of issue.
-
-### Proxying to a Vue app
-
-Similar to the situation with React apps, you have to make a few modifications to proxy a Vue app.
-
-1. add `vue.config.js`
-2. update the values to match this (you can use any free port):
-
-```js
-module.exports = {
-  devServer: {
-    port: 3454,
-    sockPath: "sockjs-node",
-  },
-  publicPath: "/absproxy/3454",
 }
 ```
 
-3. access app at `<code-server-root>/absproxy/3454` e.g. `http://localhost:8080/absproxy/3454`
+Remember to replace `mydomain.com` with your domain name!
 
-Read more about `publicPath` in the [Vue.js docs](https://cli.vuejs.org/config/#publicpath)
+5. Reload caddy with:
-
+
-## SSH into code-server on VS Code
+```bash
-
+sudo systemctl reload caddy
-[![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:
+Visit `https://<your-domain-name>` to access `code-server`. Congratulations!
-
+
-1. Install `openssh-server`, `wget`, and `unzip`.
+In a future release we plan to integrate Let's Encrypt directly with `code-server` to avoid
+the dependency on caddy.
+
+#### NGINX
+
+If you prefer to use NGINX instead of Caddy then please follow steps 1-2 above and then:
+
+3. Install `nginx`:
 
 ```bash
-# example for Debian and Ubuntu operating systems
 sudo apt update
-sudo apt install wget unzip openssh-server
+sudo apt install -y nginx certbot python3-certbot-nginx
 ```
 
-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),
+4. Put the following config into `/etc/nginx/sites-available/code-server` with sudo:
+
+```nginx
+server {
+    listen 80;
+    listen [::]:80;
+    server_name mydomain.com;
+
+    location / {
+      proxy_pass http://localhost:8080/;
+      proxy_set_header Host $host;
+      proxy_set_header Upgrade $http_upgrade;
+      proxy_set_header Connection upgrade;
+      proxy_set_header Accept-Encoding gzip;
+    }
+}
+```
+
+Remember to replace `mydomain.com` with your domain name!
+
+5. Enable the config:
 
 ```bash
-sudo service ssh start
+sudo ln -s ../sites-available/code-server /etc/nginx/sites-enabled/code-server
-sudo passwd {user} # replace user with your code-server user
+sudo certbot --non-interactive --redirect --agree-tos --nginx -d mydomain.com -m me@example.com
 ```
 
-### Option 1: cloudflared tunnel
+Make sure to substitute `me@example.com` with your actual email.
 
-[![Cloudflared](https://img.shields.io/badge/Cloudflared-E4863B?style=for-the-badge&logo=cloudflare&logoColor=ffffff)](https://github.com/cloudflare/cloudflared)
+Visit `https://<your-domain-name>` to access `code-server`. Congratulations!
 
-1.  Install [cloudflared](https://github.com/cloudflare/cloudflared#installing-cloudflared) on your local computer
+### Self Signed Certificate
-2.  Then go to `~/.ssh/config` and add the following:
 
-```shell
+**note:** Self signed certificates do not work with iPad normally. See [./ipad.md](./ipad.md) for details.
-Host *.trycloudflare.com
-HostName %h
-User root
-Port 22
-ProxyCommand "cloudflared location" access ssh --hostname %h
-```
 
-3. Run `cloudflared tunnel --url ssh://localhost:22` on the remote server
+Recommended reading: https://security.stackexchange.com/a/8112.
 
-4. Finally on VS Code or any IDE that supports SSH, run `ssh coder@https://your-link.trycloudflare.com` or `ssh coder@your-link.trycloudflare.com`
+We recommend this as a last resort because self signed certificates do not work with iPads and can
+cause other bizarre issues. Not to mention all the warnings when you access `code-server`.
+Only use this if:
 
-### Option 2: ngrok tunnel
+1. You do not want to buy a domain or you cannot expose the remote machine to the internet.
+2. You do not want to use SSH forwarding.
 
-[![Ngrok](https://img.shields.io/badge/Ngrok-1F1E37?style=for-the-badge&logo=ngrok&logoColor=ffffff)](https://ngrok.com/)
+ssh into your instance and edit your code-server config file to use a randomly generated self signed certificate:
-
-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"
+# Replaces "cert: false" with "cert: true" in the code-server config.
-unzip "ngrok-stable-linux-amd64.zip"
+sed -i.bak 's/cert: false/cert: true/' ~/.config/code-server/config.yaml
+# Replaces "bind-addr: 127.0.0.1:8080" with "bind-addr: 0.0.0.0:443" in the code-server config.
+sed -i.bak 's/bind-addr: 127.0.0.1:8080/bind-addr: 0.0.0.0:443/' ~/.config/code-server/config.yaml
+# Allows code-server to listen on port 443.
+sudo setcap cap_net_bind_service=+ep /usr/lib/code-server/lib/node
 ```
 
-5.  Then, go to [dashboard.ngrok.com](https://dashboard.ngrok.com) and go to the `Your Authtoken` section.
+Assuming you have been following the guide, restart `code-server` with:
-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.
+sudo systemctl restart code-server@$USER
 ```
 
-8.  Now, forward port 22, which is the SSH port with this command:
+Edit your instance and checkmark the allow HTTPS traffic option.
+
+Visit `https://<your-instance-ip>` to access `code-server`.
+You'll get a warning when accessing but if you click through you should be good.
+
+To avoid the warnings, you can use [mkcert](https://mkcert.dev) to create a self signed certificate
+trusted by your OS and then pass it into `code-server` via the `cert` and `cert-key` config
+fields.
+
+### Change the password?
+
+Edit the `password` field in the `code-server` config file at `~/.config/code-server/config.yaml`
+and then restart `code-server` with:
 
 ```bash
-./ngrok tcp 22
+sudo systemctl restart code-server@$USER
 ```
 
-Now, you get a screen in the terminal like this:
+Alternatively, you can specify the SHA-256 of your password at the `hashed-password` field in the config file.
+The `hashed-password` field takes precedence over `password`.
 
-```console
+### How do I securely access development web services?
-ngrok by @inconshreveable(Ctrl+C to quit)
 
-Session Status                online
+If you're working on a web service and want to access it locally, `code-server` can proxy it for you.
-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:
+See the [FAQ](./FAQ.md#how-do-i-securely-access-web-services).
-
-```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.

docs/helm.md

@@ -1,160 +0,0 @@
-# code-server Helm Chart
-
-[![Version: 1.0.0](https://img.shields.io/badge/Version-1.0.0-informational?style=flat-square)](https://img.shields.io/badge/Version-1.0.0-informational?style=flat-square) [![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)](https://img.shields.io/badge/Type-application-informational?style=flat-square) [![AppVersion: 4.1.0](https://img.shields.io/badge/AppVersion-4.1.0-informational?style=flat-square)](https://img.shields.io/badge/AppVersion-4.1.0-informational?style=flat-square)
-
-[code-server](https://github.com/coder/code-server) code-server is VS Code running
-on a remote server, accessible through the browser.
-
-This chart is community maintained by [@Matthew-Beckett](https://github.com/Matthew-Beckett) and [@alexgorbatchev](https://github.com/alexgorbatchev)
-
-## Quickstart
-
-```console
-$ git clone https://github.com/coder/code-server
-$ cd code-server
-$ helm upgrade --install code-server ci/helm-chart
-```
-
-## Introduction
-
-This chart bootstraps a code-server deployment on a
-[Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh)
-package manager.
-
-## Prerequisites
-
-- Kubernetes 1.6+
-
-## Installing the Chart
-
-To install the chart with the release name `code-server`:
-
-```console
-$ git clone https://github.com/coder/code-server
-$ cd code-server
-$ helm upgrade --install code-server ci/helm-chart
-```
-
-The command deploys code-server on the Kubernetes cluster in the default
-configuration. The [configuration](#configuration) section lists the parameters
-that can be configured during installation.
-
-> **Tip**: List all releases using `helm list`
-
-## Uninstalling the Chart
-
-To uninstall/delete the `code-server` deployment:
-
-```console
-$ helm delete code-server
-```
-
-The command removes all the Kubernetes components associated with the chart and
-deletes the release.
-
-## Configuration
-
-The following table lists the configurable parameters of the code-server chart
-and their default values.
-
-## Values
-
-| Key                                         | Type   | Default                  |
-| ------------------------------------------- | ------ | ------------------------ |
-| affinity                                    | object | `{}`                     |
-| extraArgs                                   | list   | `[]`                     |
-| extraConfigmapMounts                        | list   | `[]`                     |
-| extraContainers                             | string | `""`                     |
-| extraInitContainers                         | string | `""`                     |
-| extraSecretMounts                           | list   | `[]`                     |
-| extraVars                                   | list   | `[]`                     |
-| extraVolumeMounts                           | list   | `[]`                     |
-| fullnameOverride                            | string | `""`                     |
-| hostnameOverride                            | string | `""`                     |
-| image.pullPolicy                            | string | `"Always"`               |
-| image.repository                            | string | `"codercom/code-server"` |
-| image.tag                                   | string | `"4.1.0"`                |
-| imagePullSecrets                            | list   | `[]`                     |
-| ingress.enabled                             | bool   | `false`                  |
-| nameOverride                                | string | `""`                     |
-| nodeSelector                                | object | `{}`                     |
-| persistence.accessMode                      | string | `"ReadWriteOnce"`        |
-| persistence.annotations                     | object | `{}`                     |
-| persistence.enabled                         | bool   | `true`                   |
-| persistence.size                            | string | `"1Gi"`                  |
-| podAnnotations                              | object | `{}`                     |
-| podSecurityContext                          | object | `{}`                     |
-| replicaCount                                | int    | `1`                      |
-| resources                                   | object | `{}`                     |
-| securityContext.enabled                     | bool   | `true`                   |
-| securityContext.fsGroup                     | int    | `1000`                   |
-| securityContext.runAsUser                   | int    | `1000`                   |
-| service.port                                | int    | `8443`                   |
-| service.type                                | string | `"ClusterIP"`            |
-| serviceAccount.create                       | bool   | `true`                   |
-| serviceAccount.name                         | string | `nil`                    |
-| tolerations                                 | list   | `[]`                     |
-| volumePermissions.enabled                   | bool   | `true`                   |
-| volumePermissions.securityContext.runAsUser | int    | `0`                      |
-
-Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
-
-```console
-$ helm upgrade --install code-server \
-  ci/helm-chart \
-  --set persistence.enabled=false
-```
-
-The above command sets the the persistence storage to false.
-
-Alternatively, a YAML file that specifies the values for the above parameters
-can be provided while installing the chart. For example,
-
-```console
-$ helm upgrade --install code-server ci/helm-chart -f values.yaml
-```
-
-> **Tip**: You can use the default [values.yaml](values.yaml)
-
-# Extra Containers
-
-There are two parameters which allow to add more containers to pod.
-Use `extraContainers` to add regular containers
-and `extraInitContainers` to add init containers. You can read more
-about init containers in [k8s documentation](https://kubernetes.io/docs/concepts/workloads/pods/init-containers/).
-
-Both parameters accept strings and use them as a templates
-
-Example of using `extraInitContainers`:
-
-```yaml
-extraInitContainers: |
-  - name: customization
-    image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
-    imagePullPolicy: IfNotPresent
-    env:
-      - name: SERVICE_URL
-        value: https://open-vsx.org/vscode/gallery
-      - name: ITEM_URL
-        value: https://open-vsx.org/vscode/item
-    command:
-      - sh
-      - -c
-      - |
-        code-server --install-extension ms-python.python
-        code-server --install-extension golang.Go
-    volumeMounts:
-      - name: data
-        mountPath: /home/coder
-```
-
-With this yaml in file `init.yaml`, you can execute
-
-```console
-$ helm upgrade --install code-server \
-  ci/helm-chart \
-  --values init.yaml
-```
-
-to deploy code-server with python and golang extensions preinstalled
-before main container have started.

docs/install.md

@@ -2,159 +2,98 @@
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 # Install
 
+- [Upgrading](#upgrading)
 - [install.sh](#installsh)
-  - [Detection reference](#detection-reference)
+  - [Flags](#flags)
-- [yarn, npm](#yarn-npm)
+  - [Detection Reference](#detection-reference)
-- [Standalone releases](#standalone-releases)
 - [Debian, Ubuntu](#debian-ubuntu)
 - [Fedora, CentOS, RHEL, SUSE](#fedora-centos-rhel-suse)
 - [Arch Linux](#arch-linux)
-- [macOS](#macos)
-- [Docker](#docker)
-- [Helm](#helm)
-- [Windows](#windows)
-- [Raspberry Pi](#raspberry-pi)
 - [Termux](#termux)
-- [Cloud providers](#cloud-providers)
+- [Raspberry Pi](#raspberry-pi)
-- [Uninstall](#uninstall)
+- [yarn, npm](#yarn-npm)
-  - [install.sh](#installsh-1)
+- [macOS](#macos)
-  - [Homebrew](#homebrew)
+- [Standalone Releases](#standalone-releases)
-  - [yarn, npm](#yarn-npm-1)
+- [Docker](#docker)
-  - [Debian, Ubuntu](#debian-ubuntu-1)
+- [helm](#helm)
+- [Cloud Providers](#cloud-providers)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 
-This document demonstrates how to install `code-server` on various distros and
+This document demonstrates how to install `code-server` on
-operating systems.
+various distros and operating systems.
+
+## Upgrading
+
+When upgrading you can just install the new version over the old one. code-server
+maintains all user data in `~/.local/share/code-server` so that it is preserved in between
+installations.
 
 ## install.sh
 
-The easiest way to install code-server is to use our [install
+We have a [script](../install.sh) to install code-server for Linux, macOS and FreeBSD.
-script](https://github.com/coder/code-server/blob/main/install.sh) for Linux, macOS and FreeBSD. The install script
-[attempts to use the system package manager](#detection-reference) if possible.
 
-You can preview what occurs during the install process:
+It tries to use the system package manager if possible.
+
+First run to print out the install process:
 
 ```bash
 curl -fsSL https://code-server.dev/install.sh | sh -s -- --dry-run
 ```
 
-To install, run:
+Now to actually install:
 
 ```bash
 curl -fsSL https://code-server.dev/install.sh | sh
 ```
 
-You can modify the installation process by including one or more of the
+The script will print out how to run and start using code-server.
-following flags:
 
-- `--dry-run`: echo the commands for the install process without running them.
+If you believe an install script used with `curl | sh` is insecure, please give
-- `--method`: choose the installation method.
+[this wonderful blogpost](https://sandstorm.io/news/2015-09-24-is-curl-bash-insecure-pgp-verified-install) by
-  - `--method=detect`: detect the package manager but fallback to
+[sandstorm.io](https://sandstorm.io) a read.
-    `--method=standalone`.
-  - `--method=standalone`: install a standalone release archive into `~/.local`.
-- `--prefix=/usr/local`: install a standalone release archive system-wide.
-- `--version=X.X.X`: install version `X.X.X` instead of latest version.
-- `--help`: see usage docs.
 
-When done, the install script prints out instructions for running and starting
+If you'd still prefer manual installation despite the below [detection reference](#detection-reference) and `--dry-run`
-code-server.
+then continue on for docs on manual installation. The [`install.sh`](../install.sh) script runs the _exact_ same
+commands presented in the rest of this document.
 
-> If you're concerned about the install script's use of `curl | sh` and the
+### Flags
-> security implications, please see [this blog
-> post](https://sandstorm.io/news/2015-09-24-is-curl-bash-insecure-pgp-verified-install)
-> by [sandstorm.io](https://sandstorm.io).
 
-If you prefer to install code-server manually, despite the [detection
+- `--dry-run` to echo the commands for the install process without running them.
-references](#detection-reference) and `--dry-run` feature, then continue on for
+- `--method` to choose the installation method.
-information on how to do this. The [`install.sh`](https://github.com/coder/code-server/blob/main/install.sh) script runs the
+  - `--method=detect` to detect the package manager but fallback to `--method=standalone`.
-_exact_ same commands presented in the rest of this document.
+  - `--method=standalone` to install a standalone release archive into `~/.local`.
+- `--prefix=/usr/local` to install a standalone release archive system wide.
+- `--version=X.X.X` to install version `X.X.X` instead of latest.
+- `--help` to see full usage docs.
 
-### Detection reference
+### Detection Reference
 
-- For Debian and Ubuntu, code-server will install the latest deb package.
+- For Debian and Ubuntu it will install the latest deb package.
-- For Fedora, CentOS, RHEL and openSUSE, code-server will install the latest RPM
+- For Fedora, CentOS, RHEL and openSUSE it will install the latest rpm package.
-  package.
+- For Arch Linux it will install the AUR package.
-- For Arch Linux, code-server will install the AUR package.
+- For any unrecognized Linux operating system it will install the latest standalone release into `~/.local`.
-- For any unrecognized Linux operating system, code-server will install the
-  latest standalone release into `~/.local`.
 
-  - Ensure that you add `~/.local/bin` to your `$PATH` to run code-server.
+  - Add `~/.local/bin` to your `$PATH` to run code-server.
 
-- For macOS, code-server will install the Homebrew package (if you don't have
+- For macOS it will install the Homebrew package.
-  Homebrew installed, code-server will install the latest standalone release
-  into `~/.local`).
 
-  - Ensure that you add `~/.local/bin` to your `$PATH` to run code-server.
+  - If Homebrew is not installed it will install the latest standalone release into `~/.local`.
+  - Add `~/.local/bin` to your `$PATH` to run code-server.
 
-- For FreeBSD, code-server will install the [npm package](#yarn-npm) with `yarn`
+- For FreeBSD, it will install the [npm package](#yarn-npm) with `yarn` or `npm`.
-  or `npm`.
 
-- If you're installing code-server onto architecture with no releases,
+- If ran on an architecture with no releases, it will install the [npm package](#yarn-npm) with `yarn` or `npm`.
-  code-server will install the [npm package](#yarn-npm) with `yarn` or `npm`
+  - We only have releases for amd64 and arm64 presently.
-  - We currently offer releases for amd64 and arm64.
+  - The [npm package](#yarn-npm) builds the native modules on postinstall.
-  - The [npm package](#yarn-npm) builds the native modules on post-install.
-
-## yarn, npm
-
-We recommend installing with `yarn` or `npm` when:
-
-1. You aren't using a machine with `amd64` or `arm64`.
-1. You are installing code-server on Windows
-1. You're on Linux with `glibc` < v2.17, `glibcxx` < v3.4.18 on `amd64`, `glibc`
-   < v2.23, or `glibcxx` < v3.4.21 on `arm64`.
-1. You're running Alpine Linux or are using a non-glibc libc. See
-   [#1430](https://github.com/coder/code-server/issues/1430#issuecomment-629883198)
-   for more information.
-
-Installing code-server with `yarn` or `npm` builds native modules on install.
-
-This process requires C dependencies; see our guide on [installing with yarn and npm][./npm.md](./npm.md) for more information.
-
-## Standalone releases
-
-We publish self-contained `.tar.gz` archives for every release on
-[GitHub](https://github.com/coder/code-server/releases). The archives bundle the
-node binary and node modules.
-
-We create the standalone releases using the [npm package](#yarn-npm), and we
-then create the remaining releases using the standalone version.
-
-The only requirement to use the standalone release is `glibc` >= 2.17 and
-`glibcxx` >= v3.4.18 on Linux (for macOS, there is no minimum system
-requirement).
-
-To use a standalone release:
-
-1. Download the latest release archive for your system from
-   [GitHub](https://github.com/coder/code-server/releases).
-2. Unpack the release.
-3. Run code-server by executing `./bin/code-server`.
-
-You can add `./bin/code-server` to your `$PATH` so that you can execute
-`code-server` without providing full path each time.
-
-Here is a sample script for installing and using a standalone code-server
-release on Linux:
-
-```bash
-mkdir -p ~/.local/lib ~/.local/bin
-curl -fL https://github.com/coder/code-server/releases/download/v$VERSION/code-server-$VERSION-linux-amd64.tar.gz \
-  | tar -C ~/.local/lib -xz
-mv ~/.local/lib/code-server-$VERSION-linux-amd64 ~/.local/lib/code-server-$VERSION
-ln -s ~/.local/lib/code-server-$VERSION/bin/code-server ~/.local/bin/code-server
-PATH="~/.local/bin:$PATH"
-code-server
-# Now visit http://127.0.0.1:8080. Your password is in ~/.config/code-server/config.yaml
-```
 
 ## Debian, Ubuntu
 
-> The standalone arm64 .deb does not support Ubuntu 16.04 or earlier. Please
+NOTE: The standalone arm64 .deb does not support Ubuntu <16.04.
-> upgrade or [build with yarn](#yarn-npm).
+Please upgrade or [build with yarn](#yarn-npm).
 
 ```bash
-curl -fOL https://github.com/coder/code-server/releases/download/v$VERSION/code-server_$VERSION_amd64.deb
+curl -fOL https://github.com/cdr/code-server/releases/download/v$VERSION/code-server_$VERSION_amd64.deb
 sudo dpkg -i code-server_$VERSION_amd64.deb
 sudo systemctl enable --now code-server@$USER
 # Now visit http://127.0.0.1:8080. Your password is in ~/.config/code-server/config.yaml
@@ -162,11 +101,11 @@ sudo systemctl enable --now code-server@$USER
 
 ## Fedora, CentOS, RHEL, SUSE
 
-> The standalone arm64 .rpm does not support CentOS 7. Please upgrade or [build
+NOTE: The standalone arm64 .rpm does not support CentOS 7.
-> with yarn](#yarn-npm).
+Please upgrade or [build with yarn](#yarn-npm).
 
 ```bash
-curl -fOL https://github.com/coder/code-server/releases/download/v$VERSION/code-server-$VERSION-amd64.rpm
+curl -fOL https://github.com/cdr/code-server/releases/download/v$VERSION/code-server-$VERSION-amd64.rpm
 sudo rpm -i code-server-$VERSION-amd64.rpm
 sudo systemctl enable --now code-server@$USER
 # Now visit http://127.0.0.1:8080. Your password is in ~/.config/code-server/config.yaml
@@ -175,14 +114,14 @@ sudo systemctl enable --now code-server@$USER
 ## Arch Linux
 
 ```bash
-# Install code-server from the AUR using yay.
+# Installs code-server from the AUR using yay.
 yay -S code-server
 sudo systemctl enable --now code-server@$USER
 # Now visit http://127.0.0.1:8080. Your password is in ~/.config/code-server/config.yaml
 ```
 
 ```bash
-# Install code-server from the AUR with plain makepkg.
+# Installs code-server from the AUR with plain makepkg.
 git clone https://aur.archlinux.org/code-server.git
 cd code-server
 makepkg -si
@@ -190,6 +129,34 @@ sudo systemctl enable --now code-server@$USER
 # Now visit http://127.0.0.1:8080. Your password is in ~/.config/code-server/config.yaml
 ```
 
+## Termux
+
+Please see "Installation" in the [Termux docs](./termux.md#installation)
+
+## Raspberry Pi
+
+If you're running a Raspberry Pi, we recommend install code-server with `yarn` or `npm`. See [yarn-npm](#yarn-npm).
+
+## yarn, npm
+
+We recommend installing with `yarn` or `npm` when:
+
+1. You aren't on `amd64` or `arm64`.
+2. If you're on Linux with glibc < v2.17 or glibcxx < v3.4.18 on amd64, or glibc < v2.23 or glibcxx < v3.4.21 on arm64.
+3. You're running Alpine Linux, or are using a non-glibc libc. See [#1430](https://github.com/cdr/code-server/issues/1430#issuecomment-629883198)
+
+**note:** Installing via `yarn` or `npm` builds native modules on install and so requires C dependencies.
+See [./npm.md](./npm.md) for installing these dependencies.
+
+You will need at least node v12 installed. See [#1633](https://github.com/cdr/code-server/issues/1633).
+
+```bash
+yarn global add code-server
+# Or: npm install -g code-server
+code-server
+# Now visit http://127.0.0.1:8080. Your password is in ~/.config/code-server/config.yaml
+```
+
 ## macOS
 
 ```bash
@@ -198,6 +165,34 @@ brew services start code-server
 # Now visit http://127.0.0.1:8080. Your password is in ~/.config/code-server/config.yaml
 ```
 
+## Standalone Releases
+
+We publish self contained `.tar.gz` archives for every release on [github](https://github.com/cdr/code-server/releases).
+They bundle the node binary and `node_modules`.
+
+These are created from the [npm package](#yarn-npm) and the rest of the releases are created from these.
+Only requirement is glibc >= 2.17 && glibcxx >= v3.4.18 on Linux and for macOS there is no minimum system requirement.
+
+1. Download the latest release archive for your system from [github](https://github.com/cdr/code-server/releases).
+2. Unpack the release.
+3. You can run code-server by executing `./bin/code-server`.
+
+You can add the code-server `bin` directory to your `$PATH` to easily execute `code-server`
+without the full path every time.
+
+Here is an example script for installing and using a standalone `code-server` release on Linux:
+
+```bash
+mkdir -p ~/.local/lib ~/.local/bin
+curl -fL https://github.com/cdr/code-server/releases/download/v$VERSION/code-server-$VERSION-linux-amd64.tar.gz \
+  | tar -C ~/.local/lib -xz
+mv ~/.local/lib/code-server-$VERSION-linux-amd64 ~/.local/lib/code-server-$VERSION
+ln -s ~/.local/lib/code-server-$VERSION/bin/code-server ~/.local/bin/code-server
+PATH="~/.local/bin:$PATH"
+code-server
+# Now visit http://127.0.0.1:8080. Your password is in ~/.config/code-server/config.yaml
+```
+
 ## Docker
 
 ```bash
@@ -218,83 +213,18 @@ docker run -it --name code-server -p 127.0.0.1:8080:8080 \
   codercom/code-server:latest
 ```
 
-Our official image supports `amd64` and `arm64`. For `arm32` support, you can
+Our official image supports `amd64` and `arm64`.
-use a [community-maintained code-server
-alternative](https://hub.docker.com/r/linuxserver/code-server).
 
-## Helm
+For `arm32` support there is a popular community maintained alternative:
 
-You can install code-server using the [Helm package manager](https://coder.com/docs/code-server/latest/helm).
+https://hub.docker.com/r/linuxserver/code-server
 
-## Windows
+## helm
 
-We currently [do not publish Windows releases](https://github.com/coder/code-server/issues/1397). We recommend installing code-server onto Windows with [`yarn` or `npm`](#yarn-npm).
+See [the chart](../ci/helm-chart).
 
-> Note: You will also need to [build coder/cloud-agent manually](https://github.com/coder/cloud-agent/issues/17) if you would like to use `code-server --link` on Windows.
+## Cloud Providers
 
-## Raspberry Pi
+We maintain one-click apps and install scripts for different cloud providers such as DigitalOcean, Railway, Heroku, Azure, etc. Check out the repository:
 
-We recommend installing code-server onto Raspberry Pi with [`yarn` or
+https://github.com/cdr/deploy-code-server
-`npm`](#yarn-npm).
-
-## Termux
-
-Please see code-server's [Termux docs](./termux.md#installation) for more
-information.
-
-## Cloud providers
-
-We maintain [one-click apps and install scripts for cloud
-providers](https://github.com/coder/deploy-code-server) such as DigitalOcean,
-Railway, Heroku, and Azure.
-
-## Uninstall
-
-code-server can be completely uninstalled by removing the application directory, and your user configuration directory.
-
-To delete settings and data:
-
-```shell
-rm -rf ~/.local/share/code-server ~/.config/code-server
-```
-
-### install.sh
-
-If you installed with the install script, by default code-server will be in `~/.local/lib/code-server-<version>` and you can remove it with `rm -rf`. e.g.
-
-```shell
-rm -rf ~/.local/lib/code-server-*
-```
-
-### Homebrew
-
-To remove the code-server homebrew package, run:
-
-```shell
-brew remove code-server
-
-# Alternatively
-brew uninstall code-server
-```
-
-### yarn, npm
-
-To remove the code-server global module, run:
-
-```shell
-yarn global remove code-server
-```
-
-or
-
-```shell
-npm uninstall -g code-server
-```
-
-### Debian, Ubuntu
-
-To uninstall, run:
-
-```shell
-sudo apt remove code-server
-```

docs/ios.md

@@ -1,7 +0,0 @@
-# Using code-server on iOS with iSH
-
-1. Install iSH from the [App Store](https://apps.apple.com/us/app/ish-shell/id1436902243)
-2. Install `curl` with `apk add curl`
-3. Install code-server with `curl -fsSL https://code-server.dev/install.sh | sh`
-4. Run code-server with `code-server`
-5. Access on localhost:8080 in your browser

docs/ipad.md

@@ -2,196 +2,162 @@
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 # iPad
 
-- [Using the code-server progressive web app (PWA)](#using-the-code-server-progressive-web-app-pwa)
+- [Known Issues](#known-issues)
-- [Access code-server using Servediter](#access-code-server-using-servediter)
+- [How to install PWA](#how-to-install-pwa)
-- [Raspberry Pi USB-C network](#raspberry-pi-usb-c-network)
+- [How to access code-server with a self signed certificate on iPad?](#how-to-access-code-server-with-a-self-signed-certificate-on-ipad)
+  - [Servediter iPad App](#servediter-ipad-app)
+- [Raspberry Pi USB-C Network](#raspberry-pi-usb-c-network)
+- [Ctrl C Workaround](#ctrl-c-workaround)
 - [Recommendations](#recommendations)
-- [Known issues](#known-issues)
+- [By 2022 iPad coding more desirable on Arm Macs](#by-2022-ipad-coding-more-desirable-on-arm-macs)
-  - [Workaround for issue with `ctrl+c` not stopping a running process in the terminal](#workaround-for-issue-with-ctrlc-not-stopping-a-running-process-in-the-terminal)
-- [Access code-server with a self-signed certificate on an iPad](#access-code-server-with-a-self-signed-certificate-on-an-ipad)
-  - [Certificate requirements](#certificate-requirements)
-  - [Sharing a self-signed certificate with an iPad](#sharing-a-self-signed-certificate-with-an-ipad)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 
-Once you've installed code-server, you can access it from an iPad.
+## Known Issues
 
-## Using the code-server progressive web app (PWA)
+- Getting self signed certificates certificates to work is involved, see below.
+- Keyboard issues
+  - May disappear sometimes [#1313](https://github.com/cdr/code-server/issues/1313), [#979](https://github.com/cdr/code-server/issues/979)
+  - Some short cuts expectations may not be met
+    - `command + n` opens new browser window instead of new file and difficult to even set to another quick key
+    - In general it's just note worthy you most likely will need to edit keyboard shortcuts
+  - No escape key by default on Magic Keyboard but everyone sets the globe key to be an escape key
+    - Opinion: It's actually an awesome joy having the escape key at bottom of keyboard
+- Trackpad scrolling does not work [#1455](https://github.com/cdr/code-server/issues/1455)
+  - [Bug tracking of a WebKit fix here](https://bugs.webkit.org/show_bug.cgi?id=210071#c13)
+  - [tracking of WebKit patch](https://trac.webkit.org/changeset/270712/webkit)
+  - Alternative: Install line-jump extension and use keyboard to nav by jumping large amount of lines
+  - Alternative: Just use touch scrolling
+- See [issues tagged with the iPad label](https://github.com/cdr/code-server/issues?q=is%3Aopen+is%3Aissue+label%3AiPad) for more.
+- `ctrl+c` does not stop a long-running process in the browser
+  - Tracking upstream issue here: [#114009](https://github.com/microsoft/vscode/issues/114009)
+  - See [workaround](#ctrl-c-workaround)
 
-To use code-server on an iPad, we recommend installing the code-server
+## How to install PWA
-progressive web app (PWA):
 
-1. Open code-server in Safari.
+To install the code-server PWA, follow these steps:
-2. Click the **Share** icon.
-3. Click **Add to Home Screen**.
 
-You can now open code-server from the Home screen, and when you do, you'll be
+1. Open code-server in Safari
-using the PWA. Running code-server as a PWA gets you more screen real estate and
+2. Click the Share icon
-access to top-level keyboard shortcuts since its running like a native app.
+3. Click "Add to Home Screen"
 
-For example, you can use `cmd+w` to close an active file in the workbench. You
+Now when you open code-server from the home screen, you will be using the PWA.
-can add this to `keybindings.json`:
+The advantages of this are more screen real estate and access to top-level keyboard shortcuts because it's running like an app.
+An example shortcut is the `cmd+w` to close an active file in the workbench. You can add this to your `keybindings.json` by doing the following:
 
-1. Open code-server
+1. Open up code-serer
-2. Go to **Command Palette** > **Open Keyboard Shortcuts (JSON)**
+2. `Command Palette > Open Keyboard Shortcuts (JSON)`
-3. Add the following to `keybindings.json`
+3. Add the following to your `keybindings.json`
 
-   ```json
+```json
-   {
+{
-     "key": "cmd+w",
+  "key": "cmd+w",
-     "command": "workbench.action.closeActiveEditor"
+  "command": "workbench.action.closeActiveEditor"
-   }
+}
-   ```
+```
 
-4. Test the command by using `cmd+w` to close an active file.
+Test out command by hitting `cmd+w` to close an active file
 
-## Access code-server using Servediter
+## How to access code-server with a self signed certificate on iPad?
 
-If you are unable to get the self-signed certificate working, or you do not have a domain
+Accessing a self signed certificate on iPad isn't as easy as accepting through all
-name to use, you can use [Servediter for code-server](https://apps.apple.com/us/app/servediter-for-code-server/id1504491325).
+the security warnings. Safari will prevent WebSocket connections unless the certificate
+is installed as a profile on the device.
 
-> Servediter for code-server is **not** officially supported by the code-server team!
+The below assumes you are using the self signed certificate that code-server
+generates for you. If not, that's fine but you'll have to make sure your certificate
+abides by the following guidelines from Apple: https://support.apple.com/en-us/HT210176
 
-To use Servediter:
+**note**: Another undocumented requirement we noticed is that the certificate has to have `basicConstraints=CA:true`.
 
-1. Download the app from the App Store.
+The following instructions assume you have code-server installed and running
-2. When prompted, provide your server information. If you are running a local
+with a self signed certificate. If not, please first go through [./guide.md](./guide.md)!
-   server or a [Raspberry Pi connected via USB-C](#raspberry-pi-usb-c-network), you will input your settings
-   into **Self Hosted Server**.
 
-## Raspberry Pi USB-C network
+**warning**: Your iPad must access code-server via a domain name. It could be local
+DNS like `mymacbookpro.local` but it must be a domain name. Otherwise Safari will
+refuse to allow WebSockets to connect.
 
-We've heard of users having great success using code-server on an iPad connected
+1. Your certificate **must** have a subject alt name that matches the hostname
-to a Raspberry Pi via USB-C (the Raspberry Pi provides both power and direct
+   at which you will access code-server from your iPad. You can pass this to code-server
-network access). Setting this up requires you to turn on **Network over USB-C**
+   so that it generates the certificate correctly with `--cert-host`.
-on the Raspberry Pi, then continuing with code-server as usual on the iPad.
+2. Share your self signed certificate with the iPad.
+   - code-server will print the location of the certificate it has generated in the logs.
 
-For more information, see:
+```
+[2020-10-30T08:55:45.139Z] info    - Using generated certificate and key for HTTPS: ~/.local/share/code-server/mymbp_local.crt
+```
 
-- [General introduction to Pi as an iPad
+- You can mail it to yourself or if you have a Mac, it's easiest to just Airdrop to the iPad.
-  accessory](https://www.youtube.com/watch?v=IR6sDcKo3V8)
+
+3. When opening the `*.crt` file, you'll be prompted to go into settings to install.
+4. Go to `Settings -> General -> Profile`, select the profile and then hit `Install`.
+   - It should say the profile is verified.
+5. Go to `Settings -> About -> Certificate Trust Settings` and enable full trust for
+   the certificate. [more apple support here](https://support.apple.com/en-us/HT204477)
+6. Now you can access code-server! 🍻
+
+### Servediter iPad App
+
+If you are unable to get the self signed certificate working or you do not have a domain
+name to use, you can use the Servediter iPad App instead!
+
+**note**: This is not an officially supported app by the code-server team!
+
+Download [Serveediter](https://apps.apple.com/us/app/servediter-for-code-server/id1504491325) from the
+App Store and then input your server information. If you are running a local server or mabye a usb-c
+connected Raspberry Pi, you will input your settings into "Self Hosted Server".
+
+## Raspberry Pi USB-C Network
+
+It is a bit out of scope for this project, however, great success is being reported using iPad on the go with just a single USB-C cable connected to a Raspberry Pi both powering and supplying direct network access. Many support articles already exist but the key steps boil down to turning on Network over USB-C on the Raspberry Pi itself and the rest of the steps are just like getting Code Server running any where else.
+
+Resources worthy of review:
+
+- [General intro to Pi as an iPad accessory](https://www.youtube.com/watch?v=IR6sDcKo3V8)
 - [iPad with Pi FAQ](https://www.youtube.com/watch?v=SPSlyqo5Q2Q)
-- [Technical guide to connecting a Raspberry Pi to an
+- [Technical guide to perform the steps](https://www.geeky-gadgets.com/connect-a-raspberry-pi-4-to-an-ipad-pro-21-01-2020/)
-  iPad](https://www.geeky-gadgets.com/connect-a-raspberry-pi-4-to-an-ipad-pro-21-01-2020/)
 
-You may also find the following tips from [Acker
+> Here are my keys to success. I bought a 4" touch screen with fan included that attaches as a case to the Pi. I use the touch screen for anytime I have connection issues, otherwise I turn off the Pi screen. I gave my Pi a network name so I can easily connect at home on wifi or when on go with 1 usb-c cable that supplys both power and network connectivity. Lastly, not all usb-c cables are equal and not all will work so try different usb-c cables if you are going mad (confirm over wifi first then move to cable).
-Apple](http://github.com/ackerapple/) helpful:
+>
+> -- <cite>[Acker Apple](http://github.com/ackerapple/)</cite>
 
-> Here are my keys to success. I bought a 4" touch screen with fan included that
+## Ctrl C Workaround
-> attaches as a case to the Pi. I use the touch screen for anytime I have
+
-> connection issues, otherwise I turn off the Pi screen. I gave my Pi a network
+There is currently an issue with `ctrl+c` not stopping a running process in the integrated terminal. We have filed an issue upstream and are tracking [here](https://github.com/microsoft/vscode/issues/114009). As a temporary workaround, it works if you manually define the shortcut like so:
-> name so I can easily connect at home on wifi or when on go with 1 usb-c cable
+
-> that supplys both power and network connectivity. Lastly, not all usb-c cables
+1. Open Command Palette
-> are equal and not all will work so try different usb-c cables if you are going
+2. Look for "Preferences: Open Keyboard Shortcuts (JSON)"
-> mad (confirm over wifi first then move to cable).
+3. Add this:
+
+```json
+{
+  "key": "ctrl+c",
+  "command": "workbench.action.terminal.sendSequence",
+  "args": {
+    "text": "\u0003"
+  },
+  "when": "terminalFocus"
+}
+```
+
+Source: [StackOverflow](https://stackoverflow.com/a/52735954/3015595)
 
 ## Recommendations
 
-Once you can access code-server on your iPad, you may find the following tips
+Once you have code-server accessible to your iPad a few things could help save you time:
-and tricks helpful:
 
-- Use multi-task mode to make code changes and see the browser at the same time
+- Use multi task mode to make code changes and see browser at the same time
-  - This prevents the iOS background from dropping an app's state if you are
+  - Prevents iOs background dropping an App's state if you are full screen switching between code-server and browser
-    switching between code-server and browser (with both in full-screen)
+- Be sure you are using the debug/terminal that is built into VS Code so that you don’t need another terminal app running
-- Be sure you are using the debug/terminal that is built into VS Code so that
+  - Again, prevents switching between full screen app and losing your view to iOs background app memory management
-  you don’t need another terminal app running
+- You should be of a mindset willing to deal and adapt with differences in having an imperfect experience, for the perceived joyful benefits of interacting with your computer in more intuitive ways
-  - This also prevents switching between full screen apps and losing your view
-    due to iOS' background app memory management
 
-## Known issues
+## By 2022 iPad coding more desirable on Arm Macs
 
-- Getting self-signed certificates to work [is an involved
+> This section is generalized opinions intended to inform fellow Apple product consumers of perceived over time changes coming down the line
-  process](#access-code-server-with-a-self-signed-certificate-on-an-ipad)
-- Keyboard issues:
-  - The keyboard disappear sometimes
-    [#979](https://github.com/coder/code-server/issues/979)
-  - Some expectations regarding shortcuts may not be met:
-    - `cmd + n` opens new browser window instead of new file, and it's difficult
-      to set alternative as a workaround
-    - In general, expect to edit your keyboard shortcuts
-  - There's no escape key by default on the Magic Keyboard, so most users set
-    the globe key to be an escape key
-- Trackpad scrolling does not work on iPadOS < 14.5
-  ([#1455](https://github.com/coder/code-server/issues/1455))
-  - [WebKit fix](https://bugs.webkit.org/show_bug.cgi?id=210071#c13)
-- Keyboard may lose focus in Safari / split view [#4182](https://github.com/coder/code-server/issues/4182)
-- Terminal text does not appear by default [#3824](https://github.com/coder/code-server/issues/3824)
-- Copy & paste in terminal does not work well with keyboard shortcuts [#3491](https://github.com/coder/code-server/issues/3491)
-- `ctrl+c` does not stop a long-running process in the browser
-  - Tracking upstream issue here:
-    [#114009](https://github.com/microsoft/vscode/issues/114009)
-  - See [workaround](#ctrl-c-workaround)
 
-Additionally, see [issues in the code-server repo that are tagged with the `os-ios`
+The general feeling from overall Apple movements recently, is that the Mac arm processors are in fact helping support the direction of having Macs with touch screens. Many great YouTube videos of interest call out highly suggestive evidence. In the past Apple has hard declared reasons of body fatigue and such as why not to encourage nor further developments on the iPad touch experience mixed with a keyboard/mouse/trackpad. Regardless, products and software have been released further supporting just that very experience.
-label](https://github.com/coder/code-server/issues?q=is%3Aopen+is%3Aissue+label%3Aos-ios)
-for more information.
 
-### Workaround for issue with `ctrl+c` not stopping a running process in the terminal
+The iPad coding experience has been a joy for some of us that are willing to trade an imperfect experience for a uniquely effective focus driven experience. Note worthy, some of us think it's a trashy waste of time. This experience is undoubtably going to get better just by the work that can be seen by all parties, even in our own code-server attempt to make it better.
 
-This's currently an issue with `ctrl+c` not stopping a running process in the
+Lastly, it is note worthy that if you have decided to incorporate a Raspberry Pi into you iPad coding experience, they are Arm processors. You are perfectly lined up with the future of Macs as well.
-integrated terminal. We have filed an issue upstream and are tracking
-[here](https://github.com/microsoft/vscode/issues/114009).
-
-In the meantime, you can manually define a shortcut as a workaround:
-
-1. Open the Command Palette
-2. Look for **Preferences: Open Keyboard Shortcuts (JSON)**
-3. Add the following snippet:
-
-   ```json
-   {
-     "key": "ctrl+c",
-     "command": "workbench.action.terminal.sendSequence",
-     "args": {
-       "text": "\u0003"
-     },
-     "when": "terminalFocus"
-   }
-   ```
-
-_Source: [StackOverflow](https://stackoverflow.com/a/52735954/3015595)_
-
-## Access code-server with a self-signed certificate on an iPad
-
-If you've installed code-server and are [running it with a self-signed
-certificate](./guide.md#using-a-self-signed-certificate), you may see multiple
-security warnings from Safari. To fix this, you'll need to install the
-self-signed certificate generated by code-server as a profile on your device (you'll also need to do this to
-enable WebSocket connections).
-
-### Certificate requirements
-
-- We're assuming that you're using the self-signed certificate code-server
-  generates for you (if not, make sure that your certificate [abides by the
-  guidelines issued by Apple](https://support.apple.com/en-us/HT210176)).
-- We've noticed that the certificate has to include `basicConstraints=CA:true`.
-- Your certificate must have a subject alt name that matches the hostname you'll
-  use to access code-server from the iPad. You can pass this name to code-server
-  so that it generates the certificate correctly using `--cert-host`.
-
-### Sharing a self-signed certificate with an iPad
-
-To share a self-signed certificate with an iPad:
-
-1. Get the location of the certificate code-server generated; code-server prints
-   the certificate's location in its logs:
-
-   ```console
-   [2020-10-30T08:55:45.139Z] info - Using generated certificate and key for HTTPS: ~/.local/share/code-server/mymbp_local.crt
-   ```
-
-2. Send the certificate to the iPad, either by emailing it to yourself or using
-   Apple's Airdrop feature.
-
-3. Open the `*.crt` file so that you're prompted to go into Settings to install.
-
-4. Go to **Settings** > **General** > **Profile**, and select the profile. Tap **Install**.
-
-5. Go to **Settings** > **About** > **Certificate Trust Settings** and [enable
-   full trust for your certificate](https://support.apple.com/en-us/HT204477).
-
-You should be able to access code-server without all of Safari's warnings now.
-
-**warning**: Your iPad must access code-server via a domain name. It could be local
-DNS like `mymacbookpro.local`, but it must be a domain name. Otherwise, Safari will
-not allow WebSockets connections.

docs/link.md

@@ -1,11 +0,0 @@
-# code-server --link
-
-> Note: This feature is no longer recommended due to instability. Stay tuned for a revised version.
-
-Run code-server with the flag `--link` and you'll get TLS, authentication, and a dedicated URL
-for accessing your IDE out of the box.
-
-```console
-$ code-server --link
-Proxying code-server, you can access your IDE at https://example.coder.co
-```

docs/manifest.json

@@ -1,114 +0,0 @@
-{
-  "versions": ["v4.1.0"],
-  "routes": [
-    {
-      "title": "Home",
-      "description": "Learn how to install and run code-server.",
-      "path": "./README.md",
-      "icon": "<svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" version=\"1.1\" viewBox=\"0 0 16 16\" width=\"16px\" xml:space=\"preserve\"><path d=\"M15.45,7L14,5.551V2c0-0.55-0.45-1-1-1h-1c-0.55,0-1,0.45-1,1v0.553L9,0.555C8.727,0.297,8.477,0,8,0S7.273,0.297,7,0.555  L0.55,7C0.238,7.325,0,7.562,0,8c0,0.563,0.432,1,1,1h1v6c0,0.55,0.45,1,1,1h3v-5c0-0.55,0.45-1,1-1h2c0.55,0,1,0.45,1,1v5h3  c0.55,0,1-0.45,1-1V9h1c0.568,0,1-0.437,1-1C16,7.562,15.762,7.325,15.45,7z\"></path></svg>"
-    },
-    {
-      "title": "Requirements",
-      "description": "Learn about what you need to run code-server.",
-      "icon": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\"><path d=\"M6 2V11H2V15C2 16.7 3.3 18 5 18H15C16.7 18 18 16.7 18 15V2H6ZM16 15C16 15.6 15.6 16 15 16H8V4H16V15Z\" /><path d=\"M14 7H10V9H14V7Z\" /><path d=\"M14 11H10V13H14V11Z\" /></svg>",
-      "path": "./requirements.md"
-    },
-    {
-      "title": "Install",
-      "description": "How to install code-server.",
-      "icon": "<svg class=\"MuiSvgIcon-root jss172\" focusable=\"false\" viewBox=\"0 0 24 24\" aria-hidden=\"true\"><path d=\"M22.7 19l-9.1-9.1c.9-2.3.4-5-1.5-6.9-2-2-5-2.4-7.4-1.3L9 6 6 9 1.6 4.7C.4 7.1.9 10.1 2.9 12.1c1.9 1.9 4.6 2.4 6.9 1.5l9.1 9.1c.4.4 1 .4 1.4 0l2.3-2.3c.5-.4.5-1.1.1-1.4z\"></path></svg>",
-      "path": "./install.md",
-      "children": [
-        {
-          "title": "npm",
-          "description": "How to install code-server using npm or yarn",
-          "path": "./npm.md"
-        },
-        {
-          "title": "Helm",
-          "description": "How to install code-server using the Helm package manager",
-          "path": "./helm.md"
-        }
-      ]
-    },
-    {
-      "title": "Usage",
-      "description": "How to set up and use code-server.",
-      "icon": "<svg viewBox=\"0 0 16 16\" xmlns=\"http://www.w3.org/2000/svg\"><path d=\"M4 6H2v14c0 1.1.9 2 2 2h14v-2H4V6zm16-4H8c-1.1 0-2 .9-2 2v12c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V4c0-1.1-.9-2-2-2zm0 10l-2.5-1.5L15 12V4h5v8z\"></path></svg>",
-      "path": "./guide.md",
-      "children": [
-        {
-          "title": "--link",
-          "description": "How to run code-server --link",
-          "path": "./link.md"
-        },
-        {
-          "title": "iPad",
-          "description": "How to access your code-server installation using an iPad.",
-          "path": "./ipad.md"
-        },
-        {
-          "title": "Termux",
-          "description": "How to install Termux to run code-server on an Android device.",
-          "path": "./termux.md"
-        },
-        {
-          "title": "iOS",
-          "description": "How to use code-server on iOS with iSH.",
-          "path": "./ios.md"
-        },
-        {
-          "title": "Android",
-          "description": "How to run code-server on an Android device using UserLAnd.",
-          "path": "./android.md"
-        }
-      ]
-    },
-    {
-      "title": "Collaboration",
-      "description": "How to setup real time collaboration using code server.",
-      "icon": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M12.2 13.4357L9.5 11.4357C10.4 10.7357 11 9.7357 11 8.5357V7.7357C11 5.8357 9.6 4.1357 7.7 4.0357C5.7 3.9357 4 5.5357 4 7.5357V8.5357C4 9.7357 4.6 10.7357 5.5 11.4357L2.8 13.5357C2.3 13.9357 2 14.5357 2 15.1357V17.0357C2 17.6357 2.4 18.0357 3 18.0357H12C12.6 18.0357 13 17.6357 13 17.0357V15.0357C13 14.4357 12.7 13.8357 12.2 13.4357Z\"/> <path d=\"M17.1 8.43436L15.3 7.23436C15.7 6.83436 16 6.23436 16 5.53436V4.63436C16 3.43436 15.1 2.23436 13.9 2.03436C12.7 1.83436 11.7 2.53436 11.2 3.43436C12.3 4.43436 13 5.83436 13 7.43436V8.43436C13 9.33436 12.8 10.2344 12.4 10.9344C12.4 10.9344 13.6 11.8344 13.6 11.9344H17C17.6 11.9344 18 11.5344 18 10.9344V10.1344C18 9.43436 17.7 8.83436 17.1 8.43436Z\"/></svg>",
-      "path": "./collaboration.md"
-    },
-    {
-      "title": "Upgrade",
-      "description": "How to upgrade code-server.",
-      "icon": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\"><path d=\"M17.8049 2.19795C17.7385 2.1311 17.6587 2.07899 17.5708 2.04504C17.4829 2.01108 17.3889 1.99604 17.2948 2.00089C7.89216 2.49153 4.4188 10.8673 4.38528 10.9517C4.33624 11.0736 4.32406 11.2071 4.35028 11.3358C4.3765 11.4645 4.43995 11.5827 4.53274 11.6756L8.32449 15.4674C8.41787 15.5606 8.53669 15.6242 8.66606 15.6502C8.79543 15.6762 8.92959 15.6634 9.05174 15.6135C9.13552 15.5793 17.4664 12.0671 17.9986 2.7087C18.0039 2.61474 17.9895 2.5207 17.9561 2.4327C17.9227 2.3447 17.8712 2.26471 17.8049 2.19795ZM12.3314 9.56427C12.1439 9.75179 11.9051 9.87951 11.645 9.93126C11.385 9.98302 11.1154 9.9565 10.8704 9.85505C10.6254 9.7536 10.4161 9.58178 10.2687 9.36131C10.1214 9.14085 10.0428 8.88166 10.0428 8.6165C10.0428 8.35135 10.1214 8.09215 10.2687 7.87169C10.4161 7.65123 10.6254 7.47941 10.8704 7.37796C11.1154 7.27651 11.385 7.24998 11.645 7.30174C11.9051 7.3535 12.1439 7.48121 12.3314 7.66873C12.5827 7.92012 12.7239 8.26104 12.7239 8.6165C12.7239 8.97197 12.5827 9.31288 12.3314 9.56427Z\"/><path d=\"M2.74602 14.5444C2.92281 14.3664 3.133 14.2251 3.36454 14.1285C3.59608 14.0319 3.8444 13.9819 4.09529 13.9815C4.34617 13.9811 4.59466 14.0.12 4.82653 14.126C5.05839 14.2218 5.26907 14.3624 5.44647 14.5398C5.62386 14.7172 5.7645 14.9279 5.86031 15.1598C5.95612 15.3916 6.00522 15.6401 6.00479 15.891C6.00437 16.1419 5.95442 16.3902 5.85782 16.6218C5.76122 16.8533 5.61987 17.0635 5.44186 17.2403C4.69719 17.985 2 18.0004 2 18.0004C2 18.0004 2 15.2884 2.74602 14.5444Z\"/><path d=\"M8.9416 3.48269C7.99688 3.31826 7.02645 3.38371 6.11237 3.67352C5.19828 3.96332 4.36741 4.46894 3.68999 5.14765C3.33153 5.50944 3.01988 5.91477 2.76233 6.35415C2.68692 6.4822 2.6562 6.63169 2.67501 6.77911C2.69381 6.92652 2.76108 7.06351 2.86623 7.16853L4.1994 8.50238C5.43822 6.53634 7.04911 4.83119 8.9416 3.48269Z\"/><path d=\"M16.5181 11.0585C16.6825 12.0033 16.6171 12.9737 16.3273 13.8878C16.0375 14.8019 15.5318 15.6327 14.8531 16.3101C14.4914 16.6686 14.086 16.9803 13.6466 17.2378C13.5186 17.3132 13.3691 17.3439 13.2217 17.3251C13.0743 17.3063 12.9373 17.2391 12.8323 17.1339L11.4984 15.8007C13.4645 14.5619 15.1696 12.951 16.5181 11.0585Z\"/></svg>",
-      "path": "./upgrade.md"
-    },
-    {
-      "title": "FAQ",
-      "description": "Frequently asked questions on installing and running code-server.",
-      "icon": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><path d=\"M10.0001 18.3333C14.6025 18.3333 18.3334 14.6024 18.3334 10C18.3334 5.39762 14.6025 1.66666 10.0001 1.66666C5.39771 1.66666 1.66675 5.39762 1.66675 10C1.66675 14.6024 5.39771 18.3333 10.0001 18.3333Z\" stroke=\"currentColor\" fill=\"none\" stroke-width=\"2\" stroke-linecap=\"round\" stroke-linejoin=\"round\"/><path d=\"M7.57495 7.5C7.77087 6.94306 8.15758 6.47342 8.66658 6.17428C9.17558 5.87513 9.77403 5.76578 10.3559 5.86559C10.9378 5.96541 11.4656 6.26794 11.8458 6.71961C12.2261 7.17128 12.4342 7.74294 12.4333 8.33333C12.4333 10 9.93328 10.8333 9.93328 10.8333\" stroke=\"currentColor\" fill=\"none\" stroke-width=\"2\" stroke-linecap=\"round\" stroke-linejoin=\"round\"/><path d=\"M10 14.1667H10.0083\" stroke=\"currentColor\" fill=\"none\" stroke-width=\"2\" stroke-linecap=\"round\" stroke-linejoin=\"round\"/></svg>",
-      "path": "./FAQ.md"
-    },
-    {
-      "title": "Contributing",
-      "description": "How to contribute to code-server.",
-      "icon": "<svg width=\"20\" height=\"20\" fill=\"none\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><path d=\"M5 2.5V12.5\" stroke=\"currentColor\" fill=\"none\" stroke-width=\"2\" stroke-linecap=\"round\" stroke-linejoin=\"round\"/><path d=\"M15 7.5C16.3807 7.5 17.5 6.38071 17.5 5C17.5 3.61929 16.3807 2.5 15 2.5C13.6193 2.5 12.5 3.61929 12.5 5C12.5 6.38071 13.6193 7.5 15 7.5Z\" stroke=\"currentColor\" fill=\"none\" stroke-width=\"2\" stroke-linecap=\"round\" stroke-linejoin=\"round\"/><path d=\"M5 17.5C6.38071 17.5 7.5 16.3807 7.5 15C7.5 13.6193 6.38071 12.5 5 12.5C3.61929 12.5 2.5 13.6193 2.5 15C2.5 16.3807 3.61929 17.5 5 17.5Z\" stroke=\"currentColor\" fill=\"none\" stroke-width=\"2\" stroke-linecap=\"round\" stroke-linejoin=\"round\"/><path d=\"M15 7.5C15 9.48912 14.2098 11.3968 12.8033 12.8033C11.3968 14.2098 9.48912 15 7.5 15\" stroke=\"currentColor\" fill=\"none\" stroke-width=\"2\" stroke-linecap=\"round\" stroke-linejoin=\"round\"/></svg>",
-      "path": "./CONTRIBUTING.md",
-      "children": [
-        {
-          "title": "Code of conduct",
-          "description": "Coder expects contributors to code-server to behave in a manner that creates an open and welcoming environment.",
-          "path": "./CODE_OF_CONDUCT.md"
-        },
-        {
-          "title": "Maintenance",
-          "description": "Learn about the workflow followed by code-server's maintainers.",
-          "path": "./MAINTAINING.md"
-        },
-        {
-          "title": "Triage",
-          "description": "How the maintainers triage issues with code-server.",
-          "path": "./triage.md"
-        },
-        {
-          "title": "Security",
-          "description": "Learn about the tools used to detect vulnerabilities in code-server, and how you can report vulnerabilities.",
-          "path": "./SECURITY.md"
-        }
-      ]
-    }
-  ]
-}

docs/npm.md

@@ -2,32 +2,23 @@
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 # npm Install Requirements
 
-- [Node.js version](#nodejs-version)
 - [Ubuntu, Debian](#ubuntu-debian)
 - [Fedora, CentOS, RHEL](#fedora-centos-rhel)
 - [Alpine](#alpine)
 - [macOS](#macos)
 - [FreeBSD](#freebsd)
-- [Windows](#windows)
-- [Installing](#installing)
-- [Troubleshooting](#troubleshooting)
-  - [Issues with Node.js after version upgrades](#issues-with-nodejs-after-version-upgrades)
-  - [Debugging install issues with npm](#debugging-install-issues-with-npm)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 
-If you're installing code-server via `npm`, you'll need to install additional
+If you're installing the npm module you'll need certain dependencies to build the native modules used by VS Code.
-dependencies required to build the native modules used by VS Code. This article
-includes installing instructions based on your operating system.
 
-## Node.js version
+- Node.js: version `>= 12`, `<= 14`
 
-We use the same major version of Node.js shipped with VSCode's Electron,
+_Note: the Node.js version requirements are based on the VS Code Node.js requirements. See [here](https://github.com/microsoft/vscode/wiki/How-to-Contribute#prerequisites)._
-which is currently `14.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
+Related:
-behavior](https://github.com/coder/code-server/issues/1633).
+
+- [#1633](https://github.com/cdr/code-server/issues/1633)
 
 ## Ubuntu, Debian
 
@@ -39,8 +30,6 @@ sudo apt-get install -y \
 npm config set python python3
 ```
 
-Proceed to [installing](#installing)
-
 ## Fedora, CentOS, RHEL
 
 ```bash
@@ -50,8 +39,6 @@ sudo yum install -y python2
 npm config set python python2
 ```
 
-Proceed to [installing](#installing)
-
 ## Alpine
 
 ```bash
@@ -59,89 +46,15 @@ apk add alpine-sdk bash libstdc++ libc6-compat
 npm config set python python3
 ```
 
-Proceed to [installing](#installing)
-
 ## macOS
 
 ```bash
 xcode-select --install
 ```
 
-Proceed to [installing](#installing)
-
 ## FreeBSD
 
 ```sh
-pkg install -y git python npm-node14 yarn-node14 pkgconf
+pkg install -y git python npm-node12 yarn-node12 pkgconf
 pkg install -y libinotify
 ```
-
-Proceed to [installing](#installing)
-
-## Windows
-
-Installing code-server requires all of the [prerequisites for VS Code development](https://github.com/Microsoft/vscode/wiki/How-to-Contribute#prerequisites). When installing the C++ compiler tool chain, we recommend using "Option 2: Visual Studio 2019" for best results.
-
-Next, install code-server with:
-
-```bash
-yarn global add code-server
-# Or: npm install -g code-server
-code-server
-# Now visit http://127.0.0.1:8080. Your password is in ~/.config/code-server/config.yaml
-```
-
-A `postinstall.sh` script will attempt to run. Select your terminal (e.g., Git bash) as the default application for `.sh` files. If an additional dialog does not appear, run the install command again.
-
-If the `code-server` command is not found, you'll need to [add a directory to your PATH](https://www.architectryan.com/2018/03/17/add-to-the-path-on-windows-10/). To find the directory, use the following command:
-
-```shell
-yarn global bin
-# Or: npm config get prefix
-```
-
-For help and additional troubleshooting, see [#1397](https://github.com/coder/code-server/issues/1397).
-
-## Installing
-
-After adding the dependencies for your OS, install the code-server package globally:
-
-```bash
-yarn global add code-server
-# Or: npm install -g code-server
-code-server
-# Now visit http://127.0.0.1:8080. Your password is in ~/.config/code-server/config.yaml
-```
-
-## Troubleshooting
-
-If you need further assistance, post on our [GitHub Discussions
-page](https://github.com/coder/code-server/discussions).
-
-### Issues with Node.js after version upgrades
-
-Occasionally, you may run into issues with Node.js.
-
-If you install code-server using `yarn` or `npm`, and you upgrade your Node.js
-version, you may need to reinstall code-server to recompile native modules.
-Sometimes, you can get around this by navigating into code-server's `lib/vscode`
-directory and running `npm rebuild` to recompile the modules.
-
-A step-by-step example of how you might do this is:
-
-1. Install code-server: `brew install code-server`
-2. Navigate into the directory: `cd /usr/local/Cellar/code-server/<version>/libexec/lib/vscode/`
-3. Recompile the native modules: `npm rebuild`
-4. Restart code-server
-
-### Debugging install issues with npm
-
-`yarn` suppresses logs when running `yarn global add`, so to debug installation issues, install with `npm` instead:
-
-```shell
-# Uninstall
-npm uninstall -g --unsafe-perm code-server > /dev/null 2>&1
-
-# Install with logging
-npm install --loglevel verbose -g --unsafe-perm code-server
-```

docs/requirements.md

@@ -1,56 +0,0 @@
-# Requirements
-
-You'll need a machine on which you can run code-server. You can use a physical
-machine you have, or you can use a VM on GCP/AWS.
-
-At the minimum, we recommend:
-
-- 1 GB of RAM
-- 2 CPU cores
-
-You can use any Linux distribution, but [our
-docs](https://coder.com/docs/code-server/latest/guide) assume that you're using
-Debian hosted by Google Cloud (see the following section for instructions on
-setting this up).
-
-Your environment must have WebSockets enabled, since code-server uses WebSockets
-for communication between the browser and the server.
-
-## Set up a VM on Google Cloud
-
-The following steps walk you through setting up a VM running Debian using Google
-Cloud (though you are welcome to use any machine or VM provider).
-
-If you're [signing up with Google](https://console.cloud.google.com/getting-started) for the first time, you should get a 12-month trial with
-$300 of credits.
-
-After you sign up and create a new Google Cloud Provider (GCP) project, create a
-new Compute Engine VM instance:
-
-1. Using the sidebar, navigate to **Compute Engine** > **VM Instances**.
-2. Click **Create Instance**.
-3. Provide a **name** for new instance.
-4. Choose the **region** that's closest to you based on [GCP
-   ping](https://gcping.com/).
-5. Choose a **zone** (any option is fine).
-6. We recommend choosing an **E2 series instance** from the [general-purpose
-   family](https://cloud.google.com/compute/docs/machine-types#general_purpose).
-7. Change the instance type to **custom** and set at least **2 cores** and **2
-   GB of RAM**. You can add more resources if desired, though you can also edit
-   your instance at a later point.
-8. Though optional, we highly recommend switching the persistent disk to an SSD
-   with at least 32 GB. To do so, click **change** under **Boot Disk**. Then,
-   change the type to **SSD Persistent Disk**, and set the size to **32**. (You
-   can also grow your disk at a later date).
-9. Go to **Networking** > **Networking Interfaces** and edit the existing
-   interface to use a static internal IP. Click **Done** to save.
-10. If you don't have a [project-wide SSH
-    key](https://cloud.google.com/compute/docs/instances/adding-removing-ssh-keys#project-wide),
-    go to **Security** > **SSH Keys** to add your public key.
-11. Click **Create** to proceed.
-
-Notes:
-
-- To lower costs, you can shut down your server when you're not using it.
-- We recommend using the `gcloud cli` to avoid using the GCP Dashboard if possible.
-- For serving code-server over HTTPS, we recommend using an external domain name along with a service such as Let's Encrypt

docs/termux.md

@@ -2,147 +2,60 @@
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 # Termux
 
-- [Install](#install)
+- [Termux](#termux)
-- [Upgrade](#upgrade)
+  - [Installation](#installation)
-- [Known Issues](#known-issues)
+  - [Upgrading](#upgrading)
-  - [Git won't work in `/sdcard`](#git-wont-work-in-sdcard)
+  - [Known Issues](#known-issues)
-- [Extra](#extra)
+    - [Search issue](#search-issue)
-  - [Create a new user](#create-a-new-user)
+    - [Backspace not working](#backspace-not-working)
-  - [Install Go](#install-go)
-  - [Install Python](#install-python)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 
-## Install
+# Termux
 
-1. Get [Termux](https://f-droid.org/en/packages/com.termux/) from **F-Droid**.
+Termux is an Android terminal application and Linux environment, which can also run code-server from your phone.
-2. Install Debian by running the following.
-   - Run `termux-setup-storage` to allow storage access, or else code-server won't be able to read from `/sdcard`.\
-      If you used the Andronix command then you may have to edit the `start-debian.sh` script to mount `/sdcard` just as simple as uncommenting the `command+=" -b /sdcard"` line.
-     > The following command was extracted from [Andronix](https://andronix.app/) you can also use [proot-distro](https://github.com/termux/proot-distro).
-     > After Debian is installed the `~ $` will change to `root@localhost`.
 
-```bash
+## Installation
-pkg update -y && pkg install wget curl proot tar -y && wget https://raw.githubusercontent.com/AndronixApp/AndronixOrigin/master/Installer/Debian/debian.sh -O debian.sh && chmod +x debian.sh && bash debian.sh
-```
 
-3. Run the following commands to setup Debian.
+1. Install Termux from [F-Droid](https://f-droid.org/en/packages/com.termux/)
+2. Make sure it's up-to-date by running `apt update && apt upgrade`
+3. Install required packages: `apt install build-essential python git nodejs yarn`
+4. Install code-server: `yarn global add code-server`
+5. Run code-server: `code-server` and navigate to localhost:8080 in your browser
 
-```bash
+## Upgrading
-apt update
-apt upgrade -y
-apt-get install nano vim sudo curl wget git -y
-```
 
-4. Install [NVM](https://github.com/nvm-sh/nvm) by following the install guide in the README, just a curl/wget command.
+To upgrade run: `yarn global upgrade code-server --latest`
-5. Set up NVM for multi-user. After installing NVM it automatically adds the necessary commands for it to work, but it will only work if you are logged in as root;
-
-   - Copy the lines NVM asks you to run after running the install script.
-   - Run `nano /root/.bashrc` and comment out those lines by adding a `#` at the start.
-   - Run `nano /etc/profile` and paste those lines at the end and make sure to replace `$HOME` with `/root`
-   - Now run `exit` and start Debain again.
-
-6. After following the instructions and setting up NVM you can now install the [required node version](https://coder.com/docs/code-server/latest/npm#nodejs-version) using `nvm install version_here`.
-7. To install `code-server` run the following.
-   > To check the install process (Will not actually install code-server)
-   > If it all looks good, you can install code-server by running the second command
-
-```bash
-curl -fsSL https://code-server.dev/install.sh | sh -s -- --dry-run
-```
-
-```bash
-curl -fsSL https://code-server.dev/install.sh | sh
-```
-
-8. You can now start code server by simply running `code-server`.
-
-> Consider using a new user instead of root, read [here](https://www.howtogeek.com/124950/htg-explains-why-you-shouldnt-log-into-your-linux-system-as-root/) why using root is not recommended.\
-> Learn how to add a user [here](#create-a-new-user).
-
-## Upgrade
-
-1. Remove all previous installs `rm -rf ~/.local/lib/code-server-*`
-2. Run the install script again `curl -fsSL https://code-server.dev/install.sh | sh`
 
 ## Known Issues
 
-### Git won't work in `/sdcard`
+### Search issue
 
-Issue : Using git in the `/sdcard` directory will fail during cloning/commit/staging/etc...\
+There is a known issue with search not working on Android because it's missing `bin/rg`. To fix:
-Fix : None\
-Potential Workaround :
 
-1. Create a soft-link from the debian-fs to your folder in `/sdcard`
+1. Install `ripgrep` with `pkg`
-2. Use git from termux (preferred)
+   ```sh
+   pkg install ripgrep
+   ```
+2. Make a soft link using `ln -s`
 
-## Extra
+```sh
-
+# run this command inside the code-server directory
-### Create a new user
+ln -s $PREFIX/bin/rg ./lib/vscode/node_modules/vscode-ripgrep/bin/rg
-
-To create a new user follow these simple steps -
-
-1. Create a new user by running `useradd username -m`.
-2. Change the password by running `passwd username`.
-3. Give your new user sudo access by runnning `visudo`, scroll down to `User privilege specification` and add the following line after root `username ALL=(ALL:ALL) ALL`.
-4. Now edit the `/etc/passwd` file with your commadline editor of choice and at the end of the line that specifies your user change `/bin/sh` to `/bin/bash`.
-5. Now switch users, by running `su - username`
-
-- Remember the `-` betweeen `su` and username is required to execute `/etc/profile`,\
-  since `/etc/profile` may have some necessary things to be executed you should always add a `-`.
-
-### Install Go
-
-> From https://golang.org/doc/install
-
-1. Go to https://golang.org/dl/ and copy the download link for `linux arm` and run the following.
-
-```bash
-wget download_link
 ```
 
-2. Extract the downloaded archive. (This step will erase all previous GO installs, make sure to create a backup if you have previously installed GO)
+For more context, see [comment](https://github.com/cdr/code-server/issues/1730#issuecomment-721515979).
 
-```bash
+### Backspace not working
-rm -rf /usr/local/go && tar -C /usr/local -xzf archive_name
-```
 
-3. Run `nano /etc/profile` and add the following line `export PATH=$PATH:/usr/local/go/bin`.
+There is a known issue with the backspace key not working correctly when using the on-screen keyboard on Android. This is due to an upstream issue. Read more:
-4. Now run `exit` (depending on if you have switched users or not, you may have to run `exit` multiple times to get to normal termux shell) and start Debian again.
-5. Check if your install was successful by running `go version`
 
-### Install Python
+- [Issues with Backspace in Codespaces on Android (Surface Duo)](https://github.com/microsoft/vscode/issues/107602)
+- [Support mobile platforms](https://github.com/xtermjs/xterm.js/issues/1101)
 
-> Run these commands as root
+Workaround: use a Bluetooth keyboard.
 
-1. Run the following command to install required packages to build python.
+For more context, see issues:
 
-```bash
+- [500 error: 3.9.2 not working on Android + Termux](https://github.com/cdr/code-server/issues/3036)
-sudo apt-get update
+- [Document Android backspace issue](https://github.com/cdr/code-server/issues/3079)
-sudo apt-get install make build-essential libssl-dev zlib1g-dev \
-  libbz2-dev libreadline-dev libsqlite3-dev wget curl llvm \
-  libncursesw5-dev xz-utils tk-dev libxml2-dev libxmlsec1-dev libffi-dev liblzma-dev
-```
-
-2. Install [pyenv](https://github.com/pyenv/pyenv/) from [pyenv-installer](https://github.com/pyenv/pyenv-installer) by running.
-
-```bash
-curl -L https://github.com/pyenv/pyenv-installer/raw/master/bin/pyenv-installer | bash
-```
-
-3. Run `nano /etc/profile` and add the following
-
-```bash
-export PYENV_ROOT="/root/.pyenv"
-export PATH="/root/.pyenv/bin:$PATH"
-eval "$(pyenv init --path)"
-eval "$(pyenv virtualenv-init -)"
-```
-
-4. Exit start Debian again.
-5. Run `pyenv versions` to list all installable versions.
-6. Run `pyenv install version` to install the desired python version.
-   > The build process may take some time (an hour or 2 depending on your device).
-7. Run `touch /root/.pyenv/version && echo "your_version_here" > /root/.pyenv/version`
-8. (You may have to start Debian again) Run `python3 -V` to verify if PATH works or not.
-   > If `python3` doesn't work but pyenv says that the install was successful in step 6 then try running `$PYENV_ROOT/versions/your_version/bin/python3`.

docs/triage.md

@@ -1,35 +1,37 @@
 # Triage
 
+## Filter
+
 Triaging code-server issues is done with the following issue filter:
 
-```text
+```
 is:issue is:open no:project sort:created-asc -label:blocked -label:upstream -label:waiting-for-info -label:extension-request
 ```
 
 This will show issues that:
 
 1. Are open.
-1. Have no assigned project.
+2. Have no assigned project.
-1. Are not `blocked` or tagged for work by `upstream` (the VS Code core team).
+3. Are not `blocked` or tagged for work by `upstream` (VS Code core team)
-   If an upstream issue is detrimental to the code-server experience we may fix
+   - If an upstream issue is detrimental to the code-server experience we may fix it in
-   it in our patch instead of waiting for the VS Code team to fix it. Someone
+     our patch instead of waiting for the VS Code team to fix it.
-   should periodically go through these issues to see if they can be unblocked!
+   - Someone should periodically go through these issues to see if they can be unblocked
-1. Are not labeled `waiting-for-info`.
+     though!
-1. Are not extension requests.
+4. Are not in `waiting-for-info`.
+5. Are not extension requests.
 
-## Triage process
+## Process
 
-1. If an issue is a question/discussion, it should be converted into a GitHub
+1. If an issue is a question/discussion it should be converted into a GitHub discussion.
-   discussion.
+2. Next, give the issue the appropriate labels and feel free to create new ones if
-1. Otherwise, give the issue the appropriate labels (feel free to create new
+   necessary.
-   ones if necessary). There are no hard and set rules for labels. We don't have
+   - There are no hard and set rules for labels. We don't have many so look through and
-   many so look through and see how they've been used throughout the repository.
+     see how they've been used throughout the repository. They all also have descriptions.
-   They all also have descriptions.
+3. If more information is required, please ask the submitter and tag as
-1. If more information is required, please ask the submitter and tag as
    `waiting-for-info` and wait.
-1. Finally, the issue should be moved into the
+4. Finally, the issue should be moved into the
-   [code-server](https://github.com/coder/code-server/projects/1) project where we
+   [code-server](https://github.com/cdr/code-server/projects/1) project where we pick
-   pick out issues to fix and track their progress.
+   out issues to fix and track their progress.
 
-We also use [milestones](https://github.com/coder/code-server/milestones) to track
+We also use [milestones](https://github.com/cdr/code-server/milestones) to track what
-what issues are planned/or were closed for what release.
+issues are planned/or were closed for what release.

docs/upgrade.md

@@ -1,5 +0,0 @@
-# Upgrade
-
-To upgrade code-server, install the new version over the old version. All user
-data is in `~/.local/share/code-server`, so they are preserved between
-installations.

install.sh

@@ -2,7 +2,7 @@
 set -eu
 
 # code-server's automatic install script.
-# See https://coder.com/docs/code-server/latest/install
+# See https://github.com/cdr/code-server/blob/main/docs/install.md
 
 usage() {
   arg0="$0"
@@ -13,8 +13,8 @@ usage() {
 "
   fi
 
-  cath << EOF
+  cath <<EOF
-Installs code-server.
+Installs code-server for Linux, macOS and FreeBSD.
 It tries to use the system package manager if possible.
 After successful installation it explains how to start using code-server.
 
@@ -23,7 +23,7 @@ The remote host must have internet access.
 ${not_curl_usage-}
 Usage:
 
-  $arg0 [--dry-run] [--version X.X.X] [--edge] [--method detect] \
+  $arg0 [--dry-run] [--version X.X.X] [--method detect] \
         [--prefix ~/.local] [--rsh ssh] [user@host]
 
   --dry-run
@@ -32,9 +32,6 @@ Usage:
   --version X.X.X
       Install a specific version instead of the latest.
 
-  --edge
-      Install the latest edge version instead of the latest stable version.
-
   --method [detect | standalone]
       Choose the installation method. Defaults to detect.
       - detect detects the system package manager and tries to use it.
@@ -51,79 +48,62 @@ Usage:
   --rsh <bin>
       Specifies the remote shell for remote installation. Defaults to ssh.
 
-The detection method works as follows:
+- For Debian, Ubuntu and Raspbian it will install the latest deb package.
-  - Debian, Ubuntu, Raspbian: install the deb package from GitHub.
+- For Fedora, CentOS, RHEL and openSUSE it will install the latest rpm package.
-  - Fedora, CentOS, RHEL, openSUSE: install the rpm package from GitHub.
+- For Arch Linux it will install the AUR package.
-  - Arch Linux: install from the AUR (which pulls releases from GitHub).
+- For any unrecognized Linux operating system it will install the latest standalone
-  - FreeBSD, Alpine: install from yarn/npm.
+  release into ~/.local
-  - macOS: install using Homebrew if installed otherwise install from GitHub.
-  - All others: install the release from GitHub.
 
-We only build releases on GitHub for amd64 and arm64 on Linux and amd64 for
+- For macOS it will install the Homebrew package.
-macOS. When the detection method tries to pull a release from GitHub it will
+  - If Homebrew is not installed it will install the latest standalone release
-fall back to installing from npm when there is no matching release for the
+    into ~/.local
-system's operating system and architecture.
 
-The standalone method will force installion using GitHub releases. It will not
+- For FreeBSD, it will install the npm package with yarn or npm.
-fall back to npm so on architectures without pre-built releases this will error.
 
-The installer will cache all downloaded assets into ~/.cache/code-server
+- If ran on an architecture with no releases, it will install the
+  npm package with yarn or npm.
+  - We only have releases for amd64 and arm64 presently.
+  - The npm package builds the native modules on postinstall.
 
-More installation docs are at https://coder.com/docs/code-server/latest/install
+It will cache all downloaded assets into ~/.cache/code-server
+
+More installation docs are at https://github.com/cdr/code-server/blob/main/docs/install.md
 EOF
 }
 
 echo_latest_version() {
-  if [ "${EDGE-}" ]; then
+  # https://gist.github.com/lukechilds/a83e1d7127b78fef38c2914c4ececc3c#gistcomment-2758860
-    version="$(curl -fsSL https://api.github.com/repos/coder/code-server/releases | awk 'match($0,/.*"html_url": "(.*\/releases\/tag\/.*)".*/)' | head -n 1 | awk -F '"' '{print $4}')"
+  version="$(curl -fsSLI -o /dev/null -w "%{url_effective}" https://github.com/cdr/code-server/releases/latest)"
-  else
+  version="${version#https://github.com/cdr/code-server/releases/tag/}"
-    # https://gist.github.com/lukechilds/a83e1d7127b78fef38c2914c4ececc3c#gistcomment-2758860
-    version="$(curl -fsSLI -o /dev/null -w "%{url_effective}" https://github.com/coder/code-server/releases/latest)"
-  fi
-  version="${version#https://github.com/coder/code-server/releases/tag/}"
   version="${version#v}"
   echo "$version"
 }
 
 echo_npm_postinstall() {
   echoh
-  cath << EOF
+  cath <<EOF
-npm package has been installed.
+The npm package has been installed successfully!
-
+Please extend your path to use code-server:
-Extend your path to use code-server:
   PATH="$NPM_BIN_DIR:\$PATH"
-Then run with:
+Please run with:
   code-server
 EOF
 }
 
 echo_standalone_postinstall() {
   echoh
-  cath << EOF
+  cath <<EOF
 Standalone release has been installed into $STANDALONE_INSTALL_PREFIX/lib/code-server-$VERSION
-
+Please extend your path to use code-server:
-Extend your path to use code-server:
   PATH="$STANDALONE_INSTALL_PREFIX/bin:\$PATH"
-Then run with:
+Then you can run:
-  code-server
-EOF
-}
-
-echo_brew_postinstall() {
-  echoh
-  cath << EOF
-Brew release has been installed.
-
-Run with:
   code-server
 EOF
 }
 
 echo_systemd_postinstall() {
   echoh
-  cath << EOF
+  cath <<EOF
-$1 package has been installed.
-
 To have systemd start code-server now and restart on boot:
   sudo systemctl enable --now code-server@\$USER
 Or, if you don't want/need a background service you can run:
@@ -139,75 +119,73 @@ main() {
   unset \
     DRY_RUN \
     METHOD \
+    STANDALONE_INSTALL_PREFIX \
+    VERSION \
     OPTIONAL \
     ALL_FLAGS \
     RSH_ARGS \
-    EDGE \
     RSH
 
   ALL_FLAGS=""
   while [ "$#" -gt 0 ]; do
     case "$1" in
-      -*)
+    -*)
-        ALL_FLAGS="${ALL_FLAGS} $1"
+      ALL_FLAGS="${ALL_FLAGS} $1"
-        ;;
+      ;;
     esac
 
     case "$1" in
-      --dry-run)
+    --dry-run)
-        DRY_RUN=1
+      DRY_RUN=1
-        ;;
+      ;;
-      --method)
+    --method)
-        METHOD="$(parse_arg "$@")"
+      METHOD="$(parse_arg "$@")"
-        shift
+      shift
-        ;;
+      ;;
-      --method=*)
+    --method=*)
-        METHOD="$(parse_arg "$@")"
+      METHOD="$(parse_arg "$@")"
-        ;;
+      ;;
-      --prefix)
+    --prefix)
-        STANDALONE_INSTALL_PREFIX="$(parse_arg "$@")"
+      STANDALONE_INSTALL_PREFIX="$(parse_arg "$@")"
-        shift
+      shift
-        ;;
+      ;;
-      --prefix=*)
+    --prefix=*)
-        STANDALONE_INSTALL_PREFIX="$(parse_arg "$@")"
+      STANDALONE_INSTALL_PREFIX="$(parse_arg "$@")"
-        ;;
+      ;;
-      --version)
+    --version)
-        VERSION="$(parse_arg "$@")"
+      VERSION="$(parse_arg "$@")"
-        shift
+      shift
-        ;;
+      ;;
-      --version=*)
+    --version=*)
-        VERSION="$(parse_arg "$@")"
+      VERSION="$(parse_arg "$@")"
-        ;;
+      ;;
-      --edge)
+    --rsh)
-        EDGE=1
+      RSH="$(parse_arg "$@")"
-        ;;
+      shift
-      --rsh)
+      ;;
-        RSH="$(parse_arg "$@")"
+    --rsh=*)
-        shift
+      RSH="$(parse_arg "$@")"
-        ;;
+      ;;
-      --rsh=*)
+    -h | --h | -help | --help)
-        RSH="$(parse_arg "$@")"
+      usage
-        ;;
+      exit 0
-      -h | --h | -help | --help)
+      ;;
-        usage
+    --)
-        exit 0
+      shift
-        ;;
+      # We remove the -- added above.
-      --)
+      ALL_FLAGS="${ALL_FLAGS% --}"
-        shift
+      RSH_ARGS="$*"
-        # We remove the -- added above.
+      break
-        ALL_FLAGS="${ALL_FLAGS% --}"
+      ;;
-        RSH_ARGS="$*"
+    -*)
-        break
+      echoerr "Unknown flag $1"
-        ;;
+      echoerr "Run with --help to see usage."
-      -*)
+      exit 1
-        echoerr "Unknown flag $1"
+      ;;
-        echoerr "Run with --help to see usage."
+    *)
-        exit 1
+      RSH_ARGS="$*"
-        ;;
+      break
-      *)
+      ;;
-        RSH_ARGS="$*"
-        break
-        ;;
     esac
 
     shift
@@ -220,103 +198,102 @@ main() {
     return
   fi
 
+  VERSION="${VERSION-$(echo_latest_version)}"
   METHOD="${METHOD-detect}"
   if [ "$METHOD" != detect ] && [ "$METHOD" != standalone ]; then
     echoerr "Unknown install method \"$METHOD\""
     echoerr "Run with --help to see usage."
     exit 1
   fi
+  STANDALONE_INSTALL_PREFIX="${STANDALONE_INSTALL_PREFIX-$HOME/.local}"
 
-  # These are used by the various install_* functions that make use of GitHub
+  OS="$(os)"
-  # releases in order to download and unpack the right release.
+  if [ ! "$OS" ]; then
-  CACHE_DIR=$(echo_cache_dir)
+    echoerr "Unsupported OS $(uname)."
-  STANDALONE_INSTALL_PREFIX=${STANDALONE_INSTALL_PREFIX:-$HOME/.local}
+    exit 1
-  VERSION=${VERSION:-$(echo_latest_version)}
+  fi
-  # These can be overridden for testing but shouldn't normally be used as it can
-  # result in a broken code-server.
-  OS=${OS:-$(os)}
-  ARCH=${ARCH:-$(arch)}
 
   distro_name
 
-  # Standalone installs by pulling pre-built releases from GitHub.
+  ARCH="$(arch)"
-  if [ "$METHOD" = standalone ]; then
+  if [ ! "$ARCH" ]; then
-    if has_standalone; then
+    if [ "$METHOD" = standalone ]; then
-      install_standalone
+      echoerr "No precompiled releases for $(uname -m)."
-      exit 0
+      echoerr 'Please rerun without the "--method standalone" flag to install from npm.'
-    else
-      echoerr "There are no standalone releases for $ARCH"
-      echoerr "Please try again without '--method standalone'"
       exit 1
     fi
+    echoh "No precompiled releases for $(uname -m)."
+    install_npm
+    return
   fi
 
-  # DISTRO can be overridden for testing but shouldn't normally be used as it
+  if [ "$OS" = "freebsd" ]; then
-  # can result in a broken code-server.
+    if [ "$METHOD" = standalone ]; then
-  DISTRO=${DISTRO:-$(distro)}
+      echoerr "No precompiled releases available for $OS."
+      echoerr 'Please rerun without the "--method standalone" flag to install from npm.'
+      exit 1
+    fi
+    echoh "No precompiled releases available for $OS."
+    install_npm
+    return
+  fi
 
-  case $DISTRO in
+  CACHE_DIR="$(echo_cache_dir)"
-    # macOS uses brew when available and falls back to standalone. We only have
+
-    # amd64 for macOS so for anything else use npm.
+  if [ "$METHOD" = standalone ]; then
-    macos)
+    install_standalone
-      BREW_PATH="${BREW_PATH-brew}"
+    return
-      if command_exists "$BREW_PATH"; then
+  fi
-        install_brew
+
-      else
+  case "$(distro)" in
-        echoh "Homebrew not installed."
+  macos)
-        echoh "Falling back to standalone installation."
+    install_macos
-        npm_fallback install_standalone
+    ;;
-      fi
+  debian)
-      ;;
+    install_deb
-    # The .deb and .rpm files are pulled from GitHub and we only have amd64 and
+    ;;
-    # arm64 there and need to fall back to npm otherwise.
+  fedora | opensuse)
-    debian) npm_fallback install_deb ;;
+    install_rpm
-    fedora | opensuse) npm_fallback install_rpm ;;
+    ;;
-    # Arch uses the AUR package which only supports amd64 and arm64 since it
+  arch)
-    # pulls releases from GitHub so we need to fall back to npm.
+    install_aur
-    arch) npm_fallback install_aur ;;
+    ;;
-    # We don't have GitHub releases that work on Alpine or FreeBSD so we have no
+  *)
-    # choice but to use npm here.
+    echoh "Unsupported package manager."
-    alpine | freebsd) install_npm ;;
+    install_standalone
-    # For anything else we'll try to install standalone but fall back to npm if
+    ;;
-    # we don't have releases for the architecture.
-    *)
-      echoh "Unsupported package manager."
-      echoh "Falling back to standalone installation."
-      npm_fallback install_standalone
-      ;;
   esac
 }
 
 parse_arg() {
   case "$1" in
-    *=*)
+  *=*)
-      # Remove everything after first equal sign.
+    # Remove everything after first equal sign.
-      opt="${1%%=*}"
+    opt="${1%%=*}"
-      # Remove everything before first equal sign.
+    # Remove everything before first equal sign.
-      optarg="${1#*=}"
+    optarg="${1#*=}"
-      if [ ! "$optarg" ] && [ ! "${OPTIONAL-}" ]; then
+    if [ ! "$optarg" ] && [ ! "${OPTIONAL-}" ]; then
-        echoerr "$opt requires an argument"
+      echoerr "$opt requires an argument"
-        echoerr "Run with --help to see usage."
+      echoerr "Run with --help to see usage."
-        exit 1
+      exit 1
-      fi
+    fi
-      echo "$optarg"
+    echo "$optarg"
-      return
+    return
-      ;;
+    ;;
   esac
 
   case "${2-}" in
-    "" | -*)
+  "" | -*)
-      if [ ! "${OPTIONAL-}" ]; then
+    if [ ! "${OPTIONAL-}" ]; then
-        echoerr "$1 requires an argument"
+      echoerr "$1 requires an argument"
-        echoerr "Run with --help to see usage."
+      echoerr "Run with --help to see usage."
-        exit 1
+      exit 1
-      fi
+    fi
-      ;;
+    ;;
-    *)
+  *)
-      echo "$2"
+    echo "$2"
-      return
+    return
-      ;;
+    ;;
   esac
 }
 
@@ -338,39 +315,45 @@ fetch() {
   sh_c mv "$FILE.incomplete" "$FILE"
 }
 
-install_brew() {
+install_macos() {
-  echoh "Installing latest from Homebrew."
+  if command_exists brew; then
-  echoh
+    echoh "Installing from Homebrew."
+    echoh
 
-  sh_c "$BREW_PATH" install code-server
+    sh_c brew install code-server
 
-  echo_brew_postinstall
+    return
+  fi
+
+  echoh "Homebrew not installed."
+
+  install_standalone
 }
 
 install_deb() {
-  echoh "Installing v$VERSION of the $ARCH deb package from GitHub."
+  echoh "Installing v$VERSION deb package from GitHub releases."
   echoh
 
-  fetch "https://github.com/coder/code-server/releases/download/v$VERSION/code-server_${VERSION}_$ARCH.deb" \
+  fetch "https://github.com/cdr/code-server/releases/download/v$VERSION/code-server_${VERSION}_$ARCH.deb" \
     "$CACHE_DIR/code-server_${VERSION}_$ARCH.deb"
   sudo_sh_c dpkg -i "$CACHE_DIR/code-server_${VERSION}_$ARCH.deb"
 
-  echo_systemd_postinstall deb
+  echo_systemd_postinstall
 }
 
 install_rpm() {
-  echoh "Installing v$VERSION of the $ARCH rpm package from GitHub."
+  echoh "Installing v$VERSION rpm package from GitHub releases."
   echoh
 
-  fetch "https://github.com/coder/code-server/releases/download/v$VERSION/code-server-$VERSION-$ARCH.rpm" \
+  fetch "https://github.com/cdr/code-server/releases/download/v$VERSION/code-server-$VERSION-$ARCH.rpm" \
     "$CACHE_DIR/code-server-$VERSION-$ARCH.rpm"
   sudo_sh_c rpm -i "$CACHE_DIR/code-server-$VERSION-$ARCH.rpm"
 
-  echo_systemd_postinstall rpm
+  echo_systemd_postinstall
 }
 
 install_aur() {
-  echoh "Installing latest from the AUR."
+  echoh "Installing from the AUR."
   echoh
 
   sh_c mkdir -p "$CACHE_DIR/code-server-aur"
@@ -381,20 +364,16 @@ install_aur() {
   fi
   sh_c makepkg -si
 
-  echo_systemd_postinstall AUR
+  echo_systemd_postinstall
 }
 
 install_standalone() {
-  echoh "Installing v$VERSION of the $ARCH release from GitHub."
+  echoh "Installing standalone release archive v$VERSION from GitHub releases."
   echoh
 
-  fetch "https://github.com/coder/code-server/releases/download/v$VERSION/code-server-$VERSION-$OS-$ARCH.tar.gz" \
+  fetch "https://github.com/cdr/code-server/releases/download/v$VERSION/code-server-$VERSION-$OS-$ARCH.tar.gz" \
     "$CACHE_DIR/code-server-$VERSION-$OS-$ARCH.tar.gz"
 
-  # -w only works if the directory exists so try creating it first. If this
-  # fails we can ignore the error as the -w check will then swap us to sudo.
-  sh_c mkdir -p "$STANDALONE_INSTALL_PREFIX" 2> /dev/null || true
-
   sh_c="sh_c"
   if [ ! -w "$STANDALONE_INSTALL_PREFIX" ]; then
     sh_c="sudo_sh_c"
@@ -416,74 +395,50 @@ install_standalone() {
 }
 
 install_npm() {
-  echoh "Installing latest from npm."
+  if command_exists yarn; then
-  echoh
-
-  YARN_PATH="${YARN_PATH-yarn}"
-  NPM_PATH="${YARN_PATH-npm}"
-  if command_exists "$YARN_PATH"; then
     sh_c="sh_c"
-    if [ ! "${DRY_RUN-}" ] && [ ! -w "$($YARN_PATH global bin)" ]; then
+    if [ ! -w "$(yarn global bin)" ]; then
       sh_c="sudo_sh_c"
     fi
     echoh "Installing with yarn."
     echoh
-    "$sh_c" "$YARN_PATH" global add code-server --unsafe-perm
+    "$sh_c" yarn global add code-server --unsafe-perm
-    NPM_BIN_DIR="\$($YARN_PATH global bin)" echo_npm_postinstall
+    NPM_BIN_DIR="$(yarn global bin)" echo_npm_postinstall
     return
-  elif command_exists "$NPM_PATH"; then
+  elif command_exists npm; then
     sh_c="sh_c"
-    if [ ! "${DRY_RUN-}" ] && [ ! -w "$(NPM_PATH config get prefix)" ]; then
+    if [ ! -w "$(npm config get prefix)" ]; then
       sh_c="sudo_sh_c"
     fi
     echoh "Installing with npm."
     echoh
-    "$sh_c" "$NPM_PATH" install -g code-server --unsafe-perm
+    "$sh_c" npm install -g code-server --unsafe-perm
-    NPM_BIN_DIR="\$($NPM_PATH bin -g)" echo_npm_postinstall
+    NPM_BIN_DIR="$(npm bin -g)" echo_npm_postinstall
     return
   fi
+  echoh
   echoerr "Please install npm or yarn to install code-server!"
   echoerr "You will need at least node v12 and a few C dependencies."
-  echoerr "See the docs https://coder.com/docs/code-server/latest/install#yarn-npm"
+  echoerr "See the docs https://github.com/cdr/code-server/blob/v3.10.1/docs/install.md#yarn-npm"
-
   exit 1
 }
 
-# Run $1 if we have a standalone otherwise run install_npm.
-npm_fallback() {
-  if has_standalone; then
-    $1
-  else
-    echoh "No standalone releases for $ARCH."
-    echoh "Falling back to installation from npm."
-    install_npm
-  fi
-}
-
-# Determine if we have standalone releases on GitHub for the system's arch.
-has_standalone() {
-  case $ARCH in
-    amd64) return 0 ;;
-    # We only have amd64 for macOS.
-    arm64)
-      [ "$(distro)" != macos ]
-      return
-      ;;
-    *) return 1 ;;
-  esac
-}
-
 os() {
-  uname="$(uname)"
+  case "$(uname)" in
-  case $uname in
+  Linux)
-    Linux) echo linux ;;
+    echo linux
-    Darwin) echo macos ;;
+    ;;
-    FreeBSD) echo freebsd ;;
+  Darwin)
-    *) echo "$uname" ;;
+    echo macos
+    ;;
+  FreeBSD)
+    echo freebsd
+    ;;
   esac
 }
 
-# Print the detected Linux distro, otherwise print the OS name.
+# distro prints the detected operating system including linux distros.
+# Also parses ID_LIKE for common distro bases.
 #
 # Example outputs:
 # - macos -> macos
@@ -520,7 +475,7 @@ distro() {
   fi
 }
 
-# Print a human-readable name for the OS/distro.
+# os_name prints a pretty human readable name for the OS/Distro.
 distro_name() {
   if [ "$(uname)" = "Darwin" ]; then
     echo "macOS v$(sw_vers -productVersion)"
@@ -540,17 +495,21 @@ distro_name() {
 }
 
 arch() {
-  uname_m=$(uname -m)
+  case "$(uname -m)" in
-  case $uname_m in
+  aarch64)
-    aarch64) echo arm64 ;;
+    echo arm64
-    x86_64) echo amd64 ;;
+    ;;
-    *) echo "$uname_m" ;;
+  x86_64)
+    echo amd64
+    ;;
+  amd64) # FreeBSD.
+    echo amd64
+    ;;
   esac
 }
 
 command_exists() {
-  if [ ! "$1" ]; then return 1; fi
+  command -v "$@" >/dev/null
-  command -v "$@" > /dev/null
 }
 
 sh_c() {
@@ -612,7 +571,7 @@ prefix() {
   fifo="$(mktemp -d)/fifo"
   mkfifo "$fifo"
   sed -e "s#^#$PREFIX: #" "$fifo" &
-  "$@" > "$fifo" 2>&1
+  "$@" >"$fifo" 2>&1
 }
 
 main "$@"

lib/vscode/.devcontainer/README.md

@@ -0,0 +1,100 @@
+# Code - OSS Development Container
+
+This repository includes configuration for a development container for working with Code - OSS in an isolated local container or using [GitHub Codespaces](https://github.com/features/codespaces).
+
+> **Tip:** The default VNC password is `vscode`. The VNC server runs on port `5901` with a web client at `6080`. For better performance, we recommend using a [VNC Viewer](https://www.realvnc.com/en/connect/download/viewer/). Applications like the macOS Screen Sharing app will not perform as well.
+
+## Quick start - local
+
+1. Install Docker Desktop or Docker for Linux on your local machine. (See [docs](https://aka.ms/vscode-remote/containers/getting-started) for additional details.)
+
+2. **Important**: Docker needs at least **4 Cores and 6 GB of RAM (8 GB recommended)** to run full build. If you on macOS, or using the old Hyper-V engine for Windows, update these values for Docker Desktop by right-clicking on the Docker status bar item, going to **Preferences/Settings > Resources > Advanced**.
+
+    > **Note:** The [Resource Monitor](https://marketplace.visualstudio.com/items?itemName=mutantdino.resourcemonitor) extension is included in the container so you can keep an eye on CPU/Memory in the status bar.
+
+3. Install [Visual Studio Code Stable](https://code.visualstudio.com/) or [Insiders](https://code.visualstudio.com/insiders/) and the [Remote - Containers](https://aka.ms/vscode-remote/download/containers) extension.
+
+    ![Image of Remote - Containers extension](https://microsoft.github.io/vscode-remote-release/images/remote-containers-extn.png)
+
+    > Note that the Remote - Containers extension requires the Visual Studio Code distribution of Code - OSS. See the [FAQ](https://aka.ms/vscode-remote/faq/license) for details.
+
+4. Press <kbd>Ctrl/Cmd</kbd> + <kbd>Shift</kbd> + <kbd>P</kbd> and select **Remote-Containers: Clone Repository in Container Volume...**.
+
+    > **Tip:** While you can use your local source tree instead, operations like `yarn install` can be slow on macOS or using the Hyper-V engine on Windows. We recommend the "clone repository in container" approach instead since it uses "named volume" rather than the local filesystem.
+
+5. Type `https://github.com/microsoft/vscode` (or a branch or PR URL) in the input box and press <kbd>Enter</kbd>.
+
+6. After the container is running, open a web browser and go to [http://localhost:6080](http://localhost:6080) or use a [VNC Viewer](https://www.realvnc.com/en/connect/download/viewer/) to connect to `localhost:5901` and enter `vscode` as the password.
+
+Anything you start in VS Code or the integrated terminal will appear here.
+
+Next: **[Try it out!](#try-it)**
+
+## Quick start - GitHub Codespaces
+
+> **IMPORTANT:** You need to use a "Standard" sized codespace or larger (4-core, 8GB) since VS Code needs 6GB of RAM to compile. This is now the default for GitHub Codespaces, but do not downgrade to "Basic" unless you do not intend to compile.
+
+1. From the [microsoft/vscode GitHub repository](https://github.com/microsoft/vscode), click on the **Code** dropdown, select **Open with Codespaces**, and the **New codespace**
+
+    > Note that you will not see these options if you are not in the beta yet.
+
+2. After the codespace is up and running in your browser, press <kbd>F1</kbd> and select **Ports: Focus on Ports View**.
+
+3. You should see port `6080` under **Forwarded Ports**. Select the line and click on the globe icon to open it in a browser tab.
+
+    > If you do not see port `6080`, press <kbd>F1</kbd>, select **Forward a Port** and enter port `6080`.
+
+4. In the new tab, you should see noVNC. Click **Connect** and enter `vscode` as the password.
+
+Anything you start in VS Code or the integrated terminal will appear here.
+
+Next: **[Try it out!](#try-it)**
+
+### Using VS Code with GitHub Codespaces
+
+You will likely see better performance when accessing the codespace you created from VS Code since you can use a[VNC Viewer](https://www.realvnc.com/en/connect/download/viewer/). Here's how to do it.
+
+1. [Create a codespace](#quick-start---github-codespaces) if you have not already.
+
+2. Set up [VS Code for use with GitHub Codespaces](https://docs.github.com/github/developing-online-with-codespaces/using-codespaces-in-visual-studio-code)
+
+3. After the VS Code is up and running, press <kbd>F1</kbd>, choose **Codespaces: Connect to Codespace**, and select the codespace you created.
+
+4. After you've connected to the codespace, use a [VNC Viewer](https://www.realvnc.com/en/connect/download/viewer/) to connect to `localhost:5901` and enter `vscode` as the password.
+
+5. Anything you start in VS Code or the integrated terminal will appear here.
+
+Next: **[Try it out!](#try-it)**
+
+## Try it!
+
+This container uses the [Fluxbox](http://fluxbox.org/) window manager to keep things lean. **Right-click on the desktop** to see menu options. It works with GNOME and GTK applications, so other tools can be installed if needed.
+
+Note you can also set the resolution from the command line by typing `set-resolution`.
+
+To start working with Code - OSS, follow these steps:
+
+1. In your local VS Code, open a terminal (<kbd>Ctrl/Cmd</kbd> + <kbd>Shift</kbd> + <kbd>\`</kbd>) and type the following commands:
+
+    ```bash
+    yarn install
+    bash scripts/code.sh
+    ```
+
+    Note that a previous run of `yarn install`  will already be cached, so this step should simply pick up any recent differences.
+
+2. After the build is complete, open a web browser or a [VNC Viewer](https://www.realvnc.com/en/connect/download/viewer/) to the desktop environnement as described in the quick start and enter `vscode` as the password.
+
+3. You should now see Code - OSS!
+
+Next, let's try debugging.
+
+1. Shut down Code - OSS by clicking the box in the upper right corner of the Code - OSS window through your browser or VNC viewer.
+
+2. Go to your local VS Code client, and use Run / Debug view to launch the **VS Code** configuration. (Typically the default, so you can likely just press <kbd>F5</kbd>).
+
+    > **Note:** If launching times out, you can increase the value of `timeout` in the "VS Code", "Attach Main Process", "Attach Extension Host", and "Attach to Shared Process" configurations in [launch.json](../.vscode/launch.json). However, running `scripts/code.sh` first will set up Electron which will usually solve timeout issues.
+
+3. After a bit, Code - OSS will appear with the debugger attached!
+
+Enjoy!

lib/vscode/.devcontainer/cache/.gitignore

@@ -0,0 +1 @@
+*.manifest

lib/vscode/.devcontainer/cache/before-cache.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+# This file establishes a basline for the reposuitory before any steps in the "prepare.sh"
+# are run. Its just a find command that filters out a few things we don't need to watch.
+
+set -e
+
+SCRIPT_PATH="$(cd "$(dirname $0)" && pwd)"
+SOURCE_FOLDER="${1:-"."}"
+
+cd "${SOURCE_FOLDER}"
+echo "[$(date)] Generating ""before"" manifest..."
+find -L . -not -path "*/.git/*" -and -not -path "${SCRIPT_PATH}/*.manifest" -type f >  "${SCRIPT_PATH}/before.manifest"
+echo "[$(date)] Done!"
+

lib/vscode/.devcontainer/cache/build-cache-image.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+
+# This file simply wraps the dockeer build command used to build the image with the
+# cached result of the commands from "prepare.sh" and pushes it to the specified
+# container image registry.
+
+set -e
+
+SCRIPT_PATH="$(cd "$(dirname $0)" && pwd)"
+CONTAINER_IMAGE_REPOSITORY="$1"
+BRANCH="${2:-"main"}"
+
+if [ "${CONTAINER_IMAGE_REPOSITORY}" = "" ]; then
+	echo "Container repository not specified!"
+	exit 1
+fi
+
+TAG="branch-${BRANCH//\//-}"
+echo "[$(date)] ${BRANCH} => ${TAG}"
+cd "${SCRIPT_PATH}/../.."
+
+echo "[$(date)] Starting image build..."
+docker build -t ${CONTAINER_IMAGE_REPOSITORY}:"${TAG}" -f "${SCRIPT_PATH}/cache.Dockerfile" .
+echo "[$(date)] Image build complete."
+
+echo "[$(date)] Pushing image..."
+docker push ${CONTAINER_IMAGE_REPOSITORY}:"${TAG}"
+echo "[$(date)] Done!"

lib/vscode/.devcontainer/cache/cache-diff.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+# This file is used to archive off a copy of any differences in the source tree into another location
+# in the image. Once the codespace is up, this will be restored into its proper location (which is
+# quick and happens parallel to other startup activities)
+
+set -e
+
+SCRIPT_PATH="$(cd "$(dirname $0)" && pwd)"
+SOURCE_FOLDER="${1:-"."}"
+CACHE_FOLDER="${2:-"/usr/local/etc/devcontainer-cache"}"
+
+echo "[$(date)] Starting cache operation..."
+cd "${SOURCE_FOLDER}"
+echo "[$(date)] Determining diffs..."
+find -L . -not -path "*/.git/*" -and -not -path "${SCRIPT_PATH}/*.manifest" -type f > "${SCRIPT_PATH}/after.manifest"
+grep -Fxvf  "${SCRIPT_PATH}/before.manifest" "${SCRIPT_PATH}/after.manifest" > "${SCRIPT_PATH}/cache.manifest"
+echo "[$(date)] Archiving diffs..."
+mkdir -p "${CACHE_FOLDER}"
+tar -cf "${CACHE_FOLDER}/cache.tar" --totals --files-from "${SCRIPT_PATH}/cache.manifest"
+echo "[$(date)] Done! $(du -h "${CACHE_FOLDER}/cache.tar")"