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.

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

Alignment with upstream #485

Open
wants to merge 598 commits into
base: main
Choose a base branch
from

Conversation

RomanNikitenko
Copy link
Contributor

@RomanNikitenko RomanNikitenko commented Jan 13, 2025

What does this PR do?

  • Rebase against the upstream
  • We still can not align Node.js version with upstream as 20.18.1 version is not available in the images that we use to prepare che-code assembly
  • Downgrade vscode/proxy-agent version to 0.28.0, see code/package.json and code/remote/package.json.
    The reason is: 0.29.0 version requires 20.18.1 version of the Node.js - it is still not available in the ubi images
  • Downgrade @playwright/test - muscl-based assembly has a problem with the new version of the @playwright/test dep.

What issues does this PR fix?

eclipse-che/che#23310

How to test this PR?

  • PR jobs should be green
  • testing of any use cases is useful as we pick up a lot of commits from the upstream

You can use the following links to start a workspace for testing:

Does this PR contain changes that override default upstream Code-OSS behavior?

  • the PR contains changes in the code folder (you can skip it if your changes are placed in a che extension )
  • the corresponding items were added to the CHANGELOG.md file
  • rules for automatic git rebase were added to the .rebase folder

Copy link

github-actions bot commented Jan 13, 2025

Click here to review and test in web IDE: Contribute

Copy link

@RomanNikitenko RomanNikitenko force-pushed the alignment-with-upstream branch 2 times, most recently from ff37a81 to 1248bca Compare January 15, 2025 19:42
Copy link

2 similar comments
Copy link

Copy link

@RomanNikitenko RomanNikitenko marked this pull request as ready for review January 17, 2025 13:33
@vitaliy-guliy
Copy link
Contributor

The first test of the terminal highlighted the problem with a huge delay appeared after command execution. Terminal title is blinking from time to time

simplescreenrecorder-2025-01-17_16.00.32.mp4

@RomanNikitenko
Copy link
Contributor Author

@vitaliy-guliy
thanks for reporting it!

will try to reproduce the problem...

@RomanNikitenko RomanNikitenko force-pushed the alignment-with-upstream branch from 1ecef49 to 46d6754 Compare January 17, 2025 21:23
Copy link

@RomanNikitenko RomanNikitenko marked this pull request as draft January 18, 2025 07:48
@RomanNikitenko RomanNikitenko force-pushed the alignment-with-upstream branch from 46d6754 to 2380960 Compare January 18, 2025 08:32
roblourens and others added 14 commits January 22, 2025 08:07
…emapper request (#238429)

To drive codemapper telemetry
Fix typo in the help text of the icon extension point
Bumps [undici](https://github.com/nodejs/undici) from 7.2.0 to 7.2.3.
- [Release notes](https://github.com/nodejs/undici/releases)
- [Commits](nodejs/undici@v7.2.0...v7.2.3)

---
updated-dependencies:
- dependency-name: undici
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
build: update to include more tsc boilerplate
…ide (#238453)

* StatusBar - keep disposing a status bar entry on the extension host side

* Update src/vs/workbench/api/common/extHostStatusBar.ts

Co-authored-by: Benjamin Pasero <benjamin.pasero@microsoft.com>

* Update src/vs/workbench/api/common/extHostStatusBar.ts

Co-authored-by: Benjamin Pasero <benjamin.pasero@microsoft.com>

* Fix argument names

---------

Co-authored-by: Benjamin Pasero <benjamin.pasero@microsoft.com>
Switch to use nodenext module resolution
Remove unused test file

This test has been commented out for 5 years now
osortega and others added 26 commits January 28, 2025 13:12
…-fix

Fix for no results found message on ai results
[prompts]: change `Prompt` to `Prompt..` in the attachments list
* [prompts]: add docs link to the empty prompts selection dialog

* [prompt]: fix a typo in localization string ID

* [prompts]: refactor to reduce number of function arguments

* Update src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts

Co-authored-by: Harald Kirschner <hkirschner@microsoft.com>

---------

Co-authored-by: Harald Kirschner <hkirschner@microsoft.com>
* [prompts]: make the configuration setting public(experimental)

* [prompts]: update config setting name

* [prompts]: cleanup

* [prompts]: fix localization compilation error
Explain how multiple providers work for paste and drop
line replace view width computation fix
vscode-upstream-sha1: ea25475

rh-pre-commit.version: 2.2.0
rh-pre-commit.check-secrets: ENABLED
Signed-off-by: Roman Nikitenko <rnikiten@redhat.com>

rh-pre-commit.version: 2.2.0
rh-pre-commit.check-secrets: ENABLED
Signed-off-by: Roman Nikitenko <rnikiten@redhat.com>
Signed-off-by: Roman Nikitenko <rnikiten@redhat.com>
Copy link

@RomanNikitenko RomanNikitenko marked this pull request as ready for review January 30, 2025 14:31
Signed-off-by: Roman Nikitenko <rnikiten@redhat.com>
Copy link

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.