From 71b1f9f3421c2a7a042188b7af63ae176fd99680 Mon Sep 17 00:00:00 2001
From: Asher <ash@coder.com>
Date: Wed, 10 Nov 2021 22:52:52 +0000
Subject: [PATCH] Update VS Code

Fixes https://github.com/cdr/code-server/issues/4397
Fixes https://github.com/cdr/code-server/issues/4480
Fixes https://github.com/cdr/code-server/issues/4482
Fixes https://github.com/cdr/code-server/issues/4484
Fixes https://github.com/cdr/code-server/issues/4489
---
 CHANGELOG.md               |  2 ++
 docs/collaboration.md      | 10 +---------
 src/node/cli.ts            |  6 ------
 test/unit/node/cli.test.ts |  4 ++--
 4 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8811cff94c7b..62d33e77e9f5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -38,6 +38,8 @@ implementation (#4414).
   vscode-remote-resource endpoint still can.
 - OpenVSX has been made the default marketplace. However this means web
   extensions like Vim are now broken.
+- The proposed API has been defaulted to on.  As a result the
+  `--enable-proposed-api` flag has been removed.
 
 ## [3.12.0](https://github.com/cdr/code-server/releases/tag/v3.12.0) - 2021-09-15
 
diff --git a/docs/collaboration.md b/docs/collaboration.md
index 72fd909aed7c..b247fdbb6161 100644
--- a/docs/collaboration.md
+++ b/docs/collaboration.md
@@ -54,12 +54,4 @@ As `code-server` is based on VS Code, you can follow the steps described on Duck
      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/v3.12.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.
+2. Refresh code-server and navigate to the CodeTogether icon in the sidebar to host or join a coding session.
diff --git a/src/node/cli.ts b/src/node/cli.ts
index d9bbca0e2658..91cfed499a63 100644
--- a/src/node/cli.ts
+++ b/src/node/cli.ts
@@ -77,7 +77,6 @@ export interface UserProvidedArgs {
   "disable-telemetry"?: boolean
   force?: boolean
   "user-data-dir"?: string
-  "enable-proposed-api"?: string[]
   "extensions-dir"?: string
   "builtin-extensions-dir"?: string
   "install-extension"?: string[]
@@ -196,11 +195,6 @@ const options: Options<Required<UserProvidedArgs>> = {
       "Install or update a VS Code extension by id or vsix. The identifier of an extension is `${publisher}.${name}`.\n" +
       "To install a specific version provide `@${version}`. For example: 'vscode.csharp@1.2.3'.",
   },
-  "enable-proposed-api": {
-    type: "string[]",
-    description:
-      "Enable proposed API features for extensions. Can receive one or more extension IDs to enable individually.",
-  },
   "uninstall-extension": { type: "string[]", description: "Uninstall a VS Code extension by id." },
   "show-versions": { type: "boolean", description: "Show VS Code extension versions." },
   "proxy-domain": { type: "string[]", description: "Domain used for proxying ports." },
diff --git a/test/unit/node/cli.test.ts b/test/unit/node/cli.test.ts
index 0dcf24f4b8cc..285b1dc7da7f 100644
--- a/test/unit/node/cli.test.ts
+++ b/test/unit/node/cli.test.ts
@@ -439,9 +439,9 @@ describe("cli", () => {
 
 describe("splitOnFirstEquals", () => {
   it("should split on the first equals", () => {
-    const testStr = "enabled-proposed-api=test=value"
+      const testStr = "proxy-domain=test=value"
     const actual = splitOnFirstEquals(testStr)
-    const expected = ["enabled-proposed-api", "test=value"]
+      const expected = ["proxy-domain", "test=value"]
     expect(actual).toEqual(expect.arrayContaining(expected))
   })
   it("should split on first equals regardless of multiple equals signs", () => {