feat: upgrade to 1.64 #45

jsjoeio · 2022-02-17T18:37:19Z

Summary

This PR upgrades VS Code to 1.64.

Testing Plan

To test this locally, you need to:

clone coder/code-server locally
make sure yarn link is set up correctly
run yarn watch

Video

Screen.Recording.2022-02-24.at.1.52.38.PM.mov

How to Review this PR

I committed the merge conflicts and fixed them one-by-one. Look at the Commits tab starting with this commit.

Files with Merge Conflicts

Next Steps

Fixes coder/code-server#4822

* Enable resourceurls * Add selection to resourceurls from trees * Rename identifier * Respond to PR feedback * Do not loop opver openEditors

Bumps [node-fetch](https://github.com/node-fetch/node-fetch) from 2.6.2 to 2.6.7. - [Release notes](https://github.com/node-fetch/node-fetch/releases) - [Commits](node-fetch/node-fetch@v2.6.2...v2.6.7) --- updated-dependencies: - dependency-name: node-fetch dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [node-fetch](https://github.com/node-fetch/node-fetch) from 2.6.1 to 2.6.7. - [Release notes](https://github.com/node-fetch/node-fetch/releases) - [Commits](node-fetch/node-fetch@v2.6.1...v2.6.7) --- updated-dependencies: - dependency-name: node-fetch dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Fixes microsoft#140867

Fixes microsoft#141419

Fixes microsoft#141416

…ed. Fixes microsoft#141445

Fixes microsoft#141456

Fixes microsoft#141443

Clean up IWorkbenchConstructionOptions. That's mostly it here.

Added flexible:Height: true to the SyncDescriptor since we were missing it. Removed a block that showed the prevented the web view extensions from automatically hiding. I did this because upstream removed two properties it was using: this.hasInstalledWebExtensionsContextKey and this.updateInstalledWebExtensionsContext. I hope that was right.

jsjoeio · 2022-02-17T23:30:03Z

src/vs/code/browser/workbench/workbench.ts

Should be the next thing to work on.

I removed `args['server-data-dir']` from `REMOTE_DATA_FOLDER` since we don't have access to `args` here. The other change was the `{ mode: 0o700 }` added to the `fs.mkdirSync` call. Not sure if that's related to chmod 0700 or something else.

We resolved a few things here with the conflicts.

We were able to remove a couple of our patches, which is awesome! Still have some things to test though.

Moved our custom serverThemeService into the src/vs/server/node folder and added the missing _serviceBrand to the interface and the class to fix a ctor error.

jsjoeio · 2022-02-24T20:30:47Z

Folder Path in URL 🐛

When you first start code-server and the URL updates with the folder, we get this: http://localhost:3000/?folder=%2FUsers%2Fjp%2Fdev%2Fcoder - I think we need to add our patch back then. 🐛
When you do "File > Open Folder", it works as expected: http://localhost:3000/?folder=/Users/jp/dev/folder-for-testing
When you edit by hand, it works as expected: http://localhost:3000/?folder=/Users/jp/dev

jsjoeio · 2022-02-24T23:16:27Z

Opening Folder or Workspace from CLI 🐛

Testing locally with yarn watch --port 3000 ./docs and it did not work. It seems to only open your last opened workspace.

code-asher

Nice work! Everything looks good to me.

scripts/code-server.sh

src/vs/platform/remote/browser/browserSocketFactory.ts

src/vs/platform/remote/common/remoteAgentConnection.ts

src/vs/workbench/browser/client.ts

connor4312 and others added 30 commits January 24, 2022 22:00

debug: bump js-debug

2a3b916

Resources lost their authority part (fix microsoft#141328)

f93c696

Run OSS tool

e0e77c8

Enable resourceurls (microsoft#140709)

1ee13ae

* Enable resourceurls * Add selection to resourceurls from trees * Rename identifier * Respond to PR feedback * Do not loop opver openEditors

cleanup @vscode/windows-registry

ca19f12

fixes microsoft#141392

d6fb938

Add check that the editor's ESM JS files can be loaded in a browser

bd369c6

Create from template options for configure tasks

a9ed79d

Fixes microsoft#140867

web - only simplify vscode-remote workspaces (microsoft#141411)

8d78843

web - use correct untitled workspace object (fix microsoft#141411)

07c6f53

Install playwright using npx playwright install

fcb7a9f

Fix microsoft#141326

c5ab188

Most recent -> last link

ee37c0b

Fixes microsoft#141419

Add ellipsis to open detected link

f440a97

Fixes microsoft#141416

$ref '' in 'http://json-schema.org/draft-07/schema' can not be resolv…

c89f347

…ed. Fixes microsoft#141445

Use @playwright/test instead of playwright

2ccb32c

Document how to unset auto reply, support null explicitly

a30e4b2

Fixes microsoft#141456

remove unnecessary async

060e72d

fix microsoft#141435

5bc227a

add shell integration message to zsh part of microsoft#141448

1faba6d

add shell integration message to pwsh, fix microsoft#141448

cc8b5c0

Fix spelling error

51c7f6d

Install playwright deps

a33a712

Remove redundant 0 from bold sequence

9daa788

fix microsoft#141420

01f9ae2

Run headless on CI

1b1d594

bold pwsh shell integration text

16315dc

Fix cwdFolder on Windows

0e45c9f

Fixes microsoft#141443

jsjoeio added 2 commits February 17, 2022 15:13

fix: src/vs/workbench/browser/web.api.ts

9753a09

Clean up IWorkbenchConstructionOptions. That's mostly it here.

jsjoeio added 8 commits February 22, 2022 15:37

fix: src/vs/server/node/server.main.ts

80ec82f

I removed `args['server-data-dir']` from `REMOTE_DATA_FOLDER` since we don't have access to `args` here. The other change was the `{ mode: 0o700 }` added to the `fs.mkdirSync` call. Not sure if that's related to chmod 0700 or something else.

wip

2ddceaf

fix: conflicts in src/vs/server/node/webClientServer.ts

90f0c44

We resolved a few things here with the conflicts.

fix: src/vs/code/browser/workbench/workbench.ts

9ed898a

We were able to remove a couple of our patches, which is awesome! Still have some things to test though.

fix: src/vs/server/node/remoteExtensionHostAgentServer.ts

2d096b9

Moved our custom serverThemeService into the src/vs/server/node folder and added the missing _serviceBrand to the interface and the class to fix a ctor error.

fix: remove clientTheme from webClientServer

62bb680

fix: also remove from html files

aa27540

Merge remote-tracking branch 'origin/main' into vscode-update

152714d

jsjoeio added 2 commits February 24, 2022 13:55

fix: add missing __metadata change

e7ce922

chore: clean up code comments

a56d320

jsjoeio added 3 commits February 25, 2022 10:16

chore: clean up comments

f7df7ee

chore: fix typo

63e4122

wip: add notes for debugging folder query param

6ff776b

This was referenced Mar 1, 2022

feat(http): keep slashes in queryParams in redirects coder/code-server#4928

Merged

refactor: remove folder/workspace from vsCodeCliArgs coder/code-server#4932

Merged

jsjoeio added 3 commits March 2, 2022 13:19

refactor: remove workspace & folder from code-server args

23692ce

fixup!: clean up TODOS

9288f52

Merge remote-tracking branch 'origin/main' into vscode-update

9771e31

jsjoeio marked this pull request as ready for review March 2, 2022 21:30

jsjoeio mentioned this pull request Mar 2, 2022

chore: update vscode to 1.64 coder/code-server#4902

Merged

2 tasks

jsjoeio requested a review from code-asher March 2, 2022 22:38

code-asher approved these changes Mar 3, 2022

View reviewed changes

scripts/code-server.sh Outdated Show resolved Hide resolved

src/vs/platform/remote/browser/browserSocketFactory.ts Show resolved Hide resolved

src/vs/platform/remote/common/remoteAgentConnection.ts Show resolved Hide resolved

src/vs/workbench/browser/client.ts Show resolved Hide resolved

revert(code-server.sh): match upstream

c188e92

jsjoeio merged commit a13f6e1 into main Mar 4, 2022

jsjoeio deleted the vscode-update branch March 4, 2022 21:59

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: upgrade to 1.64 #45

feat: upgrade to 1.64 #45

jsjoeio commented Feb 17, 2022 •

edited

Loading

jsjoeio commented Feb 17, 2022

jsjoeio commented Feb 24, 2022 •

edited

Loading

jsjoeio commented Feb 24, 2022

code-asher left a comment

feat: upgrade to 1.64 #45

feat: upgrade to 1.64 #45

Conversation

jsjoeio commented Feb 17, 2022 • edited Loading

Summary

Testing Plan

Video

How to Review this PR

Files with Merge Conflicts

Next Steps

jsjoeio commented Feb 17, 2022

jsjoeio commented Feb 24, 2022 • edited Loading

Folder Path in URL 🐛

jsjoeio commented Feb 24, 2022

Opening Folder or Workspace from CLI 🐛

code-asher left a comment

Choose a reason for hiding this comment

jsjoeio commented Feb 17, 2022 •

edited

Loading

jsjoeio commented Feb 24, 2022 •

edited

Loading