Merge recent 2025.01 updates to main #6035
Merged
Conversation
This file contains 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
Upstream `main` was missing a few changes that are needed for the Workbench patch, see PR: rstudio/vscode-server#162 - address Snyk vulnerabilities in micromatch and dompurify - use correct table name when saving state to Workbench - update extension host agent server to send first heartbeat on startup in Workbench - bump workbench extension ### Release Notes <!-- Optionally, replace `N/A` with text to be included in the next release notes. The `N/A` bullets are ignored. If you refer to one or more Positron issues, these issues are used to collect information about the feature or bugfix, such as the relevant language pack as determined by Github labels of type `lang: `. The note will automatically be tagged with the language. These notes are typically filled by the Positron team. If you are an external contributor, you may ignore this section. --> #### New Features - N/A #### Bug Fixes - N/A ### QA Notes <!-- Add additional information for QA on how to validate the change, paying special attention to the level of risk, adjacent areas that could be affected by the change, and any important contextual information not present in the linked issues. --> --------- Co-authored-by: petetronic <[email protected]> Co-authored-by: Jonathan McPherson <[email protected]>
This change addresses an issue in which Positron Server doesn't start
due to an error like this one:
```
(node:11206) Warning: To load an ES module, set "type": "module" in the package.json or use the .mjs extension.
(Use `node --trace-warnings ...` to show where the warning was created)
/home/ubuntu/vscode-reh-web-linux-x64/out/server-main.js:26
export function __extends(d, b) {
^^^^^^
SyntaxError: Unexpected token 'export'
at wrapSafe (node:internal/modules/cjs/loader:1378:20)
at Module._compile
```
The problem was caused by an incompletely merged line in the initial
1.95 merge, which caused a cascade of silent failures that led to
`package.json` being omitted from the `reh-web` bundle, which led to the
above failure since `package.json` was responsible for setting `"type":
"module"` as noted above. The fix is just to update the line to match
what it was before the merge:
https://github.com/posit-dev/positron/blob/fa567b23598d7f91eab1f2aa182ae8b1e8b50099/build/gulpfile.reh.js#L378-L383
Addresses, coincidentally,
#5775, which is where this
error was first spotted.
After the change, it ought to be possible to run `./positron-server`
without error. E.g.:
```
./positron-server --version
Positron: 2025.01.1 build 4
Positron SHA: 9f520e6
Code OSS: 1.96.0
Arch: arm64
```
|
E2E Tests 🚀 |
|
We may want to grab #6058 as well! |
- addresses rstudio/rstudio-pro#7306 - adds help.html and external ESM modules to the reh-web build ### Release Notes #### New Features - N/A #### Bug Fixes - Fix issue preventing Positron from loading in Posit Workbench ### QA Notes These files should no longer be missing, so Positron should now load in Workbench. <img width="236" alt="image" src="https://github.com/user-attachments/assets/2142d440-58cb-4149-86fa-81b19b9da138" /> I also noticed that help.html was missing, which was preventing the Help Pane from working. Opening Help for R and Python from a Console should now work: R Console ```r ?iris ``` Python Console ```python ?print ``` --------- Co-authored-by: sharon wang <[email protected]>
|
I think the tests are repeatedly failing due to the heartbeat service added here. We probably need a guard to prevent this from starting up in Positron outside the context of Workbench. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This change pulls in a few changes from the 2025.01 branch that also need to be made on main: