-
Notifications
You must be signed in to change notification settings - Fork 82
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.
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
Merge 1.93 from upstream #4655
Merge 1.93 from upstream #4655
Conversation
} | ||
}); | ||
// --- End Positron --- | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Deleted by accident?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
shoot, thanks for catching that! I put it back.
This change introduced a surprising number of test failures that I still need to work through before merge. Right now the positron-r tests are failing because the test process is literally exiting in the middle of the test for no apparent reason.
|
"@xterm/xterm": "5.6.0-beta.51", | ||
"he": "^1.2.0", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We lost he
! Can we please bring he
back? We'll need to yarn
so the reh-web package.json
can re-inherit he
as well
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done!
remote/web/package.json
Outdated
"@xterm/xterm": "5.6.0-beta.52", | ||
"@xterm/xterm": "5.6.0-beta.51", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just noticed we have a duplicate entry here for "@xterm/xterm"
. Based on remote/package.json
, I think we want the .52
one!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fixed in 0ebafbf!
remote/web/package.json
Outdated
"@xterm/xterm": "5.6.0-beta.51", | ||
"he": "^1.2.0", | ||
"he": "^1.2.0", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
looks like the indentation changed from tabs to spaces on this line
"he": "^1.2.0", | |
"he": "^1.2.0", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fixed in 0ebafbf!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM!
I've been running a build based on this branch in Workbench and in Server+Web and Desktop locally with no obvious issues with the typical IDE functionality
This change includes two large payloads:
A lot of hand-editing needed to happen here since our compressed history means we have no common baseline to use for a commit-based merge. The methodology used was roughly:
This was a one-shot merge process that won't need to be repeated since next time we will have a common baseline (a tag from vscode-server representing what we merged last time).
Nothing too crazy in here. One of the more annoying parts was getting the
rstudio.rstudio-workbench
built-in extension set up so that it gets bundled for thereh-web
build but ignored in other contexts.QA Notes
This contains a lot of churn introduced from two different sources, so some testing is indicated pre-merge. Here are some binaries you can test:
https://github.com/posit-dev/positron-builds/actions/runs/10821973170