Skip to content

Gitfarm sync update#143

Merged
feiyangliu2023 merged 4 commits intoaws:1.1from
feiyangliu2023:gitfarm-sync-update
Feb 18, 2026
Merged

Gitfarm sync update#143
feiyangliu2023 merged 4 commits intoaws:1.1from
feiyangliu2023:gitfarm-sync-update

Conversation

@feiyangliu2023
Copy link
Contributor

Issue

D372376902

Description of Changes

  • Resolved merge conflicts in internal patches, make sure internal patches fit the upstream code after VSCode upgrade to 1.108.2
  • Fix installer.diff to use untar in correct way for code editor compilation
  • Adopted custom vsce-sign extension to override npmpm registry

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

@feiyangliu2023 feiyangliu2023 requested a review from a team as a code owner February 16, 2026 13:33
"@vscode/iconv-lite-umd": "0.7.1",
- "@vscode/ripgrep": "^1.15.13",
"@vscode/vsce": "3.6.1",
+ "@vscode/vsce-sign": "file:../../../../build-tools/vsce-sign",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we also need to add the vsce-sign binary to this path? Currently there's nothing present in this path.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, vsce-sign is needed on code editor gitfarm only. And it is added here so that the patches will be in sync on both repositories

"dependencies": {
- "vscode-languageclient": "^10.0.0-next.15",
- "vscode-languageclient": "^10.0.0-next.18",
+ "vscode-languageclient": "10.0.0-next.9",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are we lowering the version here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These have been downgraded only because npmpm had an issue with allowlisting packages. It seems to have been resolved, so I will remove this override

@sachinh-amazon
Copy link
Contributor

Let's also add this to the main branch.

@feiyangliu2023 feiyangliu2023 merged commit 160c612 into aws:1.1 Feb 18, 2026
1 check passed
feiyangliu2023 added a commit to feiyangliu2023/code-editorv2 that referenced this pull request Feb 18, 2026
* resolve internal patch conflicts and adopt custom built vsce-sign

* correct usage of untar in gulp

* Remove outdated version upgrade

* Revert "Remove outdated version upgrade"

This reverts commit 5ce945f.

---------

Co-authored-by: Feiyang Liu <lfeiyang@amazon.nl>
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.

2 participants