Alignment with upstream by RomanNikitenko · Pull Request #485 · che-incubator/che-code

RomanNikitenko · 2025-01-13T19:05:35Z

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:

ubi8-based tools container: https://che-dogfooding.apps.che-dev.x6e0.p1.openshiftapps.com/#/https://github.com/RomanNikitenko/web-nodejs-sample/tree/ubi8-based
ubi8-nodejs-based tools container: https://che-dogfooding.apps.che-dev.x6e0.p1.openshiftapps.com/#/https://github.com/RomanNikitenko/web-nodejs-sample/tree/ubi8-nodejs-based
ubi9-based tools container: https://che-dogfooding.apps.che-dev.x6e0.p1.openshiftapps.com/#/https://github.com/RomanNikitenko/web-nodejs-sample/tree/ubi9-based
ubi9-nodejs-based tools container: https://che-dogfooding.apps.che-dev.x6e0.p1.openshiftapps.com/#/https://github.com/RomanNikitenko/web-nodejs-sample/tree/ubi9-nodejs-based

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

github-actions · 2025-01-13T19:05:48Z

Click here to review and test in web IDE:

github-actions · 2025-01-14T10:06:22Z

Pull Request images published ✨

Editor: quay.io/che-incubator-pull-requests/che-code:pr-485-amd64
Dev image: quay.io/che-incubator-pull-requests/che-code-dev:pr-485-dev-amd64

github-actions · 2025-01-15T19:49:41Z

Pull Request images published ✨

Editor: quay.io/che-incubator-pull-requests/che-code:pr-485-amd64
Dev image: quay.io/che-incubator-pull-requests/che-code-dev:pr-485-dev-amd64

github-actions · 2025-01-16T13:06:16Z

Pull Request images published ✨

Editor: quay.io/che-incubator-pull-requests/che-code:pr-485-amd64
Dev image: quay.io/che-incubator-pull-requests/che-code-dev:pr-485-dev-amd64

github-actions · 2025-01-17T12:27:29Z

Pull Request images published ✨

Editor: quay.io/che-incubator-pull-requests/che-code:pr-485-amd64
Dev image: quay.io/che-incubator-pull-requests/che-code-dev:pr-485-dev-amd64

vitaliy-guliy · 2025-01-17T14:08:39Z

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 · 2025-01-17T14:12:41Z

@vitaliy-guliy
thanks for reporting it!

will try to reproduce the problem...

github-actions · 2025-01-17T22:30:58Z

Pull Request images published ✨

Editor: quay.io/che-incubator-pull-requests/che-code:pr-485-amd64
Dev image: quay.io/che-incubator-pull-requests/che-code-dev:pr-485-dev-amd64

fix deletion decoration

closes microsoft/vscode-copilot#11923

@isidorn

…gs around it (#238447) fyi @isidorn

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

* [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

…down (#239059)

Explain how multiple providers work for paste and drop

line replace view width computation fix

insertion view fixes

fix NES freezes window

Fixes microsoft/vscode-pull-request-github#6618

fix microsoft/vscode-copilot#12501

…atEditorController` (#239077) fixes microsoft/vscode-copilot#12252

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>

github-actions · 2025-01-30T13:24:17Z

Pull Request images published ✨

Editor: quay.io/che-incubator-pull-requests/che-code:pr-485-amd64
Dev image: quay.io/che-incubator-pull-requests/che-code-dev:pr-485-dev-amd64

Signed-off-by: Roman Nikitenko <rnikiten@redhat.com>

github-actions · 2025-01-30T18:53:07Z

Pull Request images published ✨

Editor: quay.io/che-incubator-pull-requests/che-code:pr-485-amd64
Dev image: quay.io/che-incubator-pull-requests/che-code-dev:pr-485-dev-amd64

github-actions · 2025-02-03T14:02:49Z

Pull Request images published ✨

Editor: quay.io/che-incubator-pull-requests/che-code:pr-485-amd64
Dev image: quay.io/che-incubator-pull-requests/che-code-dev:pr-485-dev-amd64

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

RomanNikitenko marked this pull request as ready for review January 17, 2025 13:33

RomanNikitenko requested review from azatsarynnyy and vitaliy-guliy as code owners January 17, 2025 13:33

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

RomanNikitenko marked this pull request as draft January 18, 2025 07:48

RomanNikitenko force-pushed the alignment-with-upstream branch from 46d6754 to 2380960 Compare January 18, 2025 08:32

benibenj and others added 14 commits January 22, 2025 08:50

Fix deletion decoration logic in inline diff view (#238377)

63c3204

fix deletion decoration

wip - inline chat via editing session

3aece83

Merge Go To and Accept in gutter menu (#238446)

70f22f5

closes microsoft/vscode-copilot#11923

remove chat.editing.alwaysSaveWithGeneratedChanges setting and thin…

9b637ac

…gs around it (#238447) fyi @isidorn

Merge branch 'main' into joh/inlineChatEdits

295fd49

Merge pull request #238393 from rcjsuen/icon-extension-point-typo-fix

e98a37a

Fix typo in the help text of the icon extension point

Git - add caching for commit details (#238451)

b169dfc

Merge pull request #238422 from tmm1/tmm1/ts-boilerplate-more

741a1e9

build: update to include more tsc boilerplate

Git - enable git blame status bar entry by default (#238454)

23c4dc3

Merge pull request #236640 from mjbvz/passive-penguin

b61a7f3

Switch to use nodenext module resolution

Remove unused classification test (#237989)

92c3380

Remove unused test file This test has been commented out for 5 years now

show spec info w priority over path (#238408)

69ce98f

legomushroom and others added 21 commits January 29, 2025 01:18

publish configuration setting for prompt files (#239053)

3250a26

* [prompts]: make the configuration setting public(experimental) * [prompts]: update config setting name * [prompts]: cleanup * [prompts]: fix localization compilation error

Change "Explore New Features" to "Show Release Notes" (#239058)

4f9f7ac

Don't toggle agent mode when clicking the selected option in the drop…

3f1d0f7

…down (#239059)

Merge pull request #239042 from mjbvz/generous-armadillo

b1e74d9

Explain how multiple providers work for paste and drop

Fix line replacement view width computation (#239064)

4c081d3

line replace view width computation fix

Fix insertion view height and position calculations (#239065)

ac2084d

insertion view fixes

fix microsoft/vscode-copilot#12393 (#239066)

e646f3e

fixes microsoft/vscode#238926 (#239067)

6325b95

filter out images from history (#239069)

aefbe6c

fix microsoft/vscode#238925 (#239070)

bd23a0b

workaround for microsoft/vscode-copilot#11811 (#239072)

e09aa10

Fix NES freezes window issue (#239074)

3c3730b

fix NES freezes window

Improve description for comments.thread.confirmOnCollapse (#239075)

7c15e5a

Fixes microsoft/vscode-pull-request-github#6618

Fix gutter icon positioning over minimap (#239076)

4a26729

fix microsoft/vscode-copilot#12501

avoid cyclic dependency between ChatEditorOverlayController and `Ch…

d799a0b

…atEditorController` (#239077) fixes microsoft/vscode-copilot#12252

fix #238952 (#239079)

ea25475

Rebase against the upstream ea25475

7f7eb4c

vscode-upstream-sha1: ea25475 rh-pre-commit.version: 2.2.0 rh-pre-commit.check-secrets: ENABLED

chore: Update lock file after resolving conflicts

269f693

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

Downgrade @playwright/test

d7cfbe5

Signed-off-by: Roman Nikitenko <rnikiten@redhat.com>

chore: Add info related to rebasing against upstream

66e9a02

Signed-off-by: Roman Nikitenko <rnikiten@redhat.com>

RomanNikitenko marked this pull request as ready for review January 30, 2025 14:31

chore: Merge main to resolve conflicts

22fd7ef

Signed-off-by: Roman Nikitenko <rnikiten@redhat.com>

Merge branch 'main' into alignment-with-upstream

2f36761

vitaliy-guliy approved these changes Feb 3, 2025

View reviewed changes

RomanNikitenko merged commit f946163 into che-incubator:main Feb 4, 2025
7 checks passed

RomanNikitenko deleted the alignment-with-upstream branch February 4, 2025 14:28

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Alignment with upstream#485

Alignment with upstream#485
RomanNikitenko merged 599 commits intoche-incubator:mainfrom
RomanNikitenko:alignment-with-upstream

RomanNikitenko commented Jan 13, 2025 •

edited

Loading

Uh oh!

github-actions bot commented Jan 13, 2025 •

edited

Loading

Uh oh!

github-actions bot commented Jan 14, 2025

Uh oh!

github-actions bot commented Jan 15, 2025

Uh oh!

github-actions bot commented Jan 16, 2025

Uh oh!

github-actions bot commented Jan 17, 2025

Uh oh!

vitaliy-guliy commented Jan 17, 2025

Uh oh!

RomanNikitenko commented Jan 17, 2025

Uh oh!

github-actions bot commented Jan 17, 2025

Uh oh!

github-actions bot commented Jan 30, 2025

Uh oh!

github-actions bot commented Jan 30, 2025

Uh oh!

github-actions bot commented Feb 3, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants

Conversation

RomanNikitenko commented Jan 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What does this PR do?

What issues does this PR fix?

How to test this PR?

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

Uh oh!

github-actions bot commented Jan 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Jan 14, 2025

Uh oh!

github-actions bot commented Jan 15, 2025

Uh oh!

github-actions bot commented Jan 16, 2025

Uh oh!

github-actions bot commented Jan 17, 2025

Uh oh!

vitaliy-guliy commented Jan 17, 2025

Uh oh!

RomanNikitenko commented Jan 17, 2025

Uh oh!

github-actions bot commented Jan 17, 2025

Uh oh!

github-actions bot commented Jan 30, 2025

Uh oh!

github-actions bot commented Jan 30, 2025

Uh oh!

github-actions bot commented Feb 3, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants

RomanNikitenko commented Jan 13, 2025 •

edited

Loading

github-actions bot commented Jan 13, 2025 •

edited

Loading