Skip to content

Commit 71b1f9f

Browse files
committed
Update VS Code
Fixes coder#4397 Fixes coder#4480 Fixes coder#4482 Fixes coder#4484 Fixes coder#4489
1 parent d052cc2 commit 71b1f9f

File tree

4 files changed

+5
-17
lines changed

4 files changed

+5
-17
lines changed

CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ implementation (#4414).
3838
vscode-remote-resource endpoint still can.
3939
- OpenVSX has been made the default marketplace. However this means web
4040
extensions like Vim are now broken.
41+
- The proposed API has been defaulted to on. As a result the
42+
`--enable-proposed-api` flag has been removed.
4143

4244
## [3.12.0](https://github.com/cdr/code-server/releases/tag/v3.12.0) - 2021-09-15
4345

docs/collaboration.md

+1-9
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,4 @@ As `code-server` is based on VS Code, you can follow the steps described on Duck
5454
code-server --install-extension genuitecllc.codetogether
5555
```
5656

57-
2. CodeTogether requires VS Code's proposed API to run. Start code-server with the following flag:
58-
59-
```sh
60-
code-server --enable-proposed-api genuitecllc.codetogether
61-
```
62-
63-
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).
64-
65-
3. Refresh code-server and navigate to the CodeTogether icon in the sidebar to host or join a coding session.
57+
2. Refresh code-server and navigate to the CodeTogether icon in the sidebar to host or join a coding session.

src/node/cli.ts

-6
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ export interface UserProvidedArgs {
7777
"disable-telemetry"?: boolean
7878
force?: boolean
7979
"user-data-dir"?: string
80-
"enable-proposed-api"?: string[]
8180
"extensions-dir"?: string
8281
"builtin-extensions-dir"?: string
8382
"install-extension"?: string[]
@@ -196,11 +195,6 @@ const options: Options<Required<UserProvidedArgs>> = {
196195
"Install or update a VS Code extension by id or vsix. The identifier of an extension is `${publisher}.${name}`.\n" +
197196
"To install a specific version provide `@${version}`. For example: '[email protected]'.",
198197
},
199-
"enable-proposed-api": {
200-
type: "string[]",
201-
description:
202-
"Enable proposed API features for extensions. Can receive one or more extension IDs to enable individually.",
203-
},
204198
"uninstall-extension": { type: "string[]", description: "Uninstall a VS Code extension by id." },
205199
"show-versions": { type: "boolean", description: "Show VS Code extension versions." },
206200
"proxy-domain": { type: "string[]", description: "Domain used for proxying ports." },

test/unit/node/cli.test.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -439,9 +439,9 @@ describe("cli", () => {
439439

440440
describe("splitOnFirstEquals", () => {
441441
it("should split on the first equals", () => {
442-
const testStr = "enabled-proposed-api=test=value"
442+
const testStr = "proxy-domain=test=value"
443443
const actual = splitOnFirstEquals(testStr)
444-
const expected = ["enabled-proposed-api", "test=value"]
444+
const expected = ["proxy-domain", "test=value"]
445445
expect(actual).toEqual(expect.arrayContaining(expected))
446446
})
447447
it("should split on first equals regardless of multiple equals signs", () => {

0 commit comments

Comments
 (0)