Skip to content
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

Jump to bottom

feat: upgrade to 1.64 #45

Merged
merged 2,360 commits into from
Mar 4, 2022
Merged

feat: upgrade to 1.64 #45

merged 2,360 commits into from
Mar 4, 2022

Conversation

jsjoeio
Copy link

@jsjoeio jsjoeio commented Feb 17, 2022 •
edited
Loading

Summary

This PR upgrades VS Code to 1.64.

Testing Plan

To test this locally, you need to:

  1. clone coder/code-server locally
  2. make sure yarn link is set up correctly
  3. 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

  • package.json
  • yarn.lock
  • product.json
  • scripts/code-server.sh
  • src/vs/base/common/network.ts
  • src/vs/code/browser/workbench/workbench-dev.html
  • src/vs/code/browser/workbench/workbench.html
  • src/vs/platform/remote/browser/browserSocketFactory.ts
  • src/vs/platform/remote/common/remoteAgentConnection.ts
  • src/vs/server/node/serverEnvironmentService.ts
  • src/vs/workbench/browser/web.main.ts
  • src/vs/workbench/browser/web.api.ts
  • src/vs/server/node/server.main.ts
  • src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts
  • src/vs/server/node/webClientServer.ts
  • src/vs/code/browser/workbench/workbench.ts
  • src/vs/server/node/remoteExtensionHostAgentServer.ts

Next Steps

Fixes coder/code-server#4822

connor4312 and others added 30 commits January 24, 2022 22:00
@connor4312
debug: bump js-debug
2a3b916
@bpasero
Resources lost their authority part (fix microsoft#141328)
f93c696
@hediet
Run OSS tool
e0e77c8
@alexr00
Enable resourceurls (microsoft#140709)
1ee13ae 
* Enable resourceurls

* Add selection to resourceurls from trees

* Rename identifier

* Respond to PR feedback

* Do not loop opver openEditors
@joaomoreno
cleanup @vscode/windows-registry
ca19f12
@dependabot
Bump node-fetch from 2.6.2 to 2.6.7 (microsoft#141307)
5a27dae 
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>
@dependabot
Bump node-fetch from 2.6.1 to 2.6.7 in /build (microsoft#141306)
f13f882 
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>
@joaomoreno
fixes microsoft#141392
d6fb938
@alexdima
Add check that the editor's ESM JS files can be loaded in a browser
bd369c6
@alexr00
Create from template options for configure tasks
a9ed79d 
Fixes microsoft#140867
@bpasero
web - only simplify vscode-remote workspaces (microsoft#141411)
8d78843
@bpasero
web - use correct untitled workspace object (fix microsoft#141411)
07c6f53
@alexdima
Install playwright using npx playwright install
fcb7a9f
@lramos15
Fix microsoft#141326
c5ab188
@Tyriar
Most recent -> last link
ee37c0b 
Fixes microsoft#141419
@Tyriar
Add ellipsis to open detected link
f440a97 
Fixes microsoft#141416
@aeschli
$ref '' in 'http://json-schema.org/draft-07/schema' can not be resolv…
c89f347 
…ed. Fixes microsoft#141445
@alexdima
Use @playwright/test instead of playwright
2ccb32c
@Tyriar
Document how to unset auto reply, support null explicitly
a30e4b2 
Fixes microsoft#141456
@meganrogge
remove unnecessary async
060e72d
@meganrogge
fix microsoft#141435
5bc227a
@meganrogge
add shell integration message to zsh part of microsoft#141448
1faba6d
@meganrogge
add shell integration message to pwsh, fix microsoft#141448
cc8b5c0
@lramos15
Fix spelling error
51c7f6d
@alexdima
Install playwright deps
a33a712
@Tyriar
Remove redundant 0 from bold sequence
9daa788
@meganrogge
fix microsoft#141420
01f9ae2
@alexdima
Run headless on CI
1b1d594
@meganrogge
bold pwsh shell integration text
16315dc
@Tyriar
Fix cwdFolder on Windows
0e45c9f 
Fixes microsoft#141443
@jsjoeio
fix: src/vs/workbench/browser/web.api.ts
9753a09 
Clean up IWorkbenchConstructionOptions. That's mostly it here.
@jsjoeio
fix: src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts
733cd4c 
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
Copy link
Author

jsjoeio commented Feb 17, 2022

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

Should be the next thing to work on.

@jsjoeio
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.
@jsjoeio
wip
2ddceaf
@jsjoeio
fix: conflicts in src/vs/server/node/webClientServer.ts
90f0c44 
We resolved a few things here with the conflicts.
@jsjoeio
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.
@jsjoeio
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.
@jsjoeio
fix: remove clientTheme from webClientServer
62bb680
@jsjoeio
fix: also remove from html files
aa27540
@jsjoeio
Merge remote-tracking branch 'origin/main' into vscode-update
152714d
@jsjoeio
Copy link
Author

jsjoeio commented Feb 24, 2022 •
edited
Loading

Folder Path in URL 🐛

  1. 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. 🐛
  2. When you do "File > Open Folder", it works as expected: http://localhost:3000/?folder=/Users/jp/dev/folder-for-testing
  3. When you edit by hand, it works as expected: http://localhost:3000/?folder=/Users/jp/dev

@jsjoeio
Copy link
Author

jsjoeio commented Feb 24, 2022

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.

This was referenced Mar 1, 2022
Merged
Merged
@jsjoeio jsjoeio marked this pull request as ready for review March 2, 2022 21:30
@jsjoeio jsjoeio mentioned this pull request Mar 2, 2022
Merged
2 tasks
@jsjoeio jsjoeio requested a review from code-asher March 2, 2022 22:38
code-asher
code-asher approved these changes Mar 3, 2022
View reviewed changes
Copy link
Member

@code-asher code-asher left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice work! Everything looks good to me.

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
@jsjoeio jsjoeio merged commit a13f6e1 into main Mar 4, 2022
@jsjoeio jsjoeio deleted the vscode-update branch March 4, 2022 21:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@code-asher code-asher code-asher approved these changes

Assignees

@jsjoeio jsjoeio

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Chore]: update vscode to 1.64