feat: upgrade to 1.64 - #45
Merged
jsjoeio merged 2360 commits intoMar 4, 2022
Merged
jsjoeio merged 2360 commits into
jsjoeio merged 2360 commits into
Conversation
Copy link
Copy Markdown
Sorry, something went wrong.
* 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] <support@github.com> 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] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
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.
Copy link
Copy Markdown
Author
Should be the next thing to work on. |
Sorry, something went wrong.
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.
Copy link
Copy Markdown
Author
Folder Path in URL 🐛
|
Sorry, something went wrong.
Copy link
Copy Markdown
Author
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. |
Sorry, something went wrong.
This was referenced Mar 1, 2022
code-asher
approved these changes
Mar 3, 2022
code-asher
left a comment
Copy link
Copy Markdown
Member
There was a problem hiding this comment.
Nice work! Everything looks good to me.
Sorry, something went wrong.
Comment thread
scripts/code-server.sh
Outdated
Comment thread
src/vs/platform/remote/browser/browserSocketFactory.ts
Comment thread
src/vs/platform/remote/common/remoteAgentConnection.ts
Comment thread
src/vs/workbench/browser/client.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
This PR upgrades VS Code to 1.64.
Testing Plan
To test this locally, you need to:
Video
Screen.Recording.2022-02-24.at.1.52.38.PM.movHow 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