Skip to content

chore: update vscode to 1.64 #4902

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Mar 9, 2022
Merged

chore: update vscode to 1.64 #4902

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
276c4f4
chore: update vscode server files
jsjoeio Feb 23, 2022
e48506e
chore: update code to 1.64
jsjoeio Mar 4, 2022
8510df1
refactor: clean up code in constants.ts
jsjoeio Mar 7, 2022
435e6f6
chore: keep package.json vscode cache
jsjoeio Mar 7, 2022
8e628d5
fixup!: formatting
jsjoeio Mar 7, 2022
0f5d8d3
Merge branch 'main' into jsjoeio-update-vscode-164
jsjoeio Mar 8, 2022
c5d4d5d
feat(ci): add VSCODE_CACHE_VERSION
jsjoeio Mar 8, 2022
b88fff3
fix(ci): add package.json for e2e tests
jsjoeio Mar 8, 2022
4263bfa
fix: TS errors
jsjoeio Mar 8, 2022
1a33394
refactor: remove isConnected e2e tests
jsjoeio Mar 8, 2022
ed44bbc
Merge branch 'main' into jsjoeio-update-vscode-164
jsjoeio Mar 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/node/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ export const shouldSpawnCliProcess = (args: UserProvidedArgs): boolean => {
export const runVsCodeCli = async (args: DefaultedArgs): Promise<void> => {
logger.debug("Running VS Code CLI")

// See ../../vendor/modules/code-oss-dev/src/vs/server/main.js.
const spawnCli = await loadAMDModule<CodeServerLib.SpawnCli>("vs/server/remoteExtensionHostAgent", "spawnCli")
// See ../../vendor/modules/code-oss-dev/src/vs/server/node/server.main.js.
const spawnCli = await loadAMDModule<CodeServerLib.SpawnCli>("vs/server/node/server.main", "spawnCli")

try {
await spawnCli(await toVsCodeArgs(args))
Expand Down
7 changes: 2 additions & 5 deletions src/node/routes/vscode.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,12 +118,9 @@ export class CodeServerRouteWrapper {
const { args } = req

/**
* @file ../../../vendor/modules/code-oss-dev/src/vs/server/main.js
* @file ../../../vendor/modules/code-oss-dev/src/vs/server/node/server.main.js
*/
const createVSServer = await loadAMDModule<CodeServerLib.CreateServer>(
"vs/server/remoteExtensionHostAgent",
"createServer",
)
const createVSServer = await loadAMDModule<CodeServerLib.CreateServer>("vs/server/node/server.main", "createServer")

try {
this._codeServerMain = await createVSServer(null, {
Expand Down
2 changes: 1 addition & 1 deletion vendor/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
"postinstall": "./postinstall.sh"
},
"devDependencies": {
"code-oss-dev": "coder/vscode#94384412221f432c15bb679315c49964925090be"
"code-oss-dev": "coder/vscode#a13f6e1434ad6ab820eef0ecca5b923b3e275667"
}
}
Loading